diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2008-12-10 12:48:59 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 08:11:56 -0500 |
commit | e2dc14a2a6c9a83baaafc51f06b7e73cec2167be (patch) | |
tree | ba2344f04adac30ab1c4e5cace83b5390f0d7580 | |
parent | 26961efe0dab9ca73f8fc3b6137b814252e04972 (diff) |
AMD IOMMU: add a domain flag for default domains
Impact: adds a new protection domain flag
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r-- | arch/x86/include/asm/amd_iommu_types.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h index 1c769f4e6cdf..6adc7020ef97 100644 --- a/arch/x86/include/asm/amd_iommu_types.h +++ b/arch/x86/include/asm/amd_iommu_types.h | |||
@@ -192,6 +192,8 @@ | |||
192 | 192 | ||
193 | /* Protection domain flags */ | 193 | /* Protection domain flags */ |
194 | #define PD_DMA_OPS_MASK (1UL << 0) /* domain used for dma_ops */ | 194 | #define PD_DMA_OPS_MASK (1UL << 0) /* domain used for dma_ops */ |
195 | #define PD_DEFAULT_MASK (1UL << 1) /* domain is a default dma_ops | ||
196 | domain for an IOMMU */ | ||
195 | 197 | ||
196 | /* | 198 | /* |
197 | * This structure contains generic data for IOMMU protection domains | 199 | * This structure contains generic data for IOMMU protection domains |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index d9b651c01186..f2956546423b 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1574,6 +1574,7 @@ int __init amd_iommu_init_dma_ops(void) | |||
1574 | iommu->default_dom = dma_ops_domain_alloc(iommu, order); | 1574 | iommu->default_dom = dma_ops_domain_alloc(iommu, order); |
1575 | if (iommu->default_dom == NULL) | 1575 | if (iommu->default_dom == NULL) |
1576 | return -ENOMEM; | 1576 | return -ENOMEM; |
1577 | iommu->default_dom->domain.flags |= PD_DEFAULT_MASK; | ||
1577 | ret = iommu_init_unity_mappings(iommu); | 1578 | ret = iommu_init_unity_mappings(iommu); |
1578 | if (ret) | 1579 | if (ret) |
1579 | goto free_domains; | 1580 | goto free_domains; |