mirror of
https://github.com/torvalds/linux.git
synced 2026-05-23 22:52:19 +02:00
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>
This commit is contained in:
parent
7d8b06ecc4
commit
5335fc1657
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user