Commit 61feb438 authored by Joerg Roedel's avatar Joerg Roedel

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: default avatarJoerg Roedel <jroedel@suse.de>
Tested-by: default avatarOded Gabbay <Oded.Gabbay@amd.com>
parent c5db16ad
...@@ -99,7 +99,6 @@ static struct workqueue_struct *iommu_wq; ...@@ -99,7 +99,6 @@ static struct workqueue_struct *iommu_wq;
static u64 *empty_page_table; static u64 *empty_page_table;
static void free_pasid_states(struct device_state *dev_state); 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) static u16 device_id(struct pci_dev *pdev)
{ {
...@@ -301,7 +300,7 @@ static void put_pasid_state_wait(struct pasid_state *pasid_state) ...@@ -301,7 +300,7 @@ static void put_pasid_state_wait(struct pasid_state *pasid_state)
free_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; struct iommu_domain *domain;
...@@ -314,18 +313,6 @@ static void __unbind_pasid(struct pasid_state *pasid_state) ...@@ -314,18 +313,6 @@ static void __unbind_pasid(struct pasid_state *pasid_state)
flush_workqueue(iommu_wq); 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) static void free_pasid_states_level1(struct pasid_state **tbl)
{ {
int i; int i;
...@@ -480,7 +467,7 @@ static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm) ...@@ -480,7 +467,7 @@ static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm)
if (pasid_state->device_state->inv_ctx_cb) if (pasid_state->device_state->inv_ctx_cb)
dev_state->inv_ctx_cb(dev_state->pdev, pasid_state->pasid); 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 = { static struct mmu_notifier_ops iommu_mn = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment