OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB 

commit 3d7c194b7c9ad414264935ad4f943a6ce285ebb1 upstream.

The block layer forces a minimum segment size of PAGE_SIZE, so a segment
can be too big for the ADMA table, if PAGE_SIZE >= 64KiB. Fix by writing
multiple descriptors, noting that the ADMA table is sized for 4KiB chunks
anyway, so it will be big enough.

Reported-and-tested-by: Bough Chen <haibo.chen@nxp.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20211115082345.802238-1-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Adrian Hunter 2021-11-15 10:23:45 +02:00 committed by Greg Kroah-Hartman
parent e09e868c63
commit e466278662
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/host/sdhci.c
View File

@ -749,7 +749,19 @@ static void sdhci_adma_table_pre(struct sdhci_host *host,
len -= offset; 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 */ /* tran, valid */
if (len) if (len)
@ -3568,6 +3580,7 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
* descriptor for each segment, plus 1 for a nop end descriptor. * descriptor for each segment, plus 1 for a nop end descriptor.
*/ */
host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;
host->max_adma = 65536;
return host; return host;
} }
@ -4221,10 +4234,12 @@ int sdhci_setup_host(struct sdhci_host *host)
* be larger than 64 KiB though. * be larger than 64 KiB though.
*/ */
if (host->flags & SDHCI_USE_ADMA) { 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; mmc->max_seg_size = 65535;
else } else {
mmc->max_seg_size = 65536; mmc->max_seg_size = 65536;
}
} else { } else {
mmc->max_seg_size = mmc->max_req_size; mmc->max_seg_size = mmc->max_req_size;
} }

4
drivers/mmc/host/sdhci.h
View File

@ -349,7 +349,8 @@ struct sdhci_adma2_64_desc {
/* /*
* Maximum segments assuming a 512KiB maximum requisition size and a minimum * 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 #define SDHCI_MAX_SEGS 128
@ -547,6 +548,7 @@ struct sdhci_host {
unsigned int blocks; /* remaining PIO blocks */ unsigned int blocks; /* remaining PIO blocks */
int sg_count; /* Mapped sg entries */ int sg_count; /* Mapped sg entries */
int max_adma; /* Max. length in ADMA descriptor */
void *adma_table; /* ADMA descriptor table */ void *adma_table; /* ADMA descriptor table */
void *align_buffer; /* Bounce buffer */ void *align_buffer; /* Bounce buffer */