irqchip/gicv3: Add support for Range Selector (RS) feature
PATCH v3 1/1 irqchip/gicv3: Add support for Range Selector (RS) feature
A new feature Range Selector (RS) has been added to GIC specification in order to support more than 16 CPUs at affinity level 0. New fields are introduced in SGI system registers (ICC_SGI0R_EL1, ICC_SGI1R_EL1 and ICC_ASGI1R_EL1) to relax an artificial limit of 16 at level 0.
- A new RSS field in ICC_CTLR_EL3, ICC_CTLR_EL1 and ICV_CTLR_EL1:
[18] - Range Selector Support (RSS)
0b0 = Targeted SGIs with affinity level 0 values of 0-15 are supported. 0b1 = Targeted SGIs with affinity level 0 values of 0-255 are supported.
- A new RS field in ICC_SGI0R_EL1, ICC_SGI1R_EL1 and ICC_ASGI1R_EL1:
[47:44] - RangeSelector (RS) which group of 16 TargetList[n] field
TargetList[n] represents aff0 value ((RS*16)+n) When ICC_CTLR_EL3.RSS==0 or ICC_CTLR_EL1.RSS==0, RS is RES0.
- A new RSS field in GICD_TYPER:
[26] - Range Selector Support (RSS)
0b0 = Targeted SGIs with affinity level 0 values of 0-15 are supported. 0b1 = Targeted SGIs with affinity level 0 values of 0-255 are supported.
---
Changes since v2:
- Changed from pr_crit() to pr_crit_once().
- Incorporated Marc's simplified RSS validation check.
Changes since v1:
- Addressed Marc's review comments on RSS validation checks.
- Apply code changes to gic_compute_target_list() to support RSS feature.
- Fix the compilation on ARM32.
arch/arm/include/asm/arch_gicv3.h | 5 ++++ arch/arm64/include/asm/arch_gicv3.h | 5 ++++ drivers/irqchip/irq-gic-v3.c | 49 ++++++++++++++++++++++++++++++------- include/linux/irqchip/arm-gic-v3.h | 4 +++ 4 files changed, 54 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch_gicv3.h +5 -0
@@ -196,6 +196,11 @@ static inline void gic_write_ctlr(u32 val)isb (); } +static inline u32 gic_read_ctlr (void ) +{ +return read_sysreg (ICC_CTLR ); +} +static inline void gic_write_grpen1 (u32 val) {write_sysreg (val,ICC_IGRPEN1 );
arch/arm64/include/asm/arch_gicv3.h +5 -0
@@ -87,6 +87,11 @@ static inline void gic_write_ctlr(u32 val)isb (); } +static inline u32 gic_read_ctlr (void ) +{ +return read_sysreg_s (SYS_ICC_CTLR_EL1 ); +} +static inline void gic_write_grpen1 (u32 val) {write_sysreg_s (val,SYS_ICC_IGRPEN1_EL1 );
drivers/irqchip/irq-gic-v3.c +40 -9
110 lines not on this page · raw message
include/linux/irqchip/arm-gic-v3.h +4 -0
@@ -68,6 +68,7 @@#define GICD_CTLR_ENABLE_SS_G1 (1U << 1)#define GICD_CTLR_ENABLE_SS_G0 (1U << 0) +#define GICD_TYPER_RSS (1U << 26)#define GICD_TYPER_LPIS (1U << 17)#define GICD_TYPER_MBIS (1U << 16)
@@ -459,6 +460,7 @@#define ICC_CTLR_EL1_SEIS_MASK (0x1 << ICC_CTLR_EL1_SEIS_SHIFT)#define ICC_CTLR_EL1_A3V_SHIFT 15#define ICC_CTLR_EL1_A3V_MASK (0x1 << ICC_CTLR_EL1_A3V_SHIFT) +#define ICC_CTLR_EL1_RSS (0x1 << 18)#define ICC_PMR_EL1_SHIFT 0#define ICC_PMR_EL1_MASK (0xff << ICC_PMR_EL1_SHIFT)#define ICC_BPR0_EL1_SHIFT 0
@@ -547,6 +549,8 @@#define ICC_SGI1R_AFFINITY_2_SHIFT 32#define ICC_SGI1R_AFFINITY_2_MASK (0xffULL << ICC_SGI1R_AFFINITY_2_SHIFT)#define ICC_SGI1R_IRQ_ROUTING_MODE_BIT 40 +#define ICC_SGI1R_RS_SHIFT 44 +#define ICC_SGI1R_RS_MASK (0xfULL << ICC_SGI1R_RS_SHIFT)#define ICC_SGI1R_AFFINITY_3_SHIFT 48#define ICC_SGI1R_AFFINITY_3_MASK (0xffULL << ICC_SGI1R_AFFINITY_3_SHIFT)
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 1 line · Shanker Donthineni
+#define
MPIDR_TO_SGI_CLUSTER_ID(mpidr)(mpidr & ~0xFUL)
This should be "((mpidr) & 0xFUL)", just to be safe.
I posted v4 patch https://patchwork.kernel.org/patch/9989667/ with parentheses around a macro parameter.
-----Original Message-----
From: Timur Tabi [mailto:timur at codeaurora.org]
Sent: Friday, October 6, 2017 9:26 AM
To: Shanker Donthineni <[email protected]>
Cc: Marc Zyngier <[email protected]>; linux-kernel <[email protected]>; linux-arm-kernel <[email protected]>; Thomas Gleixner <[email protected]>; Jason Cooper <[email protected]>; Vikram Sethi <[email protected]>
Subject: Re: [PATCH v3] irqchip/gicv3: Add support for Range Selector (RS) feature
Quoted 1 line · Shanker Donthineni
+#define
MPIDR_TO_SGI_CLUSTER_ID(mpidr)(mpidr & ~0xFUL)
This should be "((mpidr) & 0xFUL)", just to be safe.