* [PATCH mmc-next v3 1/3] mmc: sdhci: add adma_table_num member to struct sdhci_host
@ 2018-07-30 2:44 Jisheng Zhang
2018-08-15 7:39 ` Adrian Hunter
0 siblings, 1 reply; 2+ messages in thread
From: Jisheng Zhang @ 2018-07-30 2:44 UTC (permalink / raw)
To: Adrian Hunter, Ulf Hansson; +Cc: linux-mmc, linux-kernel, linux-arm-kernel
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).
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
drivers/mmc/host/sdhci.c | 17 +++++++++--------
drivers/mmc/host/sdhci.h | 2 ++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a7b5602ef6f7..14dd4a49e03b 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -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;
}
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 23966f887da6..d55fd7033e93 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -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;
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH mmc-next v3 1/3] mmc: sdhci: add adma_table_num member to struct sdhci_host
2018-07-30 2:44 [PATCH mmc-next v3 1/3] mmc: sdhci: add adma_table_num member to struct sdhci_host Jisheng Zhang
@ 2018-08-15 7:39 ` Adrian Hunter
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Hunter @ 2018-08-15 7:39 UTC (permalink / raw)
To: Jisheng Zhang, Ulf Hansson; +Cc: linux-mmc, linux-kernel, linux-arm-kernel
On 30/07/18 05:44, Jisheng Zhang wrote:
> 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).
>
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
> ---
> drivers/mmc/host/sdhci.c | 17 +++++++++--------
> drivers/mmc/host/sdhci.h | 2 ++
> 2 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index a7b5602ef6f7..14dd4a49e03b 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -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
> + * 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
> +
> 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;
> }
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 23966f887da6..d55fd7033e93 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -563,6 +563,8 @@ struct sdhci_host {
> /* Host SDMA buffer boundary. */
> u32 sdma_boundary;
>
> + u32 adma_table_num;
Could use a comment
> +
> u64 data_timeout;
>
> unsigned long private[0] ____cacheline_aligned;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-15 7:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-30 2:44 [PATCH mmc-next v3 1/3] mmc: sdhci: add adma_table_num member to struct sdhci_host Jisheng Zhang
2018-08-15 7:39 ` Adrian Hunter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).