Skip to content

Partially revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585"#7393

Merged
pelwell merged 1 commit into
raspberrypi:rpi-6.18.yfrom
pelwell:is7355
May 22, 2026
Merged

Partially revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585"#7393
pelwell merged 1 commit into
raspberrypi:rpi-6.18.yfrom
pelwell:is7355

Conversation

@pelwell
Copy link
Copy Markdown
Contributor

@pelwell pelwell commented May 22, 2026

This reverts commit 105c425.

Between [1] and this reversion of it, 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: #7355
https://forums.raspberrypi.com/viewtopic.php?p=2374573&sid=a9d90a55d42694d4f24bf03946e44a4f#p2374573

Signed-off-by: Phil Elwell phil@raspberrypi.com

[1] commit 105c425 ("ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585")

@popcornmix
Copy link
Copy Markdown
Collaborator

What do you think about making this a partial revert just to minimise future conflicts?
a // comment on lines 453 and 454 would be one option.

@pelwell
Copy link
Copy Markdown
Contributor Author

pelwell commented May 22, 2026

A minimal patch would be something like this:

 	[board_ahci_jmb585] = {
 		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR |
-				 AHCI_HFLAG_32BIT_ONLY),
+				 0*AHCI_HFLAG_32BIT_ONLY),
 		.flags		= AHCI_FLAG_COMMON,

@pelwell pelwell changed the title Revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585" Partially revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585" May 22, 2026
@pelwell
Copy link
Copy Markdown
Contributor Author

pelwell commented May 22, 2026

Resubmitted as a minimal partial reversion.

@pelwell
Copy link
Copy Markdown
Contributor Author

pelwell commented May 22, 2026

Are you OK with this, @P33M?

This partially reverts commit 105c425.

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: raspberrypi#7355
     https://forums.raspberrypi.com/viewtopic.php?p=2374573&sid=a9d90a55d42694d4f24bf03946e44a4f#p2374573

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

[1] commit 105c425 ("ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585")
@pelwell pelwell merged commit bb5a64a into raspberrypi:rpi-6.18.y May 22, 2026
11 of 12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request May 22, 2026
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request May 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants