Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v6.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"MMC host:
- bcm2835: Fix dma_unmap_sg() nents value
- sdhci_am654: Add workaround for maximum HW timeout
- sdhci-pci: Disable broken CQE Intel GLK-based Positivo models
MEMSTICK:
- Zero initialize id_reg in h_memstick_read_dev_id()"
* tag 'mmc-v6.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
memstick: core: Zero initialize id_reg in h_memstick_read_dev_id()
mmc: bcm2835: Fix dma_unmap_sg() nents value
mmc: sdhci_am654: Workaround for Errata i2312
mmc: sdhci-pci: Quirk for broken command queuing on Intel GLK-based Positivo models
+11
-6
+1
-1
drivers/memstick/core/memstick.c
+1
-1
drivers/memstick/core/memstick.c
···
324
324
static int h_memstick_read_dev_id(struct memstick_dev *card,
325
325
struct memstick_request **mrq)
326
326
{
327
-
struct ms_id_register id_reg;
327
+
struct ms_id_register id_reg = {};
328
328
329
329
if (!(*mrq)) {
330
330
memstick_init_req(&card->current_mrq, MS_TPC_READ_REG, &id_reg,
+2
-1
drivers/mmc/host/bcm2835.c
+2
-1
drivers/mmc/host/bcm2835.c
+2
-1
drivers/mmc/host/sdhci-pci-core.c
+2
-1
drivers/mmc/host/sdhci-pci-core.c
···
913
913
{
914
914
return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC &&
915
915
(dmi_match(DMI_BIOS_VENDOR, "LENOVO") ||
916
-
dmi_match(DMI_SYS_VENDOR, "IRBIS"));
916
+
dmi_match(DMI_SYS_VENDOR, "IRBIS") ||
917
+
dmi_match(DMI_SYS_VENDOR, "Positivo Tecnologia SA"));
917
918
}
918
919
919
920
static bool jsl_broken_hs400es(struct sdhci_pci_slot *slot)
+6
-3
drivers/mmc/host/sdhci_am654.c
+6
-3
drivers/mmc/host/sdhci_am654.c
···
613
613
static const struct sdhci_pltfm_data sdhci_am654_pdata = {
614
614
.ops = &sdhci_am654_ops,
615
615
.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
616
-
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
616
+
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
617
+
SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
617
618
};
618
619
619
620
static const struct sdhci_am654_driver_data sdhci_am654_sr1_drvdata = {
···
644
643
static const struct sdhci_pltfm_data sdhci_j721e_8bit_pdata = {
645
644
.ops = &sdhci_j721e_8bit_ops,
646
645
.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
647
-
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
646
+
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
647
+
SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
648
648
};
649
649
650
650
static const struct sdhci_am654_driver_data sdhci_j721e_8bit_drvdata = {
···
669
667
static const struct sdhci_pltfm_data sdhci_j721e_4bit_pdata = {
670
668
.ops = &sdhci_j721e_4bit_ops,
671
669
.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
672
-
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
670
+
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
671
+
SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
673
672
};
674
673
675
674
static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = {