Rename dmar_get_dma_tag() to acpi_iommu_get_dma_tag().
This is needed for a new IOMMU controller support. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D24943
This commit is contained in:
parent
2287afd818
commit
43843cc281
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=361532
@ -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)
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user