lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines

Browse Source 
This patch make the functions flushing the DTE and IOTLBs
only take the dev_data structure instead of the struct
device directly.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel
2011-06-09 17:07:31 +02:00
parent ea61cddb9d
commit 6c54204793
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/x86/kernel/amd_iommu.c
View File

@@ -693,14 +693,13 @@ void iommu_flush_all_caches(struct amd_iommu *iommu)
/* /*
* Command send function for flushing on-device TLB * Command send function for flushing on-device TLB
*/ */
static int device_flush_iotlb(struct device *dev, u64 address, size_t size) static int device_flush_iotlb(struct iommu_dev_data *dev_data,
u64 address, size_t size)
{ {
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu; struct amd_iommu *iommu;
struct iommu_cmd cmd; struct iommu_cmd cmd;
int qdep; int qdep;
dev_data = get_dev_data(dev);
qdep = dev_data->ats.qdep; qdep = dev_data->ats.qdep;
iommu = amd_iommu_rlookup_table[dev_data->devid]; iommu = amd_iommu_rlookup_table[dev_data->devid];
@@ -712,23 +711,19 @@ static int device_flush_iotlb(struct device *dev, u64 address, size_t size)
/* /*
* Command send function for invalidating a device table entry * Command send function for invalidating a device table entry
*/ */
static int device_flush_dte(struct device *dev) static int device_flush_dte(struct iommu_dev_data *dev_data)
{ {
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu; struct amd_iommu *iommu;
struct pci_dev *pdev;
int ret; int ret;
pdev = to_pci_dev(dev); iommu = amd_iommu_rlookup_table[dev_data->devid];
dev_data = get_dev_data(dev);
iommu = amd_iommu_rlookup_table[dev_data->devid];
ret = iommu_flush_dte(iommu, dev_data->devid); ret = iommu_flush_dte(iommu, dev_data->devid);
if (ret) if (ret)
return ret; return ret;
if (dev_data->ats.enabled) if (dev_data->ats.enabled)
ret = device_flush_iotlb(dev, 0, ~0UL); ret = device_flush_iotlb(dev_data, 0, ~0UL);
return ret; return ret;
} }
@@ -763,7 +758,7 @@ static void __domain_flush_pages(struct protection_domain *domain,
if (!dev_data->ats.enabled) if (!dev_data->ats.enabled)
continue; continue;
ret |= device_flush_iotlb(dev_data->dev, address, size); ret |= device_flush_iotlb(dev_data, address, size);
} }
WARN_ON(ret); WARN_ON(ret);
@@ -815,7 +810,7 @@ static void domain_flush_devices(struct protection_domain *domain)
spin_lock_irqsave(&domain->lock, flags); spin_lock_irqsave(&domain->lock, flags);
list_for_each_entry(dev_data, &domain->dev_list, list) list_for_each_entry(dev_data, &domain->dev_list, list)
device_flush_dte(dev_data->dev); device_flush_dte(dev_data);
spin_unlock_irqrestore(&domain->lock, flags); spin_unlock_irqrestore(&domain->lock, flags);
} }
@@ -1586,7 +1581,7 @@ static void do_attach(struct device *dev, struct protection_domain *domain)
domain->dev_cnt += 1; domain->dev_cnt += 1;
/* Flush the DTE entry */ /* Flush the DTE entry */
device_flush_dte(dev); device_flush_dte(dev_data);
} }
static void do_detach(struct device *dev) static void do_detach(struct device *dev)
@@ -1607,7 +1602,7 @@ static void do_detach(struct device *dev)
clear_dte_entry(dev_data->devid); clear_dte_entry(dev_data->devid);
/* Flush the DTE entry */ /* Flush the DTE entry */
device_flush_dte(dev); device_flush_dte(dev_data);
} }
/* /*