mmc: sdhci: add adma_table_num member to struct sdhci_host
PATCH v3 1/3 mmc: sdhci: add adma_table_num member to struct sdhci_host
This patch adds adma_table_num member to struct sdhci_host to give more flexibility to drivers to control the ADMA table number.
Default value of adma_table_num is set to (SDHCI_MAX_SEGS * 2 + 1).
--- drivers/mmc/host/sdhci.c | 17 +++++++++-------- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-)
drivers/mmc/host/sdhci.c +9 -8
@@ -3316,6 +3316,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->sdma_boundary =SDHCI_DEFAULT_BOUNDARY_ARG ; +/* +* The DMA descriptor table number 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_num =SDHCI_MAX_SEGS *2 +1 ; +return host; }
@@ -3561,18 +3568,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_num *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_num *SDHCI_ADMA2_32_DESC_SZ ; host->desc_sz =SDHCI_ADMA2_32_DESC_SZ ; }
drivers/mmc/host/sdhci.h +2 -0
@@ -563,6 +563,8 @@ struct sdhci_host {/* Host SDMA buffer boundary. */ u32 sdma_boundary; +u32 adma_table_num; +u64 data_timeout;unsigned long private[0 ]____cacheline_aligned ;
Signature · 1 line
2.18.0
Adrian Hunter
maintainerQuoted 16 lines · Jisheng Zhang
This patch adds
adma_table_nummember to structsdhci_hostto give more flexibility to drivers to control the ADMA table number.Default value of
adma_table_numis set to (SDHCI_MAX_SEGS* 2 + 1).Signed-off-by Jisheng Zhang <[email protected]>--- drivers/mmc/host/sdhci.c | 17 +++++++++-------- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-)drivers/mmc/host/sdhci.c +0
-0
drivers/mmc/host/sdhci.c struct sdhci_host *sdhci_alloc_host(struct device *dev, · line 3320
Quoted 5 lines
drivers/mmc/host/sdhci.c +2
-0@@ -3316,6 +3316,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->sdma_boundary =SDHCI_DEFAULT_BOUNDARY_ARG ; +/* +* The DMA descriptor table number is calculated as the maximum
* The DMA table descriptor count is calculated as the maximum
drivers/mmc/host/sdhci.c struct sdhci_host *sdhci_alloc_host(struct device *dev, · line 3324
Quoted 4 lines
drivers/mmc/host/sdhci.c +4
-0+* number of segments times 2, to allow for an alignment +* descriptor for each segment, plus 1 for a nop end descriptor. +*/ + host->adma_table_num =SDHCI_MAX_SEGS *2 +1 ;
Let's make this adma_table_cnt
Quoted 30 lines
drivers/mmc/host/sdhci.c +3
-8+return host; }@@ -3561,18 +3568,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_num *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_num *SDHCI_ADMA2_32_DESC_SZ ; host->desc_sz =SDHCI_ADMA2_32_DESC_SZ ; }drivers/mmc/host/sdhci.h +0
-0
drivers/mmc/host/sdhci.h struct sdhci_host { · line 566
Quoted 4 lines
drivers/mmc/host/sdhci.h +1
-0@@ -563,6 +563,8 @@ struct sdhci_host {/* Host SDMA buffer boundary. */ u32 sdma_boundary; +u32 adma_table_num;
Could use a comment
Quoted 5 lines
drivers/mmc/host/sdhci.h +1
-0+u64 data_timeout;unsigned long private[0 ]____cacheline_aligned ;