|
@@ -1817,7 +1817,8 @@ static bool dma_ops_domain(struct protection_domain *domain)
|
|
return domain->flags & PD_DMA_OPS_MASK;
|
|
return domain->flags & PD_DMA_OPS_MASK;
|
|
}
|
|
}
|
|
|
|
|
|
-static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)
|
|
|
|
|
|
+static void set_dte_entry(u16 devid, struct protection_domain *domain,
|
|
|
|
+ bool ats, bool ppr)
|
|
{
|
|
{
|
|
u64 pte_root = 0;
|
|
u64 pte_root = 0;
|
|
u64 flags = 0;
|
|
u64 flags = 0;
|
|
@@ -1834,6 +1835,13 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)
|
|
if (ats)
|
|
if (ats)
|
|
flags |= DTE_FLAG_IOTLB;
|
|
flags |= DTE_FLAG_IOTLB;
|
|
|
|
|
|
|
|
+ if (ppr) {
|
|
|
|
+ struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
|
|
|
|
+
|
|
|
|
+ if (iommu_feature(iommu, FEATURE_EPHSUP))
|
|
|
|
+ pte_root |= 1ULL << DEV_ENTRY_PPR;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (domain->flags & PD_IOMMUV2_MASK) {
|
|
if (domain->flags & PD_IOMMUV2_MASK) {
|
|
u64 gcr3 = iommu_virt_to_phys(domain->gcr3_tbl);
|
|
u64 gcr3 = iommu_virt_to_phys(domain->gcr3_tbl);
|
|
u64 glx = domain->glx;
|
|
u64 glx = domain->glx;
|
|
@@ -1896,9 +1904,9 @@ static void do_attach(struct iommu_dev_data *dev_data,
|
|
domain->dev_cnt += 1;
|
|
domain->dev_cnt += 1;
|
|
|
|
|
|
/* Update device table */
|
|
/* Update device table */
|
|
- set_dte_entry(dev_data->devid, domain, ats);
|
|
|
|
|
|
+ set_dte_entry(dev_data->devid, domain, ats, dev_data->iommu_v2);
|
|
if (alias != dev_data->devid)
|
|
if (alias != dev_data->devid)
|
|
- set_dte_entry(alias, domain, ats);
|
|
|
|
|
|
+ set_dte_entry(alias, domain, ats, dev_data->iommu_v2);
|
|
|
|
|
|
device_flush_dte(dev_data);
|
|
device_flush_dte(dev_data);
|
|
}
|
|
}
|
|
@@ -2277,13 +2285,15 @@ static void update_device_table(struct protection_domain *domain)
|
|
struct iommu_dev_data *dev_data;
|
|
struct iommu_dev_data *dev_data;
|
|
|
|
|
|
list_for_each_entry(dev_data, &domain->dev_list, list) {
|
|
list_for_each_entry(dev_data, &domain->dev_list, list) {
|
|
- set_dte_entry(dev_data->devid, domain, dev_data->ats.enabled);
|
|
|
|
|
|
+ set_dte_entry(dev_data->devid, domain, dev_data->ats.enabled,
|
|
|
|
+ dev_data->iommu_v2);
|
|
|
|
|
|
if (dev_data->devid == dev_data->alias)
|
|
if (dev_data->devid == dev_data->alias)
|
|
continue;
|
|
continue;
|
|
|
|
|
|
/* There is an alias, update device table entry for it */
|
|
/* There is an alias, update device table entry for it */
|
|
- set_dte_entry(dev_data->alias, domain, dev_data->ats.enabled);
|
|
|
|
|
|
+ set_dte_entry(dev_data->alias, domain, dev_data->ats.enabled,
|
|
|
|
+ dev_data->iommu_v2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|