aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 1752afef948a..779ace292475 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -252,7 +252,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
252/* Function to enable the hardware */ 252/* Function to enable the hardware */
253static void iommu_enable(struct amd_iommu *iommu) 253static void iommu_enable(struct amd_iommu *iommu)
254{ 254{
255 printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n", 255 printk(KERN_INFO "AMD-Vi: Enabling IOMMU at %s cap 0x%hx\n",
256 dev_name(&iommu->dev->dev), iommu->cap_ptr); 256 dev_name(&iommu->dev->dev), iommu->cap_ptr);
257 257
258 iommu_feature_enable(iommu, CONTROL_IOMMU_EN); 258 iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
@@ -868,7 +868,7 @@ static int __init init_iommu_all(struct acpi_table_header *table)
868 switch (*p) { 868 switch (*p) {
869 case ACPI_IVHD_TYPE: 869 case ACPI_IVHD_TYPE:
870 870
871 DUMP_printk("IOMMU: device: %02x:%02x.%01x cap: %04x " 871 DUMP_printk("device: %02x:%02x.%01x cap: %04x "
872 "seg: %d flags: %01x info %04x\n", 872 "seg: %d flags: %01x info %04x\n",
873 PCI_BUS(h->devid), PCI_SLOT(h->devid), 873 PCI_BUS(h->devid), PCI_SLOT(h->devid),
874 PCI_FUNC(h->devid), h->cap_ptr, 874 PCI_FUNC(h->devid), h->cap_ptr,
@@ -912,7 +912,7 @@ static int __init iommu_setup_msi(struct amd_iommu *iommu)
912 912
913 r = request_irq(iommu->dev->irq, amd_iommu_int_handler, 913 r = request_irq(iommu->dev->irq, amd_iommu_int_handler,
914 IRQF_SAMPLE_RANDOM, 914 IRQF_SAMPLE_RANDOM,
915 "AMD IOMMU", 915 "AMD-Vi",
916 NULL); 916 NULL);
917 917
918 if (r) { 918 if (r) {
@@ -1160,7 +1160,7 @@ int __init amd_iommu_init(void)
1160 1160
1161 1161
1162 if (no_iommu) { 1162 if (no_iommu) {
1163 printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n"); 1163 printk(KERN_INFO "AMD-Vi disabled by kernel command line\n");
1164 return 0; 1164 return 0;
1165 } 1165 }
1166 1166
@@ -1258,16 +1258,16 @@ int __init amd_iommu_init(void)
1258 1258
1259 enable_iommus(); 1259 enable_iommus();
1260 1260
1261 printk(KERN_INFO "AMD IOMMU: device isolation "); 1261 printk(KERN_INFO "AMD-Vi: device isolation ");
1262 if (amd_iommu_isolate) 1262 if (amd_iommu_isolate)
1263 printk("enabled\n"); 1263 printk("enabled\n");
1264 else 1264 else
1265 printk("disabled\n"); 1265 printk("disabled\n");
1266 1266
1267 if (amd_iommu_unmap_flush) 1267 if (amd_iommu_unmap_flush)
1268 printk(KERN_INFO "AMD IOMMU: IO/TLB flush on unmap enabled\n"); 1268 printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");
1269 else 1269 else
1270 printk(KERN_INFO "AMD IOMMU: Lazy IO/TLB flushing enabled\n"); 1270 printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");
1271 1271
1272out: 1272out:
1273 return ret; 1273 return ret;