iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3
@ 2021-09-22  5:47 Lu Baolu
  2021-09-22  5:47 ` [PATCH 1/1] iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses Lu Baolu
  2021-09-28  9:41 ` [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Joerg Roedel
  0 siblings, 2 replies; 3+ messages in thread
From: Lu Baolu @ 2021-09-22  5:47 UTC (permalink / raw)
  To: Joerg Roedel; +Cc: Bjorn Helgaas, iommu

Hi Joerg,

A fix is queued for v5.15. It aims to fix:

 - Drop "0x" prefix from PCI bus & device addresses

Please consider it for the iommu/fix branch.

Best regards,
Lu Baolu

Bjorn Helgaas (1):
  iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses

 drivers/iommu/intel/dmar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.25.1

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/1] iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses
  2021-09-22  5:47 [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Lu Baolu
@ 2021-09-22  5:47 ` Lu Baolu
  2021-09-28  9:41 ` [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Joerg Roedel
  1 sibling, 0 replies; 3+ messages in thread
From: Lu Baolu @ 2021-09-22  5:47 UTC (permalink / raw)
  To: Joerg Roedel; +Cc: Bjorn Helgaas, iommu

From: Bjorn Helgaas <bhelgaas@google.com>

719a19335692 ("iommu/vt-d: Tweak the description of a DMA fault") changed
the DMA fault reason from hex to decimal.  It also added "0x" prefixes to
the PCI bus/device, e.g.,

  - DMAR: [INTR-REMAP] Request device [00:00.5]
  + DMAR: [INTR-REMAP] Request device [0x00:0x00.5]

These no longer match dev_printk() and other similar messages in
dmar_match_pci_path() and dmar_acpi_insert_dev_scope().

Drop the "0x" prefixes from the bus and device addresses.

Fixes: 719a19335692 ("iommu/vt-d: Tweak the description of a DMA fault")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20210903193711.483999-1-helgaas@kernel.org
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/intel/dmar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index 0ec5514c9980..b7708b93f3fa 100644
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -1942,18 +1942,18 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
 	reason = dmar_get_fault_reason(fault_reason, &fault_type);
 
 	if (fault_type == INTR_REMAP)
-		pr_err("[INTR-REMAP] Request device [0x%02x:0x%02x.%d] fault index 0x%llx [fault reason 0x%02x] %s\n",
+		pr_err("[INTR-REMAP] Request device [%02x:%02x.%d] fault index 0x%llx [fault reason 0x%02x] %s\n",
 		       source_id >> 8, PCI_SLOT(source_id & 0xFF),
 		       PCI_FUNC(source_id & 0xFF), addr >> 48,
 		       fault_reason, reason);
 	else if (pasid == INVALID_IOASID)
-		pr_err("[%s NO_PASID] Request device [0x%02x:0x%02x.%d] fault addr 0x%llx [fault reason 0x%02x] %s\n",
+		pr_err("[%s NO_PASID] Request device [%02x:%02x.%d] fault addr 0x%llx [fault reason 0x%02x] %s\n",
 		       type ? "DMA Read" : "DMA Write",
 		       source_id >> 8, PCI_SLOT(source_id & 0xFF),
 		       PCI_FUNC(source_id & 0xFF), addr,
 		       fault_reason, reason);
 	else
-		pr_err("[%s PASID 0x%x] Request device [0x%02x:0x%02x.%d] fault addr 0x%llx [fault reason 0x%02x] %s\n",
+		pr_err("[%s PASID 0x%x] Request device [%02x:%02x.%d] fault addr 0x%llx [fault reason 0x%02x] %s\n",
 		       type ? "DMA Read" : "DMA Write", pasid,
 		       source_id >> 8, PCI_SLOT(source_id & 0xFF),
 		       PCI_FUNC(source_id & 0xFF), addr,
-- 
2.25.1

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3
  2021-09-22  5:47 [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Lu Baolu
  2021-09-22  5:47 ` [PATCH 1/1] iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses Lu Baolu
@ 2021-09-28  9:41 ` Joerg Roedel
  1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2021-09-28  9:41 UTC (permalink / raw)
  To: Lu Baolu; +Cc: Bjorn Helgaas, iommu

On Wed, Sep 22, 2021 at 01:47:25PM +0800, Lu Baolu wrote:
> Bjorn Helgaas (1):
>   iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-28  9:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-22  5:47 [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Lu Baolu
2021-09-22  5:47 ` [PATCH 1/1] iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses Lu Baolu
2021-09-28  9:41 ` [PATCH 0/1] iommu/vt-d: A fix for v5.15-rc3 Joerg Roedel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).