Support Andes PMU extension
Subsystems (9)
v3 cover Support Andes PMU extension
Hi All,
This patch series introduces the Andes PMU extension, which serves the same purpose as Sscofpmf. In this version we use FDT-based probing and the CONFIG_ANDES_CUSTOM_PMU to enable perf sampling and filtering support.
Its non-standard local interrupt is assigned to bit 18 in the custom S-mode local interrupt enable/pending registers (slie/slip), while the interrupt cause is (256 + 18).
The feature needs the PMU device registered in OpenSBI. The OpenSBI and Linux patches can be found on Andes Technology GitHub
- https://github.com/andestech/opensbi/commits/andes-pmu-support-v2
- https://github.com/andestech/linux/commits/andes-pmu-support-v3
The PMU device tree node used on AX45MP:
- https://github.com/andestech/opensbi/blob/andes-pmu-support-v2/docs/pmu_support.md#example-3
Tested hardware:
- ASUS Tinker-V (RZ/Five, AX45MP single core)
- Andes AE350 (AX45MP quad core)
Locus Wei-Han Chen (1):
riscv: andes: Support symbolic FW and HW raw events
Yu Chien Peter Lin (12):
riscv: errata: Rename defines for Andes irqchip/riscv-intc: Allow large non-standard hwirq number irqchip/riscv-intc: Introduce Andes IRQ chip
dt-bindings: riscv: Add Andes interrupt controller compatible string
riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes
INTC
perf: RISC-V: Eliminate redundant IRQ enable/disable operations
RISC-V: Move T-Head PMU to CPU feature alternative framework
perf: RISC-V: Introduce Andes PMU for perf event sampling
dt-bindings: riscv: Add T-Head PMU extension description
dt-bindings: riscv: Add Andes PMU extension description
riscv: dts: allwinner: Add T-Head PMU extension
riscv: dts: renesas: Add Andes PMU extension
.../devicetree/bindings/riscv/cpus.yaml | 7 +- .../devicetree/bindings/riscv/extensions.yaml | 13 ++ arch/riscv/Kconfig.errata | 13 -- arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 +- arch/riscv/errata/andes/errata.c | 10 +- arch/riscv/errata/thead/errata.c | 19 --- arch/riscv/include/asm/errata_list.h | 19 +-- arch/riscv/include/asm/hwcap.h | 2 + arch/riscv/include/asm/vendorid_list.h | 2 +- arch/riscv/kernel/alternative.c | 2 +- arch/riscv/kernel/cpufeature.c | 2 + drivers/irqchip/irq-riscv-intc.c | 63 +++++++-- drivers/perf/Kconfig | 27 ++++ drivers/perf/riscv_pmu_sbi.c | 51 +++++-- include/linux/irqchip/irq-riscv-intc.h | 12 ++ .../arch/riscv/andes/ax45/firmware.json | 68 ++++++++++ .../arch/riscv/andes/ax45/instructions.json | 127 ++++++++++++++++++ .../arch/riscv/andes/ax45/memory.json | 57 ++++++++ .../arch/riscv/andes/ax45/microarch.json | 77 +++++++++++ tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + 21 files changed, 499 insertions(+), 79 deletions(-) create mode 100644 include/linux/irqchip/irq-riscv-intc.h create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json
Signature · 1 line
2.34.1
PATCH RESEND v3 1/13 riscv: errata: Rename defines for Andes
Using "ANDES" rather than "ANDESTECH" to unify the naming convention with directory, file names, Kconfig options and other definitions.
---
Changes v1 -> v2:
- No change
Changes v2 -> v3:
- Rewrote commit message (suggested by Conor)
--- arch/riscv/errata/andes/errata.c | 10 +++++----- arch/riscv/include/asm/errata_list.h | 4 ++-- arch/riscv/include/asm/vendorid_list.h | 2 +- arch/riscv/kernel/alternative.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
arch/riscv/errata/andes/errata.c +5 -5
@@ -18,9 +18,9 @@#include <asm/sbi.h> #include <asm/vendorid_list.h> -#define ANDESTECH_AX45MP_MARCHID 0x8000000000008a45UL -#define ANDESTECH_AX45MP_MIMPID 0x500UL -#define ANDESTECH_SBI_EXT_ANDES 0x0900031E +#define ANDES_AX45MP_MARCHID 0x8000000000008a45UL +#define ANDES_AX45MP_MIMPID 0x500UL +#define ANDES_SBI_EXT_ANDES 0x0900031E#define ANDES_SBI_EXT_IOCP_SW_WORKAROUND 1
@@ -32,7 +32,7 @@ static long ax45mp_iocp_sw_workaround(void)* ANDES_SBI_EXT_IOCP_SW_WORKAROUND SBI EXT checks if the IOCP is missing and * cache is controllable only then CMO will be applied to the platform. */ - ret =sbi_ecall (ANDESTECH_SBI_EXT_ANDES ,ANDES_SBI_EXT_IOCP_SW_WORKAROUND , + ret =sbi_ecall (ANDES_SBI_EXT_ANDES ,ANDES_SBI_EXT_IOCP_SW_WORKAROUND ,0 ,0 ,0 ,0 ,0 ,0 );return ret.error ?0 : ret.value;
@@ -43,7 +43,7 @@ static bool errata_probe_iocp(unsigned int stage, unsigned long arch_id, unsigneif (!IS_ENABLED (CONFIG_ERRATA_ANDES_CMO ))return false; -if (arch_id !=ANDESTECH_AX45MP_MARCHID || impid !=ANDESTECH_AX45MP_MIMPID ) +if (arch_id !=ANDES_AX45MP_MARCHID || impid !=ANDES_AX45MP_MIMPID )return false;if (!ax45mp_iocp_sw_workaround ())
arch/riscv/include/asm/errata_list.h +2 -2
@@ -12,8 +12,8 @@#include <asm/vendorid_list.h> #ifdef CONFIG_ERRATA_ANDES -#define ERRATA_ANDESTECH_NO_IOCP 0 -#define ERRATA_ANDESTECH_NUMBER 1 +#define ERRATA_ANDES_NO_IOCP 0 +#define ERRATA_ANDES_NUMBER 1#endif #ifdef CONFIG_ERRATA_SIFIVE
arch/riscv/include/asm/vendorid_list.h +1 -1
@@ -5,7 +5,7 @@#ifndef ASM_VENDOR_LIST_H #define ASM_VENDOR_LIST_H -#define ANDESTECH_VENDOR_ID 0x31e +#define ANDES_VENDOR_ID 0x31e#define SIFIVE_VENDOR_ID 0x489#define THEAD_VENDOR_ID 0x5b7
arch/riscv/kernel/alternative.c +1 -1
@@ -43,7 +43,7 @@ static void riscv_fill_cpu_mfr_info(struct cpu_manufacturer_info_t *cpu_mfr_infoswitch (cpu_mfr_info->vendor_id) {#ifdef CONFIG_ERRATA_ANDES -case ANDESTECH_VENDOR_ID : +case ANDES_VENDOR_ID : cpu_mfr_info->patch_func = andes_errata_patch_func;break ;#endif
Signature · 1 line
2.34.1
Re: [PATCH v3 RESEND 01/13] riscv: errata: Rename defines for Andes
Quoted 7 lines · Yu Chien Peter Lin
Using "ANDES" rather than "ANDESTECH" to unify the naming convention with directory, file names,
Kconfigoptions and other definitions.Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Charles Ci-Jyun Wu <[email protected]>Reviewed-by Leo Yu-Chi Liang <[email protected]>
Cheers,
Conor.
RFC PATCH v3 2/13 irqchip/riscv-intc: Allow large non-standard hwirq number
In reply to Yu Chien Peter LinCurrently, the implementation of the RISC-V INTC driver uses the interrupt cause as hwirq and has a limitation of supporting a maximum of 64 hwirqs. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
This limitation prevents us from fully utilizing the available local interrupt sources. Additionally, the hwirqs used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU irq) being currently used for supervisor mode.
The patch switches to using irq_domain_create_tree() which creates the radix tree map, allowing us to handle a larger number of hwirqs.
---
Changes v1 -> v2:
- Fixed irq mapping failure checking (suggested by Clément and Anup)
Changes v2 -> v3:
- No change
--- drivers/irqchip/irq-riscv-intc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/irqchip/irq-riscv-intc.c +4 -8
@@ -24,10 +24,8 @@ static asmlinkage void riscv_intc_irq(struct pt_regs *regs) {unsigned long cause = regs->cause & ~CAUSE_IRQ_FLAG ; -if (unlikely (cause >=BITS_PER_LONG )) -panic ("unexpected interrupt cause" ); - -generic_handle_domain_irq (intc_domain, cause); +if (generic_handle_domain_irq (intc_domain, cause)) +pr_warn ("Failed to handle interrupt (cause: %ld)\n" , cause); }/*
@@ -117,8 +115,8 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn) {int rc; - intc_domain =irq_domain_create_linear (fn,BITS_PER_LONG , - &riscv_intc_domain_ops,NULL ); + intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops, +NULL );if (!intc_domain) {pr_err ("unable to add IRQ domain\n" );return -ENXIO ;
@@ -132,8 +130,6 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn)riscv_set_intc_hwnode_fn (riscv_intc_hwnode); -pr_info ("%d local interrupts mapped\n" ,BITS_PER_LONG ); -return 0 ; }
Signature · 1 line
2.34.1
Re: [RFC PATCH v3 RESEND 02/13] irqchip/riscv-intc: Allow large non-standard hwirq number
Quoted 11 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as hwirq and has a limitation of supporting a maximum of 64 hwirqs. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
This limitation prevents us from fully utilizing the available local interrupt sources. Additionally, the hwirqs used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU irq) being currently used for supervisor mode.
The patch switches to using
irq_domain_create_tree()which
git grep "This patch" Documentation/process/
Quoted 2 lines
creates the radix tree map, allowing us to handle a larger number of hwirqs.
Who is 'us'? We are not part of the chip and please write out 'hardware interrupts'
drivers/irqchip/irq-riscv-intc.c static asmlinkage void riscv_intc_irq(struct pt_regs *regs) · line 28
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +2
-4@@ -24,10 +24,8 @@ static asmlinkage void riscv_intc_irq(struct pt_regs *regs) {unsigned long cause = regs->cause & ~CAUSE_IRQ_FLAG ; -if (unlikely (cause >=BITS_PER_LONG )) -panic ("unexpected interrupt cause" ); - -generic_handle_domain_irq (intc_domain, cause); +if (generic_handle_domain_irq (intc_domain, cause)) +pr_warn ("Failed to handle interrupt (cause: %ld)\n" , cause);
pr_warn_once() or at least pr_warn_ratelimited().
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 119
Quoted 11 lines
drivers/irqchip/irq-riscv-intc.c +2
-2}/* @@ -117,8 +115,8 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn) {int rc; - intc_domain =irq_domain_create_linear (fn,BITS_PER_LONG , - &riscv_intc_domain_ops,NULL ); + intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops, +NULL );
Put it into one line. Linebreaking arguments is really only required when the line length is exceedingly long. This one is not.
Re: [RFC PATCH v3 RESEND 02/13] irqchip/riscv-intc: Allow large non-standard hwirq number
Hi Thomas,
Thanks for the review.
Quoted 6 lines · Thomas Gleixner
Quoted 5 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as hwirq and has a limitation of supporting a maximum of 64 hwirqs. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
Quoted 8 lines
Quoted 6 lines
This limitation prevents us from fully utilizing the available local interrupt sources. Additionally, the hwirqs used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU irq) being currently used for supervisor mode.
The patch switches to using
irq_domain_create_tree()whichgit grep "This patch"
Documentation/process/
Sure, will fix.
Quoted 5 lines
Quoted 2 lines
creates the radix tree map, allowing us to handle a larger number of hwirqs.
Who is 'us'? We are not part of the chip and please write out 'hardware interrupts'
OK!
Quoted 4 lines
Quoted 4 lines
drivers/irqchip/irq-riscv-intc.c +0
-0@@ -24,10 +24,8 @@ static asmlinkage void riscv_intc_irq(struct pt_regs *regs) {unsigned long cause = regs->cause & ~CAUSE_IRQ_FLAG ;
Quoted 8 lines
drivers/irqchip/irq-riscv-intc.c static asmlinkage void riscv_intc_irq(struct pt_regs *regs) · line 28
Quoted 6 lines
drivers/irqchip/irq-riscv-intc.c +2
-4-if (unlikely (cause >=BITS_PER_LONG )) -panic ("unexpected interrupt cause" ); - -generic_handle_domain_irq (intc_domain, cause); +if (generic_handle_domain_irq (intc_domain, cause)) +pr_warn ("Failed to handle interrupt (cause: %ld)\n" , cause);
pr_warn_once()or at leastpr_warn_ratelimited().
OK!
Quoted 7 lines
Quoted 7 lines
(quoted diff) +0
-0} /*@@ -117,8 +115,8 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn) { int rc;
Quoted 7 lines
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 119
Quoted 4 lines
drivers/irqchip/irq-riscv-intc.c +2
-2- intc_domain =irq_domain_create_linear (fn,BITS_PER_LONG , - &riscv_intc_domain_ops,NULL ); + intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops, +NULL );Put it into one line. Linebreaking arguments is really only required when the line length is exceedingly long. This one is not.
OK! will fix.
Thanks,
Peter Lin
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
RFC PATCH v3 3/13 irqchip/riscv-intc: Introduce Andes IRQ chip
In reply to Yu Chien Peter LinThis commit adds support for the Andes IRQ chip, which provides IRQ mask/unmask functions to access the custom CSR (SLIE) where the non-standard S-mode local interrupt enable bits are located.
The Andes INTC requires the "andestech,cpu-intc" compatible string to be present in interrupt-controller of cpu node. e.g.,
cpu0: cpu@0 {
compatible = "andestech,ax45mp", "riscv";
...
cpu0-intc: interrupt-controller {
#interrupt-cells = <0x01>;
compatible = "andestech,cpu-intc", "riscv,cpu-intc";
interrupt-controller;
};
};---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Return -ENXIO if no valid compatible INTC found
- Allow falling back to generic RISC-V INTC
--- drivers/irqchip/irq-riscv-intc.c | 51 +++++++++++++++++++++++++- include/linux/irqchip/irq-riscv-intc.h | 12 ++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 include/linux/irqchip/irq-riscv-intc.h
drivers/irqchip/irq-riscv-intc.c +49 -2
@@ -13,6 +13,7 @@#include <linux/irq.h> #include <linux/irqchip.h> #include <linux/irqdomain.h> +#include <linux/irqchip/irq-riscv-intc.h> #include <linux/interrupt.h> #include <linux/module.h> #include <linux/of.h>
@@ -45,6 +46,26 @@ static void riscv_intc_irq_unmask(struct irq_data *d)csr_set (CSR_IE ,BIT (d->hwirq)); } +static void andes_intc_irq_mask (struct irq_data *d) +{ +unsigned int mask =BIT (d->hwirq %BITS_PER_LONG ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE ) +csr_clear (CSR_IE , mask); +else +csr_clear (ANDES_CSR_SLIE , mask); +} + +static void andes_intc_irq_unmask (struct irq_data *d) +{ +unsigned int mask =BIT (d->hwirq %BITS_PER_LONG ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE ) +csr_set (CSR_IE , mask); +else +csr_set (ANDES_CSR_SLIE , mask); +} +static void riscv_intc_irq_eoi (struct irq_data *d) {/*
@@ -68,12 +89,37 @@ static struct irq_chip riscv_intc_chip = { .irq_eoi = riscv_intc_irq_eoi, }; +static struct irq_chip andes_intc_chip = { + .name ="RISC-V INTC" , + .irq_mask = andes_intc_irq_mask, + .irq_unmask = andes_intc_irq_unmask, + .irq_eoi = riscv_intc_irq_eoi, +}; +static int riscv_intc_domain_map (struct irq_domain *d,unsigned int irq,irq_hw_number_t hwirq) { +struct fwnode_handle *fn =riscv_get_intc_hwnode (); +struct irq_chip *chip; +const char *cp; +int rc; +irq_set_percpu_devid (irq); -irq_domain_set_info (d, irq, hwirq, &riscv_intc_chip, d->host_data, - handle_percpu_devid_irq,NULL ,NULL ); + + rc =fwnode_property_read_string (fn,"compatible" , &cp); +if (rc) +return rc; + +if (strcmp (cp,"riscv,cpu-intc" ) ==0 ) + chip = &riscv_intc_chip; +else if (strcmp (cp,"andestech,cpu-intc" ) ==0 ) + chip = &andes_intc_chip; +else +return -ENXIO ; + +irq_domain_set_info (d, irq, hwirq, chip, + d->host_data, handle_percpu_devid_irq,NULL , +NULL );return 0 ; }
@@ -166,6 +212,7 @@ static int __init riscv_intc_init(struct device_node *node, }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init); +IRQCHIP_DECLARE (andes,"andestech,cpu-intc" , riscv_intc_init);#ifdef CONFIG_ACPI
include/linux/irqchip/irq-riscv-intc.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2023 Andes Technology Corporation +*/ +#ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_RISCV_INTC_H +#define __INCLUDE_LINUX_IRQCHIP_IRQ_RISCV_INTC_H + +#define ANDES_SLI_CAUSE_BASE 256 +#define ANDES_CSR_SLIE 0x9c4 +#define ANDES_CSR_SLIP 0x9c5 + +#endif /* __INCLUDE_LINUX_IRQCHIP_IRQ_RISCV_INTC_H */
Signature · 1 line
2.34.1
Re: [RFC PATCH v3 RESEND 03/13] irqchip/riscv-intc: Introduce Andes IRQ chip
drivers/irqchip/irq-riscv-intc.c static struct irq_chip riscv_intc_chip = { · line 118
Quoted 7 lines · Yu Chien Peter Lin
drivers/irqchip/irq-riscv-intc.c +7
-0+ +if (strcmp (cp,"riscv,cpu-intc" ) ==0 ) + chip = &riscv_intc_chip; +else if (strcmp (cp,"andestech,cpu-intc" ) ==0 ) + chip = &andes_intc_chip; +else +return -ENXIO ;
See the other reply.
PATCH RESEND v3 4/13 dt-bindings: riscv: Add Andes interrupt controller compatible string
In reply to Yu Chien Peter LinAdd "andestech,cpu-intc" compatible string which indicates that Andes specific local interrupt is supported on the core, e.g. AX45MP cores have 3 types of non-standard local interrupt can be handled in supervisor mode:
- Slave port ECC error interrupt
- Bus write transaction error interrupt
- Performance monitor overflow interrupt
These interrupts are enabled/disabled via a custom register SLIE instead of the standard interrupt enable register SIE.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Updated commit message
- Fixed possible compatibles for Andes INTC
--- Documentation/devicetree/bindings/riscv/cpus.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/riscv/cpus.yaml +6 -1
@@ -99,7 +99,12 @@ properties: const: 1 compatible: - const: riscv,cpu-intc + oneOf: + - items: + - enum: + - andestech,cpu-intc + - const: riscv,cpu-intc + - const: riscv,cpu-intc interrupt-controller: true
Signature · 1 line
2.34.1
Re: [PATCH v3 RESEND 04/13] dt-bindings: riscv: Add Andes interrupt controller compatible string
Quoted 28 lines · Yu Chien Peter Lin
Add "andestech,cpu-intc" compatible string which indicates that Andes specific local interrupt is supported on the core, e.g. AX45MP cores have 3 types of non-standard local interrupt can be handled in supervisor mode:
- Slave port ECC error interrupt
- Bus write transaction error interrupt
- Performance monitor overflow interruptThese interrupts are enabled/disabled via a custom register SLIE instead of the standard interrupt enable register SIE.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Updated commit message
- Fixed possible compatibles for Andes INTC--- Documentation/devicetree/bindings/riscv/cpus.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/riscv/cpus.yaml +0
-0
Documentation/devicetree/bindings/riscv/cpus.yaml properties: · line 105
Quoted 8 lines
Documentation/devicetree/bindings/riscv/cpus.yaml +4
-1@@ -99,7 +99,12 @@ properties: const: 1 compatible: - const: riscv,cpu-intc + oneOf: + - items: + - enum: + - andestech,cpu-intc
Why is this an enum rather than const? What other entries are we going to add here in the near future?
Documentation/devicetree/bindings/riscv/cpus.yaml properties: · line 106
Quoted 1 line
Documentation/devicetree/bindings/riscv/cpus.yaml +1
-0+ - const: riscv,cpu-intc
My follow-up question, if my original question on the v2 series had been answered was going to be about how generic the "andestech,cpu-intc" compatible is.
Having a cpu-specific compatible in addition to "andestech,cpu-intc" one makes sense to me, so that we can differentiate between implementations/integrations of this intc, especially if Andes have no plans to move to the standard implementation.
Cheers,
Conor.
Quoted 7 lines
Documentation/devicetree/bindings/riscv/cpus.yaml +1
-0+ - const: riscv,cpu-intc interrupt-controller: trueSignature · 1 line
2.34.1
Re: [PATCH v3 RESEND 04/13] dt-bindings: riscv: Add Andes interrupt controller compatible string
Hi Conor,
Quoted 31 lines · Conor Dooley
Quoted 30 lines · Yu Chien Peter Lin
Add "andestech,cpu-intc" compatible string which indicates that Andes specific local interrupt is supported on the core, e.g. AX45MP cores have 3 types of non-standard local interrupt can be handled in supervisor mode:
- Slave port ECC error interrupt
- Bus write transaction error interrupt
- Performance monitor overflow interruptThese interrupts are enabled/disabled via a custom register SLIE instead of the standard interrupt enable register SIE.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Updated commit message
- Fixed possible compatibles for Andes INTC--- Documentation/devicetree/bindings/riscv/cpus.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/riscv/cpus.yaml +0
-0@@ -99,7 +99,12 @@ properties: const: 1
Quoted 9 lines
Documentation/devicetree/bindings/riscv/cpus.yaml properties: · line 105
Quoted 6 lines
Documentation/devicetree/bindings/riscv/cpus.yaml +4
-1compatible: - const: riscv,cpu-intc + oneOf: + - items: + - enum: + - andestech,cpu-intcWhy is this an enum rather than const? What other entries are we going to add here in the near future?
I have no plan to add other entries here, will update in the next version of patch. Thanks for the review.
Quoted 5 lines
Documentation/devicetree/bindings/riscv/cpus.yaml properties: · line 106
Quoted 1 line
Documentation/devicetree/bindings/riscv/cpus.yaml +1
-0+ - const: riscv,cpu-intcMy follow-up question, if my original question on the v2 series had been answered was going to be about how generic the "andestech,cpu-intc" compatible is.
This can be applied to any Linux-capable CPUs from Andes.
Best regards,
Peter Lin
Quoted 15 lines
Having a cpu-specific compatible in addition to "andestech,cpu-intc" one makes sense to me, so that we can differentiate between implementations/integrations of this intc, especially if Andes have no plans to move to the standard implementation.
Cheers,
Conor.Quoted 7 lines
Documentation/devicetree/bindings/riscv/cpus.yaml +1
-0+ - const: riscv,cpu-intc interrupt-controller: trueSignature · 1 line
2.34.1
PATCH RESEND v3 5/13 riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes INTC
In reply to Yu Chien Peter LinThe Andes INTC allows AX45MP cores to handle custom local interrupts, such as the performance monitor overflow interrupt.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Fixed possible compatibles for Andes INTC
--- arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/renesas/r9a07g043f.dtsi +1 -1
@@ -37,7 +37,7 @@ cpu0: cpu@0 { cpu0_intc: interrupt-controller { #interrupt-cells = <1>; - compatible = "riscv,cpu-intc"; + compatible = "andestech,cpu-intc", "riscv,cpu-intc"; interrupt-controller; }; };
Signature · 1 line
2.34.1
PATCH RESEND v3 6/13 perf: RISC-V: Eliminate redundant IRQ enable/disable operations
In reply to Yu Chien Peter LinThe IRQ enable/disable operations are already performed by the IRQ chip functions riscv_intc_irq_unmask()/riscv_intc_irq_mask() during enable_percpu_irq()/disable_percpu_irq(). We can just do it once.
---
This patch allows us to drop unnecessary ALT_SBI_PMU_OVF_{DISABLE,ENABLE} in the last PATCH3 [1].
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- No change
--- drivers/perf/riscv_pmu_sbi.c | 2 -- 1 file changed, 2 deletions(-)
drivers/perf/riscv_pmu_sbi.c +0 -2
@@ -778,7 +778,6 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)if (riscv_pmu_use_irq) { cpu_hw_evt->irq = riscv_pmu_irq;csr_clear (CSR_IP ,BIT (riscv_pmu_irq_num)); -csr_set (CSR_IE ,BIT (riscv_pmu_irq_num));enable_percpu_irq (riscv_pmu_irq,IRQ_TYPE_NONE ); }
@@ -789,7 +788,6 @@ static int pmu_sbi_dying_cpu(unsigned int cpu, struct hlist_node *node) {if (riscv_pmu_use_irq) {disable_percpu_irq (riscv_pmu_irq); -csr_clear (CSR_IE ,BIT (riscv_pmu_irq_num)); }/* Disable all counters access for user mode now */
Signature · 1 line
2.34.1
RFC PATCH v3 7/13 RISC-V: Move T-Head PMU to CPU feature alternative framework
In reply to Yu Chien Peter LinThe custom PMU extension aims to support perf event sampling prior to the ratification of Sscofpmf. Instead of utilizing the bits and CSRs reserved for future standard, a set of custom CSRs is added. Hence, we may consider it as a CPU feature rather than an erratum.
T-Head cores need to append "xtheadpmu" to the riscv,isa-extensions for each cpu node in device tree, and enable CONFIG_THEAD_CUSTOM_PMU for proper functioning as of this commit.
---
Hi All,
This is in preparation for introducing other PMU alternative. We follow Conor's suggestion [1] to use cpu feature alternative framework rather than errata, if you want to stick with errata alternative or have other issues, please let me know. Thanks.
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25503860
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Removed m{vendor/arch/imp}id checks in pmu_sbi_setup_irqs()
--- arch/riscv/Kconfig.errata | 13 ------------- arch/riscv/errata/thead/errata.c | 19 ------------------- arch/riscv/include/asm/errata_list.h | 15 +-------------- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + drivers/perf/Kconfig | 13 +++++++++++++ drivers/perf/riscv_pmu_sbi.c | 19 ++++++++++++++----- 7 files changed, 30 insertions(+), 51 deletions(-)
arch/riscv/Kconfig.errata +0 -13
@@ -85,17 +85,4 @@ config ERRATA_THEAD_CMO If you don't know what to do here, say "Y". -config ERRATA_THEAD_PMU - bool "Apply T-Head PMU errata" - depends on ERRATA_THEAD && RISCV_PMU_SBI - default y - help - The T-Head C9xx cores implement a PMU overflow extension very - similar to the core SSCOFPMF extension. - - This will apply the overflow errata to handle the non-standard - behaviour via the regular SBI PMU driver and interface. - - If you don't know what to do here, say "Y". - endmenu # "CPU errata selection"
arch/riscv/errata/thead/errata.c +0 -19
@@ -53,22 +53,6 @@ static bool errata_probe_cmo(unsigned int stage,return true; } -static bool errata_probe_pmu (unsigned int stage, -unsigned long arch_id,unsigned long impid) -{ -if (!IS_ENABLED (CONFIG_ERRATA_THEAD_PMU )) -return false; - -/* target-c9xx cores report arch_id and impid as 0 */ -if (arch_id !=0 || impid !=0 ) -return false; - -if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -return false; - -return true; -} -static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {
@@ -80,9 +64,6 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |=BIT (ERRATA_THEAD_CMO ); -if (errata_probe_pmu (stage, archid, impid)) - cpu_req_errata |=BIT (ERRATA_THEAD_PMU ); -return cpu_req_errata; }
arch/riscv/include/asm/errata_list.h +1 -14
@@ -25,8 +25,7 @@#ifdef CONFIG_ERRATA_THEAD #define ERRATA_THEAD_PBMT 0#define ERRATA_THEAD_CMO 1 -#define ERRATA_THEAD_PMU 2 -#define ERRATA_THEAD_NUMBER 3 +#define ERRATA_THEAD_NUMBER 2#endif #ifdef __ASSEMBLY__
@@ -147,18 +146,6 @@ asm volatile(ALTERNATIVE_2( \ "r"((unsigned long)(_start) + (_size)) \ : "a0") -#define THEAD_C9XX_RV_IRQ_PMU 17 -#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5 - -#define ALT_SBI_PMU_OVERFLOW (__ovl) \ -asm volatile(ALTERNATIVE( \ - "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ - "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ - THEAD_VENDOR_ID, ERRATA_THEAD_PMU, \ - CONFIG_ERRATA_THEAD_PMU) \ - : "=r" (__ovl) : \ - : "memory") -#endif /* __ASSEMBLY__ */ #endif
arch/riscv/include/asm/hwcap.h +1 -0
@@ -58,6 +58,7 @@#define RISCV_ISA_EXT_ZICSR 40#define RISCV_ISA_EXT_ZIFENCEI 41#define RISCV_ISA_EXT_ZIHPM 42 +#define RISCV_ISA_EXT_XTHEADPMU 43#define RISCV_ISA_EXT_MAX 64
arch/riscv/kernel/cpufeature.c +1 -0
@@ -181,6 +181,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (svinval,RISCV_ISA_EXT_SVINVAL ),__RISCV_ISA_EXT_DATA (svnapot,RISCV_ISA_EXT_SVNAPOT ),__RISCV_ISA_EXT_DATA (svpbmt,RISCV_ISA_EXT_SVPBMT ), + __RISCV_ISA_EXT_DATA(xtheadpmu, RISCV_ISA_EXT_XTHEADPMU), };const size_t riscv_isa_ext_count =ARRAY_SIZE (riscv_isa_ext);
drivers/perf/Kconfig +13 -0
@@ -86,6 +86,19 @@ config RISCV_PMU_SBI full perf feature support i.e. counter overflow, privilege mode filtering, counter configuration. +config THEAD_CUSTOM_PMU + bool "T-Head custom PMU support" + depends on RISCV_ALTERNATIVE && RISCV_PMU_SBI + default y + help + The T-Head C9xx cores implement a PMU overflow extension very + similar to the core SSCOFPMF extension. + + This will patch the overflow CSR and handle the non-standard + behaviour via the regular SBI PMU driver and interface. + + If you don't know what to do here, say "Y". + config ARM_PMU_ACPI depends on ARM_PMU && ACPI def_bool y
drivers/perf/riscv_pmu_sbi.c +14 -5
@@ -20,10 +20,21 @@#include <linux/cpu_pm.h> #include <linux/sched/clock.h> -#include <asm/errata_list.h> #include <asm/sbi.h> #include <asm/hwcap.h> +#define THEAD_C9XX_RV_IRQ_PMU 17 +#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5 + +#define ALT_SBI_PMU_OVERFLOW (__ovl) \ +asm volatile(ALTERNATIVE( \ + "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ + "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ + 0, RISCV_ISA_EXT_XTHEADPMU, \ + CONFIG_THEAD_CUSTOM_PMU) \ + : "=r" (__ovl) : \ + : "memory") +#define SYSCTL_NO_USER_ACCESS 0#define SYSCTL_USER_ACCESS 1#define SYSCTL_LEGACY 2
@@ -805,10 +816,8 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pdeif (riscv_isa_extension_available (NULL ,SSCOFPMF )) { riscv_pmu_irq_num =RV_IRQ_PMU ; riscv_pmu_use_irq = true; - }else if (IS_ENABLED (CONFIG_ERRATA_THEAD_PMU ) && -riscv_cached_mvendorid (0 ) ==THEAD_VENDOR_ID && -riscv_cached_marchid (0 ) ==0 && -riscv_cached_mimpid (0 ) ==0 ) { + }else if (riscv_isa_extension_available (NULL ,XTHEADPMU ) && +IS_ENABLED (CONFIG_THEAD_CUSTOM_PMU )) { riscv_pmu_irq_num =THEAD_C9XX_RV_IRQ_PMU ; riscv_pmu_use_irq = true; }
Signature · 1 line
2.34.1
Re: [RFC PATCH v3 RESEND 07/13] RISC-V: Move T-Head PMU to CPU feature alternative framework
Quoted 9 lines · Yu Chien Peter Lin
The custom PMU extension aims to support perf event sampling prior to the ratification of Sscofpmf. Instead of utilizing the bits and CSRs reserved for future standard, a set of custom CSRs is added. Hence, we may consider it as a CPU feature rather than an erratum.
T-Head cores need to append "xtheadpmu" to the riscv,isa-extensions for each cpu node in device tree, and enable
CONFIG_THEAD_CUSTOM_PMUfor proper functioning as of this commit.
Quoted 8 lines
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Hi All,This is in preparation for introducing other PMU alternative. We follow Conor's suggestion [1] to use cpu feature alternative framework rather than errata, if you want to stick with errata alternative or have other issues, please let me know. Thanks.
I replied to the discussion on v2 earlier this morning (please try to wait for previous conversations to resolve before sending new versions) commenting on this patch:
https://lore.kernel.org/linux-riscv/20231023-impulse-quickness-4c7076e6eb58@spud/T/#m77982ce990577b974edd24bb3ac175737b2a621c
Sticking with the existing method for the t-head stuff isn't a matter of how the code is structured, but a question of regressing existing platforms.
Cheers,
Conor.
Quoted 200 lines
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25503860
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Removed m{vendor/arch/imp}id checks inpmu_sbi_setup_irqs()--- arch/riscv/Kconfig.errata | 13 ------------- arch/riscv/errata/thead/errata.c | 19 ------------------- arch/riscv/include/asm/errata_list.h | 15 +-------------- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + drivers/perf/Kconfig | 13 +++++++++++++ drivers/perf/riscv_pmu_sbi.c | 19 ++++++++++++++----- 7 files changed, 30 insertions(+), 51 deletions(-)arch/riscv/Kconfig.errata +0
-13@@ -85,17 +85,4 @@ config ERRATA_THEAD_CMO If you don't know what to do here, say "Y". -config ERRATA_THEAD_PMU - bool "Apply T-Head PMU errata" - depends on ERRATA_THEAD && RISCV_PMU_SBI - default y - help - The T-Head C9xx cores implement a PMU overflow extension very - similar to the core SSCOFPMF extension. - - This will apply the overflow errata to handle the non-standard - behaviour via the regular SBI PMU driver and interface. - - If you don't know what to do here, say "Y". - endmenu # "CPU errata selection"arch/riscv/errata/thead/errata.c +0
-19@@ -53,22 +53,6 @@ static bool errata_probe_cmo(unsigned int stage,return true; } -static bool errata_probe_pmu (unsigned int stage, -unsigned long arch_id,unsigned long impid) -{ -if (!IS_ENABLED (CONFIG_ERRATA_THEAD_PMU )) -return false; - -/* target-c9xx cores report arch_id and impid as 0 */ -if (arch_id !=0 || impid !=0 ) -return false; - -if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -return false; - -return true; -} -static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {@@ -80,9 +64,6 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |=BIT (ERRATA_THEAD_CMO ); -if (errata_probe_pmu (stage, archid, impid)) - cpu_req_errata |=BIT (ERRATA_THEAD_PMU ); -return cpu_req_errata; }arch/riscv/include/asm/errata_list.h +1
-14@@ -25,8 +25,7 @@#ifdef CONFIG_ERRATA_THEAD #define ERRATA_THEAD_PBMT 0#define ERRATA_THEAD_CMO 1 -#define ERRATA_THEAD_PMU 2 -#define ERRATA_THEAD_NUMBER 3 +#define ERRATA_THEAD_NUMBER 2#endif #ifdef __ASSEMBLY__@@ -147,18 +146,6 @@ asm volatile(ALTERNATIVE_2( \ "r"((unsigned long)(_start) + (_size)) \ : "a0") -#define THEAD_C9XX_RV_IRQ_PMU 17 -#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5 - -#define ALT_SBI_PMU_OVERFLOW (__ovl) \ -asm volatile(ALTERNATIVE( \ - "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ - "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ - THEAD_VENDOR_ID, ERRATA_THEAD_PMU, \ - CONFIG_ERRATA_THEAD_PMU) \ - : "=r" (__ovl) : \ - : "memory") -#endif /* __ASSEMBLY__ */ #endif arch/riscv/include/asm/hwcap.h +1
-0@@ -58,6 +58,7 @@#define RISCV_ISA_EXT_ZICSR 40#define RISCV_ISA_EXT_ZIFENCEI 41#define RISCV_ISA_EXT_ZIHPM 42 +#define RISCV_ISA_EXT_XTHEADPMU 43#define RISCV_ISA_EXT_MAX 64arch/riscv/kernel/cpufeature.c +1
-0@@ -181,6 +181,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (svinval,RISCV_ISA_EXT_SVINVAL ),__RISCV_ISA_EXT_DATA (svnapot,RISCV_ISA_EXT_SVNAPOT ),__RISCV_ISA_EXT_DATA (svpbmt,RISCV_ISA_EXT_SVPBMT ), + __RISCV_ISA_EXT_DATA(xtheadpmu, RISCV_ISA_EXT_XTHEADPMU), };const size_t riscv_isa_ext_count =ARRAY_SIZE (riscv_isa_ext);drivers/perf/Kconfig +13
-0@@ -86,6 +86,19 @@ config RISCV_PMU_SBI full perf feature support i.e. counter overflow, privilege mode filtering, counter configuration. +config THEAD_CUSTOM_PMU + bool "T-Head custom PMU support" + depends on RISCV_ALTERNATIVE && RISCV_PMU_SBI + default y + help + The T-Head C9xx cores implement a PMU overflow extension very + similar to the core SSCOFPMF extension. + + This will patch the overflow CSR and handle the non-standard + behaviour via the regular SBI PMU driver and interface. + + If you don't know what to do here, say "Y". + config ARM_PMU_ACPI depends on ARM_PMU && ACPI def_bool ydrivers/perf/riscv_pmu_sbi.c +14
-5@@ -20,10 +20,21 @@#include <linux/cpu_pm.h> #include <linux/sched/clock.h> -#include <asm/errata_list.h> #include <asm/sbi.h> #include <asm/hwcap.h> +#define THEAD_C9XX_RV_IRQ_PMU 17 +#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5 + +#define ALT_SBI_PMU_OVERFLOW (__ovl) \ +asm volatile(ALTERNATIVE( \ + "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ + "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ + 0, RISCV_ISA_EXT_XTHEADPMU, \ + CONFIG_THEAD_CUSTOM_PMU) \ + : "=r" (__ovl) : \ + : "memory") +#define SYSCTL_NO_USER_ACCESS 0#define SYSCTL_USER_ACCESS 1#define SYSCTL_LEGACY 2@@ -805,10 +816,8 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pdeif (riscv_isa_extension_available (NULL ,SSCOFPMF )) { riscv_pmu_irq_num =RV_IRQ_PMU ; riscv_pmu_use_irq = true; - }else if (IS_ENABLED (CONFIG_ERRATA_THEAD_PMU ) && -riscv_cached_mvendorid (0 ) ==THEAD_VENDOR_ID && -riscv_cached_marchid (0 ) ==0 && -riscv_cached_mimpid (0 ) ==0 ) { + }else if (riscv_isa_extension_available (NULL ,XTHEADPMU ) && +IS_ENABLED (CONFIG_THEAD_CUSTOM_PMU )) { riscv_pmu_irq_num =THEAD_C9XX_RV_IRQ_PMU ; riscv_pmu_use_irq = true; }Signature · 1 line
2.34.1
PATCH RESEND v3 8/13 perf: RISC-V: Introduce Andes PMU for perf event sampling
In reply to Yu Chien Peter LinThe Andes PMU extension provides the same mechanism as Sscofpmf, allowing us to reuse the SBI PMU driver to support event sampling and mode filtering.
To make use of this custom PMU extension, "xandespmu" needs to be appended to the riscv,isa-extensions for each cpu node in device-tree, and enable CONFIG_ANDES_CUSTOM_PMU.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Reordered list in riscv_isa_ext[]
- Removed mvendorid check in pmu_sbi_setup_irqs()
--- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + drivers/perf/Kconfig | 14 ++++++++++++++ drivers/perf/riscv_pmu_sbi.c | 34 +++++++++++++++++++++++++++++----- 4 files changed, 45 insertions(+), 5 deletions(-)
arch/riscv/include/asm/hwcap.h +1 -0
@@ -59,6 +59,7 @@#define RISCV_ISA_EXT_ZIFENCEI 41#define RISCV_ISA_EXT_ZIHPM 42#define RISCV_ISA_EXT_XTHEADPMU 43 +#define RISCV_ISA_EXT_XANDESPMU 44#define RISCV_ISA_EXT_MAX 64
arch/riscv/kernel/cpufeature.c +1 -0
@@ -181,6 +181,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (svinval,RISCV_ISA_EXT_SVINVAL ),__RISCV_ISA_EXT_DATA (svnapot,RISCV_ISA_EXT_SVNAPOT ),__RISCV_ISA_EXT_DATA (svpbmt,RISCV_ISA_EXT_SVPBMT ), +__RISCV_ISA_EXT_DATA (xandespmu,RISCV_ISA_EXT_XANDESPMU ), __RISCV_ISA_EXT_DATA(xtheadpmu, RISCV_ISA_EXT_XTHEADPMU), };
drivers/perf/Kconfig +14 -0
@@ -86,6 +86,20 @@ config RISCV_PMU_SBI full perf feature support i.e. counter overflow, privilege mode filtering, counter configuration. +config ANDES_CUSTOM_PMU + bool "Andes custom PMU support" + depends on RISCV_ALTERNATIVE && RISCV_PMU_SBI + default y + help + The Andes cores implement a PMU overflow extension very + similar to the core SSCOFPMF extension. + + This will patch the overflow/pending CSR and handle the + non-standard behaviour via the regular SBI PMU driver and + interface. + + If you don't know what to do here, say "Y". + config THEAD_CUSTOM_PMU bool "T-Head custom PMU support" depends on RISCV_ALTERNATIVE && RISCV_PMU_SBI
drivers/perf/riscv_pmu_sbi.c +29 -5
@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqchip/irq-riscv-intc.h> #include <linux/of_irq.h> #include <linux/of.h> #include <linux/cpu_pm.h>
@@ -26,15 +27,31 @@#define THEAD_C9XX_RV_IRQ_PMU 17#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5 +#define ANDES_RV_IRQ_PMU 18 +#define ANDES_CSR_SCOUNTEROF 0x9d4 +#define ANDES_CSR_SLIP 0x9c5 +#define ALT_SBI_PMU_OVERFLOW (__ovl) \ -asm volatile(ALTERNATIVE( \ +asm volatile(ALTERNATIVE_2( \ "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ 0, RISCV_ISA_EXT_XTHEADPMU, \ - CONFIG_THEAD_CUSTOM_PMU) \ + CONFIG_THEAD_CUSTOM_PMU, \ + "csrr %0, " __stringify(ANDES_CSR_SCOUNTEROF), \ + 0, RISCV_ISA_EXT_XANDESPMU, \ + CONFIG_ANDES_CUSTOM_PMU) \ : "=r" (__ovl) : \ : "memory") +#define ALT_SBI_PMU_OVF_CLEAR_PENDING (__irq_mask) \ +asm volatile(ALTERNATIVE( \ + "csrc " __stringify(CSR_IP) ", %0\n\t", \ + "csrc " __stringify(ANDES_CSR_SLIP) ", %0\n\t", \ + 0, RISCV_ISA_EXT_XANDESPMU, \ + CONFIG_ANDES_CUSTOM_PMU) \ + : : "r"(__irq_mask) \ + : "memory") +#define SYSCTL_NO_USER_ACCESS 0#define SYSCTL_USER_ACCESS 1#define SYSCTL_LEGACY 2
@@ -72,6 +89,7 @@ static int sysctl_perf_user_access __read_mostly = SYSCTL_USER_ACCESS;static union sbi_pmu_ctr_info *pmu_ctr_list;static bool riscv_pmu_use_irq;static unsigned int riscv_pmu_irq_num; +static unsigned int riscv_pmu_irq_mask;static unsigned int riscv_pmu_irq;/* Cache the available counters in a bitmask */
@@ -702,7 +720,7 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) fidx =find_first_bit (cpu_hw_evt->used_hw_ctrs,RISCV_MAX_COUNTERS ); event = cpu_hw_evt->events[fidx];if (!event) { -csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num)); +ALT_SBI_PMU_OVF_CLEAR_PENDING (riscv_pmu_irq_mask);return IRQ_NONE ; }
@@ -716,7 +734,7 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev)* Overflow interrupt pending bit should only be cleared after stopping * all the counters to avoid any race condition. */ -csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num)); +ALT_SBI_PMU_OVF_CLEAR_PENDING (riscv_pmu_irq_mask);/* No overflow bit is set */ if (!overflow)
@@ -788,7 +806,7 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)if (riscv_pmu_use_irq) { cpu_hw_evt->irq = riscv_pmu_irq; -csr_clear (CSR_IP ,BIT (riscv_pmu_irq_num)); +ALT_SBI_PMU_OVF_CLEAR_PENDING (riscv_pmu_irq_mask);enable_percpu_irq (riscv_pmu_irq,IRQ_TYPE_NONE ); }
@@ -820,8 +838,14 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde IS_ENABLED(CONFIG_THEAD_CUSTOM_PMU)) { riscv_pmu_irq_num =THEAD_C9XX_RV_IRQ_PMU ; riscv_pmu_use_irq = true; + } else if (riscv_isa_extension_available(NULL, XANDESPMU) && +IS_ENABLED (CONFIG_ANDES_CUSTOM_PMU )) { + riscv_pmu_irq_num =ANDES_SLI_CAUSE_BASE +ANDES_RV_IRQ_PMU ; + riscv_pmu_use_irq = true; } + riscv_pmu_irq_mask =BIT (riscv_pmu_irq_num %BITS_PER_LONG ); +if (!riscv_pmu_use_irq)return -EOPNOTSUPP ;
Signature · 1 line
2.34.1
RFC PATCH v3 9/13 dt-bindings: riscv: Add T-Head PMU extension description
In reply to Yu Chien Peter LinDocument the ISA string for T-Head performance monitor extension which provides counter overflow interrupt mechanism.
---
Changes v2 -> v3:
- New patch
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +6 -0
@@ -246,5 +246,11 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual. + - const: xtheadpmu + description: + The T-Head performance monitor extension for counter overflow. For more + details, see the chapter 12 in the Xuantie C906 user manual. + https://github.com/T-head-Semi/openc906/tree/main/doc + additionalProperties: true ...
Signature · 1 line
2.34.1
Re: [RFC PATCH v3 RESEND 09/13] dt-bindings: riscv: Add T-Head PMU extension description
Quoted 16 lines · Yu Chien Peter Lin
Document the ISA string for T-Head performance monitor extension which provides counter overflow interrupt mechanism.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v2 -> v3:
- New patch--- Documentation/devicetree/bindings/riscv/extensions.yaml | 6 ++++++ 1 file changed, 6 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +0
-0
Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 253
Quoted 8 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +5
-0@@ -246,5 +246,11 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual. + - const: xtheadpmu + description: + The T-Head performance monitor extension for counter overflow. For more + details, see the chapter 12 in the Xuantie C906 user manual. + https://github.com/T-head-Semi/openc906/tree/main/doc
This really needs to be linked off to a specific version of the document, lest there be revisions that remove the document from the repository and to one that is in English.
Cheers,
Conor.
Quoted 6 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +1
-0+ additionalProperties: trueSignature · 1 line
2.34.1
PATCH RESEND v3 10/13 dt-bindings: riscv: Add Andes PMU extension description
In reply to Yu Chien Peter LinDocument the ISA string for Andes Technology performance monitor extension which provides counter overflow interrupt and mode filtering mechanisms.
---
Changes v2 -> v3:
- New patch
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +7 -0
@@ -246,6 +246,13 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual. + - const: xandespmu + description: + The Andes Technology performance monitor extension for counter overflow + and privilege mode filtering. For more details, see Counter Related + Registers in the AX45MP datasheet. + https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdf + - const: xtheadpmu description: The T-Head performance monitor extension for counter overflow. For more
Signature · 1 line
2.34.1
Re: [PATCH v3 RESEND 10/13] dt-bindings: riscv: Add Andes PMU extension description
Quoted 17 lines · Yu Chien Peter Lin
Document the ISA string for Andes Technology performance monitor extension which provides counter overflow interrupt and mode filtering mechanisms.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v2 -> v3:
- New patch--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +0
-0
Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 254
Quoted 9 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +6
-0@@ -246,6 +246,13 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual. + - const: xandespmu + description: + The Andes Technology performance monitor extension for counter overflow + and privilege mode filtering. For more details, see Counter Related + Registers in the AX45MP datasheet. + https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdf
Does/will this PMU function identically on the other CPUs that support it? I assume the answer is yes.
Cheers,
Conor.
Quoted 7 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +1
-0+ - const: xtheadpmu description: The T-Head performance monitor extension for counter overflow. For moreSignature · 1 line
2.34.1
Re: [PATCH v3 RESEND 10/13] dt-bindings: riscv: Add Andes PMU extension description
Hi Conor,
Quoted 21 lines · Conor Dooley
Quoted 20 lines · Yu Chien Peter Lin
Document the ISA string for Andes Technology performance monitor extension which provides counter overflow interrupt and mode filtering mechanisms.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v2 -> v3:
- New patch--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +0
-0@@ -246,6 +246,13 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual.
Quoted 8 lines
Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 254
Quoted 6 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +6
-0+ - const: xandespmu + description: + The Andes Technology performance monitor extension for counter overflow + and privilege mode filtering. For more details, see Counter Related + Registers in the AX45MP datasheet. + https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdfDoes/will this PMU function identically on the other CPUs that support it?
Yes, I can confirm that.
Thanks for the review.
Best regards,
Peter Lin
Quoted 12 lines
I assume the answer is yes.
Cheers,
Conor.Quoted 7 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +1
-0+ - const: xtheadpmu description: The T-Head performance monitor extension for counter overflow. For moreSignature · 1 line
2.34.1
Conor Dooley
Acked-byRe: [PATCH v3 RESEND 10/13] dt-bindings: riscv: Add Andes PMU extension description
Quoted 33 lines · Yu-Chien Peter Lin
Hi Conor,
Quoted 21 lines · Conor Dooley
Quoted 20 lines · Yu Chien Peter Lin
Document the ISA string for Andes Technology performance monitor extension which provides counter overflow interrupt and mode filtering mechanisms.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v2 -> v3:
- New patch--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +0
-0@@ -246,6 +246,13 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual.Quoted 8 lines
Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 254
Quoted 6 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +6
-0+ - const: xandespmu + description: + The Andes Technology performance monitor extension for counter overflow + and privilege mode filtering. For more details, see Counter Related + Registers in the AX45MP datasheet. + https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdfDoes/will this PMU function identically on the other CPUs that support it?
Quoted 1 line
Yes, I can confirm that.
If there's a more generic document available, that'd be good. Otherwise,
Thanks,
Conor.
Re: [PATCH v3 RESEND 10/13] dt-bindings: riscv: Add Andes PMU extension description
Quoted 34 lines · Conor Dooley
Quoted 33 lines · Yu-Chien Peter Lin
Hi Conor,
Quoted 29 lines · Conor Dooley
Quoted 17 lines · Yu Chien Peter Lin
Document the ISA string for Andes Technology performance monitor extension which provides counter overflow interrupt and mode filtering mechanisms.
Signed-off-by Yu Chien Peter Lin <[email protected]>---
Changes v2 -> v3:
- New patch--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +0
-0Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 254
Quoted 9 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +6
-0@@ -246,6 +246,13 @@ properties: in commit 2e5236 ("Ztso is now ratified.") of the riscv-isa-manual. + - const: xandespmu + description: + The Andes Technology performance monitor extension for counter overflow + and privilege mode filtering. For more details, see Counter Related + Registers in the AX45MP datasheet. + https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdfDoes/will this PMU function identically on the other CPUs that support it?
Quoted 3 lines
Quoted 1 line
Yes, I can confirm that.
If there's a more generic document available, that'd be good.
While it is currently the most comprehensive and publicly available document we have, I will update it here once I obtain a more specific version of the extension.
Quoted 2 lines
Otherwise,
Acked-by Conor Dooley <[email protected]>
Thanks for the review.
Regards,
Peter Lin
Quoted 3 lines
Thanks,
Conor.
RFC PATCH v3 11/13 riscv: dts: allwinner: Add T-Head PMU extension
In reply to Yu Chien Peter LinBased on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
---
Changes v2 -> v3:
- New patch
--- arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi +1 -1
@@ -27,7 +27,7 @@ cpu0: cpu@0 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; #cooling-cells = <2>; cpu0_intc: interrupt-controller {
Signature · 1 line
2.34.1
PATCH RESEND v3 12/13 riscv: dts: renesas: Add Andes PMU extension
In reply to Yu Chien Peter LinBased on the added Andes PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- No change
--- arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/renesas/r9a07g043f.dtsi +1 -1
@@ -26,7 +26,7 @@ cpu0: cpu@0 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xandespmu"; mmu-type = "riscv,sv39"; i-cache-size = <0x8000>; i-cache-line-size = <0x40>;
Signature · 1 line
2.34.1
PATCH RESEND v3 13/13 riscv: andes: Support symbolic FW and HW raw events
In reply to Yu Chien Peter LinFrom: Locus Wei-Han Chen <[email protected]>
This patch adds the Andes AX45 JSON files in the perf tool, allowing perf to be used with symbolic event names.
---
Changes v1 -> v2:
- No change
Changes v2 -> v3:
- No change
--- .../arch/riscv/andes/ax45/firmware.json | 68 ++++++++++ .../arch/riscv/andes/ax45/instructions.json | 127 ++++++++++++++++++ .../arch/riscv/andes/ax45/memory.json | 57 ++++++++ .../arch/riscv/andes/ax45/microarch.json | 77 +++++++++++ tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + 5 files changed, 330 insertions(+) create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json new file +68 -0
@@ -0,0 +1,68 @@ +[ + { + "ArchStdEvent": "FW_MISALIGNED_LOAD" + }, + { + "ArchStdEvent": "FW_MISALIGNED_STORE" + }, + { + "ArchStdEvent": "FW_ACCESS_LOAD" + }, + { + "ArchStdEvent": "FW_ACCESS_STORE" + }, + { + "ArchStdEvent": "FW_ILLEGAL_INSN" + }, + { + "ArchStdEvent": "FW_SET_TIMER" + }, + { + "ArchStdEvent": "FW_IPI_SENT" + }, + { + "ArchStdEvent": "FW_IPI_RECEIVED" + }, + { + "ArchStdEvent": "FW_FENCE_I_SENT" + }, + { + "ArchStdEvent": "FW_FENCE_I_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_SENT" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_RECEIVED" + } +]
tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json new file +127 -0
127 lines not on this page · raw message
tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json new file +57 -0
57 lines not on this page · raw message
tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json new file +77 -0
77 lines not on this page · raw message
tools/perf/pmu-events/arch/riscv/mapfile.csv +1 -0
@@ -15,3 +15,4 @@ # #MVENDORID-MARCHID-MIMPID,Version,Filename,EventType 0x489-0x8000000000000007-0x[[:xdigit:]]+,v1,sifive/u74,core +0x31e-0x8000000000008a45-0x[[:xdigit:]]+,v1,andes/ax45,core
Signature · 1 line
2.34.1