Commit c2a6af5e authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel

iommu/amd: Remove unused GCR3 table parameters from struct protection_domain

Since they are moved to struct iommu_dev_data, and the driver has been
ported to use them.
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20240205115615.6053-17-vasant.hegde@amd.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent a7b2aff3
...@@ -453,15 +453,6 @@ ...@@ -453,15 +453,6 @@
#define MAX_DOMAIN_ID 65536 #define MAX_DOMAIN_ID 65536
/* Protection domain flags */
#define PD_DMA_OPS_MASK BIT(0) /* domain used for dma_ops */
#define PD_DEFAULT_MASK BIT(1) /* domain is a default dma_ops
domain for an IOMMU */
#define PD_PASSTHROUGH_MASK BIT(2) /* domain has no page
translation */
#define PD_IOMMUV2_MASK BIT(3) /* domain has gcr3 table */
#define PD_GIOV_MASK BIT(4) /* domain enable GIOV support */
/* Timeout stuff */ /* Timeout stuff */
#define LOOP_TIMEOUT 100000 #define LOOP_TIMEOUT 100000
#define MMIO_STATUS_TIMEOUT 2000000 #define MMIO_STATUS_TIMEOUT 2000000
...@@ -563,10 +554,7 @@ struct protection_domain { ...@@ -563,10 +554,7 @@ struct protection_domain {
struct amd_io_pgtable iop; struct amd_io_pgtable iop;
spinlock_t lock; /* mostly used to lock the page table*/ spinlock_t lock; /* mostly used to lock the page table*/
u16 id; /* the domain id written to the device table */ u16 id; /* the domain id written to the device table */
int glx; /* Number of levels for GCR3 table */
int nid; /* Node ID */ int nid; /* Node ID */
u64 *gcr3_tbl; /* Guest CR3 table */
unsigned long flags; /* flags to find out type of domain */
enum protection_domain_mode pd_mode; /* Track page table type */ enum protection_domain_mode pd_mode; /* Track page table type */
bool dirty_tracking; /* dirty tracking is enabled in the domain */ bool dirty_tracking; /* dirty tracking is enabled in the domain */
unsigned dev_cnt; /* devices assigned to this domain */ unsigned dev_cnt; /* devices assigned to this domain */
......
...@@ -86,7 +86,7 @@ static void set_dte_entry(struct amd_iommu *iommu, ...@@ -86,7 +86,7 @@ static void set_dte_entry(struct amd_iommu *iommu,
static inline bool pdom_is_v2_pgtbl_mode(struct protection_domain *pdom) static inline bool pdom_is_v2_pgtbl_mode(struct protection_domain *pdom)
{ {
return (pdom && (pdom->flags & PD_IOMMUV2_MASK)); return (pdom && (pdom->pd_mode == PD_MODE_V2));
} }
static inline int get_acpihid_device_id(struct device *dev, static inline int get_acpihid_device_id(struct device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment