iommu/amd: Rename DEV_DOMID_MASK to DTE_DOMID_MASK

Also change the define to use GENMASK_ULL instead.
There is no functional change.

Reviewed-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 320733e7d8b423d8573c73eb9a9a8eebd8e8f2d7..14801d734684cd5e7ba7580510252546738b3f51 100644 (file)
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -358,7 +358,7 @@
 
 #define DTE_FLAG_IOTLB BIT_ULL(32)
 #define DTE_FLAG_MASK  (0x3ffULL << 32)
-#define DEV_DOMID_MASK 0xffffULL
+#define DTE_DOMID_MASK GENMASK_ULL(15, 0)
 
 #define DTE_GCR3_14_12 GENMASK_ULL(60, 58)
 #define DTE_GCR3_30_15 GENMASK_ULL(31, 16)

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 384c90b4f90a0a267177925da95225712f941219..cfbc9ff105c3608a9667e23b517f36bd9056e091 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1179,7 +1179,7 @@ static bool __reuse_device_table(struct amd_iommu *iommu)
        for (devid = 0; devid <= pci_seg->last_bdf; devid++) {
                old_dev_tbl_entry = &pci_seg->old_dev_tbl_cpy[devid];
                dte_v = FIELD_GET(DTE_FLAG_V, old_dev_tbl_entry->data[0]);
-               dom_id = FIELD_GET(DEV_DOMID_MASK, old_dev_tbl_entry->data[1]);
+               dom_id = FIELD_GET(DTE_DOMID_MASK, old_dev_tbl_entry->data[1]);
 
                if (!dte_v || !dom_id)
                        continue;

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index d550a7e431acc1248d78c3079339192b9add48b3..e3d9215244eac9913e9c1ddf58248157c03cd628 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2120,7 +2120,7 @@ static void set_dte_entry(struct amd_iommu *iommu,
        if (dev_data->ats_enabled)
                new.data[1] |= DTE_FLAG_IOTLB;
 
-       old_domid = READ_ONCE(dte->data[1]) & DEV_DOMID_MASK;
+       old_domid = READ_ONCE(dte->data[1]) & DTE_DOMID_MASK;
        new.data[1] |= domid;
 
        /*