Commit c09df940 authored Nov 04, 2014 by Adrian Hunter Committed by Ulf Hansson Nov 10, 2014

mmc: sdhci: Fix incorrect ADMA2 descriptor table size



The ADMA2 descriptor table size was being calculated incorrectly
Fix it.

Note that it has been wrong for a long time and likely has not
caused any problems because of a combination of 1) not needing
alignment descriptors for block operations 2) more memory being
allocated than was requested 3) the use of
SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC which does not use an extra
descriptor for the end marker.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 76d55564

drivers/mmc/host/sdhci.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,13 @@

		#define MAX_TUNING_LOOP 40

		#define ADMA_SIZE ((128 * 2 + 1) * 4)
		/*
		* The ADMA2 descriptor table size is calculated as the maximum number of
		* segments (128), times 2 to allow for an alignment descriptor for each
		* segment, plus 1 for a nop end descriptor, all multipled by the 32-bit
		* descriptor size (8).
		*/
		#define ADMA_SIZE ((128 * 2 + 1) * 8)

		static unsigned int debug_quirks = 0;
		static unsigned int debug_quirks2;