* [PATCH 1/1] Revert "iommu/vt-d: Remove unused function"
@ 2023-10-25 13:18 Lu Baolu
2023-10-25 13:34 ` Jason Gunthorpe
2023-10-25 15:32 ` Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Lu Baolu @ 2023-10-25 13:18 UTC (permalink / raw)
To: Joerg Roedel, Jason Gunthorpe
Cc: Stephen Rothwell, iommu, linux-kernel, Lu Baolu
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>
---
drivers/iommu/intel/pasid.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c
index 06ddb3c927f5..8f92b92f3d2a 100644
--- 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.
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] Revert "iommu/vt-d: Remove unused function"
2023-10-25 13:18 [PATCH 1/1] Revert "iommu/vt-d: Remove unused function" Lu Baolu
@ 2023-10-25 13:34 ` Jason Gunthorpe
2023-10-25 15:32 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2023-10-25 13:34 UTC (permalink / raw)
To: Lu Baolu; +Cc: Joerg Roedel, Stephen Rothwell, iommu, linux-kernel
On Wed, Oct 25, 2023 at 09:18:54PM +0800, Lu Baolu wrote:
> 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>
> ---
> drivers/iommu/intel/pasid.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Needed to avoid ugly conflicts with iommufd, Joerg please take it
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Revert "iommu/vt-d: Remove unused function"
2023-10-25 13:18 [PATCH 1/1] Revert "iommu/vt-d: Remove unused function" Lu Baolu
2023-10-25 13:34 ` Jason Gunthorpe
@ 2023-10-25 15:32 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2023-10-25 15:32 UTC (permalink / raw)
To: Lu Baolu; +Cc: Jason Gunthorpe, Stephen Rothwell, iommu, linux-kernel
On Wed, Oct 25, 2023 at 09:18:54PM +0800, Lu Baolu wrote:
> drivers/iommu/intel/pasid.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-25 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-25 13:18 [PATCH 1/1] Revert "iommu/vt-d: Remove unused function" Lu Baolu
2023-10-25 13:34 ` Jason Gunthorpe
2023-10-25 15:32 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox