Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI/IORT: take _DMA methods into account for named components

Browse Source 
Where IORT nodes for named components can describe simple DMA limits
expressed as the number of address bits a device can drive, _DMA methods
in AML can express more complex topologies, involving DMA translation in
particular.

Currently, we only take this _DMA method into account if it appears on a
ACPI device node describing a PCIe root complex, but it is perfectly
acceptable to use them for named components as well, so let's ensure
we take them into account in those cases too.

Note that such named components are expected to reside under a
pseudo-bus node such as the ACPI0004 container device, which should be
providing the _DMA method as well as a _CRS (as mandated by the ACPI
spec). This is not enforced by the code however.

Reported-by: Andrei Warkentin <awarkentin@vmware.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Link: https://lore.kernel.org/r/20200420092753.9819-1-ardb@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Ard Biesheuvel 2020-04-20 11:27:53 +02:00 committed by Will Deacon
parent 6a8b55ed40
commit 7fb89e1d44
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/arm64/iort.c
View File

@ -1148,13 +1148,10 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size)
else else
size = 1ULL << 32; size = 1ULL << 32;
if (dev_is_pci(dev)) { ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size);
ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size); if (ret == -ENODEV)
if (ret == -ENODEV) ret = dev_is_pci(dev) ? rc_dma_get_range(dev, &size)
ret = rc_dma_get_range(dev, &size); : nc_dma_get_range(dev, &size);
} else {
ret = nc_dma_get_range(dev, &size);
}
if (!ret) { if (!ret) {
/* /*