Skip to content

Commit 5335fc1

Browse files
ssuthiku-amdjoergroedel
authored andcommitted
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>
1 parent 7d8b06e commit 5335fc1

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/iommu/amd/amd_iommu_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358

359359
#define DTE_FLAG_IOTLB BIT_ULL(32)
360360
#define DTE_FLAG_MASK (0x3ffULL << 32)
361-
#define DEV_DOMID_MASK 0xffffULL
361+
#define DTE_DOMID_MASK GENMASK_ULL(15, 0)
362362

363363
#define DTE_GCR3_14_12 GENMASK_ULL(60, 58)
364364
#define DTE_GCR3_30_15 GENMASK_ULL(31, 16)

drivers/iommu/amd/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ static bool __reuse_device_table(struct amd_iommu *iommu)
11791179
for (devid = 0; devid <= pci_seg->last_bdf; devid++) {
11801180
old_dev_tbl_entry = &pci_seg->old_dev_tbl_cpy[devid];
11811181
dte_v = FIELD_GET(DTE_FLAG_V, old_dev_tbl_entry->data[0]);
1182-
dom_id = FIELD_GET(DEV_DOMID_MASK, old_dev_tbl_entry->data[1]);
1182+
dom_id = FIELD_GET(DTE_DOMID_MASK, old_dev_tbl_entry->data[1]);
11831183

11841184
if (!dte_v || !dom_id)
11851185
continue;

drivers/iommu/amd/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2120,7 +2120,7 @@ static void set_dte_entry(struct amd_iommu *iommu,
21202120
if (dev_data->ats_enabled)
21212121
new.data[1] |= DTE_FLAG_IOTLB;
21222122

2123-
old_domid = READ_ONCE(dte->data[1]) & DEV_DOMID_MASK;
2123+
old_domid = READ_ONCE(dte->data[1]) & DTE_DOMID_MASK;
21242124
new.data[1] |= domid;
21252125

21262126
/*

0 commit comments

Comments
 (0)