| From 54014096d90f00b130313c362d5756a797c0e9d3 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Mon, 17 May 2021 11:54:37 +0200 |
| Subject: Revert "iommu/vt-d: Remove WO permissions on second-level paging entries" |
| |
| This reverts commit c848416cc05afc1589edba04fe00b85c2f797ee3 which is |
| eea53c5816889ee8b64544fa2e9311a81184ff9c upstream. |
| |
| Another iommu patch was backported incorrectly, causing problems, so |
| drop this as well for the moment. |
| |
| Reported-by: Wolfgang MΓΌller <wolf@oriole.systems> |
| Cc: Ashok Raj <ashok.raj@intel.com> |
| Cc: Lu Baolu <baolu.lu@linux.intel.com> |
| Cc: Joerg Roedel <jroedel@suse.de> |
| Cc: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/iommu/intel/iommu.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/iommu/intel/iommu.c |
| +++ b/drivers/iommu/intel/iommu.c |
| @@ -2362,9 +2362,8 @@ static int __domain_mapping(struct dmar_ |
| return -EINVAL; |
| |
| attr = prot & (DMA_PTE_READ | DMA_PTE_WRITE | DMA_PTE_SNP); |
| - attr |= DMA_FL_PTE_PRESENT; |
| if (domain_use_first_level(domain)) { |
| - attr |= DMA_FL_PTE_XD | DMA_FL_PTE_US; |
| + attr |= DMA_FL_PTE_PRESENT | DMA_FL_PTE_XD | DMA_FL_PTE_US; |
| |
| if (domain->domain.type == IOMMU_DOMAIN_DMA) { |
| attr |= DMA_FL_PTE_ACCESS; |
