| Message ID | CAPDyKFrzVaE=upRbJ+sq2rRcR1uitw2QEvTzt=pjtoNh1bij9Q@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/21/2017, 04:08 PM, Ulf Hansson wrote: > It seems like we need something along those lines for the sdhci-pci > case as well. I cooked a patch, perhaps you have some time for test? Sure, but before I start, I want to double check: don't you want me to stick some pr_info in there to see if the computation is correct? thanks,
On 21 November 2017 at 16:13, Jiri Slaby <jslaby@suse.cz> wrote: > On 11/21/2017, 04:08 PM, Ulf Hansson wrote: >> It seems like we need something along those lines for the sdhci-pci >> case as well. I cooked a patch, perhaps you have some time for test? > > Sure, but before I start, I want to double check: don't you want me to > stick some pr_info in there to see if the computation is correct? Yeah, that seems like a good idea. :-) Br Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/21/2017, 04:08 PM, Ulf Hansson wrote: > Subject: [PATCH] mmc: sdhci: Fix bounce buffer overflow ... > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c ... > @@ -3651,22 +3652,29 @@ int sdhci_setup_host(struct sdhci_host *host) > spin_lock_init(&host->lock); > > /* > + * Maximum number of sectors in one transfer. Limited by SDMA boundary > + * size (512KiB). Note some tuning modes impose a 4MiB limit, but this > + * is less anyway. > + */ > + mmc->max_req_size = 524288; > + > + /* > * Maximum number of segments. Depends on if the hardware > * can do scatter/gather or not. > */ > - if (host->flags & SDHCI_USE_ADMA) > + if (host->flags & SDHCI_USE_ADMA) { > mmc->max_segs = SDHCI_MAX_SEGS; > - else if (host->flags & SDHCI_USE_SDMA) > + } else if (host->flags & SDHCI_USE_SDMA) { > mmc->max_segs = 1; > - else /* PIO */ > + if (swiotlb_max_segment()) { > + unsigned int max_req_size = (1 << IO_TLB_SHIFT) * > + IO_TLB_SEGSIZE; > + mmc->max_req_size = min(mmc->max_req_size, > + max_req_size); > + } > + } else { /* PIO */ > mmc->max_segs = SDHCI_MAX_SEGS; It seems to work fine. FWIW the debug output is: [ 0.708312] mmc0: max_segs=1 max_req_size=262144 h->flags=00004001 thanks,
On 24 November 2017 at 16:15, Jiri Slaby <jslaby@suse.cz> wrote: > On 11/21/2017, 04:08 PM, Ulf Hansson wrote: >> Subject: [PATCH] mmc: sdhci: Fix bounce buffer overflow > ... >> --- a/drivers/mmc/host/sdhci.c >> +++ b/drivers/mmc/host/sdhci.c > ... >> @@ -3651,22 +3652,29 @@ int sdhci_setup_host(struct sdhci_host *host) >> spin_lock_init(&host->lock); >> >> /* >> + * Maximum number of sectors in one transfer. Limited by SDMA boundary >> + * size (512KiB). Note some tuning modes impose a 4MiB limit, but this >> + * is less anyway. >> + */ >> + mmc->max_req_size = 524288; >> + >> + /* >> * Maximum number of segments. Depends on if the hardware >> * can do scatter/gather or not. >> */ >> - if (host->flags & SDHCI_USE_ADMA) >> + if (host->flags & SDHCI_USE_ADMA) { >> mmc->max_segs = SDHCI_MAX_SEGS; >> - else if (host->flags & SDHCI_USE_SDMA) >> + } else if (host->flags & SDHCI_USE_SDMA) { >> mmc->max_segs = 1; >> - else /* PIO */ >> + if (swiotlb_max_segment()) { >> + unsigned int max_req_size = (1 << IO_TLB_SHIFT) * >> + IO_TLB_SEGSIZE; >> + mmc->max_req_size = min(mmc->max_req_size, >> + max_req_size); >> + } >> + } else { /* PIO */ >> mmc->max_segs = SDHCI_MAX_SEGS; > > It seems to work fine. FWIW the debug output is: > [ 0.708312] mmc0: max_segs=1 max_req_size=262144 h->flags=00004001 Thanks for testing! I post a proper formatted patch very soon. Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 2f14334..e9290a3 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -21,6 +21,7 @@ #include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/scatterlist.h> +#include <linux/swiotlb.h> #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> #include <linux/of.h> @@ -3651,22 +3652,29 @@ int sdhci_setup_host(struct sdhci_host *host) spin_lock_init(&host->lock); /* + * Maximum number of sectors in one transfer. Limited by SDMA boundary + * size (512KiB). Note some tuning modes impose a 4MiB limit, but this + * is less anyway. + */ + mmc->max_req_size = 524288; + + /* * Maximum number of segments. Depends on if the hardware * can do scatter/gather or not. */ - if (host->flags & SDHCI_USE_ADMA) + if (host->flags & SDHCI_USE_ADMA) { mmc->max_segs = SDHCI_MAX_SEGS; - else if (host->flags & SDHCI_USE_SDMA) + } else if (host->flags & SDHCI_USE_SDMA) { mmc->max_segs = 1; - else /* PIO */ + if (swiotlb_max_segment()) { + unsigned int max_req_size = (1 << IO_TLB_SHIFT) * + IO_TLB_SEGSIZE; + mmc->max_req_size = min(mmc->max_req_size, + max_req_size); + } + } else { /* PIO */ mmc->max_segs = SDHCI_MAX_SEGS; - - /* - * Maximum number of sectors in one transfer. Limited by SDMA boundary - * size (512KiB). Note some tuning modes impose a 4MiB limit, but this - * is less anyway. - */ - mmc->max_req_size = 524288; + } /* * Maximum segment size. Could be one segment with the maximum number