| Message ID | 20180823180700.3432c4db@xhacker.debian (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | solve SDHCI DWC MSHC 128MB DMA boundary limitation | expand |
On 23/08/18 13:07, Jisheng Zhang wrote: > This patch adds adma_table_cnt member to struct sdhci_host to give more > flexibility to drivers to control the ADMA table count. > > Default value of adma_table_cnt is set to (SDHCI_MAX_SEGS * 2 + 1). > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci.c | 17 +++++++++-------- > drivers/mmc/host/sdhci.h | 3 +++ > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 1b3fbd9bd5c5..52ccf4644384 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3322,6 +3322,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, > > host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG; > > + /* > + * The DMA table descriptor count is calculated as the maximum > + * number of segments times 2, to allow for an alignment > + * descriptor for each segment, plus 1 for a nop end descriptor. > + */ > + host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; > + > return host; > } > > @@ -3567,18 +3574,12 @@ int sdhci_setup_host(struct sdhci_host *host) > dma_addr_t dma; > void *buf; > > - /* > - * The DMA descriptor table size is calculated as the maximum > - * number of segments times 2, to allow for an alignment > - * descriptor for each segment, plus 1 for a nop end descriptor, > - * all multipled by the descriptor size. > - */ > if (host->flags & SDHCI_USE_64_BIT_DMA) { > - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * > + host->adma_table_sz = host->adma_table_cnt * > SDHCI_ADMA2_64_DESC_SZ; > host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; > } else { > - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * > + host->adma_table_sz = host->adma_table_cnt * > SDHCI_ADMA2_32_DESC_SZ; > host->desc_sz = SDHCI_ADMA2_32_DESC_SZ; > } > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index f0bd36ce3817..25bddd21de31 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -563,6 +563,9 @@ struct sdhci_host { > /* Host SDMA buffer boundary. */ > u32 sdma_boundary; > > + /* Host ADMA table count */ > + u32 adma_table_cnt; > + > u64 data_timeout; > > unsigned long private[0] ____cacheline_aligned; >
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1b3fbd9bd5c5..52ccf4644384 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3322,6 +3322,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG; + /* + * The DMA table descriptor count is calculated as the maximum + * number of segments times 2, to allow for an alignment + * descriptor for each segment, plus 1 for a nop end descriptor. + */ + host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; + return host; } @@ -3567,18 +3574,12 @@ int sdhci_setup_host(struct sdhci_host *host) dma_addr_t dma; void *buf; - /* - * The DMA descriptor table size is calculated as the maximum - * number of segments times 2, to allow for an alignment - * descriptor for each segment, plus 1 for a nop end descriptor, - * all multipled by the descriptor size. - */ if (host->flags & SDHCI_USE_64_BIT_DMA) { - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * + host->adma_table_sz = host->adma_table_cnt * SDHCI_ADMA2_64_DESC_SZ; host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; } else { - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * + host->adma_table_sz = host->adma_table_cnt * SDHCI_ADMA2_32_DESC_SZ; host->desc_sz = SDHCI_ADMA2_32_DESC_SZ; } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index f0bd36ce3817..25bddd21de31 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -563,6 +563,9 @@ struct sdhci_host { /* Host SDMA buffer boundary. */ u32 sdma_boundary; + /* Host ADMA table count */ + u32 adma_table_cnt; + u64 data_timeout; unsigned long private[0] ____cacheline_aligned;
This patch adds adma_table_cnt member to struct sdhci_host to give more flexibility to drivers to control the ADMA table count. Default value of adma_table_cnt is set to (SDHCI_MAX_SEGS * 2 + 1). Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- drivers/mmc/host/sdhci.c | 17 +++++++++-------- drivers/mmc/host/sdhci.h | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-)