diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5732-mmc-sdhci-add-adma_table_cnt-member-to-struct-sdhci_.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5732-mmc-sdhci-add-adma_table_cnt-member-to-struct-sdhci_.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5732-mmc-sdhci-add-adma_table_cnt-member-to-struct-sdhci_.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5732-mmc-sdhci-add-adma_table_cnt-member-to-struct-sdhci_.patch new file mode 100644 index 00000000..f2c83301 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5732-mmc-sdhci-add-adma_table_cnt-member-to-struct-sdhci_.patch @@ -0,0 +1,77 @@ +From 3eeaf018781d1c0203d25400b12041c3238768d3 Mon Sep 17 00:00:00 2001 +From: Sudheesh Mavila <sudheesh.mavila@amd.com> +Date: Wed, 16 Jan 2019 11:23:47 +0530 +Subject: [PATCH 5732/5758] mmc: sdhci: add adma_table_cnt member to struct + sdhci_host + +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> +Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> + +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.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 677815e..f4b7c6e 100755 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -3237,6 +3237,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; + } + +@@ -3488,18 +3495,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 ba5227c..f72697d 100755 +--- a/drivers/mmc/host/sdhci.h ++++ b/drivers/mmc/host/sdhci.h +@@ -550,6 +550,9 @@ struct sdhci_host { + /* Host SDMA buffer boundary. */ + u32 sdma_boundary; + ++ /* Host ADMA table count */ ++ u32 adma_table_cnt; ++ + unsigned long private[0] ____cacheline_aligned; + }; + +-- +2.7.4 + |