mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working

The Lenovo Yoga Tablet 2 Pro 1380 sdcard slot has an active high cd pin
and a broken wp pin which always reports the card being write-protected.

Add a DMI quirk to address both issues.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240410191639.526324-5-hdegoede@redhat.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index d2003d3be6ba33b6c6b7377cc329fa8a39f040b6..c0d77f589debcf405799d358390af1827c929924 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -80,6 +80,7 @@ struct sdhci_acpi_host {
 enum {
        DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP                  = BIT(0),
        DMI_QUIRK_SD_NO_WRITE_PROTECT                           = BIT(1),
+       DMI_QUIRK_SD_CD_ACTIVE_HIGH                             = BIT(2),
 };
 
 static inline void *sdhci_acpi_priv(struct sdhci_acpi_host *c)
@@ -747,6 +748,26 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = {
                },
                .driver_data = (void *)DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP,
        },
+       {
+               /*
+                * Lenovo Yoga Tablet 2 Pro 1380F/L (13" Android version) this
+                * has broken WP reporting and an inverted CD signal.
+                * Note this has more or less the same BIOS as the Lenovo Yoga
+                * Tablet 2 830F/L or 1050F/L (8" and 10" Android), but unlike
+                * the 830 / 1050 models which share the same mainboard this
+                * model has a different mainboard and the inverted CD and
+                * broken WP are unique to this board.
+                */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Intel Corp."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "VALLEYVIEW C0 PLATFORM"),
+                       DMI_MATCH(DMI_BOARD_NAME, "BYT-T FFD8"),
+                       /* Full match so as to NOT match the 830/1050 BIOS */
+                       DMI_MATCH(DMI_BIOS_VERSION, "BLADE_21.X64.0005.R00.1504101516"),
+               },
+               .driver_data = (void *)(DMI_QUIRK_SD_NO_WRITE_PROTECT |
+                                       DMI_QUIRK_SD_CD_ACTIVE_HIGH),
+       },
        {
                /*
                 * The Toshiba WT8-B's microSD slot always reports the card being
@@ -867,6 +888,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
        if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {
                bool v = sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL);
 
+               if (quirks & DMI_QUIRK_SD_CD_ACTIVE_HIGH)
+                       host->mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+
                err = mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0);
                if (err) {
                        if (err == -EPROBE_DEFER)