mmc: Merge branch fixes into next

Ulf Hansson · Ulf Hansson · commit 886eade45257 · 2025-07-03T14:17:35.000+02:00
Merge the mmc fixes for v6.16-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.17.

Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
@@ -503,7 +503,8 @@ void bcm2835_prepare_dma(struct bcm2835_host *host, struct mmc_data *data)
 				       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
 	if (!desc) {
-		dma_unmap_sg(dma_chan->device->dev, data->sg, sg_len, dir_data);
+		dma_unmap_sg(dma_chan->device->dev, data->sg, data->sg_len,
+			     dir_data);
 		return;
 	}
 
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
@@ -902,7 +902,8 @@ static bool glk_broken_cqhci(struct sdhci_pci_slot *slot)
 {
 	return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC &&
 	       (dmi_match(DMI_BIOS_VENDOR, "LENOVO") ||
-		dmi_match(DMI_SYS_VENDOR, "IRBIS"));
+		dmi_match(DMI_SYS_VENDOR, "IRBIS") ||
+		dmi_match(DMI_SYS_VENDOR, "Positivo Tecnologia SA"));
 }
 
 static bool jsl_broken_hs400es(struct sdhci_pci_slot *slot)
diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
@@ -613,7 +613,8 @@ static const struct sdhci_ops sdhci_am654_ops = {
 static const struct sdhci_pltfm_data sdhci_am654_pdata = {
 	.ops = &sdhci_am654_ops,
 	.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
 };
 
 static const struct sdhci_am654_driver_data sdhci_am654_sr1_drvdata = {
@@ -643,7 +644,8 @@ static const struct sdhci_ops sdhci_j721e_8bit_ops = {
 static const struct sdhci_pltfm_data sdhci_j721e_8bit_pdata = {
 	.ops = &sdhci_j721e_8bit_ops,
 	.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
 };
 
 static const struct sdhci_am654_driver_data sdhci_j721e_8bit_drvdata = {
@@ -667,7 +669,8 @@ static const struct sdhci_ops sdhci_j721e_4bit_ops = {
 static const struct sdhci_pltfm_data sdhci_j721e_4bit_pdata = {
 	.ops = &sdhci_j721e_4bit_ops,
 	.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_DISABLE_HW_TIMEOUT,
 };
 
 static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = {

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,8 @@ void bcm2835_prepare_dma(struct bcm2835_host host, struct mmc_data data)`
`503`	`503`	`DMA_PREP_INTERRUPT \| DMA_CTRL_ACK);`
`504`	`504`
`505`	`505`	`if (!desc) {`
`506`		`- dma_unmap_sg(dma_chan->device->dev, data->sg, sg_len, dir_data);`
	`506`	`+ dma_unmap_sg(dma_chan->device->dev, data->sg, data->sg_len,`
	`507`	`+ dir_data);`
`507`	`508`	`return;`
`508`	`509`	`}`
`509`	`510`
Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,8 @@ static bool glk_broken_cqhci(struct sdhci_pci_slot *slot)`
`902`	`902`	`{`
`903`	`903`	`return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC &&`
`904`	`904`	`(dmi_match(DMI_BIOS_VENDOR, "LENOVO") \|\|`
`905`		`- dmi_match(DMI_SYS_VENDOR, "IRBIS"));`
	`905`	`+ dmi_match(DMI_SYS_VENDOR, "IRBIS") \|\|`
	`906`	`+ dmi_match(DMI_SYS_VENDOR, "Positivo Tecnologia SA"));`
`906`	`907`	`}`
`907`	`908`
`908`	`909`	`static bool jsl_broken_hs400es(struct sdhci_pci_slot *slot)`