Patch "mmc: sdhci-pci: Fix voltage switch for some Intel host controllers" has been added to the 4.13-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
mmc: sdhci-pci: Fix voltage switch for some Intel host controllers
to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-sdhci-pci-fix-voltage-switch-for-some-intel-host-controllers.patch
and it can be found in the queue-4.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6ae033689d7b1a419def78e8e990b0eab8bb6419Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
Date: Mon, 18 Sep 2017 15:16:08 +0300
Subject: mmc: sdhci-pci: Fix voltage switch for some Intel host controllers
From: Adrian Hunter <[email protected]>
commit 6ae033689d7b1a419def78e8e990b0eab8bb6419 upstream.
Some Intel host controllers (e.g. CNP) use an ACPI device-specific method to ensure correct voltage switching. Fix voltage switch for those, by adding a call to the DSM.
--- drivers/mmc/host/sdhci-pci-core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/mmc/host/sdhci-pci-core.c +15 -0
@@ -393,6 +393,7 @@ static const struct sdhci_pci_fixes sdhcenum {INTEL_DSM_FNS =0 , +INTEL_DSM_V18_SWITCH =3 ,INTEL_DSM_DRV_STRENGTH =9 ,INTEL_DSM_D3_RETUNE =10 , };
@@ -558,6 +559,19 @@ static void intel_hs400_enhanced_strobe(sdhci_writel (host, val,INTEL_HS400_ES_REG ); } +static void sdhci_intel_voltage_switch (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct intel_host *intel_host =sdhci_pci_priv (slot); +struct device *dev = &slot->chip->pdev->dev; +u32 result =0 ; +int err; + + err =intel_dsm (intel_host, dev,INTEL_DSM_V18_SWITCH , &result); +pr_debug ("%s: %s DSM error %d result %u\n" , +mmc_hostname (host->mmc), __func__, err, result); +} +static const struct sdhci_ops sdhci_intel_byt_ops = { .set_clock = sdhci_set_clock, .set_power = sdhci_intel_set_power,
@@ -566,6 +580,7 @@ static const struct sdhci_ops sdhci_inte .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, + .voltage_switch = sdhci_intel_voltage_switch, };static void byt_read_dsm (struct sdhci_pci_slot *slot)
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/mmc-block-fix-incorrectly-initialized-requests.patch queue-4.13/mmc-sdhci-pci-fix-voltage-switch-for-some-intel-host-controllers.patch