adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86/amd-iommu: Remove iommu specific handling from dma_ops path

Browse source 
This patch finishes the removal of all iommu specific
handling code in the dma_ops path.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel 2009-11-23 19:43:14 +01:00
parent cd8c82e875
commit f3be07da53
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/x86/kernel/amd_iommu.c
View file

@ -1436,11 +1436,11 @@ static struct dma_ops_domain *find_protection_domain(u16 devid)
* in this function. * in this function.
*/ */
static bool get_device_resources(struct device *dev, static bool get_device_resources(struct device *dev,
struct amd_iommu **iommu,
struct protection_domain **domain, struct protection_domain **domain,
u16 *bdf) u16 *bdf)
{ {
struct dma_ops_domain *dma_dom; struct dma_ops_domain *dma_dom;
struct amd_iommu *iommu;
struct pci_dev *pcidev; struct pci_dev *pcidev;
u16 _bdf; u16 _bdf;
@ -1450,21 +1450,21 @@ static bool get_device_resources(struct device *dev,
pcidev = to_pci_dev(dev); pcidev = to_pci_dev(dev);
_bdf = calc_devid(pcidev->bus->number, pcidev->devfn); _bdf = calc_devid(pcidev->bus->number, pcidev->devfn);
*bdf = amd_iommu_alias_table[_bdf]; *bdf = amd_iommu_alias_table[_bdf];
*iommu = amd_iommu_rlookup_table[*bdf]; iommu = amd_iommu_rlookup_table[*bdf];
*domain = domain_for_device(*bdf); *domain = domain_for_device(*bdf);
if (*domain == NULL) { if (*domain == NULL) {
dma_dom = find_protection_domain(*bdf); dma_dom = find_protection_domain(*bdf);
if (!dma_dom) if (!dma_dom)
dma_dom = (*iommu)->default_dom; dma_dom = iommu->default_dom;
*domain = &dma_dom->domain; *domain = &dma_dom->domain;
attach_device(*iommu, *domain, *bdf); attach_device(iommu, *domain, *bdf);
DUMP_printk("Using protection domain %d for device %s\n", DUMP_printk("Using protection domain %d for device %s\n",
(*domain)->id, dev_name(dev)); (*domain)->id, dev_name(dev));
} }
if (domain_for_device(_bdf) == NULL) if (domain_for_device(_bdf) == NULL)
attach_device(*iommu, *domain, _bdf); attach_device(iommu, *domain, _bdf);
return true; return true;
} }
@ -1776,7 +1776,6 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
unsigned long flags; unsigned long flags;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
u16 devid; u16 devid;
dma_addr_t addr; dma_addr_t addr;
@ -1785,7 +1784,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
INC_STATS_COUNTER(cnt_map_single); INC_STATS_COUNTER(cnt_map_single);
if (!get_device_resources(dev, &iommu, &domain, &devid)) if (!get_device_resources(dev, &domain, &devid))
/* device not handled by any AMD IOMMU */ /* device not handled by any AMD IOMMU */
return (dma_addr_t)paddr; return (dma_addr_t)paddr;
@ -1815,13 +1814,12 @@ static void unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction dir, struct dma_attrs *attrs) enum dma_data_direction dir, struct dma_attrs *attrs)
{ {
unsigned long flags; unsigned long flags;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
u16 devid; u16 devid;
INC_STATS_COUNTER(cnt_unmap_single); INC_STATS_COUNTER(cnt_unmap_single);
if (!get_device_resources(dev, &iommu, &domain, &devid)) if (!get_device_resources(dev, &domain, &devid))
/* device not handled by any AMD IOMMU */ /* device not handled by any AMD IOMMU */
return; return;
@ -1864,7 +1862,6 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
unsigned long flags; unsigned long flags;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
u16 devid; u16 devid;
int i; int i;
@ -1875,7 +1872,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
INC_STATS_COUNTER(cnt_map_sg); INC_STATS_COUNTER(cnt_map_sg);
if (!get_device_resources(dev, &iommu, &domain, &devid)) if (!get_device_resources(dev, &domain, &devid))
return map_sg_no_iommu(dev, sglist, nelems, dir); return map_sg_no_iommu(dev, sglist, nelems, dir);
dma_mask = *dev->dma_mask; dma_mask = *dev->dma_mask;
@ -1927,7 +1924,6 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
unsigned long flags; unsigned long flags;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
struct scatterlist *s; struct scatterlist *s;
u16 devid; u16 devid;
@ -1935,7 +1931,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
INC_STATS_COUNTER(cnt_unmap_sg); INC_STATS_COUNTER(cnt_unmap_sg);
if (!get_device_resources(dev, &iommu, &domain, &devid)) if (!get_device_resources(dev, &domain, &devid))
return; return;
if (!dma_ops_domain(domain)) if (!dma_ops_domain(domain))
@ -1962,7 +1958,6 @@ static void *alloc_coherent(struct device *dev, size_t size,
{ {
unsigned long flags; unsigned long flags;
void *virt_addr; void *virt_addr;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
u16 devid; u16 devid;
phys_addr_t paddr; phys_addr_t paddr;
@ -1970,7 +1965,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
INC_STATS_COUNTER(cnt_alloc_coherent); INC_STATS_COUNTER(cnt_alloc_coherent);
if (!get_device_resources(dev, &iommu, &domain, &devid)) { if (!get_device_resources(dev, &domain, &devid)) {
virt_addr = (void *)__get_free_pages(flag, get_order(size)); virt_addr = (void *)__get_free_pages(flag, get_order(size));
*dma_addr = __pa(virt_addr); *dma_addr = __pa(virt_addr);
return virt_addr; return virt_addr;
@ -2022,13 +2017,12 @@ static void free_coherent(struct device *dev, size_t size,
void *virt_addr, dma_addr_t dma_addr) void *virt_addr, dma_addr_t dma_addr)
{ {
unsigned long flags; unsigned long flags;
struct amd_iommu *iommu;
struct protection_domain *domain; struct protection_domain *domain;
u16 devid; u16 devid;
INC_STATS_COUNTER(cnt_free_coherent); INC_STATS_COUNTER(cnt_free_coherent);
if (!get_device_resources(dev, &iommu, &domain, &devid)) if (!get_device_resources(dev, &domain, &devid))
goto free_mem; goto free_mem;
if (!dma_ops_domain(domain)) if (!dma_ops_domain(domain))