iommu/amd: Fix logic to determine and checking max PASID

In reality, the spec can only support 16-bit PASID since
INVALIDATE_IOTLB_PAGES and COMPLETE_PPR_REQUEST commands only allow 16-bit
PASID. So, we updated the PASID_MASK accordingly and invoke BUG_ON
if the hardware is reporting PASmax more than 16-bit.

Besides, max PASID is defined as ((2^(PASmax+1)) - 1). The current does not
determine this correctly.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Tested-by: Jay Cornwall <Jay.Cornwall@amd.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 1dd9f818fc84..c949520bd196 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -963,7 +963,7 @@ static void build_inv_iommu_pasid(struct iommu_cmd *cmd, u16 domid, int pasid,
 
         address &= ~(0xfffULL);
 
-        cmd->data[0]  = pasid & PASID_MASK;
+        cmd->data[0]  = pasid;
         cmd->data[1]  = domid;
         cmd->data[2]  = lower_32_bits(address);
         cmd->data[3]  = upper_32_bits(address);
@@ -1001,7 +1001,7 @@ static void build_complete_ppr(struct iommu_cmd *cmd, u16 devid, int pasid,
 
         cmd->data[0]  = devid;
         if (gn) {
-                cmd->data[1]  = pasid & PASID_MASK;
+                cmd->data[1]  = pasid;
                 cmd->data[2]  = CMD_INV_IOMMU_PAGES_GN_MASK;
         }
         cmd->data[3]  = tag & 0x1ff;