Commit f20a6e3e authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Misc ACPI IVRS debug info clean up 



* Remove redundant AMD-Vi prefix.
* Print IVHD device entry settings field using hex value.
* Print root device of IVHD ACPI device entry using hex value.

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20241118054937.5203-2-suravee.suthikulpanit@amd.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 78d4f34e

drivers/iommu/amd/amd_iommu_types.h

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ extern bool amd_iommu_dump; 
#define DUMP_printk(format, arg...)				\

	do {							\

		if (amd_iommu_dump)				\

			pr_info("AMD-Vi: " format, ## arg);	\

			pr_info(format, ## arg);	\

	} while(0);



/* global flag if IOMMUs cache non-present entries */

drivers/iommu/amd/init.c

+15 −20
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u32 *devid, 
	entry->cmd_line	= cmd_line;

	entry->root_devid = (entry->devid & (~0x7));



	pr_info("%s, add hid:%s, uid:%s, rdevid:%d\n",

	pr_info("%s, add hid:%s, uid:%s, rdevid:%#x\n",

		entry->cmd_line ? "cmd" : "ivrs",

		entry->hid, entry->uid, entry->root_devid);
@@ -1331,15 +1331,14 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
		switch (e->type) {

		case IVHD_DEV_ALL:



			DUMP_printk("  DEV_ALL\t\t\tflags: %02x\n", e->flags);

			DUMP_printk("  DEV_ALL\t\t\tsetting: %#02x\n", e->flags);



			for (dev_i = 0; dev_i <= pci_seg->last_bdf; ++dev_i)

				set_dev_entry_from_acpi(iommu, dev_i, e->flags, 0);

			break;

		case IVHD_DEV_SELECT:



			DUMP_printk("  DEV_SELECT\t\t\t devid: %04x:%02x:%02x.%x "

				    "flags: %02x\n",

			DUMP_printk("  DEV_SELECT\t\t\tdevid: %04x:%02x:%02x.%x flags: %#02x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1350,8 +1349,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			break;

		case IVHD_DEV_SELECT_RANGE_START:



			DUMP_printk("  DEV_SELECT_RANGE_START\t "

				    "devid: %04x:%02x:%02x.%x flags: %02x\n",

			DUMP_printk("  DEV_SELECT_RANGE_START\tdevid: %04x:%02x:%02x.%x flags: %#02x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1364,8 +1362,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			break;

		case IVHD_DEV_ALIAS:



			DUMP_printk("  DEV_ALIAS\t\t\t devid: %04x:%02x:%02x.%x "

				    "flags: %02x devid_to: %02x:%02x.%x\n",

			DUMP_printk("  DEV_ALIAS\t\t\tdevid: %04x:%02x:%02x.%x flags: %#02x devid_to: %02x:%02x.%x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1382,9 +1379,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			break;

		case IVHD_DEV_ALIAS_RANGE:



			DUMP_printk("  DEV_ALIAS_RANGE\t\t "

				    "devid: %04x:%02x:%02x.%x flags: %02x "

				    "devid_to: %04x:%02x:%02x.%x\n",

			DUMP_printk("  DEV_ALIAS_RANGE\t\tdevid: %04x:%02x:%02x.%x flags: %#02x devid_to: %04x:%02x:%02x.%x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1401,8 +1396,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			break;

		case IVHD_DEV_EXT_SELECT:



			DUMP_printk("  DEV_EXT_SELECT\t\t devid: %04x:%02x:%02x.%x "

				    "flags: %02x ext: %08x\n",

			DUMP_printk("  DEV_EXT_SELECT\t\tdevid: %04x:%02x:%02x.%x flags: %#02x ext: %08x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1414,8 +1408,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			break;

		case IVHD_DEV_EXT_SELECT_RANGE:



			DUMP_printk("  DEV_EXT_SELECT_RANGE\t devid: "

				    "%04x:%02x:%02x.%x flags: %02x ext: %08x\n",

			DUMP_printk("  DEV_EXT_SELECT_RANGE\tdevid: %04x:%02x:%02x.%x flags: %#02x ext: %08x\n",

				    seg_id, PCI_BUS_NUM(e->devid),

				    PCI_SLOT(e->devid),

				    PCI_FUNC(e->devid),
@@ -1461,11 +1454,12 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			else

				var = "UNKNOWN";



			DUMP_printk("  DEV_SPECIAL(%s[%d])\t\tdevid: %04x:%02x:%02x.%x\n",

			DUMP_printk("  DEV_SPECIAL(%s[%d])\t\tdevid: %04x:%02x:%02x.%x, flags: %#02x\n",

				    var, (int)handle,

				    seg_id, PCI_BUS_NUM(devid),

				    PCI_SLOT(devid),

				    PCI_FUNC(devid));

				    PCI_FUNC(devid),

				    e->flags);



			ret = add_special_device(type, handle, &devid, false);

			if (ret)
@@ -1525,11 +1519,12 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, 
			}



			devid = PCI_SEG_DEVID_TO_SBDF(seg_id, e->devid);

			DUMP_printk("  DEV_ACPI_HID(%s[%s])\t\tdevid: %04x:%02x:%02x.%x\n",

			DUMP_printk("  DEV_ACPI_HID(%s[%s])\t\tdevid: %04x:%02x:%02x.%x, flags: %#02x\n",

				    hid, uid, seg_id,

				    PCI_BUS_NUM(devid),

				    PCI_SLOT(devid),

				    PCI_FUNC(devid));

				    PCI_FUNC(devid),

				    e->flags);



			flags = e->flags;