Skip to content

Commit 6f5086a

Browse files
committed
iommu/amd: Remove leading 0s in error log messages
Remove the leading 0s in the address field of the error log messages. Signed-off-by: Joerg Roedel <[email protected]>
1 parent 1a21ee1 commit 6f5086a

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/iommu/amd_iommu.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,10 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id,
540540
dev_data = get_dev_data(&pdev->dev);
541541

542542
if (dev_data && __ratelimit(&dev_data->rs)) {
543-
dev_err(&pdev->dev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%016llx flags=0x%04x]\n",
543+
dev_err(&pdev->dev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%llx flags=0x%04x]\n",
544544
domain_id, address, flags);
545545
} else if (printk_ratelimit()) {
546-
pr_err("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",
546+
pr_err("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",
547547
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
548548
domain_id, address, flags);
549549
}
@@ -584,45 +584,45 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
584584

585585
switch (type) {
586586
case EVENT_TYPE_ILL_DEV:
587-
dev_err(dev, "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",
587+
dev_err(dev, "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
588588
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
589589
pasid, address, flags);
590590
dump_dte_entry(devid);
591591
break;
592592
case EVENT_TYPE_DEV_TAB_ERR:
593593
dev_err(dev, "Event logged [DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
594-
"address=0x%016llx flags=0x%04x]\n",
594+
"address=0x%llx flags=0x%04x]\n",
595595
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
596596
address, flags);
597597
break;
598598
case EVENT_TYPE_PAGE_TAB_ERR:
599-
dev_err(dev, "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%016llx flags=0x%04x]\n",
599+
dev_err(dev, "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",
600600
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
601601
pasid, address, flags);
602602
break;
603603
case EVENT_TYPE_ILL_CMD:
604-
dev_err(dev, "Event logged [ILLEGAL_COMMAND_ERROR address=0x%016llx]\n", address);
604+
dev_err(dev, "Event logged [ILLEGAL_COMMAND_ERROR address=0x%llx]\n", address);
605605
dump_command(address);
606606
break;
607607
case EVENT_TYPE_CMD_HARD_ERR:
608-
dev_err(dev, "Event logged [COMMAND_HARDWARE_ERROR address=0x%016llx flags=0x%04x]\n",
608+
dev_err(dev, "Event logged [COMMAND_HARDWARE_ERROR address=0x%llx flags=0x%04x]\n",
609609
address, flags);
610610
break;
611611
case EVENT_TYPE_IOTLB_INV_TO:
612-
dev_err(dev, "Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%016llx]\n",
612+
dev_err(dev, "Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%llx]\n",
613613
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
614614
address);
615615
break;
616616
case EVENT_TYPE_INV_DEV_REQ:
617-
dev_err(dev, "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",
617+
dev_err(dev, "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
618618
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
619619
pasid, address, flags);
620620
break;
621621
case EVENT_TYPE_INV_PPR_REQ:
622622
pasid = ((event[0] >> 16) & 0xFFFF)
623623
| ((event[1] << 6) & 0xF0000);
624624
tag = event[1] & 0x03FF;
625-
dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%016llx flags=0x%04x]\n",
625+
dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
626626
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
627627
pasid, address, flags);
628628
break;

0 commit comments

Comments
 (0)