mmc: sdhci-acpi: Add some DMI quirks to fix various issues on Bay Trail devices
v3 cover mmc: sdhci-acpi: Add some DMI quirks to fix various issues on Bay Trail devices
Hi All,
Here is v3 of my series adding DMI quirks to fix various issues on Intel Bay Trail tablets.
Changes in v3:
- Replace "mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot" with a new patch from Adrian which actually fixes these modes:
"[PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts"
Note this is missing a Signed-off-by from Adrian since this started out as a quick test patch from Adrian.
Adrian, can you provide your S-o-b for this patch?
Changes in v2:
- Address a few small remarks from Andy and adds Andy's Reviewed-by to the patches
Regards,
Hans
Adrian Hunter (1):
mmc: sdhci: Add support for "Tuning Error" interrupts
Hans de Goede (5):
mmc: core: Add mmc_gpiod_set_cd_config() function
mmc: sdhci-acpi: Sort DMI quirks alphabetically
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not
working
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO
on Asus T100TA
drivers/mmc/core/slot-gpio.c | 20 ++++++++++++ drivers/mmc/host/sdhci-acpi.c | 61 +++++++++++++++++++++++++++++++---- drivers/mmc/host/sdhci.c | 10 ++++-- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/slot-gpio.h | 1 + 5 files changed, 86 insertions(+), 9 deletions(-)
Signature · 1 line
2.44.0
PATCH v3 1/6 mmc: core: Add mmc_gpiod_set_cd_config() function
Some mmc host drivers may need to fixup a card-detection GPIO's config to e.g. enable the GPIO controllers builtin pull-up resistor on devices where the firmware description of the GPIO is broken (e.g. GpioInt with PullNone instead of PullUp in ACPI DSDT).
Since this is the exception rather then the rule adding a config parameter to mmc_gpiod_request_cd() seems undesirable, so instead add a new mmc_gpiod_set_cd_config() function. This is simply a wrapper to call gpiod_set_config() on the card-detect GPIO acquired through mmc_gpiod_request_cd().
---
Changes in v2:
- Group mmc_gpiod_set_cd_config() prototype in slot-gpio.h together with mmc_gpiod_set_cd_config()
--- drivers/mmc/core/slot-gpio.c | 20 ++++++++++++++++++++ include/linux/mmc/slot-gpio.h | 1 + 2 files changed, 21 insertions(+)
drivers/mmc/core/slot-gpio.c +20 -0
@@ -221,6 +221,26 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, }EXPORT_SYMBOL (mmc_gpiod_request_cd); +/** +* mmc_gpiod_set_cd_config - set config for card-detection GPIO +* @host: mmc host +* @config: Generic pinconf config (from pinconf_to_config_packed()) +* +* This can be used by mmc host drivers to fixup a card-detection GPIO's config +* (e.g. set PIN_CONFIG_BIAS_PULL_UP) after acquiring the GPIO descriptor +* through mmc_gpiod_request_cd(). +* +* Returns: +* 0 on success, or a negative errno value on error. +*/ +int mmc_gpiod_set_cd_config (struct mmc_host *host,unsigned long config) +{ +struct mmc_gpio *ctx = host->slot.handler_priv; + +return gpiod_set_config (ctx->cd_gpio, config); +} +EXPORT_SYMBOL (mmc_gpiod_set_cd_config); +bool mmc_can_gpio_cd (struct mmc_host *host) {struct mmc_gpio *ctx = host->slot.handler_priv;
include/linux/mmc/slot-gpio.h +1 -0
@@ -21,6 +21,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, unsigned int debounce);int mmc_gpiod_request_ro (struct mmc_host *host,const char *con_id,unsigned int idx,unsigned int debounce); +int mmc_gpiod_set_cd_config (struct mmc_host *host,unsigned long config);void mmc_gpio_set_cd_isr (struct mmc_host *host,irqreturn_t (*isr)(int irq,void *dev_id));int mmc_gpio_set_cd_wake (struct mmc_host *host,bool on);
Signature · 1 line
2.44.0
PATCH v3 2/6 mmc: sdhci: Add support for "Tuning Error" interrupts
In reply to Hans de GoedeFrom: Adrian Hunter <[email protected]>
Most Bay Trail devices do not enable UHS modes for the external sdcard slot the Lenovo Yoga Tablet 2 830 / 1050 and Lenovo Yoga Tablet 2 Pro 1380 (8", 10" and 13") models however do enable this.
Using a UHS cards in these tablets results in errors like this one:
[ 225.272001] mmc2: Unexpected interrupt 0x04000000. [ 225.272024] mmc2: sdhci: ============ SDHCI REGISTER DUMP =========== [ 225.272034] mmc2: sdhci: Sys addr: 0x0712c400 | Version: 0x0000b502 [ 225.272044] mmc2: sdhci: Blk size: 0x00007200 | Blk cnt: 0x00000007 [ 225.272054] mmc2: sdhci: Argument: 0x00000000 | Trn mode: 0x00000023 [ 225.272064] mmc2: sdhci: Present: 0x01e20002 | Host ctl: 0x00000016 [ 225.272073] mmc2: sdhci: Power: 0x0000000f | Blk gap: 0x00000000 [ 225.272082] mmc2: sdhci: Wake-up: 0x00000000 | Clock: 0x00000107 [ 225.272092] mmc2: sdhci: Timeout: 0x0000000e | Int stat: 0x00000001 [ 225.272101] mmc2: sdhci: Int enab: 0x03ff000b | Sig enab: 0x03ff000b [ 225.272110] mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000001 [ 225.272119] mmc2: sdhci: Caps: 0x076864b2 | Caps_1: 0x00000004 [ 225.272129] mmc2: sdhci: Cmd: 0x00000c1b | Max curr: 0x00000000 [ 225.272138] mmc2: sdhci: Resp[0]: 0x00000c00 | Resp[1]: 0x00000000 [ 225.272147] mmc2: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000900 [ 225.272155] mmc2: sdhci: Host ctl2: 0x0000000c [ 225.272164] mmc2: sdhci: ADMA Err: 0x00000003 | ADMA Ptr: 0x0712c200 [ 225.272172] mmc2: sdhci: ============================================
which results in IO errors leading to issues accessing the sdcard.
0x04000000 is a so-called "Tuning Error" which sofar the SDHCI driver does not support / enable. Modify the IRQ handler to process these.
This fixes UHS microsd cards not working with these tablets.
--- drivers/mmc/host/sdhci.c | 10 ++++++++-- drivers/mmc/host/sdhci.h | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +8 -2
@@ -3439,12 +3439,18 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); - }else if ((intmask &SDHCI_INT_DATA_CRC ) && + }else if ((intmask & (SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) &&SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND )) !=MMC_BUS_TEST_R ) { host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); +if (intmask &SDHCI_INT_TUNING_ERROR ) { +u16 ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + + ctrl2 &= ~SDHCI_CTRL_TUNED_CLK ; +sdhci_writew (host, ctrl2,SDHCI_HOST_CONTROL2 ); + } }else if (intmask &SDHCI_INT_ADMA_ERROR ) {pr_err ("%s: ADMA error: 0x%08x\n" ,mmc_hostname (host->mmc), intmask);
@@ -3979,7 +3985,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error, }else *cmd_error =0 ; -if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC )) { +if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) { *data_error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC );
drivers/mmc/host/sdhci.h +2 -1
@@ -158,6 +158,7 @@#define SDHCI_INT_BUS_POWER 0x00800000#define SDHCI_INT_AUTO_CMD_ERR 0x01000000#define SDHCI_INT_ADMA_ERROR 0x02000000 +#define SDHCI_INT_TUNING_ERROR 0x04000000#define SDHCI_INT_NORMAL_MASK 0x00007FFF#define SDHCI_INT_ERROR_MASK 0xFFFF8000
@@ -169,7 +170,7 @@ SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ SDHCI_INT_DATA_END_BIT | SDHCI_INT_ADMA_ERROR | \ - SDHCI_INT_BLK_GAP) + SDHCI_INT_BLK_GAP | SDHCI_INT_TUNING_ERROR)#define SDHCI_INT_ALL_MASK ((unsigned int)-1)#define SDHCI_CQE_INT_ERR_MASK ( \
Signature · 1 line
2.44.0
Adrian Hunter
maintainerRe: [PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts
Quoted 27 lines · Hans de Goede
From: Adrian Hunter <[email protected]>
Most Bay Trail devices do not enable UHS modes for the external sdcard slot the Lenovo Yoga Tablet 2 830 / 1050 and Lenovo Yoga Tablet 2 Pro 1380 (8", 10" and 13") models however do enable this.
Using a UHS cards in these tablets results in errors like this one:
[ 225.272001] mmc2: Unexpected interrupt 0x04000000. [ 225.272024] mmc2: sdhci: ============ SDHCI REGISTER DUMP =========== [ 225.272034] mmc2: sdhci: Sys addr: 0x0712c400 | Version: 0x0000b502 [ 225.272044] mmc2: sdhci: Blk size: 0x00007200 | Blk cnt: 0x00000007 [ 225.272054] mmc2: sdhci: Argument: 0x00000000 | Trn mode: 0x00000023 [ 225.272064] mmc2: sdhci: Present: 0x01e20002 | Host ctl: 0x00000016 [ 225.272073] mmc2: sdhci: Power: 0x0000000f | Blk gap: 0x00000000 [ 225.272082] mmc2: sdhci: Wake-up: 0x00000000 | Clock: 0x00000107 [ 225.272092] mmc2: sdhci: Timeout: 0x0000000e | Int stat: 0x00000001 [ 225.272101] mmc2: sdhci: Int enab: 0x03ff000b | Sig enab: 0x03ff000b [ 225.272110] mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000001 [ 225.272119] mmc2: sdhci: Caps: 0x076864b2 | Caps_1: 0x00000004 [ 225.272129] mmc2: sdhci: Cmd: 0x00000c1b | Max curr: 0x00000000 [ 225.272138] mmc2: sdhci: Resp[0]: 0x00000c00 | Resp[1]: 0x00000000 [ 225.272147] mmc2: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000900 [ 225.272155] mmc2: sdhci: Host ctl2: 0x0000000c [ 225.272164] mmc2: sdhci: ADMA Err: 0x00000003 | ADMA Ptr: 0x0712c200 [ 225.272172] mmc2: sdhci: ============================================
Quoted 7 lines
which results in IO errors leading to issues accessing the sdcard.
0x04000000is a so-called "Tuning Error" which sofar the SDHCI driver does not support / enable. Modify the IRQ handler to process these.This fixes UHS microsd cards not working with these tablets.
Needs my SOB here:
Quoted 61 lines
Signed-off-by Hans de Goede <[email protected]>--- drivers/mmc/host/sdhci.c | 10 ++++++++-- drivers/mmc/host/sdhci.h | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-)drivers/mmc/host/sdhci.c +8
-2@@ -3439,12 +3439,18 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); - }else if ((intmask &SDHCI_INT_DATA_CRC ) && + }else if ((intmask & (SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) &&SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND )) !=MMC_BUS_TEST_R ) { host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); +if (intmask &SDHCI_INT_TUNING_ERROR ) { +u16 ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + + ctrl2 &= ~SDHCI_CTRL_TUNED_CLK ; +sdhci_writew (host, ctrl2,SDHCI_HOST_CONTROL2 ); + } }else if (intmask &SDHCI_INT_ADMA_ERROR ) {pr_err ("%s: ADMA error: 0x%08x\n" ,mmc_hostname (host->mmc), intmask);@@ -3979,7 +3985,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error, }else *cmd_error =0 ; -if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC )) { +if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) { *data_error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC );drivers/mmc/host/sdhci.h +2
-1@@ -158,6 +158,7 @@#define SDHCI_INT_BUS_POWER 0x00800000#define SDHCI_INT_AUTO_CMD_ERR 0x01000000#define SDHCI_INT_ADMA_ERROR 0x02000000 +#define SDHCI_INT_TUNING_ERROR 0x04000000#define SDHCI_INT_NORMAL_MASK 0x00007FFF#define SDHCI_INT_ERROR_MASK 0xFFFF8000@@ -169,7 +170,7 @@ SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ SDHCI_INT_DATA_END_BIT | SDHCI_INT_ADMA_ERROR | \ - SDHCI_INT_BLK_GAP) + SDHCI_INT_BLK_GAP | SDHCI_INT_TUNING_ERROR)#define SDHCI_INT_ALL_MASK ((unsigned int)-1)#define SDHCI_CQE_INT_ERR_MASK ( \
PATCH v3 3/6 mmc: sdhci-acpi: Sort DMI quirks alphabetically
In reply to Hans de GoedeSort the DMI quirks alphabetically.
--- drivers/mmc/host/sdhci-acpi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/mmc/host/sdhci-acpi.c +13 -12
@@ -719,7 +719,20 @@ static const struct acpi_device_id sdhci_acpi_ids[] = { };MODULE_DEVICE_TABLE (acpi, sdhci_acpi_ids); +/* Please keep this list sorted alphabetically */ static const struct dmi_system_id sdhci_acpi_quirks[] = { + { +/* +* The Acer Aspire Switch 10 (SW5-012) microSD slot always +* reports the card being write-protected even though microSD +* cards do not have a write-protect switch at all. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire SW5-012" ), + }, + .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT , + }, {/* * The Lenovo Miix 320-10ICR has a bug in the _PS0 method of
@@ -734,18 +747,6 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = { }, .driver_data = (void *)DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP, }, - { -/* -* The Acer Aspire Switch 10 (SW5-012) microSD slot always -* reports the card being write-protected even though microSD -* cards do not have a write-protect switch at all. -*/ - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), - }, - .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, - }, {/* * The Toshiba WT8-B's microSD slot always reports the card being
Signature · 1 line
2.44.0
PATCH v3 4/6 mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working
In reply to Hans de GoedeThe 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.
--- drivers/mmc/host/sdhci-acpi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/mmc/host/sdhci-acpi.c +24 -0
@@ -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 )
Signature · 1 line
2.44.0
PATCH v3 5/6 mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
In reply to Hans de GoedeOn the Toshiba WT10-A the microSD slot always reports the card being write-protected, just like on the Toshiba WT8-B.
Add a DMI quirk to work around this.
--- drivers/mmc/host/sdhci-acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/mmc/host/sdhci-acpi.c +11 -0
@@ -779,6 +779,17 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = { }, .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, }, + { + /* + * The Toshiba WT10-A's microSD slot always reports the card being + * write-protected. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A"), + }, + .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, + }, {} /* Terminating entry */ };
Signature · 1 line
2.44.0
PATCH v3 6/6 mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
In reply to Hans de GoedeThe card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models stopped working under Linux after commit 6fd03f024828 ("gpiolib: acpi:
support bias pull disable").
The GPIO in question is connected to a mechanical switch in the slot which shorts the pin to GND when a card is inserted.
The GPIO pin correctly gets configured with a 20K pull-up by the BIOS, but there is a bug in the DSDT where the GpioInt for the card-detect is configured with a PullNone setting:
GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x2710,
"\\_SB.GPO0", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0026
}Linux now actually honors the PullNone setting and disables the 20K pull-up configured by the BIOS.
Add a new DMI_QUIRK_SD_CD_ENABLE_PULL_UP quirk which when set calls mmc_gpiod_set_cd_config() to re-enable the pull-up and set this for the Asus T100TA models to fix this.
---
Cc: Nuno Sá <[email protected]>
---
Changes v2:
- Add {} to else if (quirks & DMI_QUIRK_SD_CD_ENABLE_PULL_UP) branch
--- drivers/mmc/host/sdhci-acpi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/mmc/host/sdhci-acpi.c +13 -0
@@ -10,6 +10,7 @@#include <linux/export.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/pinctrl/pinconf-generic.h> #include <linux/platform_device.h> #include <linux/ioport.h> #include <linux/io.h>
@@ -81,6 +82,7 @@ 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 ), + DMI_QUIRK_SD_CD_ENABLE_PULL_UP = BIT(3), };static inline void *sdhci_acpi_priv (struct sdhci_acpi_host *c)
@@ -734,6 +736,14 @@ static const struct dmi_system_id sdhci_acpi_quirks[] = { }, .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, }, + { +/* Asus T100TA, needs pull-up for cd but DSDT GpioInt has NoPull set */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"), + }, + .driver_data = (void *)DMI_QUIRK_SD_CD_ENABLE_PULL_UP, + }, {/* * The Lenovo Miix 320-10ICR has a bug in the _PS0 method of
@@ -908,6 +918,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev) goto err_free;dev_warn (dev,"failed to setup card detect gpio\n" ); c->use_runtime_pm = false; + }else if (quirks &DMI_QUIRK_SD_CD_ENABLE_PULL_UP ) { +mmc_gpiod_set_cd_config (host->mmc, +PIN_CONF_PACKED (PIN_CONFIG_BIAS_PULL_UP ,20000 )); }if (quirks &DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP )
Signature · 1 line
2.44.0
Re: [PATCH v3 6/6] mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
Quoted 24 lines · Hans de Goede
The card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models stopped working under Linux after commit
6fd03f024828("gpiolib: acpi:
support bias pull disable").The GPIO in question is connected to a mechanical switch in the slot which shorts the pin to GND when a card is inserted.
The GPIO pin correctly gets configured with a 20K pull-up by the BIOS, but there is a bug in the DSDT where the GpioInt for the card-detect is configured with a PullNone setting:
GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x2710, "\\_SB.GPO0", 0x00, ResourceConsumer, , ) { // Pin list 0x0026 }Linux now actually honors the PullNone setting and disables the 20K pull-up configured by the BIOS.
Add a new
DMI_QUIRK_SD_CD_ENABLE_PULL_UPquirk which when set callsmmc_gpiod_set_cd_config()to re-enable the pull-up and set this for the Asus T100TA models to fix this.
...
drivers/mmc/host/sdhci-acpi.c static int sdhci_acpi_probe(struct platform_device *pdev) · line 923
Quoted 2 lines
drivers/mmc/host/sdhci-acpi.c +2
-0+mmc_gpiod_set_cd_config (host->mmc, +PIN_CONF_PACKED (PIN_CONFIG_BIAS_PULL_UP ,20000 ));
Just noticed, the PIN_CONF_PACKED() is a helper for pinconf-generic.h. It seems unusual to use it directly, and AFAIU documentation, it's for static initialisations, however it's not explicitly said.
Hence, I suggest to use pinconf_to_config_packed() as others do for the run-time code.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 6/6] mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
Quoted 1 line · Andy Shevchenko
On Wed, Apr 10, 2024 at 09:16:39PM +0200, Hans de Goede wrote:
...
Quoted 6 lines
drivers/mmc/host/sdhci-acpi.c static int sdhci_acpi_probe(struct platform_device *pdev) · line 923
Quoted 2 lines
drivers/mmc/host/sdhci-acpi.c +2
-0+mmc_gpiod_set_cd_config (host->mmc, +PIN_CONF_PACKED (PIN_CONFIG_BIAS_PULL_UP ,20000 ));Just noticed, the
PIN_CONF_PACKED()is a helper forpinconf-generic.h. It seems unusual to use it directly, and AFAIU documentation, it's for static initialisations, however it's not explicitly said.
I stand corrected, it's said just in the comment on top of the macro definition, while I admit there is also 'etc.' whatever it means.
Quoted 2 lines
Hence, I suggest to use
pinconf_to_config_packed()as others do for the run-time code.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 6/6] mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
In reply to Andy ShevchenkoHi Andy,
Quoted 28 lines · Andy Shevchenko
Quoted 24 lines · Hans de Goede
The card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models stopped working under Linux after commit
6fd03f024828("gpiolib: acpi:
support bias pull disable").The GPIO in question is connected to a mechanical switch in the slot which shorts the pin to GND when a card is inserted.
The GPIO pin correctly gets configured with a 20K pull-up by the BIOS, but there is a bug in the DSDT where the GpioInt for the card-detect is configured with a PullNone setting:
GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x2710, "\\_SB.GPO0", 0x00, ResourceConsumer, , ) { // Pin list 0x0026 }Linux now actually honors the PullNone setting and disables the 20K pull-up configured by the BIOS.
Add a new
DMI_QUIRK_SD_CD_ENABLE_PULL_UPquirk which when set callsmmc_gpiod_set_cd_config()to re-enable the pull-up and set this for the Asus T100TA models to fix this....
Quoted 7 lines
drivers/mmc/host/sdhci-acpi.c static int sdhci_acpi_probe(struct platform_device *pdev) · line 923
Quoted 2 lines
drivers/mmc/host/sdhci-acpi.c +2
-0+mmc_gpiod_set_cd_config (host->mmc, +PIN_CONF_PACKED (PIN_CONFIG_BIAS_PULL_UP ,20000 ));Just noticed, the
PIN_CONF_PACKED()is a helper forpinconf-generic.h. It seems unusual to use it directly, and AFAIU documentation, it's for static initialisations, however it's not explicitly said.
I saw the static vs runtime comment, but I assumed that applies to the parameters passed to PIN_CONF_PACKED() being determined at runtime (not the cases here) vs the parameters being static / const.
Regards,
Hans
Quoted 36 lines · Hans de Goede
Hi All,
Here is v3 of my series adding DMI quirks to fix various issues on Intel Bay Trail tablets.
Changes in v3:
- Replace "mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot" with a new patch from Adrian which actually fixes these modes:
"[PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts"Note this is missing a Signed-off-by from Adrian since this started out as a quick test patch from Adrian.
Adrian, can you provide your S-o-b for this patch?Changes in v2:
- Address a few small remarks from Andy and adds Andy's Reviewed-by to the patchesRegards,
Hans
Adrian Hunter (1):
mmc: sdhci: Add support for "Tuning Error" interruptsHans de Goede (5):
mmc: core: Addmmc_gpiod_set_cd_config()function
mmc: sdhci-acpi: Sort DMI quirks alphabetically
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not
working
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO
on Asus T100TA
Quoted 7 lines
drivers/mmc/core/slot-gpio.c | 20 ++++++++++++ drivers/mmc/host/sdhci-acpi.c | 61 +++++++++++++++++++++++++++++++---- drivers/mmc/host/sdhci.c | 10 ++++-- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/slot-gpio.h | 1 + 5 files changed, 86 insertions(+), 9 deletions(-)
For all:
Note also patch 2 needs my Signed-off-by
Quoted 37 lines · Hans de Goede
Hi All,
Here is v3 of my series adding DMI quirks to fix various issues on Intel Bay Trail tablets.
Changes in v3:
- Replace "mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot" with a new patch from Adrian which actually fixes these modes:
"[PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts"Note this is missing a Signed-off-by from Adrian since this started out as a quick test patch from Adrian.
Adrian, can you provide your S-o-b for this patch?Changes in v2:
- Address a few small remarks from Andy and adds Andy's Reviewed-by to the patchesRegards,
Hans
Adrian Hunter (1):
mmc: sdhci: Add support for "Tuning Error" interruptsHans de Goede (5):
mmc: core: Addmmc_gpiod_set_cd_config()function
mmc: sdhci-acpi: Sort DMI quirks alphabetically
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not
working
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO
on Asus T100TA
Quoted 7 lines
drivers/mmc/core/slot-gpio.c | 20 ++++++++++++ drivers/mmc/host/sdhci-acpi.c | 61 +++++++++++++++++++++++++++++++---- drivers/mmc/host/sdhci.c | 10 ++++-- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/slot-gpio.h | 1 + 5 files changed, 86 insertions(+), 9 deletions(-)
The series applied for next, thanks!
I assume some/all these patches may deserve to get backported to stable kernels, but it looks like that may be better for you to manage by yourself!?
Kind regards
Uffe
Hi,
Quoted 46 lines · Ulf Hansson
Quoted 37 lines · Hans de Goede
Hi All,
Here is v3 of my series adding DMI quirks to fix various issues on Intel Bay Trail tablets.
Changes in v3:
- Replace "mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot" with a new patch from Adrian which actually fixes these modes:
"[PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts"Note this is missing a Signed-off-by from Adrian since this started out as a quick test patch from Adrian.
Adrian, can you provide your S-o-b for this patch?Changes in v2:
- Address a few small remarks from Andy and adds Andy's Reviewed-by to the patchesRegards,
Hans
Adrian Hunter (1):
mmc: sdhci: Add support for "Tuning Error" interruptsHans de Goede (5):
mmc: core: Addmmc_gpiod_set_cd_config()function
mmc: sdhci-acpi: Sort DMI quirks alphabetically
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not
working
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO
on Asus T100TAQuoted 7 lines
drivers/mmc/core/slot-gpio.c | 20 ++++++++++++ drivers/mmc/host/sdhci-acpi.c | 61 +++++++++++++++++++++++++++++++---- drivers/mmc/host/sdhci.c | 10 ++++-- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/slot-gpio.h | 1 + 5 files changed, 86 insertions(+), 9 deletions(-)
Quoted 5 lines
The series applied for next, thanks!
I assume some/all these patches may deserve to get backported to stable kernels, but it looks like that may be better for you to manage by yourself!?
From my pov the entire series is suitable for stable, so if you can mark them all for stable that would be great.
Regards,
Hans
Quoted 50 lines · Hans de Goede
Hi,
Quoted 46 lines · Ulf Hansson
Quoted 44 lines · Hans de Goede
Hi All,
Here is v3 of my series adding DMI quirks to fix various issues on Intel Bay Trail tablets.
Changes in v3:
- Replace "mmc: sdhci-acpi: Disable UHS/1.8V modes on Lenovo Yoga Tablet 2 series sdcard slot" with a new patch from Adrian which actually fixes these modes:
"[PATCH v3 2/6] mmc: sdhci: Add support for "Tuning Error" interrupts"Note this is missing a Signed-off-by from Adrian since this started out as a quick test patch from Adrian.
Adrian, can you provide your S-o-b for this patch?Changes in v2:
- Address a few small remarks from Andy and adds Andy's Reviewed-by to the patchesRegards,
Hans
Adrian Hunter (1):
mmc: sdhci: Add support for "Tuning Error" interruptsHans de Goede (5):
mmc: core: Addmmc_gpiod_set_cd_config()function
mmc: sdhci-acpi: Sort DMI quirks alphabetically
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not
working
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO
on Asus T100TAdrivers/mmc/core/slot-gpio.c | 20 ++++++++++++ drivers/mmc/host/sdhci-acpi.c | 61 +++++++++++++++++++++++++++++++---- drivers/mmc/host/sdhci.c | 10 ++++-- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/slot-gpio.h | 1 + 5 files changed, 86 insertions(+), 9 deletions(-)
Quoted 8 lines
Quoted 5 lines
The series applied for next, thanks!
I assume some/all these patches may deserve to get backported to stable kernels, but it looks like that may be better for you to manage by yourself!?
From my pov the entire series is suitable for stable, so if you can mark them all for stable that would be great.
Alright, done!
Kind regards
Uffe