Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iommu/vt-d: Remove the obsolete per iommu pasid tables

Browse Source 
The obsolete per iommu pasid tables are no longer used. Hence,
clean up them.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Liu Yi L <yi.l.liu@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Liu Yi L <yi.l.liu@intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Lu Baolu 2018-07-14 15:47:02 +08:00 committed by Joerg Roedel
parent 4774cc5245
commit d9737953d8
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iommu/intel-iommu.c
View File

@ -1756,7 +1756,7 @@ static void free_dmar_iommu(struct intel_iommu *iommu)
if (pasid_enabled(iommu)) { if (pasid_enabled(iommu)) {
if (ecap_prs(iommu->ecap)) if (ecap_prs(iommu->ecap))
intel_svm_finish_prq(iommu); intel_svm_finish_prq(iommu);
intel_svm_free_pasid_tables(iommu); intel_svm_exit(iommu);
} }
#endif #endif
} }
@ -3337,7 +3337,7 @@ static int __init init_dmars(void)
hw_pass_through = 0; hw_pass_through = 0;
#ifdef CONFIG_INTEL_IOMMU_SVM #ifdef CONFIG_INTEL_IOMMU_SVM
if (pasid_enabled(iommu)) if (pasid_enabled(iommu))
intel_svm_alloc_pasid_tables(iommu); intel_svm_init(iommu);
#endif #endif
} }
@ -4300,7 +4300,7 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
#ifdef CONFIG_INTEL_IOMMU_SVM #ifdef CONFIG_INTEL_IOMMU_SVM
if (pasid_enabled(iommu)) if (pasid_enabled(iommu))
intel_svm_alloc_pasid_tables(iommu); intel_svm_init(iommu);
#endif #endif
if (dmaru->ignored) { if (dmaru->ignored) {

17
drivers/iommu/intel-svm.c
View File

@ -38,7 +38,7 @@ struct pasid_state_entry {
u64 val; u64 val;
}; };
int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) int intel_svm_init(struct intel_iommu *iommu)
{ {
struct page *pages; struct page *pages;
int order; int order;
@ -63,15 +63,6 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu)
iommu->pasid_max = 0x20000; iommu->pasid_max = 0x20000;
order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
if (!pages) {
pr_warn("IOMMU: %s: Failed to allocate PASID table\n",
iommu->name);
return -ENOMEM;
}
iommu->pasid_table = page_address(pages);
pr_info("%s: Allocated order %d PASID table.\n", iommu->name, order);
if (ecap_dis(iommu->ecap)) { if (ecap_dis(iommu->ecap)) {
/* Just making it explicit... */ /* Just making it explicit... */
BUILD_BUG_ON(sizeof(struct pasid_entry) != sizeof(struct pasid_state_entry)); BUILD_BUG_ON(sizeof(struct pasid_entry) != sizeof(struct pasid_state_entry));
@ -86,14 +77,10 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu)
return 0; return 0;
} }
int intel_svm_free_pasid_tables(struct intel_iommu *iommu) int intel_svm_exit(struct intel_iommu *iommu)
{ {
int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
if (iommu->pasid_table) {
free_pages((unsigned long)iommu->pasid_table, order);
iommu->pasid_table = NULL;
}
if (iommu->pasid_state_table) { if (iommu->pasid_state_table) {
free_pages((unsigned long)iommu->pasid_state_table, order); free_pages((unsigned long)iommu->pasid_state_table, order);
iommu->pasid_state_table = NULL; iommu->pasid_state_table = NULL;

5
include/linux/intel-iommu.h
View File

@ -453,7 +453,6 @@ struct intel_iommu {
* devices away to userspace processes (e.g. for DPDK) and don't * devices away to userspace processes (e.g. for DPDK) and don't
* want to trust that userspace will use *only* the PASID it was * want to trust that userspace will use *only* the PASID it was
* told to. But while it's all driver-arbitrated, we're fine. */ * told to. But while it's all driver-arbitrated, we're fine. */
struct pasid_entry *pasid_table;
struct pasid_state_entry *pasid_state_table; struct pasid_state_entry *pasid_state_table;
struct page_req_dsc *prq; struct page_req_dsc *prq;
unsigned char prq_name[16]; /* Name for PRQ interrupt */ unsigned char prq_name[16]; /* Name for PRQ interrupt */
@ -526,8 +525,8 @@ int for_each_device_domain(int (*fn)(struct device_domain_info *info,
void *data), void *data); void *data), void *data);
#ifdef CONFIG_INTEL_IOMMU_SVM #ifdef CONFIG_INTEL_IOMMU_SVM
extern int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu); int intel_svm_init(struct intel_iommu *iommu);
extern int intel_svm_free_pasid_tables(struct intel_iommu *iommu); int intel_svm_exit(struct intel_iommu *iommu);
extern int intel_svm_enable_prq(struct intel_iommu *iommu); extern int intel_svm_enable_prq(struct intel_iommu *iommu);
extern int intel_svm_finish_prq(struct intel_iommu *iommu); extern int intel_svm_finish_prq(struct intel_iommu *iommu);