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

iommu/amd: Fix incorrect PASID decoding from event log 



IOMMU Event Log encodes 20-bit PASID for events:
    ILLEGAL_DEV_TABLE_ENTRY
    IO_PAGE_FAULT
    PAGE_TAB_HARDWARE_ERROR
    INVALID_DEVICE_REQUEST
as:
    PASID[15:0]  = bit 47:32
    PASID[19:16] = bit 19:16

Note that INVALID_PPR_REQUEST event has different encoding
from the rest of the events as the following:
    PASID[15:0]  = bit 31:16
    PASID[19:16] = bit 45:42

So, fixes the decoding logic.

Fixes: d64c0486 ("iommu/amd: Update the PASID information printed to the system log")
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Gary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ec37d4e9

drivers/iommu/amd_iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -583,7 +583,8 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) 
retry:

	type    = (event[1] >> EVENT_TYPE_SHIFT)  & EVENT_TYPE_MASK;

	devid   = (event[0] >> EVENT_DEVID_SHIFT) & EVENT_DEVID_MASK;

	pasid   = PPR_PASID(*(u64 *)&event[0]);

	pasid   = (event[0] & EVENT_DOMID_MASK_HI) |

		  (event[1] & EVENT_DOMID_MASK_LO);

	flags   = (event[1] >> EVENT_FLAGS_SHIFT) & EVENT_FLAGS_MASK;

	address = (u64)(((u64)event[3]) << 32) | event[2];
@@ -616,7 +617,7 @@ retry: 
			address, flags);

		break;

	case EVENT_TYPE_PAGE_TAB_ERR:

		dev_err(dev, "Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n",

		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),

			pasid, address, flags);

		break;

drivers/iommu/amd_iommu_types.h

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ 
#define EVENT_TYPE_INV_PPR_REQ	0x9

#define EVENT_DEVID_MASK	0xffff

#define EVENT_DEVID_SHIFT	0

#define EVENT_DOMID_MASK	0xffff

#define EVENT_DOMID_SHIFT	0

#define EVENT_DOMID_MASK_LO	0xffff

#define EVENT_DOMID_MASK_HI	0xf0000

#define EVENT_FLAGS_MASK	0xfff

#define EVENT_FLAGS_SHIFT	0x10

CRA Git | Maintained and supported by SUSTech CRA and CCSE