Linux IOMMU Development
 help / color / mirror / Atom feed
From: Vasant Hegde via iommu <iommu@lists.linux-foundation.org>
To: <iommu@lists.linux-foundation.org>, <joro@8bytes.org>
Cc: Vasant Hegde <vasant.hegde@amd.com>
Subject: [RFC PATCH 34/36] iommu/amd: Print PCI segment ID in error log messages
Date: Fri, 11 Mar 2022 15:18:52 +0530	[thread overview]
Message-ID: <20220311094854.31595-35-vasant.hegde@amd.com> (raw)
In-Reply-To: <20220311094854.31595-1-vasant.hegde@amd.com>

Print pci segment ID along with bdf. Useful for debugging.

Co-developed-by: Suravee Suthikulpaint <suravee.suthikulpanit@amd.com>
Signed-off-by: Suravee Suthikulpaint <suravee.suthikulpanit@amd.com>
Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
---
 drivers/iommu/amd/init.c  | 10 +++++-----
 drivers/iommu/amd/iommu.c | 36 ++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index ba0ef8192a2f..24814ec3dca8 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1850,11 +1850,11 @@ static int __init init_iommu_all(struct acpi_table_header *table)
 		h = (struct ivhd_header *)p;
 		if (*p == amd_iommu_target_ivhd_type) {
 
-			DUMP_printk("device: %02x:%02x.%01x cap: %04x "
-				    "seg: %d flags: %01x info %04x\n",
-				    PCI_BUS_NUM(h->devid), PCI_SLOT(h->devid),
-				    PCI_FUNC(h->devid), h->cap_ptr,
-				    h->pci_seg, h->flags, h->info);
+			DUMP_printk("device: %04x:%02x:%02x.%01x cap: %04x "
+				    "flags: %01x info %04x\n",
+				    h->pci_seg, PCI_BUS_NUM(h->devid),
+				    PCI_SLOT(h->devid), PCI_FUNC(h->devid),
+				    h->cap_ptr, h->flags, h->info);
 			DUMP_printk("       mmio-addr: %016llx\n",
 				    h->mmio_phys);
 
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index d3c29f04c970..2821c7e348f2 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -494,8 +494,8 @@ static void amd_iommu_report_rmp_hw_error(struct amd_iommu *iommu, volatile u32
 				vmg_tag, spa, flags);
 		}
 	} else {
-		pr_err_ratelimited("Event logged [RMP_HW_ERROR device=%02x:%02x.%x, vmg_tag=0x%04x, spa=0x%llx, flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		pr_err_ratelimited("Event logged [RMP_HW_ERROR device=%04x:%02x:%02x.%x, vmg_tag=0x%04x, spa=0x%llx, flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			vmg_tag, spa, flags);
 	}
 
@@ -527,8 +527,8 @@ static void amd_iommu_report_rmp_fault(struct amd_iommu *iommu, volatile u32 *ev
 				vmg_tag, gpa, flags_rmp, flags);
 		}
 	} else {
-		pr_err_ratelimited("Event logged [RMP_PAGE_FAULT device=%02x:%02x.%x, vmg_tag=0x%04x, gpa=0x%llx, flags_rmp=0x%04x, flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		pr_err_ratelimited("Event logged [RMP_PAGE_FAULT device=%04x:%02x:%02x.%x, vmg_tag=0x%04x, gpa=0x%llx, flags_rmp=0x%04x, flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			vmg_tag, gpa, flags_rmp, flags);
 	}
 
@@ -574,8 +574,8 @@ static void amd_iommu_report_page_fault(struct amd_iommu *iommu,
 				domain_id, address, flags);
 		}
 	} else {
-		pr_err_ratelimited("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		pr_err_ratelimited("Event logged [IO_PAGE_FAULT device=%04x:%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			domain_id, address, flags);
 	}
 
@@ -618,20 +618,20 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
 
 	switch (type) {
 	case EVENT_TYPE_ILL_DEV:
-		dev_err(dev, "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		dev_err(dev, "Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			pasid, address, flags);
 		dump_dte_entry(iommu, devid);
 		break;
 	case EVENT_TYPE_DEV_TAB_ERR:
-		dev_err(dev, "Event logged [DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
+		dev_err(dev, "Event logged [DEV_TAB_HARDWARE_ERROR device=%04x:%02x:%02x.%x "
 			"address=0x%llx flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			address, flags);
 		break;
 	case EVENT_TYPE_PAGE_TAB_ERR:
-		dev_err(dev, "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x pasid=0x%04x address=0x%llx flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		dev_err(dev, "Event logged [PAGE_TAB_HARDWARE_ERROR device=%04x:%02x:%02x.%x pasid=0x%04x address=0x%llx flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			pasid, address, flags);
 		break;
 	case EVENT_TYPE_ILL_CMD:
@@ -643,13 +643,13 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
 			address, flags);
 		break;
 	case EVENT_TYPE_IOTLB_INV_TO:
-		dev_err(dev, "Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%llx]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		dev_err(dev, "Event logged [IOTLB_INV_TIMEOUT device=%04x:%02x:%02x.%x address=0x%llx]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			address);
 		break;
 	case EVENT_TYPE_INV_DEV_REQ:
-		dev_err(dev, "Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		dev_err(dev, "Event logged [INVALID_DEVICE_REQUEST device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			pasid, address, flags);
 		break;
 	case EVENT_TYPE_RMP_FAULT:
@@ -661,8 +661,8 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
 	case EVENT_TYPE_INV_PPR_REQ:
 		pasid = PPR_PASID(*((u64 *)__evt));
 		tag = event[1] & 0x03FF;
-		dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x tag=0x%03x]\n",
-			PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+		dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x tag=0x%03x]\n",
+			iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
 			pasid, address, flags, tag);
 		break;
 	default:
-- 
2.27.0

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2022-03-11 10:01 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11  9:48 [RFC PATCH 00/36] iommu/amd: Add multiple PCI segments support Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 01/36] iommu/amd: Introduce pci segment structure Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 02/36] iommu/amd: Introduce per PCI segment device table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 03/36] iommu/amd: Introduce per PCI segment rlookup table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 04/36] iommu/amd: Introduce per PCI segment irq_lookup_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 05/36] iommu/amd: Introduce per PCI segment dev_data_list Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 06/36] iommu/amd: Introduce per PCI segment old_dev_tbl_cpy Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 07/36] iommu/amd: Introduce per PCI segment alias_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 08/36] iommu/amd: Introduce per PCI segment unity map list Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 09/36] iommu/amd: Introduce per PCI segment last_bdf Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 10/36] iommu/amd: Introduce per PCI segment device table size Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 11/36] iommu/amd: Introduce per PCI segment alias " Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 12/36] iommu/amd: Introduce per PCI segment rlookup " Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 13/36] iommu/amd: Convert to use per PCI segment irq_lookup_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 14/36] iommu/amd: Convert to use rlookup_amd_iommu helper function Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 15/36] iommu/amd: Update irq_remapping_alloc to use IOMMU lookup " Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 16/36] iommu/amd: Introduce struct amd_ir_data.iommu Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 17/36] iommu/amd: Update amd_irte_ops functions Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 18/36] iommu/amd: Update alloc_irq_table and alloc_irq_index Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 19/36] iommu/amd: Convert to use per PCI segment rlookup_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 20/36] iommu/amd: Update set_dte_entry and clear_dte_entry Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 21/36] iommu/amd: Update iommu_ignore_device Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 22/36] iommu/amd: Update dump_dte_entry Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 23/36] iommu/amd: Update set_dte_irq_entry Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 24/36] iommu/amd: Update (un)init_device_table_dma() Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 25/36] iommu/amd: Update set_dev_entry_bit() and get_dev_entry_bit() Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 26/36] iommu/amd: Remove global amd_iommu_dev_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 27/36] iommu/amd: Remove global amd_iommu_alias_table Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 28/36] iommu/amd: Remove global amd_iommu_last_bdf Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 29/36] iommu/amd: Flush upto last_bdf only Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 30/36] iommu/amd: Introduce get_device_sbdf_id() helper function Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 31/36] iommu/amd: Include PCI segment ID when initialize IOMMU Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 32/36] iommu/amd: Specify PCI segment ID when getting pci device Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 33/36] iommu/amd: Add PCI segment support for ivrs_ioapic, ivrs_hpet, ivrs_acpihid commands Vasant Hegde via iommu
2022-03-11  9:48 ` Vasant Hegde via iommu [this message]
2022-03-11  9:48 ` [RFC PATCH 35/36] iommu/amd: Update device_state structure to include PCI seg ID Vasant Hegde via iommu
2022-03-11  9:48 ` [RFC PATCH 36/36] iommu/amd: Update amd_iommu_fault " Vasant Hegde via iommu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220311094854.31595-35-vasant.hegde@amd.com \
    --to=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=vasant.hegde@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox