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

Commit 314162c4 authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Xiaonian Wang
Browse files

mmc: sdhci-msm: Do not enable preset value 



If preset value (bit 15) is enabled in sdhci host control2
register (0x3E), then the preset value registers(0x6F-0x60)
would be used for some of the settings such as clock and
drive strength. These are HW initialized registers and are
not properly initialized by MSM SDHCI controller. This is
resulting in low throughput for some of the modes such as
DDR50/SDR50. Hence, do not enable it for MSM SDHCI.

CRs-fixed: 474518
Change-Id: Iee1241355d14e6bcebc66c3a43abf1ec94d869c3
Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
[subhashj@codeaurora.org: fixed minor merge conflict]
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
[xiaonian@codeaurora.org: fix trivial merge conflict]
Signed-off-by: default avatarXiaonian Wang <xiaonian@codeaurora.org>
parent 87d43944

drivers/mmc/host/sdhci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -1934,6 +1934,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	host->quirks |= SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN;

	host->quirks2 |= SDHCI_QUIRK2_ALWAYS_USE_BASE_CLOCK;

	host->quirks2 |= SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD;

	host->quirks2 |= SDHCI_QUIRK2_BROKEN_PRESET_VALUE;



	host_version = readl_relaxed((host->ioaddr + SDHCI_HOST_VERSION));

	dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n",

drivers/mmc/host/sdhci.c

+3 −0
Original line number Diff line number Diff line
@@ -2295,6 +2295,9 @@ static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable) 
	if (host->version < SDHCI_SPEC_300)

		return;



	if (host->quirks2 & SDHCI_QUIRK2_BROKEN_PRESET_VALUE)

		return;



	/*

	 * We only enable or disable Preset Value if they are not already

	 * enabled or disabled respectively. Otherwise, we bail out.

drivers/mmc/host/sdhci.h

+7 −0
Original line number Diff line number Diff line
@@ -448,6 +448,13 @@ struct sdhci_host { 
 */

#define SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD		(1<<21)



/*

 * The preset value registers are not properly initialized by

 * some hardware and hence preset value must not be enabled for

 * such controllers.

 */

#define SDHCI_QUIRK2_BROKEN_PRESET_VALUE		(1<<22)



	int irq;		/* Device IRQ */

	void __iomem *ioaddr;	/* Mapped address */