diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-12 03:52:46 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-28 12:10:56 -0400 |
commit | 05f92db9f47f852ff48bbed1b063b8ab8ad00285 (patch) | |
tree | ee9f19c8900621dac9e3e4c5b89b2f12ed27baea /arch | |
parent | 7d7a110c6127b7fc683dc6d764555f2dbd22b054 (diff) |
amd_iommu: un __init functions required for suspend/resume
This patch makes sure that no function required for suspend/resume of
AMD IOMMU driver is thrown away after boot.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index ed10c0f5ff77..330896ba6a9f 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -193,7 +193,7 @@ static inline unsigned long tbl_size(int entry_size) | |||
193 | * This function set the exclusion range in the IOMMU. DMA accesses to the | 193 | * This function set the exclusion range in the IOMMU. DMA accesses to the |
194 | * exclusion range are passed through untranslated | 194 | * exclusion range are passed through untranslated |
195 | */ | 195 | */ |
196 | static void __init iommu_set_exclusion_range(struct amd_iommu *iommu) | 196 | static void iommu_set_exclusion_range(struct amd_iommu *iommu) |
197 | { | 197 | { |
198 | u64 start = iommu->exclusion_start & PAGE_MASK; | 198 | u64 start = iommu->exclusion_start & PAGE_MASK; |
199 | u64 limit = (start + iommu->exclusion_length) & PAGE_MASK; | 199 | u64 limit = (start + iommu->exclusion_length) & PAGE_MASK; |
@@ -225,7 +225,7 @@ static void __init iommu_set_device_table(struct amd_iommu *iommu) | |||
225 | } | 225 | } |
226 | 226 | ||
227 | /* Generic functions to enable/disable certain features of the IOMMU. */ | 227 | /* Generic functions to enable/disable certain features of the IOMMU. */ |
228 | static void __init iommu_feature_enable(struct amd_iommu *iommu, u8 bit) | 228 | static void iommu_feature_enable(struct amd_iommu *iommu, u8 bit) |
229 | { | 229 | { |
230 | u32 ctrl; | 230 | u32 ctrl; |
231 | 231 | ||
@@ -244,7 +244,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit) | |||
244 | } | 244 | } |
245 | 245 | ||
246 | /* Function to enable the hardware */ | 246 | /* Function to enable the hardware */ |
247 | static void __init iommu_enable(struct amd_iommu *iommu) | 247 | static void iommu_enable(struct amd_iommu *iommu) |
248 | { | 248 | { |
249 | printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n", | 249 | printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n", |
250 | dev_name(&iommu->dev->dev), iommu->cap_ptr); | 250 | dev_name(&iommu->dev->dev), iommu->cap_ptr); |
@@ -811,7 +811,7 @@ static int __init iommu_setup_msi(struct amd_iommu *iommu) | |||
811 | return 0; | 811 | return 0; |
812 | } | 812 | } |
813 | 813 | ||
814 | static int __init iommu_init_msi(struct amd_iommu *iommu) | 814 | static int iommu_init_msi(struct amd_iommu *iommu) |
815 | { | 815 | { |
816 | if (iommu->int_enabled) | 816 | if (iommu->int_enabled) |
817 | return 0; | 817 | return 0; |
@@ -936,7 +936,7 @@ static void init_device_table(void) | |||
936 | * This function finally enables all IOMMUs found in the system after | 936 | * This function finally enables all IOMMUs found in the system after |
937 | * they have been initialized | 937 | * they have been initialized |
938 | */ | 938 | */ |
939 | static void __init enable_iommus(void) | 939 | static void enable_iommus(void) |
940 | { | 940 | { |
941 | struct amd_iommu *iommu; | 941 | struct amd_iommu *iommu; |
942 | 942 | ||