Commit a663f64b authored by Veerabhadrarao Badiganti's avatar Veerabhadrarao Badiganti Committed by Ulf Hansson
Browse files

mmc: sdhci: Let a vendor driver supply and update ADMA descriptor size 



Let a vendor driver supply the maximum descriptor size that it
can operate on. ADMA descriptor table would be allocated using this
supplied size.
If any SD Host controller is of version prior to v4.10 spec
but supports 16byte descriptor, this change allows them to supply
correct descriptor size for ADMA table allocation.

Also let a vendor driver update the descriptor size by overriding
sdhc_host->desc_size if it has to operates on a different descriptor
sizes in different conditions.

Suggested-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/1579531122-28341-1-git-send-email-vbadigan@codeaurora.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 80c74823

drivers/mmc/host/sdhci.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -4043,15 +4043,13 @@ int sdhci_setup_host(struct sdhci_host *host) 
		dma_addr_t dma;

		dma_addr_t dma;

		void *buf;

		void *buf;





		if (host->flags & SDHCI_USE_64_BIT_DMA) {

		if (!(host->flags & SDHCI_USE_64_BIT_DMA))

			host->adma_table_sz = host->adma_table_cnt *

			host->alloc_desc_sz = SDHCI_ADMA2_32_DESC_SZ;

					      SDHCI_ADMA2_64_DESC_SZ(host);

		else if (!host->alloc_desc_sz)

			host->desc_sz = SDHCI_ADMA2_64_DESC_SZ(host);

			host->alloc_desc_sz = SDHCI_ADMA2_64_DESC_SZ(host);

		} else {



			host->adma_table_sz = host->adma_table_cnt *

		host->desc_sz = host->alloc_desc_sz;

					      SDHCI_ADMA2_32_DESC_SZ;

		host->adma_table_sz = host->adma_table_cnt * host->desc_sz;

			host->desc_sz = SDHCI_ADMA2_32_DESC_SZ;

		}





		host->align_buffer_sz = SDHCI_MAX_SEGS * SDHCI_ADMA2_ALIGN;

		host->align_buffer_sz = SDHCI_MAX_SEGS * SDHCI_ADMA2_ALIGN;

		/*

		/*

drivers/mmc/host/sdhci.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -558,7 +558,8 @@ struct sdhci_host { 
	dma_addr_t adma_addr;	/* Mapped ADMA descr. table */

	dma_addr_t adma_addr;	/* Mapped ADMA descr. table */

	dma_addr_t align_addr;	/* Mapped bounce buffer */

	dma_addr_t align_addr;	/* Mapped bounce buffer */





	unsigned int desc_sz;	/* ADMA descriptor size */

	unsigned int desc_sz;	/* ADMA current descriptor size */

	unsigned int alloc_desc_sz;	/* ADMA descr. max size host supports */





	struct workqueue_struct *complete_wq;	/* Request completion wq */

	struct workqueue_struct *complete_wq;	/* Request completion wq */

	struct work_struct	complete_work;	/* Request completion work */

	struct work_struct	complete_work;	/* Request completion work */

CRA Git | Maintained and supported by SUSTech CRA and CCSE