nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ACPI / scan: Refactor _CCA enforcement

Browse source 
Rather than checking the DMA attribute at each callsite, just pass it
through for acpi_dma_configure() to handle directly. That can then deal
with the relatively exceptional DEV_DMA_NOT_SUPPORTED case by explicitly
installing dummy DMA ops instead of just skipping setup entirely. This
will then free up the dev->dma_ops == NULL case for some valuable
fastpath optimisations.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Robin Murphy 2018-12-06 13:20:49 -08:00 committed by Christoph Hellwig
parent 90ac706e98
commit e5361ca29f
3 changed files with 7 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/acpi/scan.c
View file

@ -1456,6 +1456,11 @@ int acpi_dma_configure(struct device *dev, enum dev_dma_attr attr)
const struct iommu_ops *iommu; const struct iommu_ops *iommu;
u64 dma_addr = 0, size = 0; u64 dma_addr = 0, size = 0;
if (attr == DEV_DMA_NOT_SUPPORTED) {
set_dma_ops(dev, &dma_dummy_ops);
return 0;
}
iort_dma_setup(dev, &dma_addr, &size); iort_dma_setup(dev, &dma_addr, &size);
iommu = iort_iommu_configure(dev); iommu = iort_iommu_configure(dev);

3
drivers/base/platform.c
View file

@ -1138,8 +1138,7 @@ int platform_dma_configure(struct device *dev)
ret = of_dma_configure(dev, dev->of_node, true); ret = of_dma_configure(dev, dev->of_node, true);
} else if (has_acpi_companion(dev)) { } else if (has_acpi_companion(dev)) {
attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
if (attr != DEV_DMA_NOT_SUPPORTED) ret = acpi_dma_configure(dev, attr);
ret = acpi_dma_configure(dev, attr);
} }
return ret; return ret;

3
drivers/pci/pci-driver.c
View file

@ -1602,8 +1602,7 @@ static int pci_dma_configure(struct device *dev)
struct acpi_device *adev = to_acpi_device_node(bridge->fwnode); struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);
enum dev_dma_attr attr = acpi_get_dma_attr(adev); enum dev_dma_attr attr = acpi_get_dma_attr(adev);
if (attr != DEV_DMA_NOT_SUPPORTED) ret = acpi_dma_configure(dev, acpi_get_dma_attr(adev));
ret = acpi_dma_configure(dev, attr);
} }
pci_put_host_bridge_device(bridge); pci_put_host_bridge_device(bridge);