lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intel-iommu: Create new iommu_domain_identity_map() function

Browse Source 
We'll want to do this to a _domain_ (the si_domain) rather than a PCI device.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse
2009-06-26 18:50:28 +01:00
parent bf92df30df
commit b213203e47
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/pci/intel-iommu.c
View File

@@ -1849,25 +1849,12 @@ error:
static int iommu_identity_mapping; static int iommu_identity_mapping;
static int iommu_prepare_identity_map(struct pci_dev *pdev, static int iommu_domain_identity_map(struct dmar_domain *domain,
unsigned long long start, unsigned long long start,
unsigned long long end) unsigned long long end)
{ {
struct dmar_domain *domain;
unsigned long size; unsigned long size;
unsigned long long base; unsigned long long base;
int ret;
printk(KERN_INFO
"IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
pci_name(pdev), start, end);
if (iommu_identity_mapping)
domain = si_domain;
else
/* page table init */
domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
if (!domain)
return -ENOMEM;
/* The address might not be aligned */ /* The address might not be aligned */
base = start & PAGE_MASK; base = start & PAGE_MASK;
@@ -1876,31 +1863,54 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
if (!reserve_iova(&domain->iovad, IOVA_PFN(base), if (!reserve_iova(&domain->iovad, IOVA_PFN(base),
IOVA_PFN(base + size) - 1)) { IOVA_PFN(base + size) - 1)) {
printk(KERN_ERR "IOMMU: reserve iova failed\n"); printk(KERN_ERR "IOMMU: reserve iova failed\n");
ret = -ENOMEM; return -ENOMEM;
goto error;
} }
pr_debug("Mapping reserved region %lx@%llx for %s\n", pr_debug("Mapping reserved region %lx@%llx for domain %d\n",
size, base, pci_name(pdev)); size, base, domain->id);
/* /*
* RMRR range might have overlap with physical memory range, * RMRR range might have overlap with physical memory range,
* clear it first * clear it first
*/ */
dma_pte_clear_range(domain, base, base + size); dma_pte_clear_range(domain, base, base + size);
ret = domain_page_mapping(domain, base, base, size, return domain_page_mapping(domain, base, base, size,
DMA_PTE_READ|DMA_PTE_WRITE); DMA_PTE_READ|DMA_PTE_WRITE);
}
static int iommu_prepare_identity_map(struct pci_dev *pdev,
unsigned long long start,
unsigned long long end)
{
struct dmar_domain *domain;
int ret;
printk(KERN_INFO
"IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
pci_name(pdev), start, end);
if (iommu_identity_mapping)
domain = si_domain;
else
/* page table init */
domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
if (!domain)
return -ENOMEM;
ret = iommu_domain_identity_map(domain, start, end);
if (ret) if (ret)
goto error; goto error;
/* context entry init */ /* context entry init */
ret = domain_context_mapping(domain, pdev, CONTEXT_TT_MULTI_LEVEL); ret = domain_context_mapping(domain, pdev, CONTEXT_TT_MULTI_LEVEL);
if (!ret) if (ret)
goto error;
return 0; return 0;
error: error:
domain_exit(domain); domain_exit(domain);
return ret; return ret;
} }
static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr, static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr,