Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/iommu/amd_iommu_v2.c

+2 −15
Original line number Diff line number Diff line
@@ -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 = {