| Message ID | 20191113075335.31775-3-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | MMCI odd buffer alignment fixes | expand |
On 13/11/2019 08:53, Linus Walleij wrote: > The Ux500 (at least) can only deal with DMA transactions > starting and ending on an even 4-byte aligned address. > > The problem isn't in the DMA engine of the system as such: > the problem is in the state machine of the MMCI block that > has some features to handle single bytes but it seems like > it doesn't quite work. > > This problem is probably caused by most of the testing > being done on mass storage, which will be 512-bytes aligned > blocks placed neatly in pages and practically never run into > this situation. > > On SDIO (for example in WiFi adapters) this situation is > common. > > By avoiding any such transfers with a special vendor flag, > we can bail out to PIO when an odd transfer is detected > while keeping DMA for large transfers of evenly aligned > packages also for SDIO. > > Cc: Ludovic Barre <ludovic.barre@st.com> > Cc: Brian Masney <masneyb@onstation.org> > Cc: Stephan Gerhold <stephan@gerhold.net> > Cc: Niklas Cassel <niklas.cassel@linaro.org> > Cc: Russell King <rmk+kernel@armlinux.org.uk> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v1->v3: > - New patch in v3 after discussion with Ulf > --- > drivers/mmc/host/mmci.c | 21 +++++++++++++++++++++ > drivers/mmc/host/mmci.h | 10 ++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 3ffcdf78a428..a08cd845dddc 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -185,6 +185,7 @@ static struct variant_data variant_ux500 = { > .irq_pio_mask = MCI_IRQ_PIO_MASK, > .start_err = MCI_STARTBITERR, > .opendrain = MCI_OD, > + .only_long_aligned_dma = true, > .init = mmci_variant_init, > }; > > @@ -219,6 +220,7 @@ static struct variant_data variant_ux500v2 = { > .irq_pio_mask = MCI_IRQ_PIO_MASK, > .start_err = MCI_STARTBITERR, > .opendrain = MCI_OD, > + .only_long_aligned_dma = true, > .init = ux500v2_variant_init, > }; > > @@ -829,6 +831,25 @@ static int _mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data, > if (data->blksz * data->blocks <= variant->fifosize) > return -EINVAL; > > + /* > + * Handle the variants with DMA that is broken such that start and > + * end address must be aligned on a long (32bit) boundary for the DMA > + * to work. If this occurs, fall back to PIO. > + */ Nit: why use 'long' as a synonym for "32 bits" ? Why not name the field "only_32b_aligned_dma" ? (The size of C's long int is implementation-defined; most 64-bit platforms have a 64-bit long int.) Perhaps the ship has already sailed -- what with readl/writel... Regards.
On Wed, 13 Nov 2019 at 08:53, Linus Walleij <linus.walleij@linaro.org> wrote: > > The Ux500 (at least) can only deal with DMA transactions > starting and ending on an even 4-byte aligned address. > > The problem isn't in the DMA engine of the system as such: > the problem is in the state machine of the MMCI block that > has some features to handle single bytes but it seems like > it doesn't quite work. > > This problem is probably caused by most of the testing > being done on mass storage, which will be 512-bytes aligned > blocks placed neatly in pages and practically never run into > this situation. > > On SDIO (for example in WiFi adapters) this situation is > common. > > By avoiding any such transfers with a special vendor flag, > we can bail out to PIO when an odd transfer is detected > while keeping DMA for large transfers of evenly aligned > packages also for SDIO. > > Cc: Ludovic Barre <ludovic.barre@st.com> > Cc: Brian Masney <masneyb@onstation.org> > Cc: Stephan Gerhold <stephan@gerhold.net> > Cc: Niklas Cassel <niklas.cassel@linaro.org> > Cc: Russell King <rmk+kernel@armlinux.org.uk> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v1->v3: > - New patch in v3 after discussion with Ulf > --- > drivers/mmc/host/mmci.c | 21 +++++++++++++++++++++ > drivers/mmc/host/mmci.h | 10 ++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 3ffcdf78a428..a08cd845dddc 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -185,6 +185,7 @@ static struct variant_data variant_ux500 = { > .irq_pio_mask = MCI_IRQ_PIO_MASK, > .start_err = MCI_STARTBITERR, > .opendrain = MCI_OD, > + .only_long_aligned_dma = true, > .init = mmci_variant_init, > }; > > @@ -219,6 +220,7 @@ static struct variant_data variant_ux500v2 = { > .irq_pio_mask = MCI_IRQ_PIO_MASK, > .start_err = MCI_STARTBITERR, > .opendrain = MCI_OD, > + .only_long_aligned_dma = true, > .init = ux500v2_variant_init, > }; > > @@ -829,6 +831,25 @@ static int _mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data, > if (data->blksz * data->blocks <= variant->fifosize) > return -EINVAL; > > + /* > + * Handle the variants with DMA that is broken such that start and > + * end address must be aligned on a long (32bit) boundary for the DMA > + * to work. If this occurs, fall back to PIO. > + */ > + if (host->variant->only_long_aligned_dma) { > + struct scatterlist *sg; > + int tmp; > + > + for_each_sg(data->sg, sg, data->sg_len, tmp) { > + /* We start in some odd place, that doesn't work */ > + if (sg->offset & 3) > + return -EINVAL; > + /* We end in some odd place, that doesn't work */ > + if (sg->length & 3) > + return -EINVAL; > + } Assuming the data i allocated consecutive (is that a wrong assumption?)... ...then it should be sufficient to check only the first sg-element in the list having a divisible address offset by 4 (sg->offset & 0x3) and then check that the total request size is also divisible by 4 ((data->blksz * data->blocks) & 0x3). That should give the same result. In this way you don't need to iterate through the sg-list. > + } > + > device = chan->device; > nr_sg = dma_map_sg(device->dev, data->sg, data->sg_len, > mmc_get_dma_dir(data)); > diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h > index c7f94726eaa1..e20af17bb313 100644 > --- a/drivers/mmc/host/mmci.h > +++ b/drivers/mmc/host/mmci.h > @@ -307,6 +307,15 @@ struct mmci_host; > * register. > * @opendrain: bitmask identifying the OPENDRAIN bit inside MMCIPOWER register > * @dma_lli: true if variant has dma link list feature. > + * @only_long_aligned_dma: it appears that the Ux500 has a broken DMA logic for > + * single bytes when either the transfer starts at an odd offset or > + * the final DMA burst is an odd (not divisible by 4) address. > + * Reading must start and end on an even 4-byte boundary, i.e. an > + * even 32bit word in memory. If this is not the case, we need to > + * fall back to PIO for that request. For bulk transfers to mass > + * storage we are almost exclusively dealing with 512-byte chunks > + * allocated at an even address so this is usually only manifesting > + * in SDIO. > * @stm32_idmabsize_mask: stm32 sdmmc idma buffer size. > */ > struct variant_data { > @@ -350,6 +359,7 @@ struct variant_data { > u32 start_err; > u32 opendrain; > u8 dma_lli:1; > + u8 only_long_aligned_dma:1; > u32 stm32_idmabsize_mask; > void (*init)(struct mmci_host *host); > }; > -- > 2.21.0 > Kind regards Uffe
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 3ffcdf78a428..a08cd845dddc 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -185,6 +185,7 @@ static struct variant_data variant_ux500 = { .irq_pio_mask = MCI_IRQ_PIO_MASK, .start_err = MCI_STARTBITERR, .opendrain = MCI_OD, + .only_long_aligned_dma = true, .init = mmci_variant_init, }; @@ -219,6 +220,7 @@ static struct variant_data variant_ux500v2 = { .irq_pio_mask = MCI_IRQ_PIO_MASK, .start_err = MCI_STARTBITERR, .opendrain = MCI_OD, + .only_long_aligned_dma = true, .init = ux500v2_variant_init, }; @@ -829,6 +831,25 @@ static int _mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data, if (data->blksz * data->blocks <= variant->fifosize) return -EINVAL; + /* + * Handle the variants with DMA that is broken such that start and + * end address must be aligned on a long (32bit) boundary for the DMA + * to work. If this occurs, fall back to PIO. + */ + if (host->variant->only_long_aligned_dma) { + struct scatterlist *sg; + int tmp; + + for_each_sg(data->sg, sg, data->sg_len, tmp) { + /* We start in some odd place, that doesn't work */ + if (sg->offset & 3) + return -EINVAL; + /* We end in some odd place, that doesn't work */ + if (sg->length & 3) + return -EINVAL; + } + } + device = chan->device; nr_sg = dma_map_sg(device->dev, data->sg, data->sg_len, mmc_get_dma_dir(data)); diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index c7f94726eaa1..e20af17bb313 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -307,6 +307,15 @@ struct mmci_host; * register. * @opendrain: bitmask identifying the OPENDRAIN bit inside MMCIPOWER register * @dma_lli: true if variant has dma link list feature. + * @only_long_aligned_dma: it appears that the Ux500 has a broken DMA logic for + * single bytes when either the transfer starts at an odd offset or + * the final DMA burst is an odd (not divisible by 4) address. + * Reading must start and end on an even 4-byte boundary, i.e. an + * even 32bit word in memory. If this is not the case, we need to + * fall back to PIO for that request. For bulk transfers to mass + * storage we are almost exclusively dealing with 512-byte chunks + * allocated at an even address so this is usually only manifesting + * in SDIO. * @stm32_idmabsize_mask: stm32 sdmmc idma buffer size. */ struct variant_data { @@ -350,6 +359,7 @@ struct variant_data { u32 start_err; u32 opendrain; u8 dma_lli:1; + u8 only_long_aligned_dma:1; u32 stm32_idmabsize_mask; void (*init)(struct mmci_host *host); };
The Ux500 (at least) can only deal with DMA transactions starting and ending on an even 4-byte aligned address. The problem isn't in the DMA engine of the system as such: the problem is in the state machine of the MMCI block that has some features to handle single bytes but it seems like it doesn't quite work. This problem is probably caused by most of the testing being done on mass storage, which will be 512-bytes aligned blocks placed neatly in pages and practically never run into this situation. On SDIO (for example in WiFi adapters) this situation is common. By avoiding any such transfers with a special vendor flag, we can bail out to PIO when an odd transfer is detected while keeping DMA for large transfers of evenly aligned packages also for SDIO. Cc: Ludovic Barre <ludovic.barre@st.com> Cc: Brian Masney <masneyb@onstation.org> Cc: Stephan Gerhold <stephan@gerhold.net> Cc: Niklas Cassel <niklas.cassel@linaro.org> Cc: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ChangeLog v1->v3: - New patch in v3 after discussion with Ulf --- drivers/mmc/host/mmci.c | 21 +++++++++++++++++++++ drivers/mmc/host/mmci.h | 10 ++++++++++ 2 files changed, 31 insertions(+) -- 2.21.0