Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e446ae40 authored by Alamy Liu's avatar Alamy Liu Committed by Greg Kroah-Hartman
Browse files

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: a4080225 ("mmc: cqhci: support for command queue enabled host")
Signed-off-by: default avatarAlamy Liu <alamy.liu@gmail.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17bf9612

drivers/mmc/host/cqhci.c

+1 −1
Original line number Diff line number Diff line
@@ -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,