Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a57546 authored by Joerg Roedel's avatar Joerg Roedel Committed by Sasha Levin
Browse files

iommu/amd: Don't clear DTE flags when modifying it 



[ Upstream commit cbf3ccd09d683abf1cacd36e3640872ee912d99b ]

During device assignment/deassignment the flags in the DTE
get lost, which might cause spurious faults, for example
when the device tries to access the system management range.
Fix this by not clearing the flags with the rest of the DTE.

Reported-by: default avatarG. Richard Bellamy <rbellamy@pteradigm.com>
Tested-by: default avatarG. Richard Bellamy <rbellamy@pteradigm.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 3f17b603

drivers/iommu/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -2101,7 +2101,7 @@ static void clear_dte_entry(u16 devid) 
{

	/* remove entry from the device table seen by the hardware */

	amd_iommu_dev_table[devid].data[0]  = IOMMU_PTE_P | IOMMU_PTE_TV;

	amd_iommu_dev_table[devid].data[1] = 0;

	amd_iommu_dev_table[devid].data[1] &= DTE_FLAG_MASK;



	amd_iommu_apply_erratum_63(devid);

}

drivers/iommu/amd_iommu_types.h

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ 
#define IOMMU_PTE_IR (1ULL << 61)

#define IOMMU_PTE_IW (1ULL << 62)



#define DTE_FLAG_MASK	(0x3ffULL << 32)

#define DTE_FLAG_IOTLB	(0x01UL << 32)

#define DTE_FLAG_GV	(0x01ULL << 55)

#define DTE_GLX_SHIFT	(56)