iommu/amd: Use pr_fmt()

Make use of pr_fmt instead of having the 'AMD-Vi' prefix
added manually at every printk() call.

Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 71797b3..81fff9e 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#define pr_fmt(fmt)     "AMD-Vi: " fmt
+
 #include <linux/ratelimit.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
@@ -279,7 +281,7 @@ static u16 get_alias(struct device *dev)
                return pci_alias;
        }
 
-       pr_info("AMD-Vi: Using IVRS reported alias %02x:%02x.%d "
+       pr_info("Using IVRS reported alias %02x:%02x.%d "
                "for device %s[%04x:%04x], kernel reported alias "
                "%02x:%02x.%d\n", PCI_BUS_NUM(ivrs_alias), PCI_SLOT(ivrs_alias),
                PCI_FUNC(ivrs_alias), dev_name(dev), pdev->vendor, pdev->device,
@@ -293,7 +295,7 @@ static u16 get_alias(struct device *dev)
        if (pci_alias == devid &&
            PCI_BUS_NUM(ivrs_alias) == pdev->bus->number) {
                pci_add_dma_alias(pdev, ivrs_alias & 0xff);
-               pr_info("AMD-Vi: Added PCI DMA alias %02x.%d for %s\n",
+               pr_info("Added PCI DMA alias %02x.%d for %s\n",
                        PCI_SLOT(ivrs_alias), PCI_FUNC(ivrs_alias),
                        dev_name(dev));
        }
@@ -513,7 +515,7 @@ static void dump_dte_entry(u16 devid)
        int i;
 
        for (i = 0; i < 4; ++i)
-               pr_err("AMD-Vi: DTE[%d]: %016llx\n", i,
+               pr_err("DTE[%d]: %016llx\n", i,
                        amd_iommu_dev_table[devid].data[i]);
 }
 
@@ -523,7 +525,7 @@ static void dump_command(unsigned long phys_addr)
        int i;
 
        for (i = 0; i < 4; ++i)
-               pr_err("AMD-Vi: CMD[%d]: %08x\n", i, cmd->data[i]);
+               pr_err("CMD[%d]: %08x\n", i, cmd->data[i]);
 }
 
 static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,
@@ -541,7 +543,7 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,
                dev_err(&pdev->dev, "AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%016llx flags=0x%04x]\n",
                        domain_id, address, flags);
        } else if (printk_ratelimit()) {
-               pr_err("AMD-Vi: Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",
+               pr_err("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",
                        PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        domain_id, address, flags);
        }
@@ -568,7 +570,7 @@ retry:
        if (type == 0) {
                /* Did we hit the erratum? */
                if (++count == LOOP_TIMEOUT) {
-                       pr_err("AMD-Vi: No event written to event log\n");
+                       pr_err("No event written to event log\n");
                        return;
                }
                udelay(1);
@@ -654,7 +656,7 @@ static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u64 *raw)
        struct amd_iommu_fault fault;
 
        if (PPR_REQ_TYPE(raw[0]) != PPR_REQ_FAULT) {
-               pr_err_ratelimited("AMD-Vi: Unknown PPR request received\n");
+               pr_err_ratelimited("Unknown PPR request received\n");
                return;
        }
 
@@ -759,12 +761,12 @@ static void iommu_poll_ga_log(struct amd_iommu *iommu)
                        if (!iommu_ga_log_notifier)
                                break;
 
-                       pr_debug("AMD-Vi: %s: devid=%#x, ga_tag=%#x\n",
+                       pr_debug("%s: devid=%#x, ga_tag=%#x\n",
                                 __func__, GA_DEVID(log_entry),
                                 GA_TAG(log_entry));
 
                        if (iommu_ga_log_notifier(GA_TAG(log_entry)) != 0)
-                               pr_err("AMD-Vi: GA log notifier failed.\n");
+                               pr_err("GA log notifier failed.\n");
                        break;
                default:
                        break;
@@ -789,18 +791,18 @@ irqreturn_t amd_iommu_int_thread(int irq, void *data)
                        iommu->mmio_base + MMIO_STATUS_OFFSET);
 
                if (status & MMIO_STATUS_EVT_INT_MASK) {
-                       pr_devel("AMD-Vi: Processing IOMMU Event Log\n");
+                       pr_devel("Processing IOMMU Event Log\n");
                        iommu_poll_events(iommu);
                }
 
                if (status & MMIO_STATUS_PPR_INT_MASK) {
-                       pr_devel("AMD-Vi: Processing IOMMU PPR Log\n");
+                       pr_devel("Processing IOMMU PPR Log\n");
                        iommu_poll_ppr_log(iommu);
                }
 
 #ifdef CONFIG_IRQ_REMAP
                if (status & MMIO_STATUS_GALOG_INT_MASK) {
-                       pr_devel("AMD-Vi: Processing IOMMU GA Log\n");
+                       pr_devel("Processing IOMMU GA Log\n");
                        iommu_poll_ga_log(iommu);
                }
 #endif
@@ -844,7 +846,7 @@ static int wait_on_sem(volatile u64 *sem)
        }
 
        if (i == LOOP_TIMEOUT) {
-               pr_alert("AMD-Vi: Completion-Wait loop timed out\n");
+               pr_alert("Completion-Wait loop timed out\n");
                return -EIO;
        }
 
@@ -1036,7 +1038,7 @@ again:
                /* Skip udelay() the first time around */
                if (count++) {
                        if (count == LOOP_TIMEOUT) {
-                               pr_err("AMD-Vi: Command buffer timeout\n");
+                               pr_err("Command buffer timeout\n");
                                return -EIO;
                        }
 
@@ -2854,9 +2856,9 @@ int __init amd_iommu_init_dma_ops(void)
                dma_ops = &dma_direct_ops;
 
        if (amd_iommu_unmap_flush)
-               pr_info("AMD-Vi: IO/TLB flush on unmap enabled\n");
+               pr_info("IO/TLB flush on unmap enabled\n");
        else
-               pr_info("AMD-Vi: Lazy IO/TLB flushing enabled\n");
+               pr_info("Lazy IO/TLB flushing enabled\n");
 
        return 0;
 
@@ -2961,7 +2963,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
        case IOMMU_DOMAIN_DMA:
                dma_domain = dma_ops_domain_alloc();
                if (!dma_domain) {
-                       pr_err("AMD-Vi: Failed to allocate\n");
+                       pr_err("Failed to allocate\n");
                        return NULL;
                }
                pdomain = &dma_domain->domain;
@@ -4382,7 +4384,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
         * legacy mode. So, we force legacy mode instead.
         */
        if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir)) {
-               pr_debug("AMD-Vi: %s: Fall back to using intr legacy remap\n",
+               pr_debug("%s: Fall back to using intr legacy remap\n",
                         __func__);
                pi_data->is_guest_mode = false;
        }

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index bb2cd29..e0a0497 100644 (file)
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#define pr_fmt(fmt)     "AMD-Vi: " fmt
+
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/list.h>
@@ -443,9 +445,9 @@ static void iommu_disable(struct amd_iommu *iommu)
 static u8 __iomem * __init iommu_map_mmio_space(u64 address, u64 end)
 {
        if (!request_mem_region(address, end, "amd_iommu")) {
-               pr_err("AMD-Vi: Can not reserve memory region %llx-%llx for mmio\n",
+               pr_err("Can not reserve memory region %llx-%llx for mmio\n",
                        address, end);
-               pr_err("AMD-Vi: This is a BIOS bug. Please contact your hardware vendor\n");
+               pr_err("This is a BIOS bug. Please contact your hardware vendor\n");
                return NULL;
        }
 
@@ -512,7 +514,7 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h)
        u32 ivhd_size = get_ivhd_header_size(h);
 
        if (!ivhd_size) {
-               pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type);
+               pr_err("Unsupported IVHD type %#x\n", h->type);
                return -EINVAL;
        }
 
@@ -553,7 +555,7 @@ static int __init check_ivrs_checksum(struct acpi_table_header *table)
                checksum += p[i];
        if (checksum != 0) {
                /* ACPI table corrupt */
-               pr_err(FW_BUG "AMD-Vi: IVRS invalid checksum\n");
+               pr_err(FW_BUG "IVRS invalid checksum\n");
                return -ENODEV;
        }
 
@@ -1027,7 +1029,7 @@ static int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line)
                if (!(entry->id == id && entry->cmd_line))
                        continue;
 
-               pr_info("AMD-Vi: Command-line override present for %s id %d - ignoring\n",
+               pr_info("Command-line override present for %s id %d - ignoring\n",
                        type == IVHD_SPECIAL_IOAPIC ? "IOAPIC" : "HPET", id);
 
                *devid = entry->devid;
@@ -1060,7 +1062,7 @@ static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u16 *devid,
                    !entry->cmd_line)
                        continue;
 
-               pr_info("AMD-Vi: Command-line override for hid:%s uid:%s\n",
+               pr_info("Command-line override for hid:%s uid:%s\n",
                        hid, uid);
                *devid = entry->devid;
                return 0;
@@ -1076,7 +1078,7 @@ static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u16 *devid,
        entry->cmd_line = cmd_line;
        entry->root_devid = (entry->devid & (~0x7));
 
-       pr_info("AMD-Vi:%s, add hid:%s, uid:%s, rdevid:%d\n",
+       pr_info("%s, add hid:%s, uid:%s, rdevid:%d\n",
                entry->cmd_line ? "cmd" : "ivrs",
                entry->hid, entry->uid, entry->root_devid);
 
@@ -1172,7 +1174,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
         */
        ivhd_size = get_ivhd_header_size(h);
        if (!ivhd_size) {
-               pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type);
+               pr_err("Unsupported IVHD type %#x\n", h->type);
                return -EINVAL;
        }
 
@@ -1454,7 +1456,7 @@ static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu)
        pci_write_config_dword(iommu->dev, 0xf0, 0x90 | (1 << 8));
 
        pci_write_config_dword(iommu->dev, 0xf4, value | 0x4);
-       pr_info("AMD-Vi: Applying erratum 746 workaround for IOMMU at %s\n",
+       pr_info("Applying erratum 746 workaround for IOMMU at %s\n",
                dev_name(&iommu->dev->dev));
 
        /* Clear the enable writing bit */
@@ -1485,7 +1487,7 @@ static void amd_iommu_ats_write_check_workaround(struct amd_iommu *iommu)
        /* Set L2_DEBUG_3[AtsIgnoreIWDis] = 1 */
        iommu_write_l2(iommu, 0x47, value | BIT(0));
 
-       pr_info("AMD-Vi: Applying ATS write check workaround for IOMMU at %s\n",
+       pr_info("Applying ATS write check workaround for IOMMU at %s\n",
                dev_name(&iommu->dev->dev));
 }
 
@@ -1505,7 +1507,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)
        iommu->index = amd_iommus_present++;
 
        if (unlikely(iommu->index >= MAX_IOMMUS)) {
-               WARN(1, "AMD-Vi: System has more IOMMUs than supported by this driver\n");
+               WARN(1, "System has more IOMMUs than supported by this driver\n");
                return -ENOSYS;
        }
 
@@ -1673,12 +1675,12 @@ static void init_iommu_perf_ctr(struct amd_iommu *iommu)
        if ((iommu_pc_get_set_reg(iommu, 0, 0, 0, &val, true)) ||
            (iommu_pc_get_set_reg(iommu, 0, 0, 0, &val2, false)) ||
            (val != val2)) {
-               pr_err("AMD-Vi: Unable to write to IOMMU perf counter.\n");
+               pr_err("Unable to write to IOMMU perf counter.\n");
                amd_iommu_pc_present = false;
                return;
        }
 
-       pr_info("AMD-Vi: IOMMU performance counters supported\n");
+       pr_info("IOMMU performance counters supported\n");
 
        val = readl(iommu->mmio_base + MMIO_CNTR_CONF_OFFSET);
        iommu->max_banks = (u8) ((val >> 12) & 0x3f);
@@ -1839,11 +1841,11 @@ static void print_iommu_info(void)
        for_each_iommu(iommu) {
                int i;
 
-               pr_info("AMD-Vi: Found IOMMU at %s cap 0x%hx\n",
+               pr_info("Found IOMMU at %s cap 0x%hx\n",
                        dev_name(&iommu->dev->dev), iommu->cap_ptr);
 
                if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
-                       pr_info("AMD-Vi: Extended features (%#llx):\n",
+                       pr_info("Extended features (%#llx):\n",
                                iommu->features);
                        for (i = 0; i < ARRAY_SIZE(feat_str); ++i) {
                                if (iommu_feature(iommu, (1ULL << i)))
@@ -1857,11 +1859,11 @@ static void print_iommu_info(void)
                }
        }
        if (irq_remapping_enabled) {
-               pr_info("AMD-Vi: Interrupt remapping enabled\n");
+               pr_info("Interrupt remapping enabled\n");
                if (AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
-                       pr_info("AMD-Vi: virtual APIC enabled\n");
+                       pr_info("Virtual APIC enabled\n");
                if (amd_iommu_xt_mode == IRQ_REMAP_X2APIC_MODE)
-                       pr_info("AMD-Vi: X2APIC enabled\n");
+                       pr_info("X2APIC enabled\n");
        }
 }
 
@@ -2375,7 +2377,7 @@ static bool __init check_ioapic_information(void)
 
                devid = get_ioapic_devid(id);
                if (devid < 0) {
-                       pr_err("%sAMD-Vi: IOAPIC[%d] not in IVRS table\n",
+                       pr_err("%s: IOAPIC[%d] not in IVRS table\n",
                                fw_bug, id);
                        ret = false;
                } else if (devid == IOAPIC_SB_DEVID) {
@@ -2393,11 +2395,11 @@ static bool __init check_ioapic_information(void)
                 * when the BIOS is buggy and provides us the wrong
                 * device id for the IOAPIC in the system.
                 */
-               pr_err("%sAMD-Vi: No southbridge IOAPIC found\n", fw_bug);
+               pr_err("%s: No southbridge IOAPIC found\n", fw_bug);
        }
 
        if (!ret)
-               pr_err("AMD-Vi: Disabling interrupt remapping\n");
+               pr_err("Disabling interrupt remapping\n");
 
        return ret;
 }
@@ -2452,7 +2454,7 @@ static int __init early_amd_iommu_init(void)
                return -ENODEV;
        else if (ACPI_FAILURE(status)) {
                const char *err = acpi_format_exception(status);
-               pr_err("AMD-Vi: IVRS table error: %s\n", err);
+               pr_err("IVRS table error: %s\n", err);
                return -EINVAL;
        }
 
@@ -2605,7 +2607,7 @@ static bool detect_ivrs(void)
                return false;
        else if (ACPI_FAILURE(status)) {
                const char *err = acpi_format_exception(status);
-               pr_err("AMD-Vi: IVRS table error: %s\n", err);
+               pr_err("IVRS table error: %s\n", err);
                return false;
        }
 
@@ -2640,7 +2642,7 @@ static int __init state_next(void)
                ret = early_amd_iommu_init();
                init_state = ret ? IOMMU_INIT_ERROR : IOMMU_ACPI_FINISHED;
                if (init_state == IOMMU_ACPI_FINISHED && amd_iommu_disabled) {
-                       pr_info("AMD-Vi: AMD IOMMU disabled on kernel command-line\n");
+                       pr_info("AMD IOMMU disabled on kernel command-line\n");
                        free_dma_resources();
                        free_iommu_resources();
                        init_state = IOMMU_CMDLINE_DISABLED;
@@ -2787,7 +2789,7 @@ static bool amd_iommu_sme_check(void)
            (boot_cpu_data.microcode <= 0x080011ff))
                return true;
 
-       pr_notice("AMD-Vi: IOMMU not currently supported when SME is active\n");
+       pr_notice("IOMMU not currently supported when SME is active\n");
 
        return false;
 }
@@ -2872,12 +2874,12 @@ static int __init parse_ivrs_ioapic(char *str)
        ret = sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn);
 
        if (ret != 4) {
-               pr_err("AMD-Vi: Invalid command line: ivrs_ioapic%s\n", str);
+               pr_err("Invalid command line: ivrs_ioapic%s\n", str);
                return 1;
        }
 
        if (early_ioapic_map_size == EARLY_MAP_SIZE) {
-               pr_err("AMD-Vi: Early IOAPIC map overflow - ignoring ivrs_ioapic%s\n",
+               pr_err("Early IOAPIC map overflow - ignoring ivrs_ioapic%s\n",
                        str);
                return 1;
        }
@@ -2902,12 +2904,12 @@ static int __init parse_ivrs_hpet(char *str)
        ret = sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn);
 
        if (ret != 4) {
-               pr_err("AMD-Vi: Invalid command line: ivrs_hpet%s\n", str);
+               pr_err("Invalid command line: ivrs_hpet%s\n", str);
                return 1;
        }
 
        if (early_hpet_map_size == EARLY_MAP_SIZE) {
-               pr_err("AMD-Vi: Early HPET map overflow - ignoring ivrs_hpet%s\n",
+               pr_err("Early HPET map overflow - ignoring ivrs_hpet%s\n",
                        str);
                return 1;
        }
@@ -2932,7 +2934,7 @@ static int __init parse_ivrs_acpihid(char *str)
 
        ret = sscanf(str, "[%x:%x.%x]=%s", &bus, &dev, &fn, acpiid);
        if (ret != 4) {
-               pr_err("AMD-Vi: Invalid command line: ivrs_acpihid(%s)\n", str);
+               pr_err("Invalid command line: ivrs_acpihid(%s)\n", str);
                return 1;
        }
 
@@ -2941,7 +2943,7 @@ static int __init parse_ivrs_acpihid(char *str)
        uid = p;
 
        if (!hid || !(*hid) || !uid) {
-               pr_err("AMD-Vi: Invalid command line: hid or uid\n");
+               pr_err("Invalid command line: hid or uid\n");
                return 1;
        }
 

diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index fd55223..23dae93 100644 (file)
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#define pr_fmt(fmt)     "AMD-Vi: " fmt
+
 #include <linux/mmu_notifier.h>
 #include <linux/amd-iommu.h>
 #include <linux/mm_types.h>