aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlamy Liu <alamy.liu@gmail.com>2019-02-25 11:22:13 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-05 17:58:53 +0100
commite446ae40dc33caa2d400e809e6588d1f58da7d28 (patch)
treed4f86f08f64a8b8e286e4deb688a183d91d6bb51
parent17bf961224725e9d22936418583976b88538489b (diff)
downloadlinux-yocto-e446ae40dc33caa2d400e809e6588d1f58da7d28.tar.gz
linux-yocto-e446ae40dc33caa2d400e809e6588d1f58da7d28.tar.bz2
linux-yocto-e446ae40dc33caa2d400e809e6588d1f58da7d28.zip
mmc: cqhci: fix space allocated for transfer descriptor
commit 27ec9dc17c48ea2e642ccb90b4ebf7fd47468911 upstream. There is not enough space being allocated when DCMD is disabled. CQE_DCMD is not necessary to be enabled when CQE is enabled. (Software could halt CQE to send command) In the case that CQE_DCMD is not enabled, it still needs to allocate space for data transfer. For instance: CQE_DCMD is enabled: 31 slots space (one slot used by DCMD) CQE_DCMD is disabled: 32 slots space Fixes: a4080225f51d ("mmc: cqhci: support for command queue enabled host") Signed-off-by: Alamy Liu <alamy.liu@gmail.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mmc/host/cqhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index 159270e947cf..bd9a59bc0e31 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -201,7 +201,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
cq_host->desc_size = cq_host->slot_sz * cq_host->num_slots;
cq_host->data_size = cq_host->trans_desc_len * cq_host->mmc->max_segs *
- (cq_host->num_slots - 1);
+ cq_host->mmc->cqe_qdepth;
pr_debug("%s: cqhci: desc_size: %zu data_sz: %zu slot-sz: %d\n",
mmc_hostname(cq_host->mmc), cq_host->desc_size, cq_host->data_size,