diff options
| author | Thomas Gleixner | 2017-10-16 10:26:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2017-10-16 10:26:46 +0200 |
| commit | 3d51969ce318963e5330bda74dcfac22da180c71 (patch) | |
| tree | d6a12a35eb4c30b3d7800e2bec274914b6ccf3a3 /include/linux/irqchip/arm-gic-v3.h | |
| parent | Linux 4.14-rc5 (diff) | |
| parent | genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() (diff) | |
| download | kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.tar.gz kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.tar.xz kernel-qcow2-linux-3d51969ce318963e5330bda74dcfac22da180c71.zip | |
Merge tag 'irqchip-4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 4.14-rc5 from Marc Zyngier:
- Fix unfortunate mistake in the GICv3 ITS binding example
- Two fixes for the recently merged GICv4 support
- GICv3 ITS 52bit PA fixes
- Generic irqchip mask-ack fix, and its application to the tango irqchip
Diffstat (limited to 'include/linux/irqchip/arm-gic-v3.h')
| -rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 1ea576c8126f..14b74f22d43c 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -372,6 +372,8 @@ #define GITS_BASER_ENTRY_SIZE_SHIFT (48) #define GITS_BASER_ENTRY_SIZE(r) ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1) #define GITS_BASER_ENTRY_SIZE_MASK GENMASK_ULL(52, 48) +#define GITS_BASER_PHYS_52_to_48(phys) \ + (((phys) & GENMASK_ULL(47, 16)) | (((phys) >> 48) & 0xf) << 12) #define GITS_BASER_SHAREABILITY_SHIFT (10) #define GITS_BASER_InnerShareable \ GIC_BASER_SHAREABILITY(GITS_BASER, InnerShareable) |