Skip to content

Instantly share code, notes, and snippets.

@andreiw
Last active July 25, 2020 14:33
Show Gist options
  • Save andreiw/f2d27fdf5ed18f4af0db95a380dc36af to your computer and use it in GitHub Desktop.
Save andreiw/f2d27fdf5ed18f4af0db95a380dc36af to your computer and use it in GitHub Desktop.
5.5 patch to support _DMA restrictions/translations for ACPI objects, to properly support xHCI with a 4GB Pi via ACPI
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 33f71983e..f7f7114c4 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -1076,12 +1076,13 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size)
else
size = 1ULL << 32;
- if (dev_is_pci(dev)) {
- ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size);
- if (ret == -ENODEV)
+ ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size);
+ if (ret == -ENODEV) {
+ if (dev_is_pci(dev)) {
ret = rc_dma_get_range(dev, &size);
- } else {
- ret = nc_dma_get_range(dev, &size);
+ } else {
+ ret = nc_dma_get_range(dev, &size);
+ }
}
if (!ret) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment