Skip to content

Commit 11cfa78

Browse files
ssuthiku-amdjoergroedel
authored andcommitted
iommu/amd: Make amd_iommu_make_clear_dte() non-static inline
This will be reused in a new nested.c file for nested translation. Also, remove unused function parameter ptr. Reviewed-by: Nicolin Chen <nicolinc@nvidia.com> Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
1 parent 5335fc1 commit 11cfa78

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

drivers/iommu/amd/amd_iommu.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,12 @@ void amd_iommu_domain_set_pgtable(struct protection_domain *domain,
190190
struct dev_table_entry *get_dev_table(struct amd_iommu *iommu);
191191
struct iommu_dev_data *search_dev_data(struct amd_iommu *iommu, u16 devid);
192192

193+
static inline void
194+
amd_iommu_make_clear_dte(struct iommu_dev_data *dev_data, struct dev_table_entry *new)
195+
{
196+
/* All existing DTE must have V bit set */
197+
new->data128[0] = DTE_FLAG_V;
198+
new->data128[1] = 0;
199+
}
200+
193201
#endif /* AMD_IOMMU_H */

drivers/iommu/amd/iommu.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,14 +2015,6 @@ int amd_iommu_clear_gcr3(struct iommu_dev_data *dev_data, ioasid_t pasid)
20152015
return ret;
20162016
}
20172017

2018-
static void make_clear_dte(struct iommu_dev_data *dev_data, struct dev_table_entry *ptr,
2019-
struct dev_table_entry *new)
2020-
{
2021-
/* All existing DTE must have V bit set */
2022-
new->data128[0] = DTE_FLAG_V;
2023-
new->data128[1] = 0;
2024-
}
2025-
20262018
/*
20272019
* Note:
20282020
* The old value for GCR3 table and GPT have been cleared from caller.
@@ -2072,7 +2064,7 @@ static void set_dte_entry(struct amd_iommu *iommu,
20722064
struct dev_table_entry *dte = &get_dev_table(iommu)[dev_data->devid];
20732065
struct pt_iommu_amdv1_hw_info pt_info;
20742066

2075-
make_clear_dte(dev_data, dte, &new);
2067+
amd_iommu_make_clear_dte(dev_data, &new);
20762068

20772069
if (gcr3_info && gcr3_info->gcr3_tbl)
20782070
domid = dev_data->gcr3_info.domid;
@@ -2153,9 +2145,8 @@ static void set_dte_entry(struct amd_iommu *iommu,
21532145
static void clear_dte_entry(struct amd_iommu *iommu, struct iommu_dev_data *dev_data)
21542146
{
21552147
struct dev_table_entry new = {};
2156-
struct dev_table_entry *dte = &get_dev_table(iommu)[dev_data->devid];
21572148

2158-
make_clear_dte(dev_data, dte, &new);
2149+
amd_iommu_make_clear_dte(dev_data, &new);
21592150
update_dte256(iommu, dev_data, &new);
21602151
}
21612152

0 commit comments

Comments
 (0)