Skip to contentSkip to conversation

mmc: sdhci: disable ADMA when PAGE SIZE is 64K

PATCH In review [email protected] 2 participants 5 messages Oct 27, 2021 – Nov 12, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: sdhci: disable ADMA when PAGE SIZE is 64K

From: Haibo Chen <[email protected]>

For ADMA with quirks SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, it limit the max segment size as 64K-1. Currently, linux kernel support 4K/16K/64K PAGE_SIZE. If choose 64K PAGE_SIZE, sdhci in ADMA mode with the upper quirks will meet issue.

Though mmc driver give block layer the max segment size through blk_queue_max_segment_size(), but in this function, it will compare the argument with PAGE_SIZE, and will choose PAGE_SIZE if the argument is smaller than PAGE_SIZE. When PAGE_SIZE is 64K, finally the mmc request queue will get 64K as the max segment size. Once the sg data length=64K, ADMA will meet issue. For this case, need to disable ADMA mode.

---
 drivers/mmc/host/sdhci.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci.c +6 -0
index dbe87995596c..47e0c0156b94 100644
@@ -4187,6 +4187,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 		host->flags &= ~SDHCI_USE_ADMA;
 	}
 
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) &&
+		PAGE_SIZE >= 65536 && (host->flags & SDHCI_USE_ADMA)) {
+		DBG("Disabling ADMA as it don't support >= 64K PAGE_SIZE\n");
+		host->flags &= ~SDHCI_USE_ADMA;
+	}
+
 	if (sdhci_can_64bit_dma(host))
 		host->flags |= SDHCI_USE_64_BIT_DMA;
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 7 lines · On 27/10/2021 05:47, [email protected] wrote:

From: Haibo Chen <[email protected]>

For ADMA with quirks SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, it limit the max segment size as 64K-1. Currently, linux kernel support 4K/16K/64K PAGE_SIZE. If choose 64K PAGE_SIZE, sdhci in ADMA mode with the upper quirks will meet issue.

Quoted 7 lines

Though mmc driver give block layer the max segment size through blk_queue_max_segment_size(), but in this function, it will compare the argument with PAGE_SIZE, and will choose PAGE_SIZE if the argument is smaller than PAGE_SIZE. When PAGE_SIZE is 64K, finally the mmc request queue will get 64K as the max segment size. Once the sg data length=64K, ADMA will meet issue. For this case, need to disable ADMA mode.

Sorry, I didn't look closely enough at this.

For the 64K PAGE_SIZE case, did you try blk_queue_virt_boundary() with a 32K mask instead of blk_queue_max_segment_size() ? e.g. a hack for testing purposes like this:

drivers/mmc/core/queue.c +1 -2
index b15c034b42fb..4c3a9d999500 100644
@@ -376,8 +376,7 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card)
 	 * both blk_queue_max_segment_size().
 	 */
 	if (!host->can_dma_map_merge)
-		blk_queue_max_segment_size(mq->queue,
-			round_down(host->max_seg_size, block_size));
+		blk_queue_virt_boundary(mq->queue, 0x7fff);
 
 	dma_set_max_seg_size(mmc_dev(host), queue_max_segment_size(mq->queue));
 
Quoted 24 lines
---
 drivers/mmc/host/sdhci.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci.c +6 -0
index dbe87995596c..47e0c0156b94 100644
@@ -4187,6 +4187,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 		host->flags &= ~SDHCI_USE_ADMA;
 	}
 
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) &&
+		PAGE_SIZE >= 65536 && (host->flags & SDHCI_USE_ADMA)) {
+		DBG("Disabling ADMA as it don't support >= 64K PAGE_SIZE\n");
+		host->flags &= ~SDHCI_USE_ADMA;
+	}
+
 	if (sdhci_can_64bit_dma(host))
 		host->flags |= SDHCI_USE_64_BIT_DMA;
 
author
#2 lore raw
Quoted 24 lines

-----Original Message-----
From: Adrian Hunter [mailto:[email protected]]
Sent: 2021年10月27日 13:50
To: Bough Chen <[email protected]>; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>
Subject: Re: [PATCH] mmc: sdhci: disable ADMA when PAGE SIZE is 64K

Quoted 3 lines · On 27/10/2021 05:47, [email protected] wrote:

From: Haibo Chen <[email protected]>

For ADMA with quirks SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, it

limit

Quoted 11 lines

the max segment size as 64K-1. Currently, linux kernel support 4K/16K/64K PAGE_SIZE. If choose 64K PAGE_SIZE, sdhci in ADMA mode with the upper quirks will meet issue.

Though mmc driver give block layer the max segment size through blk_queue_max_segment_size(), but in this function, it will compare the argument with PAGE_SIZE, and will choose PAGE_SIZE if the argument is smaller than PAGE_SIZE. When PAGE_SIZE is 64K, finally the mmc request queue will get 64K as the max segment size. Once the sg data length=64K, ADMA will meet issue. For this case, need to disable ADMA mode.

Quoted 5 lines

Sorry, I didn't look closely enough at this.

For the 64K PAGE_SIZE case, did you try blk_queue_virt_boundary() with a 32K mask instead of blk_queue_max_segment_size() ?
e.g. a hack for testing purposes like this:

I test on my board, this do not work, I still can see sg data_length = 65536.

Best Regards
Haibo Chen

Quoted 44 lines
drivers/mmc/core/queue.c index renamed from drivers/mmc/core/queue.c +0 -0

b15c034b42fb..4c3a9d999500 100644

drivers/mmc/core/queue.c +1 -2
@@ -376,8 +376,7 @@ static void mmc_setup_queue(struct mmc_queue *mq,
 struct mmc_card *card)
 	 * both blk_queue_max_segment_size().
 	 */
 	if (!host->can_dma_map_merge)
-		blk_queue_max_segment_size(mq->queue,
-			round_down(host->max_seg_size, block_size));
+		blk_queue_virt_boundary(mq->queue, 0x7fff);
 
 	dma_set_max_seg_size(mmc_dev(host),

queue_max_segment_size(mq->queue));

Quoted 24 lines
---
 drivers/mmc/host/sdhci.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0 -0

dbe87995596c..47e0c0156b94 100644

drivers/mmc/host/sdhci.c +6 -0
@@ -4187,6 +4187,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 		host->flags &= ~SDHCI_USE_ADMA;
 	}
 
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) &&
+		PAGE_SIZE >= 65536 && (host->flags & SDHCI_USE_ADMA)) {
+		DBG("Disabling ADMA as it don't support >= 64K PAGE_SIZE\n");
+		host->flags &= ~SDHCI_USE_ADMA;
+	}
+
 	if (sdhci_can_64bit_dma(host))
 		host->flags |= SDHCI_USE_64_BIT_DMA;
 
maintainer
#3 lore raw
Quoted 24 lines · Bough Chen
Quoted 24 lines

-----Original Message-----
From: Adrian Hunter [mailto:[email protected]]
Sent: 2021年10月27日 13:50
To: Bough Chen <[email protected]>; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>
Subject: Re: [PATCH] mmc: sdhci: disable ADMA when PAGE SIZE is 64K

Quoted 3 lines · On 27/10/2021 05:47, [email protected] wrote:

From: Haibo Chen <[email protected]>

For ADMA with quirks SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, it

limit

Quoted 11 lines

the max segment size as 64K-1. Currently, linux kernel support 4K/16K/64K PAGE_SIZE. If choose 64K PAGE_SIZE, sdhci in ADMA mode with the upper quirks will meet issue.

Though mmc driver give block layer the max segment size through blk_queue_max_segment_size(), but in this function, it will compare the argument with PAGE_SIZE, and will choose PAGE_SIZE if the argument is smaller than PAGE_SIZE. When PAGE_SIZE is 64K, finally the mmc request queue will get 64K as the max segment size. Once the sg data length=64K, ADMA will meet issue. For this case, need to disable ADMA mode.

Quoted 7 lines
Quoted 5 lines

Sorry, I didn't look closely enough at this.

For the 64K PAGE_SIZE case, did you try blk_queue_virt_boundary() with a 32K mask instead of blk_queue_max_segment_size() ?
e.g. a hack for testing purposes like this:

I test on my board, this do not work, I still can see sg data_length = 65536.

What about tweaking the logic to write ADMA descriptors? Something like below for instance?

drivers/mmc/host/sdhci.c +18 -3
index 269c86569402..07c6da1f2f0f 100644
@@ -771,7 +771,19 @@ static void sdhci_adma_table_pre(struct sdhci_host *host,
 			len -= offset;
 		}
 
-		BUG_ON(len > 65536);
+		/*
+		 * The block layer forces a minimum segment size of PAGE_SIZE,
+		 * so 'len' can be too big here if PAGE_SIZE >= 64KiB. Write
+		 * multiple descriptors, noting that the ADMA table is sized
+		 * for 4KiB chunks anyway, so it will be big enough.
+		 */
+		while (len > host->max_adma) {
+			int n = 32 * 1024; /* 32KiB*/
+
+			__sdhci_adma_write_desc(host, &desc, addr, n, ADMA2_TRAN_VALID);
+			addr += n;
+			len -= n;
+		}
 
 		/* tran, valid */
 		if (len)
@@ -3968,6 +3980,7 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
 	 * descriptor for each segment, plus 1 for a nop end descriptor.
 	 */
 	host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;
+	host->max_adma = 65536;
 
 	host->max_timeout_count = 0xE;
 
@@ -4633,10 +4646,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 	 * be larger than 64 KiB though.
 	 */
 	if (host->flags & SDHCI_USE_ADMA) {
-		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)
+		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) {
+			host->max_adma = 65532; /* 32-bit alignment */
 			mmc->max_seg_size = 65535;
-		else
+		} else {
 			mmc->max_seg_size = 65536;
+		}
 	} else {
 		mmc->max_seg_size = mmc->max_req_size;
 	}
drivers/mmc/host/sdhci.h +3 -1
index bb883553d3b4..d7929d725730 100644
@@ -340,7 +340,8 @@ struct sdhci_adma2_64_desc {
 
 /*
  * Maximum segments assuming a 512KiB maximum requisition size and a minimum
- * 4KiB page size.
+ * 4KiB page size. Note this also allows enough for multiple descriptors in
+ * case of PAGE_SIZE >= 64KiB.
  */
 #define SDHCI_MAX_SEGS		128
 
@@ -543,6 +544,7 @@ struct sdhci_host {
 	unsigned int blocks;	/* remaining PIO blocks */
 
 	int sg_count;		/* Mapped sg entries */
+	int max_adma;		/* Max. length in ADMA descriptor */
 
 	void *adma_table;	/* ADMA descriptor table */
 	void *align_buffer;	/* Bounce buffer */
Signature · 1 line
2.25.1
Quoted 48 lines

Best Regards
Haibo Chen

Quoted 44 lines
drivers/mmc/core/queue.c index renamed from drivers/mmc/core/queue.c +0 -0

b15c034b42fb..4c3a9d999500 100644

drivers/mmc/core/queue.c +1 -2
@@ -376,8 +376,7 @@ static void mmc_setup_queue(struct mmc_queue *mq,
 struct mmc_card *card)
 	 * both blk_queue_max_segment_size().
 	 */
 	if (!host->can_dma_map_merge)
-		blk_queue_max_segment_size(mq->queue,
-			round_down(host->max_seg_size, block_size));
+		blk_queue_virt_boundary(mq->queue, 0x7fff);
 
 	dma_set_max_seg_size(mmc_dev(host),

queue_max_segment_size(mq->queue));

Quoted 24 lines
---
 drivers/mmc/host/sdhci.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0 -0

dbe87995596c..47e0c0156b94 100644

drivers/mmc/host/sdhci.c +6 -0
@@ -4187,6 +4187,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 		host->flags &= ~SDHCI_USE_ADMA;
 	}
 
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) &&
+		PAGE_SIZE >= 65536 && (host->flags & SDHCI_USE_ADMA)) {
+		DBG("Disabling ADMA as it don't support >= 64K PAGE_SIZE\n");
+		host->flags &= ~SDHCI_USE_ADMA;
+	}
+
 	if (sdhci_can_64bit_dma(host))
 		host->flags |= SDHCI_USE_64_BIT_DMA;
 
author
#4 lore raw
Quoted 34 lines

-----Original Message-----
From: Adrian Hunter [mailto:[email protected]]
Sent: 2021年11月9日 16:42
To: Bough Chen <[email protected]>; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>
Subject: Re: [PATCH] mmc: sdhci: disable ADMA when PAGE SIZE is 64K

Quoted 26 lines · Bough Chen
Quoted 26 lines

-----Original Message-----
From: Adrian Hunter [mailto:[email protected]]
Sent: 2021年10月27日 13:50
To: Bough Chen <[email protected]>; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>
Subject: Re: [PATCH] mmc: sdhci: disable ADMA when PAGE SIZE is 64K

Quoted 3 lines · On 27/10/2021 05:47, [email protected] wrote:

From: Haibo Chen <[email protected]>

For ADMA with quirks SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, it

limit

Quoted 11 lines

the max segment size as 64K-1. Currently, linux kernel support 4K/16K/64K PAGE_SIZE. If choose 64K PAGE_SIZE, sdhci in ADMA mode with the upper quirks will meet issue.

Though mmc driver give block layer the max segment size through blk_queue_max_segment_size(), but in this function, it will compare the argument with PAGE_SIZE, and will choose PAGE_SIZE if the argument is smaller than PAGE_SIZE. When PAGE_SIZE is 64K, finally the mmc request queue will get 64K as the max segment size. Once the sg data length=64K, ADMA will meet issue. For this case, need to disable ADMA mode.

Sorry, I didn't look closely enough at this.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

For the 64K PAGE_SIZE case, did you try blk_queue_virt_boundary() with a 32K mask instead of blk_queue_max_segment_size() ? e.g. a hack for testing purposes like this:

I test on my board, this do not work, I still can see sg data_length = 65536.

What about tweaking the logic to write ADMA descriptors? Something like below for instance?

Hi Adrian,

I prefer this solution.
I test this on my board, it works fine.
I think you can send this patch out with my Tested-by.

Best Regards
Haibo Chen

Quoted 135 lines
drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0 -0

269c86569402..07c6da1f2f0f 100644

drivers/mmc/host/sdhci.c +13 -1
@@ -771,7 +771,19 @@ static void sdhci_adma_table_pre(struct sdhci_host
 *host,
 			len -= offset;
 		}
 
-		BUG_ON(len > 65536);
+		/*
+		 * The block layer forces a minimum segment size of PAGE_SIZE,
+		 * so 'len' can be too big here if PAGE_SIZE >= 64KiB. Write
+		 * multiple descriptors, noting that the ADMA table is sized
+		 * for 4KiB chunks anyway, so it will be big enough.
+		 */
+		while (len > host->max_adma) {
+			int n = 32 * 1024; /* 32KiB*/
+
+			__sdhci_adma_write_desc(host, &desc, addr, n,
 ADMA2_TRAN_VALID);
+			addr += n;
+			len -= n;
+		}
 
drivers/mmc/host/sdhci.c +5 -2
 		/* tran, valid */
 		if (len)
@@ -3968,6 +3980,7 @@ struct sdhci_host *sdhci_alloc_host(struct device
 *dev,
 	 * descriptor for each segment, plus 1 for a nop end descriptor.
 	 */
 	host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;
+	host->max_adma = 65536;
 
 	host->max_timeout_count = 0xE;
@@ -4633,10 +4646,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 	 * be larger than 64 KiB though.
 	 */
 	if (host->flags & SDHCI_USE_ADMA) {
-		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)
+		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) {
+			host->max_adma = 65532; /* 32-bit alignment */
 			mmc->max_seg_size = 65535;
-		else
+		} else {
 			mmc->max_seg_size = 65536;
+		}
 	} else {
 		mmc->max_seg_size = mmc->max_req_size;
 	}
drivers/mmc/host/sdhci.h index renamed from drivers/mmc/host/sdhci.h +0 -0

bb883553d3b4..d7929d725730 100644

drivers/mmc/host/sdhci.h +0 -0
@@ -340,7 +340,8 @@ struct sdhci_adma2_64_desc {
 
 /*
  * Maximum segments assuming a 512KiB maximum requisition size and a

minimum
- * 4KiB page size.
+ * 4KiB page size. Note this also allows enough for multiple
+ descriptors in
+ * case of PAGE_SIZE >= 64KiB.
*/
#define SDHCI_MAX_SEGS 128

drivers/mmc/host/sdhci.h +1 -1
@@ -543,6 +544,7 @@ struct sdhci_host {
 	unsigned int blocks;	/* remaining PIO blocks */
 
 	int sg_count;		/* Mapped sg entries */
+	int max_adma;		/* Max. length in ADMA descriptor */
 
 	void *adma_table;	/* ADMA descriptor table */
 	void *align_buffer;	/* Bounce buffer */
--

2.25.1

Quoted 9 lines

Best Regards
Haibo Chen

drivers/mmc/core/queue.c static void mmc_setup_queue(struct mmc_queue

Quoted 6 lines
drivers/mmc/core/queue.c index renamed from drivers/mmc/core/queue.c +0 -0

b15c034b42fb..4c3a9d999500 100644

drivers/mmc/core/queue.c +0 -0
@@ -376,8 +376,7 @@ static void mmc_setup_queue(struct mmc_queue

*mq,

Quoted 28 lines
Quoted 28 lines
drivers/mmc/core/queue.c +1 -2
 struct mmc_card *card)
 	 * both blk_queue_max_segment_size().
 	 */
 	if (!host->can_dma_map_merge)
-		blk_queue_max_segment_size(mq->queue,
-			round_down(host->max_seg_size, block_size));
+		blk_queue_virt_boundary(mq->queue, 0x7fff);
 
 	dma_set_max_seg_size(mmc_dev(host),

queue_max_segment_size(mq->queue));

Quoted 14 lines
---
 drivers/mmc/host/sdhci.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0 -0

dbe87995596c..47e0c0156b94 100644

drivers/mmc/host/sdhci.c +0 -0
@@ -4187,6 +4187,12 @@ int sdhci_setup_host(struct sdhci_host *host)
 		host->flags &= ~SDHCI_USE_ADMA;
 	}
 
Quoted 1 line
Quoted 1 line

drivers/mmc/host/sdhci.c int sdhci_setup_host(struct sdhci_host *host) · line 4190

Quoted 1 line
drivers/mmc/host/sdhci.c +1 -0
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)

&&

Quoted 2 lines
Quoted 2 lines

drivers/mmc/host/sdhci.c int sdhci_setup_host(struct sdhci_host *host) · line 4192

Quoted 2 lines
drivers/mmc/host/sdhci.c +2 -0
+		PAGE_SIZE >= 65536 && (host->flags & SDHCI_USE_ADMA)) {
+		DBG("Disabling ADMA as it don't support >= 64K

PAGE_SIZE\n");

Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
drivers/mmc/host/sdhci.c +3 -0
+		host->flags &= ~SDHCI_USE_ADMA;
+	}
+
 	if (sdhci_can_64bit_dma(host))
 		host->flags |= SDHCI_USE_64_BIT_DMA;