mmc: sdhci-pci-gli: GL9755: Quirks for Apple ARM platforms
v3 cover mmc: sdhci-pci-gli: GL9755: Quirks for Apple ARM platforms
Hi folks,
This short series adds a few quirks needed to make the card readers in Apple M1 Pro/Max MacBook laptops work properly.
The first patch should be straightforward; it just allows configuring the CD/WP polarity based on device tree settings. There is already a standard DT binding for this.
The second patch works around an issue with 8/16-bit MMIO reads that only affects these platforms, for some reason.
Changes since v2:
- Style fixes
Hector Martin (2):
mmc: sdhci-pci-gli: GL9755: Support for CD/WP inversion on OF
platforms
mmc: sdhci-pci-gli: GL975[50]: Issue 8/16-bit MMIO reads as 32-bit
reads.
drivers/mmc/host/sdhci-pci-gli.c | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
Signature · 1 line
2.33.0
PATCH v3 1/2 mmc: sdhci-pci-gli: GL9755: Support for CD/WP inversion on OF platforms
This is required on some Apple ARM64 laptops using this controller. As is typical on DT platforms, pull these quirks from the device tree using the standard mmc bindings.
See Documentation/devicetree/bindings/mmc/mmc-controller.yaml
--- drivers/mmc/host/sdhci-pci-gli.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +11 -0
@@ -12,6 +12,7 @@#include <linux/pci.h> #include <linux/mmc/mmc.h> #include <linux/delay.h> +#include <linux/of.h> #include "sdhci.h" #include "sdhci-pci.h" #include "cqhci.h"
@@ -116,6 +117,8 @@#define PCI_GLI_9755_PECONF 0x44#define PCI_GLI_9755_LFCLK GENMASK(14, 12)#define PCI_GLI_9755_DMACLK BIT(29) +#define PCI_GLI_9755_INVERT_CD BIT(30) +#define PCI_GLI_9755_INVERT_WP BIT(31)#define PCI_GLI_9755_CFG2 0x48#define PCI_GLI_9755_CFG2_L1DLY GENMASK(28, 24)
@@ -570,6 +573,14 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)gl9755_wt_on (pdev);pci_read_config_dword (pdev,PCI_GLI_9755_PECONF , &value); +/* +* Apple ARM64 platforms using these chips may have +* inverted CD/WP detection. +*/ +if (of_property_read_bool (pdev->dev.of_node,"cd-inverted" )) + value |=PCI_GLI_9755_INVERT_CD ; +if (of_property_read_bool (pdev->dev.of_node,"wp-inverted" )) + value |=PCI_GLI_9755_INVERT_WP ; value &= ~PCI_GLI_9755_LFCLK ; value &= ~PCI_GLI_9755_DMACLK ;pci_write_config_dword (pdev,PCI_GLI_9755_PECONF , value);
Signature · 1 line
2.33.0
PATCH v3 2/2 mmc: sdhci-pci-gli: GL975[50]: Issue 8/16-bit MMIO reads as 32-bit reads.
In reply to Hector MartinFor some reason, <32-bit reads do not work on Apple ARM64 platforms with these chips (even though they do on other PCIe devices). Issue them as 32-bit reads instead. This is done unconditionally, as it shouldn't hurt even if not necessary.
--- drivers/mmc/host/sdhci-pci-gli.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +23 -0
@@ -902,7 +902,28 @@ static int gli_probe_slot_gl9763e(struct sdhci_pci_slot *slot)return 0 ; } +#define REG_OFFSET_IN_BITS (reg) ((reg) << 3 & 0x18) + +static u16 sdhci_gli_readw (struct sdhci_host *host,int reg) +{ +u32 val =readl (host->ioaddr + (reg & ~3 )); +u16 word; + + word = (val >>REG_OFFSET_IN_BITS (reg)) &0xffff ; +return word; +} + +static u8 sdhci_gli_readb (struct sdhci_host *host,int reg) +{ +u32 val =readl (host->ioaddr + (reg & ~3 )); +u8 byte = (val >>REG_OFFSET_IN_BITS (reg)) &0xff ; + +return byte; +} +static const struct sdhci_ops sdhci_gl9755_ops = { + .read_w = sdhci_gli_readw, + .read_b = sdhci_gli_readb, .set_clock = sdhci_gl9755_set_clock, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width,
@@ -922,6 +943,8 @@ const struct sdhci_pci_fixes sdhci_gl9755 = { };static const struct sdhci_ops sdhci_gl9750_ops = { + .read_w = sdhci_gli_readw, + .read_b = sdhci_gli_readb, .read_l = sdhci_gl9750_readl, .set_clock = sdhci_gl9750_set_clock, .enable_dma = sdhci_pci_enable_dma,
Signature · 1 line
2.33.0
Quoted 16 lines · Hector Martin
Hi folks,
This short series adds a few quirks needed to make the card readers in Apple M1 Pro/Max MacBook laptops work properly.
The first patch should be straightforward; it just allows configuring the CD/WP polarity based on device tree settings. There is already a standard DT binding for this.
The second patch works around an issue with 8/16-bit MMIO reads that only affects these platforms, for some reason.
Changes since v2:
- Style fixes
Quoted 9 lines
Hector Martin (2):
mmc: sdhci-pci-gli: GL9755: Support for CD/WP inversion on OF
platforms
mmc: sdhci-pci-gli: GL975[50]: Issue 8/16-bit MMIO reads as 32-bit
reads.drivers/mmc/host/sdhci-pci-gli.c | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
Applied for next, thanks!
Kind regards
Uffe