d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename dmar_get_dma_tag() to acpi_iommu_get_dma_tag().

Browse Source 
This is needed for a new IOMMU controller support.

Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D24943
This commit is contained in:
br 2020-05-26 16:40:40 +00:00
parent 97d15065f7
commit 4724e0e1f4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/acpica/acpi_pci.c
View File

@ -456,15 +456,15 @@ acpi_pci_detach(device_t dev)
}
#ifdef ACPI_DMAR
bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
bus_dma_tag_t acpi_iommu_get_dma_tag(device_t dev, device_t child);
static bus_dma_tag_t
acpi_pci_get_dma_tag(device_t bus, device_t child)
{
bus_dma_tag_t tag;
if (device_get_parent(child) == bus) {
/* try dmar and return if it works */
tag = dmar_get_dma_tag(bus, child);
/* try iommu and return if it works */
tag = acpi_iommu_get_dma_tag(bus, child);
} else
tag = NULL;
if (tag == NULL)

6
sys/dev/pci/pci.c
View File

@ -5682,7 +5682,7 @@ pci_get_resource_list (device_t dev, device_t child)
}
#ifdef ACPI_DMAR
bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
bus_dma_tag_t acpi_iommu_get_dma_tag(device_t dev, device_t child);
bus_dma_tag_t
pci_get_dma_tag(device_t bus, device_t dev)
{
@ -5690,8 +5690,8 @@ pci_get_dma_tag(device_t bus, device_t dev)
struct pci_softc *sc;
if (device_get_parent(dev) == bus) {
/* try dmar and return if it works */
tag = dmar_get_dma_tag(bus, dev);
/* try iommu and return if it works */
tag = acpi_iommu_get_dma_tag(bus, dev);
} else
tag = NULL;
if (tag == NULL) {

2
sys/x86/iommu/busdma_dmar.c
View File

@ -269,7 +269,7 @@ dmar_instantiate_ctx(struct dmar_unit *dmar, device_t dev, bool rmrr)
}
bus_dma_tag_t
dmar_get_dma_tag(device_t dev, device_t child)
acpi_iommu_get_dma_tag(device_t dev, device_t child)
{
struct dmar_unit *dmar;
struct dmar_ctx *ctx;

2
sys/x86/iommu/busdma_dmar.h
View File

@ -62,6 +62,6 @@ struct bus_dmamap_dmar {
extern struct bus_dma_impl bus_dma_dmar_impl;
bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
bus_dma_tag_t acpi_iommu_get_dma_tag(device_t dev, device_t child);
#endif