From 40116166e8e7ce52176bd6673a9742eb1841d3c6 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 May 2026 13:36:02 +0100 Subject: [PATCH] Partially revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585" This partially reverts commit 105c42566a550e2d05fc14f763216a8765ee5d0e. Between [1] and this partial reversion, all users of the JMB582/JMB585 on Raspberry Pi 5 have been forced to use the pcie-32bit-dma overlay. The reasoning behind the patch is either inherently flawed or does not apply on a Pi 5, since all inbound memory accesses are by default above 4GB and yet seem to work. See: https://github.com/raspberrypi/linux/issues/7355 https://forums.raspberrypi.com/viewtopic.php?p=2374573&sid=a9d90a55d42694d4f24bf03946e44a4f#p2374573 Signed-off-by: Phil Elwell [1] commit 105c42566a55 ("ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585") --- drivers/ata/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 1d73a53370cf3e..eb2d896daa6612 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -216,7 +216,7 @@ static const struct ata_port_info ahci_port_info[] = { /* JMicron JMB582/585: 64-bit DMA is broken, force 32-bit */ [board_ahci_jmb585] = { AHCI_HFLAGS (AHCI_HFLAG_IGN_IRQ_IF_ERR | - AHCI_HFLAG_32BIT_ONLY), + 0*AHCI_HFLAG_32BIT_ONLY), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6,