irqchip, gicv3: Updates and Cavium ThunderX errata workarounds
Subsystems (3)
v3 cover irqchip, gicv3: Updates and Cavium ThunderX errata workarounds
From: Robert Richter <[email protected]>
This patch series adds gicv3 updates and workarounds for HW errata in Cavium's ThunderX GICV3.
The first one is an unchanged resubmission of a patch from a gicv3 series I sent a while ago.
The next patches implement the workarounds for ThunderX's gicv3. Patch #2 adds generic code to parse the hw revision provided by an IIDR or MIDR register value and runs specific code if hw matches. For MIDR detection it uses the arm64 errata framework. This patch is used for the implementation of the actual errata fixes in patch #3 (gicv3) and #5 (gicv3-its). Patch #4 is a prerequisit for patch #5. Patch #6 is a change to the errata framework to only check for cpu features if the capability value is non-zero.
All current review comments addressed so far with v3.
v3:
* use arm64 errata framework for midr check
* fix mixup of errata to be dependend from midr/iidr
v2:
* Workaround for 23154:
* implement code in a single asm() to keep instruction sequence
* added comment to the code that explains the erratum
* apply workaround also if running as guest, thus check MIDR
* adding MIDR check
Robert Richter (6):
irqchip, gicv3-its: Add range check for number of allocated pages irqchip, gicv3: Add HW revision detection and configuration irqchip, gicv3: Workaround for Cavium ThunderX erratum 23154 irqchip, gicv3-its: Read typer register outside the loop irqchip, gicv3-its: Workaround for Cavium ThunderX errata 22375, 24313
arm64: errata: Match all cpus if capability value is zero
arch/arm64/Kconfig | 11 +++++++ arch/arm64/include/asm/cpufeature.h | 16 +++++++--- arch/arm64/include/asm/cputype.h | 18 ++++++----- arch/arm64/kernel/cpu_errata.c | 9 ++++++ drivers/irqchip/irq-gic-common.c | 13 ++++++++ drivers/irqchip/irq-gic-common.h | 10 ++++++ drivers/irqchip/irq-gic-v3-its.c | 62 ++++++++++++++++++++++++++++++++---- drivers/irqchip/irq-gic-v3.c | 63 ++++++++++++++++++++++++++++++++++++- include/linux/irqchip/arm-gic-v3.h | 1 + 9 files changed, 184 insertions(+), 19 deletions(-)
Signature · 1 line
2.1.1
PATCH v3 1/6 irqchip, gicv3-its: Add range check for number of allocated pages
From: Robert Richter <[email protected]>
The number of pages for the its table may exceed the maximum of 256. Adding a range check and limitting the number to its maximum.
Based on a patch from Tirumalesh Chalamarla <[email protected]>.
--- drivers/irqchip/irq-gic-v3-its.c | 11 ++++++++++- include/linux/irqchip/arm-gic-v3.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +10 -1
@@ -810,6 +810,7 @@ static int its_alloc_tables(struct its_node *its)u64 entry_size =GITS_BASER_ENTRY_SIZE (val);int order =get_order (psz);int alloc_size; +int alloc_pages;u64 tmp;void *base;
@@ -844,6 +845,14 @@ static int its_alloc_tables(struct its_node *its) } alloc_size = (1 << order) *PAGE_SIZE ; + alloc_pages = (alloc_size / psz); +if (alloc_pages >GITS_BASER_PAGES_MAX ) { + alloc_pages =GITS_BASER_PAGES_MAX ; + order =get_order (GITS_BASER_PAGES_MAX * psz); +pr_warn ("%s: Device Table too large, reduce its page order to %u (%u pages)\n" , + its->msi_chip.of_node->full_name, order, alloc_pages); + } + base = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, order);if (!base) { err = -ENOMEM ;
@@ -872,7 +881,7 @@ static int its_alloc_tables(struct its_node *its)break ; } - val |= (alloc_size / psz) -1 ; + val |= alloc_pages -1 ;writeq_relaxed (val, its->base +GITS_BASER + i *8 ); tmp =readq_relaxed (its->base +GITS_BASER + i *8 );
include/linux/irqchip/arm-gic-v3.h +1 -0
@@ -229,6 +229,7 @@#define GITS_BASER_PAGE_SIZE_16K (1UL << GITS_BASER_PAGE_SIZE_SHIFT)#define GITS_BASER_PAGE_SIZE_64K (2UL << GITS_BASER_PAGE_SIZE_SHIFT)#define GITS_BASER_PAGE_SIZE_MASK (3UL << GITS_BASER_PAGE_SIZE_SHIFT) +#define GITS_BASER_PAGES_MAX 256#define GITS_BASER_TYPE_NONE 0#define GITS_BASER_TYPE_DEVICE 1
Signature · 1 line
2.1.1
PATCH v3 2/6 irqchip, gicv3: Add HW revision detection and configuration
In reply to Robert RichterFrom: Robert Richter <[email protected]>
Some GIC revisions require an individual configuration to esp. add workarounds for HW bugs. This patch implements generic code to parse the hw revision provided by an IIDR register value and runs specific code if hw matches. There are functions that read the IIDR registers for GICV3 and ITS (GICD_IIDR/GITS_IIDR) and then go through a list of init functions to be called for specific versions.
A MIDR register value may also be used, this is especially useful for hw detection from a guest.
The patch is needed to implement workarounds for HW errata in Cavium's ThunderX GICV3.
v3:
* use arm64 errata framework for midr check
v2:
* adding MIDR check
--- drivers/irqchip/irq-gic-common.c | 13 +++++++++++++ drivers/irqchip/irq-gic-common.h | 10 ++++++++++ drivers/irqchip/irq-gic-v3-its.c | 15 +++++++++++++++ drivers/irqchip/irq-gic-v3.c | 14 ++++++++++++++ 4 files changed, 52 insertions(+)
drivers/irqchip/irq-gic-common.c +13 -0
@@ -21,6 +21,19 @@#include "irq-gic-common.h" +void gic_check_capabilities (u32 iidr,const struct gic_capabilities *cap, +void *data) +{ +for (; cap->desc; cap++) { +if (cap->cpu_cap && !cpus_have_cap (cap->cpu_cap)) +continue ; +if (cap->iidr != (cap->mask & iidr)) +continue ; + cap->init (data); +pr_info ("%s\n" , cap->desc); + } +} +int gic_configure_irq (unsigned int irq,unsigned int type,void __iomem *base,void (*sync_access)(void )) {
drivers/irqchip/irq-gic-common.h +10 -0
@@ -20,10 +20,20 @@#include <linux/of.h> #include <linux/irqdomain.h> +struct gic_capabilities { +const char *desc; +void (*init)(void *data); +u32 iidr; +u32 mask; +u16 cpu_cap; +}; +int gic_configure_irq (unsigned int irq,unsigned int type,void __iomem *base,void (*sync_access)(void ));void gic_dist_config (void __iomem *base,int gic_irqs,void (*sync_access)(void ));void gic_cpu_config (void __iomem *base,void (*sync_access)(void )); +void gic_check_capabilities (u32 iidr,const struct gic_capabilities *cap, +void *data);#endif /* _IRQ_GIC_COMMON_H */
drivers/irqchip/irq-gic-v3-its.c +15 -0
@@ -36,6 +36,7 @@#include <asm/cputype.h> #include <asm/exception.h> +#include "irq-gic-common.h" #include "irqchip.h" #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1 << 0)
@@ -1391,6 +1392,18 @@ static int its_force_quiescent(void __iomem *base) } } +static const struct gic_capabilities its_errata[] = { + { + } +}; + +static void its_check_capabilities (struct its_node *its) +{ +u32 iidr =readl_relaxed (its->base +GITS_IIDR ); + +gic_check_capabilities (iidr, its_errata, its); +} +static int its_probe (struct device_node *node,struct irq_domain *parent) {struct resource res;
@@ -1449,6 +1462,8 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) } its->cmd_write = its->cmd_base; +its_check_capabilities (its); + err =its_alloc_tables (its);if (err) goto out_free_cmd;
drivers/irqchip/irq-gic-v3.c +14 -0
@@ -766,6 +766,18 @@ static const struct irq_domain_ops gic_irq_domain_ops = { .free = gic_irq_domain_free, }; +static const struct gic_capabilities gicv3_errata[] = { + { + } +}; + +static void gicv3_check_capabilities (void ) +{ +u32 iidr =readl_relaxed (gic_data.dist_base +GICD_IIDR ); + +gic_check_capabilities (iidr, gicv3_errata,NULL ); +} +static int __init gic_of_init (struct device_node *node,struct device_node *parent) {void __iomem *dist_base;
@@ -825,6 +837,8 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare gic_data.nr_redist_regions = nr_redist_regions; gic_data.redist_stride = redist_stride; +gicv3_check_capabilities (); +/* * Find out how many interrupts are supported. * The GIC only supports up to 1020 interrupt sources (SGI+PPI+SPI)
Signature · 1 line
2.1.1
PATCH v3 3/6 irqchip, gicv3: Workaround for Cavium ThunderX erratum 23154
In reply to Robert RichterFrom: Robert Richter <[email protected]>
This patch implements Cavium ThunderX erratum 23154.
The gicv3 of ThunderX requires a modified version for reading the IAR status to ensure data synchronization. Since this is in the fast-path and called with each interrupt, runtime patching is used using jump label patching for smallest overhead (no-op). This is the same technique as used for tracepoints.
v3:
* fix erratum to be dependend from midr
* use arm64 errata framework
v2:
* implement code in a single asm() to keep instruction sequence
* added comment to the code that explains the erratum
* apply workaround also if running as guest, thus check MIDR
--- arch/arm64/Kconfig | 11 +++++++++ arch/arm64/include/asm/cpufeature.h | 3 ++- arch/arm64/include/asm/cputype.h | 18 ++++++++------ arch/arm64/kernel/cpu_errata.c | 9 +++++++ drivers/irqchip/irq-gic-v3.c | 49 ++++++++++++++++++++++++++++++++++++- 5 files changed, 81 insertions(+), 9 deletions(-)
arch/arm64/Kconfig +11 -0
@@ -417,6 +417,17 @@ config ARM64_ERRATUM_845719 If unsure, say Y. +config CAVIUM_ERRATUM_23154 + bool "Cavium erratum 23154: Access to ICC_IAR1_EL1 is not sync'ed" + depends on ARCH_THUNDER + default y + help + The gicv3 of ThunderX requires a modified version for + reading the IAR status to ensure data synchronization + (access to icc_iar1_el1 is not sync'ed before and after). + + If unsure, say Y. + endmenu
arch/arm64/include/asm/cpufeature.h +2 -1
@@ -25,8 +25,9 @@#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1#define ARM64_WORKAROUND_845719 2#define ARM64_HAS_SYSREG_GIC_CPUIF 3 +#define ARM64_WORKAROUND_CAVIUM_23154 4 -#define ARM64_NCAPS 4 +#define ARM64_NCAPS 5#ifndef __ASSEMBLY__
arch/arm64/include/asm/cputype.h +11 -7
@@ -62,15 +62,19 @@ (0xf << MIDR_ARCHITECTURE_SHIFT) | \ ((partnum) << MIDR_PARTNUM_SHIFT)) -#define ARM_CPU_IMP_ARM 0x41 -#define ARM_CPU_IMP_APM 0x50 +#define ARM_CPU_IMP_ARM 0x41 +#define ARM_CPU_IMP_APM 0x50 +#define ARM_CPU_IMP_CAVIUM 0x43 -#define ARM_CPU_PART_AEM_V8 0xD0F -#define ARM_CPU_PART_FOUNDATION 0xD00 -#define ARM_CPU_PART_CORTEX_A57 0xD07 -#define ARM_CPU_PART_CORTEX_A53 0xD03 +#define ARM_CPU_PART_AEM_V8 0xD0F +#define ARM_CPU_PART_FOUNDATION 0xD00 +#define ARM_CPU_PART_CORTEX_A57 0xD07 +#define ARM_CPU_PART_CORTEX_A53 0xD03 + +#define APM_CPU_PART_POTENZA 0x000 + +#define CAVIUM_CPU_PART_THUNDERX 0x0A1 -#define APM_CPU_PART_POTENZA 0x000#define ID_AA64MMFR0_BIGENDEL0_SHIFT 16#define ID_AA64MMFR0_BIGENDEL0_MASK (0xf << ID_AA64MMFR0_BIGENDEL0_SHIFT)
arch/arm64/kernel/cpu_errata.c +9 -0
@@ -23,6 +23,7 @@#define MIDR_CORTEX_A53 MIDR_CPU_PART(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)#define MIDR_CORTEX_A57 MIDR_CPU_PART(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57) +#define MIDR_THUNDERX MIDR_CPU_PART(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)#define CPU_MODEL_MASK (MIDR_IMPLEMENTOR_MASK | MIDR_PARTNUM_MASK | \ MIDR_ARCHITECTURE_MASK)
@@ -82,6 +83,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x04), },#endif +#ifdef CONFIG_CAVIUM_ERRATUM_23154 + { +/* Cavium ThunderX, pass 1.x */ + .desc = "Cavium erratum 23154", + .capability = ARM64_WORKAROUND_CAVIUM_23154, + MIDR_RANGE(MIDR_THUNDERX, 0x00, 0x01), + }, +#endif { } };
drivers/irqchip/irq-gic-v3.c +48 -1
69 lines not on this page · raw message
Signature · 1 line
2.1.1
Re: [PATCH v3 3/6] irqchip, gicv3: Workaround for Cavium ThunderX erratum 23154
Quoted 190 lines · Robert Richter
From: Robert Richter <[email protected]>
This patch implements Cavium ThunderX erratum 23154.
The gicv3 of ThunderX requires a modified version for reading the IAR status to ensure data synchronization. Since this is in the fast-path and called with each interrupt, runtime patching is used using jump label patching for smallest overhead (no-op). This is the same technique as used for tracepoints.
v3:
* fix erratum to be dependend from midr
* use arm64 errata frameworkv2:
* implement code in a singleasm()to keep instruction sequence
* added comment to the code that explains the erratum
* apply workaround also if running as guest, thus check MIDRSigned-off-by Robert Richter <[email protected]>--- arch/arm64/Kconfig | 11 +++++++++ arch/arm64/include/asm/cpufeature.h | 3 ++- arch/arm64/include/asm/cputype.h | 18 ++++++++------ arch/arm64/kernel/cpu_errata.c | 9 +++++++ drivers/irqchip/irq-gic-v3.c | 49 ++++++++++++++++++++++++++++++++++++- 5 files changed, 81 insertions(+), 9 deletions(-)arch/arm64/Kconfig +11
-0@@ -417,6 +417,17 @@ config ARM64_ERRATUM_845719 If unsure, say Y. +config CAVIUM_ERRATUM_23154 + bool "Cavium erratum 23154: Access to ICC_IAR1_EL1 is not sync'ed" + depends on ARCH_THUNDER + default y + help + The gicv3 of ThunderX requires a modified version for + reading the IAR status to ensure data synchronization + (access to icc_iar1_el1 is not sync'ed before and after). + + If unsure, say Y. + endmenuarch/arm64/include/asm/cpufeature.h +2
-1@@ -25,8 +25,9 @@#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1#define ARM64_WORKAROUND_845719 2#define ARM64_HAS_SYSREG_GIC_CPUIF 3 +#define ARM64_WORKAROUND_CAVIUM_23154 4 -#define ARM64_NCAPS 4 +#define ARM64_NCAPS 5#ifndef __ASSEMBLY__arch/arm64/include/asm/cputype.h +11
-7@@ -62,15 +62,19 @@ (0xf << MIDR_ARCHITECTURE_SHIFT) | \ ((partnum) << MIDR_PARTNUM_SHIFT)) -#define ARM_CPU_IMP_ARM 0x41 -#define ARM_CPU_IMP_APM 0x50 +#define ARM_CPU_IMP_ARM 0x41 +#define ARM_CPU_IMP_APM 0x50 +#define ARM_CPU_IMP_CAVIUM 0x43 -#define ARM_CPU_PART_AEM_V8 0xD0F -#define ARM_CPU_PART_FOUNDATION 0xD00 -#define ARM_CPU_PART_CORTEX_A57 0xD07 -#define ARM_CPU_PART_CORTEX_A53 0xD03 +#define ARM_CPU_PART_AEM_V8 0xD0F +#define ARM_CPU_PART_FOUNDATION 0xD00 +#define ARM_CPU_PART_CORTEX_A57 0xD07 +#define ARM_CPU_PART_CORTEX_A53 0xD03 + +#define APM_CPU_PART_POTENZA 0x000 + +#define CAVIUM_CPU_PART_THUNDERX 0x0A1 -#define APM_CPU_PART_POTENZA 0x000#define ID_AA64MMFR0_BIGENDEL0_SHIFT 16#define ID_AA64MMFR0_BIGENDEL0_MASK (0xf << ID_AA64MMFR0_BIGENDEL0_SHIFT)arch/arm64/kernel/cpu_errata.c +9
-0@@ -23,6 +23,7 @@#define MIDR_CORTEX_A53 MIDR_CPU_PART(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)#define MIDR_CORTEX_A57 MIDR_CPU_PART(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57) +#define MIDR_THUNDERX MIDR_CPU_PART(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)#define CPU_MODEL_MASK (MIDR_IMPLEMENTOR_MASK | MIDR_PARTNUM_MASK | \ MIDR_ARCHITECTURE_MASK)@@ -82,6 +83,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x04), },#endif +#ifdef CONFIG_CAVIUM_ERRATUM_23154 + { +/* Cavium ThunderX, pass 1.x */ + .desc = "Cavium erratum 23154", + .capability = ARM64_WORKAROUND_CAVIUM_23154, + MIDR_RANGE(MIDR_THUNDERX, 0x00, 0x01), + }, +#endif { } };drivers/irqchip/irq-gic-v3.c +41
-1@@ -107,7 +107,7 @@ static void gic_redist_wait_for_rwp(void) }/* Low level accessors */ -static u64 __maybe_unused gic_read_iar (void ) +static u64 gic_read_iar_common (void ) {u64 irqstat;@@ -115,6 +115,38 @@ static u64 __maybe_unused gic_read_iar(void)return irqstat; } +/* +* Cavium ThunderX erratum 23154 +* +* The gicv3 of ThunderX requires a modified version for reading the +* IAR status to ensure data synchronization (access to icc_iar1_el1 +* is not sync'ed before and after). +*/ +static u64 gic_read_iar_cavium_thunderx (void ) +{ +u64 irqstat; + + asmvolatile ( +"nop;nop;nop;nop\n\t" +"nop;nop;nop;nop\n\t" + "mrs_s %0, " __stringify(ICC_IAR1_EL1) "\n\t" + "nop;nop;nop;nop" + : "=r" (irqstat)); +mb (); + +return irqstat; +} + +struct static_key is_cavium_thunderx =STATIC_KEY_INIT_FALSE ; + +static u64 __maybe_unused gic_read_iar (void ) +{ +if (static_key_false (&is_cavium_thunderx)) +return gic_read_iar_common (); +else +return gic_read_iar_cavium_thunderx (); +} +static void __maybe_unused gic_write_pmr (u64 val) { asm volatile("msr_s " __stringify(ICC_PMR_EL1) ", %0" : : "r" (val));@@ -766,8 +798,23 @@ static const struct irq_domain_ops gic_irq_domain_ops = { .free = gic_irq_domain_free, }; +static void gicv3_enable_cavium_thunderx (void *data) +{ +static_key_slow_inc (&is_cavium_thunderx); +} +static const struct gic_capabilities gicv3_errata[] = { { +/* +* Need to be applied in guests too, thus use cpu +* detection as iidr is emulated with different vendor
drivers/irqchip/irq-gic-v3.c static const struct irq_domain_ops gic_irq_domain_ops = { · line 820
Quoted 10 lines
drivers/irqchip/irq-gic-v3.c +7
-0+* id. +*/ + .desc = "GIC: Cavium erratum 23154", + .cpu_cap = ARM64_WORKAROUND_CAVIUM_23154, + .init = gicv3_enable_cavium_thunderx, + }, + { } };
Robert,
I probably didn't express myself very well, because this not what I had in mind, sorry...
I think this is very much overdesigned for something that should be very simple. Why can't you have a simple:
if (cpu_have_feature(ARM64_WORKAROUND_CAVIUM_23154)) static_key_slow_inc(&is_cavium_thunderx);
No need for a cpu_cap field, no need to special-case feature 0, and it keeps the code fairly readable. You can even hide it in a gic_enable_cpu_quirks() function.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
PATCH v3 4/6 irqchip, gicv3-its: Read typer register outside the loop
In reply to Robert RichterFrom: Robert Richter <[email protected]>
No need to read the typer register in the loop. Values do not change.
This patch is basically a prerequisite for a follow-on patch that adds errata code for Cavium ThunderX. It moves the calculation of the number of id entries to the beginning of the function close to other setup values that are needed to allocate the its table. Now we have a central location to modify the setup parameters and the errata code can be implemented in a single block.
--- drivers/irqchip/irq-gic-v3-its.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +2 -3
@@ -804,6 +804,8 @@ static int its_alloc_tables(struct its_node *its)int psz =SZ_64K ;u64 shr = GITS_BASER_InnerShareable;u64 cache = GITS_BASER_WaWb; +u64 typer =readq_relaxed (its->base +GITS_TYPER ); +u32 ids =GITS_TYPER_DEVBITS (typer);for (i =0 ; i <GITS_BASER_NR_REGS ; i++) {u64 val =readq_relaxed (its->base +GITS_BASER + i *8 );
@@ -827,9 +829,6 @@ static int its_alloc_tables(struct its_node *its)* For other tables, only allocate a single page. */ if (type ==GITS_BASER_TYPE_DEVICE ) { -u64 typer =readq_relaxed (its->base +GITS_TYPER ); -u32 ids =GITS_TYPER_DEVBITS (typer); -/* * 'order' was initialized earlier to the default page * granule of the the ITS. We can't have an allocation
Signature · 1 line
2.1.1
PATCH v3 5/6 irqchip, gicv3-its: Workaround for Cavium ThunderX errata 22375, 24313
In reply to Robert RichterFrom: Robert Richter <[email protected]>
This implements two gicv3-its errata workarounds for ThunderX. Both with small impact affecting only ITS table allocation.
erratum 22375: only alloc 8MB table size
erratum 24313: ignore memory access type
The fixes are in ITS initialization and basically ignore memory access type and table size provided by the TYPER and BASER registers.
v3:
* fix erratum to be dependend from iidr
--- drivers/irqchip/irq-gic-v3-its.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +31 -4
@@ -39,7 +39,8 @@#include "irq-gic-common.h" #include "irqchip.h" -#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1 << 0) +#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) +#define ITS_FLAGS_CAVIUM_THUNDERX (1ULL << 1)#define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0)
@@ -803,9 +804,22 @@ static int its_alloc_tables(struct its_node *its)int i;int psz =SZ_64K ;u64 shr = GITS_BASER_InnerShareable; -u64 cache = GITS_BASER_WaWb; -u64 typer =readq_relaxed (its->base +GITS_TYPER ); -u32 ids =GITS_TYPER_DEVBITS (typer); +u64 cache; +u64 typer; +u32 ids; + +if (its->flags &ITS_FLAGS_CAVIUM_THUNDERX ) { +/* +* erratum 22375: only alloc 8MB table size +* erratum 24313: ignore memory access type +*/ + cache =0 ; + ids =0x13 ;/* 20 bits, 8MB */ + }else { + cache = GITS_BASER_WaWb; + typer =readq_relaxed (its->base +GITS_TYPER ); + ids =GITS_TYPER_DEVBITS (typer); + }for (i =0 ; i <GITS_BASER_NR_REGS ; i++) {u64 val =readq_relaxed (its->base +GITS_BASER + i *8 );
@@ -1391,8 +1405,21 @@ static int its_force_quiescent(void __iomem *base) } } +static void its_enable_cavium_thunderx (void *data) +{ +struct its_node *its = data; + + its->flags |=ITS_FLAGS_CAVIUM_THUNDERX ; +} +static const struct gic_capabilities its_errata[] = { { + .desc ="ITS: Cavium errata 22375, 24313" , + .iidr =0xa100034c ,/* ThunderX pass 1.x */ + .mask =0xffff0fff , + .init = its_enable_cavium_thunderx, + }, + { } };
Signature · 1 line
2.1.1
PATCH v3 6/6 arm64: errata: Match all cpus if capability value is zero
In reply to Robert RichterFrom: Robert Richter <[email protected]>
This patch make caps usable optionally. If its value is zero, then all cpus are matched. E.g. if caps resides in a stuct for marking it dependend on a certain cpu feature/errata, then an empty value will indicate not to use caps detection. An empty value will match all cpus and thus just skip the cpu feature test.
--- arch/arm64/include/asm/cpufeature.h | 17 +++++++++++------ drivers/irqchip/irq-gic-common.c | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-)
arch/arm64/include/asm/cpufeature.h +11 -6
@@ -21,13 +21,15 @@#define MAX_CPU_FEATURES (8 * sizeof(elf_hwcap))#define cpu_feature (x) ilog2(HWCAP_ ## x) -#define ARM64_WORKAROUND_CLEAN_CACHE 0 -#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1 -#define ARM64_WORKAROUND_845719 2 -#define ARM64_HAS_SYSREG_GIC_CPUIF 3 -#define ARM64_WORKAROUND_CAVIUM_23154 4 +/* reserve zero to match all cpus for use of caps in empty structs */ +#define ARM64_ALL_CPUS 0 +#define ARM64_WORKAROUND_CLEAN_CACHE 1 +#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 2 +#define ARM64_WORKAROUND_845719 3 +#define ARM64_HAS_SYSREG_GIC_CPUIF 4 +#define ARM64_WORKAROUND_CAVIUM_23154 5 -#define ARM64_NCAPS 5 +#define ARM64_NCAPS 6#ifndef __ASSEMBLY__
@@ -57,6 +59,9 @@ static inline bool cpu_have_feature(unsigned int num)static inline bool cpus_have_cap (unsigned int num) { +/* zero matches for all cpus */ +if (!num) +return true;if (num >=ARM64_NCAPS )return false;return test_bit (num, cpu_hwcaps);
drivers/irqchip/irq-gic-common.c +1 -1
@@ -25,7 +25,7 @@ void gic_check_capabilities(u32 iidr, const struct gic_capabilities *cap, void *data) {for (; cap->desc; cap++) { -if (cap->cpu_cap && !cpus_have_cap (cap->cpu_cap)) +if (!cpus_have_cap (cap->cpu_cap))continue ;if (cap->iidr != (cap->mask & iidr))continue ;
Signature · 1 line
2.1.1