Re: [PATCH] iommu/vt-d: Drop "0x" prefix from PCI bus & device addresses

[Lu Baolu]

Hi Bjorn,

On 9/4/21 3:37 AM, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>

Thank you for this fix. I have queued it for v5.15.

Best regards,
baolu

> ---
>   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 d66f79acd14d..8647a355dad0 100644
> --- a/drivers/iommu/intel/dmar.c
> +++ b/drivers/iommu/intel/dmar.c
> @@ -1944,18 +1944,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,