diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-07-08 14:19:35 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-10 15:36:34 +0200 |
| commit | 61feb43897ec1cf8b126689035b249f30b0d90ad (patch) | |
| tree | 4b1443309702cb745318d23b45db7884adfa3be8 /drivers/iommu | |
| parent | iommu/amd: Don't free pasid_state in mn_release path (diff) | |
| download | linux-61feb43897ec1cf8b126689035b249f30b0d90ad.tar.xz linux-61feb43897ec1cf8b126689035b249f30b0d90ad.zip | |
iommu/amd: Get rid of __unbind_pasid
Unbind_pasid is only called from mn_release which already
has the pasid_state. Use this to simplify the unbind_pasid
path and get rid of __unbind_pasid.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Oded Gabbay <Oded.Gabbay@amd.com>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu_v2.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index a621552e715d..574c71bdfcfa 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -99,7 +99,6 @@ static struct workqueue_struct *iommu_wq; static u64 *empty_page_table; static void free_pasid_states(struct device_state *dev_state); -static void unbind_pasid(struct device_state *dev_state, int pasid); static u16 device_id(struct pci_dev *pdev) { @@ -301,7 +300,7 @@ static void put_pasid_state_wait(struct pasid_state *pasid_state) free_pasid_state(pasid_state); } -static void __unbind_pasid(struct pasid_state *pasid_state) +static void unbind_pasid(struct pasid_state *pasid_state) { struct iommu_domain *domain; @@ -314,18 +313,6 @@ static void __unbind_pasid(struct pasid_state *pasid_state) flush_workqueue(iommu_wq); } -static void unbind_pasid(struct device_state *dev_state, int pasid) -{ - struct pasid_state *pasid_state; - - pasid_state = get_pasid_state(dev_state, pasid); - if (pasid_state == NULL) - return; - - __unbind_pasid(pasid_state); - put_pasid_state(pasid_state); /* Reference taken in this function */ -} - static void free_pasid_states_level1(struct pasid_state **tbl) { int i; @@ -480,7 +467,7 @@ static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm) if (pasid_state->device_state->inv_ctx_cb) dev_state->inv_ctx_cb(dev_state->pdev, pasid_state->pasid); - unbind_pasid(dev_state, pasid_state->pasid); + unbind_pasid(pasid_state); } static struct mmu_notifier_ops iommu_mn = { |