Skip to content

Commit

Permalink
x86/amd-iommu: Introduce iommu_flush_device() function
Browse files Browse the repository at this point in the history
This patch adds a function to flush a DTE entry for a given
struct device and replaces iommu_queue_inv_dev_entry calls
with this function where appropriate.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed Nov 27, 2009
1 parent 7f760dd commit 3fa4365
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions arch/x86/kernel/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,17 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
return ret;
}

static int iommu_flush_device(struct device *dev)
{
struct amd_iommu *iommu;
u16 devid;

devid = get_device_id(dev);
iommu = amd_iommu_rlookup_table[devid];

return iommu_queue_inv_dev_entry(iommu, devid);
}

static void __iommu_build_inv_iommu_pages(struct iommu_cmd *cmd, u64 address,
u16 domid, int pde, int s)
{
Expand Down Expand Up @@ -1382,7 +1393,7 @@ static void do_attach(struct device *dev, struct protection_domain *domain)
domain->dev_cnt += 1;

/* Flush the DTE entry */
iommu_queue_inv_dev_entry(iommu, devid);
iommu_flush_device(dev);
}

static void do_detach(struct device *dev)
Expand All @@ -1405,7 +1416,7 @@ static void do_detach(struct device *dev)
clear_dte_entry(devid);

/* Flush the DTE entry */
iommu_queue_inv_dev_entry(iommu, devid);
iommu_flush_device(dev);
}

/*
Expand Down Expand Up @@ -1610,7 +1621,7 @@ static int device_change_notifier(struct notifier_block *nb,
goto out;
}

iommu_queue_inv_dev_entry(iommu, devid);
iommu_flush_device(dev);
iommu_completion_wait(iommu);

out:
Expand Down Expand Up @@ -2393,7 +2404,7 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
if (!iommu)
return;

iommu_queue_inv_dev_entry(iommu, devid);
iommu_flush_device(dev);
iommu_completion_wait(iommu);
}

Expand Down

0 comments on commit 3fa4365

Please sign in to comment.