mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
50f7c5af4a
Update to next U-Boot timed release. Remove now obsolete patch 100-01-board-mediatek-add-more-network-configurations.patch Default IP addresses are now dealt with in Kconfig, no longer in board- specific C header files. Add patches to restore ANSI support in bootmenu which was broken upstream, always use high-speed mode on serial UART for improved stability and fix an issue with pinconf not being applied on MT7623 resulting in eMMC being inaccessible when booting from micro SD card. In order to keep the size of the bootloader on MT7623 below 512kB remove some unneeded commands on both MT7623 boards. Tested on: * BananaPi BPi-R2 (MT7623N) * BananaPi BPi-R3 (MT7986A) * BananaPi BPi-R64 (MT7622A) * Linksys E8450 (MT7622B) Signed-off-by: Daniel Golle <daniel@makrotopia.org>
79 lines
2.2 KiB
Diff
79 lines
2.2 KiB
Diff
From 793bed29e78cc54d989333d756fef51efaca4e56 Mon Sep 17 00:00:00 2001
|
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
|
Date: Tue, 26 Jul 2022 09:29:18 +0800
|
|
Subject: [PATCH 58/71] mmc: mtk-sd: add support to display verbose error log
|
|
|
|
Add an option to enable debug log, and also display verbose error log for
|
|
both command and data.
|
|
|
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
drivers/mmc/Kconfig | 8 ++++++++
|
|
drivers/mmc/Makefile | 4 ++++
|
|
drivers/mmc/mtk-sd.c | 24 +++++++++++++++---------
|
|
3 files changed, 27 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/mmc/Kconfig
|
|
+++ b/drivers/mmc/Kconfig
|
|
@@ -823,6 +823,14 @@ config MMC_MTK
|
|
This is needed if support for any SD/SDIO/MMC devices is required.
|
|
If unsure, say N.
|
|
|
|
+config MMC_MTK_DEBUG
|
|
+ bool "Display verbose error log"
|
|
+ default n
|
|
+ depends on MMC_MTK
|
|
+ help
|
|
+ Enable this option to allow verbose error log being displayed for
|
|
+ debugging.
|
|
+
|
|
endif
|
|
|
|
config FSL_SDHC_V2_3
|
|
--- a/drivers/mmc/Makefile
|
|
+++ b/drivers/mmc/Makefile
|
|
@@ -84,3 +84,7 @@ obj-$(CONFIG_RENESAS_SDHI) += tmio-comm
|
|
obj-$(CONFIG_MMC_BCM2835) += bcm2835_sdhost.o
|
|
obj-$(CONFIG_MMC_MTK) += mtk-sd.o
|
|
obj-$(CONFIG_MMC_SDHCI_F_SDH30) += f_sdh30.o
|
|
+
|
|
+ifdef CONFIG_MMC_MTK_DEBUG
|
|
+CFLAGS_mtk-sd.o += -DDEBUG
|
|
+endif
|
|
--- a/drivers/mmc/mtk-sd.c
|
|
+++ b/drivers/mmc/mtk-sd.c
|
|
@@ -778,18 +778,24 @@ static int msdc_ops_send_cmd(struct udev
|
|
if (cmd_ret &&
|
|
!(cmd_ret == -EIO &&
|
|
(cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK ||
|
|
- cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200)))
|
|
+ cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200))) {
|
|
+ dev_dbg(dev, "MSDC start command failure with %d, cmd=%d, arg=0x%x\n",
|
|
+ cmd_ret, cmd->cmdidx, cmd->cmdarg);
|
|
return cmd_ret;
|
|
-
|
|
- if (data) {
|
|
- data_ret = msdc_start_data(host, data);
|
|
- if (cmd_ret)
|
|
- return cmd_ret;
|
|
- else
|
|
- return data_ret;
|
|
}
|
|
|
|
- return 0;
|
|
+ if (!data)
|
|
+ return cmd_ret;
|
|
+
|
|
+ data_ret = msdc_start_data(host, data);
|
|
+ if (cmd_ret)
|
|
+ return cmd_ret;
|
|
+
|
|
+ if (data_ret)
|
|
+ dev_dbg(dev, "MSDC start data failure with %d, cmd=%d, arg=0x%x\n",
|
|
+ data_ret, cmd->cmdidx, cmd->cmdarg);
|
|
+
|
|
+ return data_ret;
|
|
}
|
|
|
|
static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
|