projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b437e8
)
Revert "iommu/vt-d: Remove unused function"
author
Lu Baolu
<baolu.lu@linux.intel.com>
Wed, 25 Oct 2023 13:18:54 +0000
(21:18 +0800)
committer
Joerg Roedel
<jroedel@suse.de>
Wed, 25 Oct 2023 15:32:03 +0000
(17:32 +0200)
This reverts commit
c61c255e114c52682546447ed44d3470b5708134
.
The pasid_set_wpe() helper, which was removed by the reverted commit,
is still used by the nesting translation support in the iommufd tree.
To avoid a merge conflict, revert the commit.
Link:
https://lore.kernel.org/linux-kernel/20231025153455.283c5b12@canb.auug.org.au/
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link:
https://lore.kernel.org/r/20231025131854.375388-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel/pasid.c
patch
|
blob
|
history
diff --git
a/drivers/iommu/intel/pasid.c
b/drivers/iommu/intel/pasid.c
index 06ddb3c927f52b9bb8f367155f3ac34ddec2fe30..8f92b92f3d2aba5ce2455fcf8d3604ea4eeee4ae 100644
(file)
--- a/
drivers/iommu/intel/pasid.c
+++ b/
drivers/iommu/intel/pasid.c
@@
-335,6
+335,15
@@
static inline void pasid_set_fault_enable(struct pasid_entry *pe)
pasid_set_bits(&pe->val[0], 1 << 1, 0);
}
+/*
+ * Setup the WPE(Write Protect Enable) field (Bit 132) of a
+ * scalable mode PASID entry.
+ */
+static inline void pasid_set_wpe(struct pasid_entry *pe)
+{
+ pasid_set_bits(&pe->val[2], 1 << 4, 1 << 4);
+}
+
/*
* Setup the P(Present) field (Bit 0) of a scalable mode PASID
* entry.