Skip to contentSkip to conversation

mmc: moxart: fix 4-bit bus width, remove 8-bit bus width

PATCH In review Sergei Antonov 2 participants 2 messages Sep 7, 2022 – Sep 14, 2022 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: moxart: fix 4-bit bus width, remove 8-bit bus width

According to the datasheet:
https://bitbucket.org/Kasreyn/mkrom-uc7112lx/src/master/documents/FIC8120_DS_v1.2.pdf
, page 377
4-bit bus width is turned on by bit 2 of the Bus Width Register, so the current bitmask is wrong:
define BUS_WIDTH_4 BIT(1)
BIT(1) does not work and BIT(2) works. It was verified on real MOXA hardware with FTSDC010 controller revision 1_6_0.

The corrected value of BUS_WIDTH_4 mask collides with:
define BUS_WIDTH_8 BIT(2)
No evidence of 8-bit bus width mode is found in the datasheet. Remove code dealing with 8-bit bus width.

Fixes 1b66e94e6b99 ("mmc: moxart: Add MOXA ART SD/MMC driver")
Cc Jonas Jensen <[email protected]>
---
 drivers/mmc/host/moxart-mmc.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/mmc/host/moxart-mmc.c +3 -14
index b6eb75f4bbfc..dfc3ffd5b1f8 100644
@@ -111,8 +111,8 @@
 #define CLK_DIV_MASK		0x7f
 
 /* REG_BUS_WIDTH */
-#define BUS_WIDTH_8		BIT(2)
-#define BUS_WIDTH_4		BIT(1)
+#define BUS_WIDTH_4_SUPPORT	BIT(3)
+#define BUS_WIDTH_4		BIT(2)
 #define BUS_WIDTH_1		BIT(0)
 
 #define MMC_VDD_360		23
@@ -524,9 +524,6 @@ static void moxart_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	case MMC_BUS_WIDTH_4:
 		writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH);
 		break;
-	case MMC_BUS_WIDTH_8:
-		writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH);
-		break;
 	default:
 		writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH);
 		break;
@@ -651,16 +648,8 @@ static int moxart_probe(struct platform_device *pdev)
 		dmaengine_slave_config(host->dma_chan_rx, &cfg);
 	}
 
-	switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) {
-	case 1:
+	if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
-		break;
-	case 2:
-		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
-		break;
-	default:
-		break;
-	}
 
 	writel(0, host->base + REG_INTERRUPT_MASK);
 
Signature · 1 line
2.34.1
#1 lore raw
Quoted 10 lines · Sergei Antonov

According to the datasheet:
https://bitbucket.org/Kasreyn/mkrom-uc7112lx/src/master/documents/FIC8120_DS_v1.2.pdf
, page 377
4-bit bus width is turned on by bit 2 of the Bus Width Register, so the current bitmask is wrong:
define BUS_WIDTH_4 BIT(1)
BIT(1) does not work and BIT(2) works. It was verified on real MOXA hardware with FTSDC010 controller revision 1_6_0.

Quoted 8 lines

The corrected value of BUS_WIDTH_4 mask collides with:
define BUS_WIDTH_8 BIT(2)
No evidence of 8-bit bus width mode is found in the datasheet. Remove code dealing with 8-bit bus width.

Fixes 1b66e94e6b99 ("mmc: moxart: Add MOXA ART SD/MMC driver")
Cc Jonas Jensen <[email protected]>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe

Quoted 50 lines
---
 drivers/mmc/host/moxart-mmc.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/mmc/host/moxart-mmc.c +3 -15
index b6eb75f4bbfc..dfc3ffd5b1f8 100644
@@ -111,8 +111,8 @@
 #define CLK_DIV_MASK           0x7f
 
 /* REG_BUS_WIDTH */
-#define BUS_WIDTH_8            BIT(2)
-#define BUS_WIDTH_4            BIT(1)
+#define BUS_WIDTH_4_SUPPORT    BIT(3)
+#define BUS_WIDTH_4            BIT(2)
 #define BUS_WIDTH_1            BIT(0)
 
 #define MMC_VDD_360            23
@@ -524,9 +524,6 @@ static void moxart_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        case MMC_BUS_WIDTH_4:
                writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH);
                break;
-       case MMC_BUS_WIDTH_8:
-               writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH);
-               break;
        default:
                writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH);
                break;
@@ -651,16 +648,8 @@ static int moxart_probe(struct platform_device *pdev)
                dmaengine_slave_config(host->dma_chan_rx, &cfg);
        }
 
-       switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) {
-       case 1:
+       if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT)
                mmc->caps |= MMC_CAP_4_BIT_DATA;
-               break;
-       case 2:
-               mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
-               break;
-       default:
-               break;
-       }
 
        writel(0, host->base + REG_INTERRUPT_MASK);
 
--

2.34.1