Commit b3e1ea16 authored Oct 15, 2020 by Jisheng Zhang Committed by Ulf Hansson Oct 15, 2020

mmc: sdhci: Use Auto CMD Auto Select only when v4_mode is true



sdhci-of-dwcmshc meets an eMMC read performance regression with below
command after commit 427b6514 ("mmc: sdhci: Add Auto CMD Auto
Select support"):

dd if=/dev/mmcblk0 of=/dev/null bs=8192 count=100000

Before the commit, the above command gives 120MB/s
After the commit, the above command gives 51.3 MB/s

So it looks like sdhci-of-dwcmshc expects Version 4 Mode for Auto
CMD Auto Select. Fix the performance degradation by ensuring v4_mode
is true to use Auto CMD Auto Select.

Fixes: 427b6514 ("mmc: sdhci: Add Auto CMD Auto Select support")
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20201015174115.4cf2c19a@xhacker.debian


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 3e4fb434

drivers/mmc/host/sdhci.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1384,9 +1384,11 @@ static inline void sdhci_auto_cmd_select(struct sdhci_host *host,
		/*
		* In case of Version 4.10 or later, use of 'Auto CMD Auto
		* Select' is recommended rather than use of 'Auto CMD12
		* Enable' or 'Auto CMD23 Enable'.
		* Enable' or 'Auto CMD23 Enable'. We require Version 4 Mode
		* here because some controllers (e.g sdhci-of-dwmshc) expect it.
		*/
		if (host->version >= SDHCI_SPEC_410 && (use_cmd12 \|\| use_cmd23)) {
		if (host->version >= SDHCI_SPEC_410 && host->v4_mode &&
		(use_cmd12 \|\| use_cmd23)) {
		*mode \|= SDHCI_TRNS_AUTO_SEL;

		ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);

Admin message