Commit ca4bbdaf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull iommu fix from Will Deacon:
 "Fix interrupt table length definition for AMD IOMMU.

  It's actually a fix for a fix, where the size of the interrupt
  remapping table was increased but a related constant for the
  size of the interrupt table was forgotten"

* tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
parents a68a0262 4165bf01

drivers/iommu/amd/amd_iommu_types.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ 
#define DTE_IRQ_REMAP_INTCTL_MASK	(0x3ULL << 60)

#define DTE_IRQ_TABLE_LEN_MASK	(0xfULL << 1)

#define DTE_IRQ_REMAP_INTCTL    (2ULL << 60)

#define DTE_IRQ_TABLE_LEN       (8ULL << 1)

#define DTE_IRQ_TABLE_LEN       (9ULL << 1)

#define DTE_IRQ_REMAP_ENABLE    1ULL



#define PAGE_MODE_NONE    0x00