diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-23 12:32:38 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:16:29 -0500 |
commit | 318afd41d2eca3224de3fd85a3b9a27a3010a98d (patch) | |
tree | 83434f1a39ee76536b4a987a25f4ff1153c41438 /arch/x86/kernel/amd_iommu_init.c | |
parent | 09b4280439ef6fdc55f1353a9135034336eb5d26 (diff) |
x86/amd-iommu: Make np-cache a global flag
The non-present cache flag was IOMMU local until now which
doesn't make sense. Make this a global flag so we can remove
the lase user of 'struct iommu' in the map/unmap path.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 73d5173765d2..fbe4c3c02a91 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -141,6 +141,9 @@ LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the | |||
141 | struct amd_iommu *amd_iommus[MAX_IOMMUS]; | 141 | struct amd_iommu *amd_iommus[MAX_IOMMUS]; |
142 | int amd_iommus_present; | 142 | int amd_iommus_present; |
143 | 143 | ||
144 | /* IOMMUs have a non-present cache? */ | ||
145 | bool amd_iommu_np_cache __read_mostly; | ||
146 | |||
144 | /* | 147 | /* |
145 | * List of protection domains - used during resume | 148 | * List of protection domains - used during resume |
146 | */ | 149 | */ |
@@ -891,6 +894,9 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) | |||
891 | init_iommu_from_acpi(iommu, h); | 894 | init_iommu_from_acpi(iommu, h); |
892 | init_iommu_devices(iommu); | 895 | init_iommu_devices(iommu); |
893 | 896 | ||
897 | if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) | ||
898 | amd_iommu_np_cache = true; | ||
899 | |||
894 | return pci_enable_device(iommu->dev); | 900 | return pci_enable_device(iommu->dev); |
895 | } | 901 | } |
896 | 902 | ||