Skip to content

Commit

Permalink
intel-iommu: Add iommu_should_identity_map() function
Browse files Browse the repository at this point in the history
We do this twice, and it's about to get more complicated. This makes the
code slightly clearer about what it's doing, too.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Jul 4, 2009
1 parent 1b7bc0a commit 40e4aa3
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/pci/intel-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2442,6 +2442,11 @@ static int iommu_dummy(struct pci_dev *pdev)
return pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
}

static int iommu_should_identity_map(struct pci_dev *pdev)
{
return pdev->dma_mask > DMA_BIT_MASK(32);
}

/* Check if the pdev needs to go through non-identity map and unmap process.*/
static int iommu_no_mapping(struct pci_dev *pdev)
{
Expand All @@ -2455,7 +2460,7 @@ static int iommu_no_mapping(struct pci_dev *pdev)

found = identity_mapping(pdev);
if (found) {
if (pdev->dma_mask > DMA_BIT_MASK(32))
if (iommu_should_identity_map(pdev))
return 1;
else {
/*
Expand All @@ -2472,7 +2477,7 @@ static int iommu_no_mapping(struct pci_dev *pdev)
* In case of a detached 64 bit DMA device from vm, the device
* is put into si_domain for identity mapping.
*/
if (pdev->dma_mask > DMA_BIT_MASK(32)) {
if (iommu_should_identity_map(pdev)) {
int ret;
ret = domain_add_dev_info(si_domain, pdev);
if (ret)
Expand Down

0 comments on commit 40e4aa3

Please sign in to comment.