Support Andes PMU extension
Subsystems (11)
v5 cover Support Andes PMU extension
Hi All,
This patch series introduces the Andes PMU extension, which serves the same purpose as Sscofpmf. To use FDT-based probing for hardware support of the PMU extensions, we first convert T-Head's PMU to CPU feature alternative, and add Andes PMU alternatives.
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).
Mainline OpenSBI has supported Andes PMU extension:
- https://github.com/riscv-software-src/opensbi/tree/master
Linux patches (based on v6.7-rc5) can be found on Andes Technology GitHub
- https://github.com/andestech/linux/commits/andes-pmu-support-v5
The PMU device tree node used on AX45MP:
- https://github.com/riscv-software-src/opensbi/blob/master/docs/pmu_support.md#example-3
Locus Wei-Han Chen (1):
riscv: andes: Support specifying symbolic firmware and hardware raw
events
Yu Chien Peter Lin (15):
riscv: errata: Rename defines for Andes irqchip/riscv-intc: Allow large non-standard interrupt number irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
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 interrupt 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 for sun20i-d1s
riscv: dts: sophgo: Add T-Head PMU extension for cv1800b
riscv: dts: sophgo: Add T-Head PMU extension for sg2042
riscv: dts: thead: Add T-Head PMU extension for th1520
riscv: dts: renesas: Add Andes PMU extension for r9a07g043f
.../devicetree/bindings/riscv/cpus.yaml | 6 +- .../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/boot/dts/sophgo/cv1800b.dtsi | 2 +- arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi | 128 +++++++++--------- arch/riscv/boot/dts/thead/th1520.dtsi | 8 +- 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 | 47 +++++-- include/linux/soc/andes/irq.h | 17 +++ .../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 + 24 files changed, 565 insertions(+), 151 deletions(-) create mode 100644 include/linux/soc/andes/irq.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 v5 1/16 riscv: errata: Rename defines for Andes
Use "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:
- Rewrite commit message (suggested by Conor)
Changes v3 -> v4:
- Include Conor's Acked-by tag
Changes v4 -> v5:
- Include Prabhakar's RB tag
--- 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;
@@ -50,7 +50,7 @@ static void errata_probe_iocp(unsigned int stage, unsigned long arch_id, unsigne done = true; -if (arch_id !=ANDESTECH_AX45MP_MARCHID || impid !=ANDESTECH_AX45MP_MIMPID ) +if (arch_id !=ANDES_AX45MP_MARCHID || impid !=ANDES_AX45MP_MIMPID )return ;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
PATCH v5 2/16 irqchip/riscv-intc: Allow large non-standard interrupt number
In reply to Yu Chien Peter LinCurrently, the implementation of the RISC-V INTC driver uses the interrupt cause as hardware interrupt number and has a limitation of supporting a maximum of 64 interrupts. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
This limitation prevents to fully utilize the available local interrupt sources. Additionally, the interrupt number used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU interrupt) being currently used for supervisor mode.
Switch to using irq_domain_create_tree() to create the radix tree map, so a larger number of hardware interrupts can be handled.
---
Changes v1 -> v2:
- Fixed irq mapping failure checking (suggested by Clément and Anup)
Changes v2 -> v3:
- No change
Changes v3 -> v4: (Suggested by Thomas [1])
- Use pr_warn_ratelimited instead
- Fix coding style and commit message
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25573085
--- 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,9 @@ 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_ratelimited ("Failed to handle interrupt (cause: %ld)\n" , + cause); }/*
@@ -117,8 +116,7 @@ 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: [PATCH v5 02/16] irqchip/riscv-intc: Allow large non-standard interrupt number
Quoted 5 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as hardware interrupt number and has a limitation of supporting a maximum of 64 interrupts. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
I disagree with this patch.
Even though RISC-V priv sepc allows interrupt causes >= 16, we still need CSRs to manage arbitrary local interrupts
Currently, we have following standard CSRs:
1) [m|s]ie and [m|s]ip which are XLEN wide
2) With AIA, we have [m|s]ieh and [m|s]iph for RV32
Clearly, we can only have a XLEN number of standard local interrupts without AIA and 64 local interrupts with AIA.
Now for implementations with custom CSRs (such as Andes), we still can't assume infinite local interrupts because HW will have a finite number of custom CSRs.
Quoted 47 lines
This limitation prevents to fully utilize the available local interrupt sources. Additionally, the interrupt number used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU interrupt) being currently used for supervisor mode.
Switch to using
irq_domain_create_tree()to create the radix tree map, so a larger number of hardware interrupts can be handled.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]>---
Changes v1 -> v2:
- Fixed irq mapping failure checking (suggested by Clément and Anup)
Changes v2 -> v3:
- No change
Changes v3 -> v4: (Suggested by Thomas [1])
- Usepr_warn_ratelimitedinstead
- Fix coding style and commit message
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25573085
--- drivers/irqchip/irq-riscv-intc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/irqchip/irq-riscv-intc.c +3
-4@@ -24,10 +24,9 @@ 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_ratelimited ("Failed to handle interrupt (cause: %ld)\n" , + cause); }/*
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 119
Quoted 6 lines
drivers/irqchip/irq-riscv-intc.c +1
-2@@ -117,8 +116,7 @@ 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 );
I disagree with this change based on the reasoning above.
Instead of this, we should determine the number of local interrupts based on the type of RISC-V intc:
1) For standard INTC without AIA, we have XLEN (or BITS_PER_LONG) local interrupts
2) For standart INTC with AIA, we have 64 local interrupts
3) For custom INTC (such as Andes), the number of local interrupt should be custom (Andes specific) which can be determined based on compatible string.
Also, creating a linear domain with a fixed number of local interrupts ensures that drivers can't map a local interrupt beyond the availability of CSRs to manage it.
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 136
Quoted 9 lines
drivers/irqchip/irq-riscv-intc.c +0
-2if (!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 ); -
Same as above, we should definitely advertise the type of INTC and number of local interrupts mapped.
Regards,
Anup
Quoted 11 lines
drivers/irqchip/irq-riscv-intc.c +0
-1return 0 ; } --2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 02/16] irqchip/riscv-intc: Allow large non-standard interrupt number
Quoted 90 lines · Anup Patel
Quoted 5 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as hardware interrupt number and has a limitation of supporting a maximum of 64 interrupts. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
I disagree with this patch.
Even though RISC-V priv sepc allows interrupt causes >= 16, we still need CSRs to manage arbitrary local interrupts
Currently, we have following standard CSRs:
1) [m|s]ie and [m|s]ip which are XLEN wide
2) With AIA, we have [m|s]ieh and [m|s]iph for RV32Clearly, we can only have a XLEN number of standard local interrupts without AIA and 64 local interrupts with AIA.
Now for implementations with custom CSRs (such as Andes), we still can't assume infinite local interrupts because HW will have a finite number of custom CSRs.
Quoted 47 lines
This limitation prevents to fully utilize the available local interrupt sources. Additionally, the interrupt number used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU interrupt) being currently used for supervisor mode.
Switch to using
irq_domain_create_tree()to create the radix tree map, so a larger number of hardware interrupts can be handled.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]>---
Changes v1 -> v2:
- Fixed irq mapping failure checking (suggested by Clément and Anup)
Changes v2 -> v3:
- No change
Changes v3 -> v4: (Suggested by Thomas [1])
- Usepr_warn_ratelimitedinstead
- Fix coding style and commit message
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25573085
--- drivers/irqchip/irq-riscv-intc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/irqchip/irq-riscv-intc.c +3
-4@@ -24,10 +24,9 @@ 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_ratelimited ("Failed to handle interrupt (cause: %ld)\n" , + cause); }/* drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 119
Quoted 6 lines
drivers/irqchip/irq-riscv-intc.c +1
-2@@ -117,8 +116,7 @@ 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 );I disagree with this change based on the reasoning above.
Instead of this, we should determine the number of local interrupts based on the type of RISC-V intc:
1) For standard INTC without AIA, we have XLEN (orBITS_PER_LONG) local interrupts
2) For standart INTC with AIA, we have 64 local interrupts
3) For custom INTC (such as Andes), the number of local interrupt should be custom (Andes specific) which can be determined based on compatible string.
Quoted 3 lines
Also, creating a linear domain with a fixed number of local interrupts ensures that drivers can't map a local interrupt beyond the availability of CSRs to manage it.
Thinking about this more. We do have a problem because Andes local interrupts are really sparse which is not the case for standard local interrupts
I have an alternate suggestion which goes as follows ...
We use irq_domain_create_tree() in-place of irq_domain_create_linear() and enforce checks on hwirq in riscv_intc_domain_alloc() to ensure that we only allow hwirq for which we have corresponding standard or custom CSR.
To achieve this, riscv_intc_init_common() will have to save the following as static global variables:
1) riscv_intc_nr_irqs: Number of standard local interrupts
2) riscv_intc_custom_base and riscv_intc_custom_nr_irqs: Base and number of custom local interrupts.
Using the above static global variables, the riscv_intc_domain_alloc() can return error if one of the following conditions are met:
1) riscv_intc_nr_irqs<= hwirq && hwirq < riscv_intc_custom_base
2) (riscv_intc_custom_base + riscv_intc_custom_nr_irqs) <= hwirq
For standard INTC, we can set the static global variable as follows:riscv_intc_nr_irqs = XLEN or BITS_PER_LONG riscv_intc_custom_base = riscv_intc_nr_irqs riscv_intc_custom_nr_irqs = 0
For Andes INTC, we can set the static global variables as follows:riscv_intc_nr_irqs = XLEN or BITS_PER_LONG riscv_intc_custom_base = 256riscv_intc_custom_nr_irqs = XLEN or BITS_PER_LONG
Regards,
Anup
Quoted 28 lines
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 136
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +0
-2if (!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 ); -Same as above, we should definitely advertise the type of INTC and number of local interrupts mapped.
Regards,
AnupQuoted 11 lines
drivers/irqchip/irq-riscv-intc.c +0
-1return 0 ; } --2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 02/16] irqchip/riscv-intc: Allow large non-standard interrupt number
Hi Anup,
Quoted 122 lines · Anup Patel
Quoted 90 lines · Anup Patel
Quoted 5 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as hardware interrupt number and has a limitation of supporting a maximum of 64 interrupts. However, according to the privileged spec, interrupt causes >= 16 are defined for platform use.
I disagree with this patch.
Even though RISC-V priv sepc allows interrupt causes >= 16, we still need CSRs to manage arbitrary local interrupts
Currently, we have following standard CSRs:
1) [m|s]ie and [m|s]ip which are XLEN wide
2) With AIA, we have [m|s]ieh and [m|s]iph for RV32Clearly, we can only have a XLEN number of standard local interrupts without AIA and 64 local interrupts with AIA.
Now for implementations with custom CSRs (such as Andes), we still can't assume infinite local interrupts because HW will have a finite number of custom CSRs.
Quoted 47 lines
This limitation prevents to fully utilize the available local interrupt sources. Additionally, the interrupt number used on RISC-V are sparse, with only interrupt numbers 1, 5 and 9 (plus Sscofpmf or T-Head's PMU interrupt) being currently used for supervisor mode.
Switch to using
irq_domain_create_tree()to create the radix tree map, so a larger number of hardware interrupts can be handled.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]>---
Changes v1 -> v2:
- Fixed irq mapping failure checking (suggested by Clément and Anup)
Changes v2 -> v3:
- No change
Changes v3 -> v4: (Suggested by Thomas [1])
- Usepr_warn_ratelimitedinstead
- Fix coding style and commit message
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25573085
--- drivers/irqchip/irq-riscv-intc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/irqchip/irq-riscv-intc.c +3
-4@@ -24,10 +24,9 @@ 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_ratelimited ("Failed to handle interrupt (cause: %ld)\n" , + cause); }/* drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 119
Quoted 6 lines
drivers/irqchip/irq-riscv-intc.c +1
-2@@ -117,8 +116,7 @@ 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 );I disagree with this change based on the reasoning above.
Instead of this, we should determine the number of local interrupts based on the type of RISC-V intc:
1) For standard INTC without AIA, we have XLEN (orBITS_PER_LONG) local interrupts
2) For standart INTC with AIA, we have 64 local interrupts
3) For custom INTC (such as Andes), the number of local interrupt should be custom (Andes specific) which can be determined based on compatible string.Quoted 3 lines
Also, creating a linear domain with a fixed number of local interrupts ensures that drivers can't map a local interrupt beyond the availability of CSRs to manage it.
Thinking about this more. We do have a problem because Andes local interrupts are really sparse which is not the case for standard local interrupts
I have an alternate suggestion which goes as follows ...
We use
irq_domain_create_tree()in-place ofirq_domain_create_linear()and enforce checks on hwirq inriscv_intc_domain_alloc()to ensure that we only allow hwirq for which we have corresponding standard or custom CSR.To achieve this,
riscv_intc_init_common()will have to save the following as static global variables:
1)riscv_intc_nr_irqs: Number of standard local interrupts
2)riscv_intc_custom_baseandriscv_intc_custom_nr_irqs: Base and number of custom local interrupts.Using the above static global variables, the
riscv_intc_domain_alloc()can return error if one of the following conditions are met:
1) riscv_intc_nr_irqs<= hwirq && hwirq <riscv_intc_custom_base
2) (riscv_intc_custom_base+riscv_intc_custom_nr_irqs) <= hwirqFor standard INTC, we can set the static global variable as follows:
riscv_intc_nr_irqs= XLEN orBITS_PER_LONGriscv_intc_custom_base=riscv_intc_nr_irqsriscv_intc_custom_nr_irqs= 0
Quoted 7 lines
For Andes INTC, we can set the static global variables as follows:
riscv_intc_nr_irqs= XLEN orBITS_PER_LONGriscv_intc_custom_base= 256riscv_intc_custom_nr_irqs= XLEN orBITS_PER_LONGRegards,
Anup
Thank you for offering your help on this.
I will rework the patch accordingly.
Best regards,
Peter Lin
Quoted 28 lines
Quoted 28 lines
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init_common(struct fwnode_handle *fn) · line 136
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +0
-2if (!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 ); -Same as above, we should definitely advertise the type of INTC and number of local interrupts mapped.
Regards,
AnupQuoted 11 lines
drivers/irqchip/irq-riscv-intc.c +0
-1return 0 ; } --2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 3/16 irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
In reply to Yu Chien Peter LinAdd support for the Andes hart-level interrupt controller. This controller provides interrupt mask/unmask functions to access the custom register (SLIE) where the non-standard S-mode local interrupt enable bits are located.
To share the riscv_intc_domain_map() with the generic RISC-V INTC and ACPI, add a chip parameter to riscv_intc_init_common(), so it can be passed to the irq_domain_set_info() as private data.
Andes hart-level interrupt controller 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
Changes v3 -> v4: (Suggested by Thomas [1])
- Add comment to andes irq chip function
- Refine code flow to share with generic RISC-V INTC and ACPI
- Move Andes specific definitions to include/linux/soc/andes/irq.h
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message
- Subtract ANDES_SLI_CAUSE_BASE from d->hwirq to calculate the value of mask
- Do not set chip_data to the chip itself with irq_domain_set_info()
- Follow reverse fir tree order variable declarations
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
--- drivers/irqchip/irq-riscv-intc.c | 53 ++++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 17 ++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 include/linux/soc/andes/irq.h
drivers/irqchip/irq-riscv-intc.c +47 -6
@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/smp.h> +#include <linux/soc/andes/irq.h> static struct irq_domain *intc_domain;
@@ -46,6 +47,31 @@ 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) +{ +/* +* Andes specific S-mode local interrupt causes (hwirq) +* are defined as (256 + n) and controlled by n-th bit +* of SLIE. +*/ +unsigned int mask =BIT (d->hwirq -ANDES_SLI_CAUSE_BASE ); + +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 -ANDES_SLI_CAUSE_BASE ); + +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) {/*
@@ -69,11 +95,20 @@ 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 irq_chip *chip = d->host_data; +irq_set_percpu_devid (irq); -irq_domain_set_info (d, irq, hwirq, &riscv_intc_chip, d->host_data, +irq_domain_set_info (d, irq, hwirq, chip,NULL , handle_percpu_devid_irq,NULL ,NULL );return 0 ;
@@ -112,11 +147,12 @@ static struct fwnode_handle *riscv_intc_hwnode(void)return intc_domain->fwnode; } -static int __init riscv_intc_init_common (struct fwnode_handle *fn) +static int __init riscv_intc_init_common (struct fwnode_handle *fn, +struct irq_chip *chip) {int rc; - intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops,NULL ); + intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops, chip);if (!intc_domain) {pr_err ("unable to add IRQ domain\n" );return -ENXIO ;
@@ -136,8 +172,9 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn)static int __init riscv_intc_init (struct device_node *node,struct device_node *parent) { -int rc; +struct irq_chip *chip = &riscv_intc_chip;unsigned long hartid; +int rc; rc =riscv_of_parent_hartid (node, &hartid);if (rc <0 ) {
@@ -162,10 +199,14 @@ static int __init riscv_intc_init(struct device_node *node,return 0 ; } -return riscv_intc_init_common (of_node_to_fwnode (node)); +if (of_device_is_compatible (node,"andestech,cpu-intc" )) + chip = &andes_intc_chip; + +return riscv_intc_init_common (of_node_to_fwnode (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init); +IRQCHIP_DECLARE (andes,"andestech,cpu-intc" , riscv_intc_init);#ifdef CONFIG_ACPI
@@ -192,7 +233,7 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header,return -ENOMEM ; } -return riscv_intc_init_common (fn); +return riscv_intc_init_common (fn, &riscv_intc_chip); } IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC, NULL,
include/linux/soc/andes/irq.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2023 Andes Technology Corporation +*/ +#ifndef __ANDES_IRQ_H +#define __ANDES_IRQ_H + +/* Andes PMU irq number */ +#define ANDES_RV_IRQ_PMU 18 +#define ANDES_SLI_CAUSE_BASE 256 + +/* Andes PMU related registers */ +#define ANDES_CSR_SLIE 0x9c4 +#define ANDES_CSR_SLIP 0x9c5 +#define ANDES_CSR_SCOUNTEROF 0x9d4 + +#endif /* __ANDES_IRQ_H */
Signature · 1 line
2.34.1
Re: [PATCH v5 03/16] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 79 lines · Yu Chien Peter Lin
Add support for the Andes hart-level interrupt controller. This controller provides interrupt mask/unmask functions to access the custom register (SLIE) where the non-standard S-mode local interrupt enable bits are located.
To share the
riscv_intc_domain_map()with the generic RISC-V INTC and ACPI, add a chip parameter toriscv_intc_init_common(), so it can be passed to theirq_domain_set_info()as private data.Andes hart-level interrupt controller 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; }; };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]>---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Return-ENXIOif no valid compatible INTC found
- Allow falling back to generic RISC-V INTC
Changes v3 -> v4: (Suggested by Thomas [1])
- Add comment to andes irq chip function
- Refine code flow to share with generic RISC-V INTC and ACPI
- Move Andes specific definitions toinclude/linux/soc/andes/irq.h
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message
- SubtractANDES_SLI_CAUSE_BASEfromd->hwirqto calculate the value of mask
- Do not setchip_datato the chip itself withirq_domain_set_info()
- Follow reverse fir tree order variable declarations[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
--- drivers/irqchip/irq-riscv-intc.c | 53 ++++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 17 ++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 include/linux/soc/andes/irq.hdrivers/irqchip/irq-riscv-intc.c +14
-0@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/smp.h> +#include <linux/soc/andes/irq.h> static struct irq_domain *intc_domain;@@ -46,6 +47,31 @@ 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) +{ +/* +* Andes specific S-mode local interrupt causes (hwirq) +* are defined as (256 + n) and controlled by n-th bit +* of SLIE. +*/ +unsigned int mask =BIT (d->hwirq -ANDES_SLI_CAUSE_BASE ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE ) +csr_clear (CSR_IE , mask); +else +csr_clear (ANDES_CSR_SLIE , mask);
drivers/irqchip/irq-riscv-intc.c static void riscv_intc_irq_unmask(struct irq_data *d) · line 72
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +10
-0+} + +static void andes_intc_irq_unmask (struct irq_data *d) +{ +unsigned int mask =BIT (d->hwirq -ANDES_SLI_CAUSE_BASE ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE ) +csr_set (CSR_IE , mask); +else +csr_set (ANDES_CSR_SLIE , mask);
Clearly, Andes does not have any CSR for:
XLEN <= local interrupt <ANDES_SLI_CAUSE_BASE
andANDES_SLI_CAUSE_BASE + XLEN <= local interrupt
Regards,
Anup
Quoted 109 lines
drivers/irqchip/irq-riscv-intc.c +23
-6+} +static void riscv_intc_irq_eoi (struct irq_data *d) {/* @@ -69,11 +95,20 @@ 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 irq_chip *chip = d->host_data; +irq_set_percpu_devid (irq); -irq_domain_set_info (d, irq, hwirq, &riscv_intc_chip, d->host_data, +irq_domain_set_info (d, irq, hwirq, chip,NULL , handle_percpu_devid_irq,NULL ,NULL );return 0 ;@@ -112,11 +147,12 @@ static struct fwnode_handle *riscv_intc_hwnode(void)return intc_domain->fwnode; } -static int __init riscv_intc_init_common (struct fwnode_handle *fn) +static int __init riscv_intc_init_common (struct fwnode_handle *fn, +struct irq_chip *chip) {int rc; - intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops,NULL ); + intc_domain =irq_domain_create_tree (fn, &riscv_intc_domain_ops, chip);if (!intc_domain) {pr_err ("unable to add IRQ domain\n" );return -ENXIO ;@@ -136,8 +172,9 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn)static int __init riscv_intc_init (struct device_node *node,struct device_node *parent) { -int rc; +struct irq_chip *chip = &riscv_intc_chip;unsigned long hartid; +int rc; rc =riscv_of_parent_hartid (node, &hartid);if (rc <0 ) {@@ -162,10 +199,14 @@ static int __init riscv_intc_init(struct device_node *node,return 0 ; } -return riscv_intc_init_common (of_node_to_fwnode (node)); +if (of_device_is_compatible (node,"andestech,cpu-intc" )) + chip = &andes_intc_chip; + +return riscv_intc_init_common (of_node_to_fwnode (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init); +IRQCHIP_DECLARE (andes,"andestech,cpu-intc" , riscv_intc_init);#ifdef CONFIG_ACPI @@ -192,7 +233,7 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header,return -ENOMEM ; } -return riscv_intc_init_common (fn); +return riscv_intc_init_common (fn, &riscv_intc_chip); } IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC, NULL,include/linux/soc/andes/irq.h new file +17
-1@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2023 Andes Technology Corporation +*/ +#ifndef __ANDES_IRQ_H +#define __ANDES_IRQ_H + +/* Andes PMU irq number */ +#define ANDES_RV_IRQ_PMU 18 +#define ANDES_SLI_CAUSE_BASE 256 + +/* Andes PMU related registers */ +#define ANDES_CSR_SLIE 0x9c4 +#define ANDES_CSR_SLIP 0x9c5 +#define ANDES_CSR_SCOUNTEROF 0x9d4 + +#endif /* __ANDES_IRQ_H */ --2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 03/16] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 88 lines · Anup Patel
Quoted 86 lines · Yu Chien Peter Lin
Add support for the Andes hart-level interrupt controller. This controller provides interrupt mask/unmask functions to access the custom register (SLIE) where the non-standard S-mode local interrupt enable bits are located.
To share the
riscv_intc_domain_map()with the generic RISC-V INTC and ACPI, add a chip parameter toriscv_intc_init_common(), so it can be passed to theirq_domain_set_info()as private data.Andes hart-level interrupt controller 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; }; };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]>---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Return-ENXIOif no valid compatible INTC found
- Allow falling back to generic RISC-V INTC
Changes v3 -> v4: (Suggested by Thomas [1])
- Add comment to andes irq chip function
- Refine code flow to share with generic RISC-V INTC and ACPI
- Move Andes specific definitions toinclude/linux/soc/andes/irq.h
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message
- SubtractANDES_SLI_CAUSE_BASEfromd->hwirqto calculate the value of mask
- Do not setchip_datato the chip itself withirq_domain_set_info()
- Follow reverse fir tree order variable declarations[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
--- drivers/irqchip/irq-riscv-intc.c | 53 ++++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 17 ++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 include/linux/soc/andes/irq.hdrivers/irqchip/irq-riscv-intc.c +21
-0@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/smp.h> +#include <linux/soc/andes/irq.h> static struct irq_domain *intc_domain;@@ -46,6 +47,31 @@ 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) +{ +/* +* Andes specific S-mode local interrupt causes (hwirq) +* are defined as (256 + n) and controlled by n-th bit +* of SLIE. +*/ +unsigned int mask =BIT (d->hwirq -ANDES_SLI_CAUSE_BASE ); + +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 -ANDES_SLI_CAUSE_BASE ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE )
Quoted 8 lines
drivers/irqchip/irq-riscv-intc.c static void riscv_intc_irq_unmask(struct irq_data *d) · line 72
Quoted 3 lines
drivers/irqchip/irq-riscv-intc.c +3
-0+csr_set (CSR_IE , mask); + else +csr_set (ANDES_CSR_SLIE ,mask );Clearly, Andes does not have any CSR for:
XLEN <= local interrupt <ANDES_SLI_CAUSE_BASE
andANDES_SLI_CAUSE_BASE+ XLEN <= local interrupt
Ah, what am I doing here.
sorry for that silly patch.
Regards,
Peter Lin
Quoted 2 lines
Regards,
Anup
Anup Patel
maintainerRe: [PATCH v5 03/16] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 99 lines · Yu-Chien Peter Lin
Quoted 88 lines · Anup Patel
Quoted 86 lines · Yu Chien Peter Lin
Add support for the Andes hart-level interrupt controller. This controller provides interrupt mask/unmask functions to access the custom register (SLIE) where the non-standard S-mode local interrupt enable bits are located.
To share the
riscv_intc_domain_map()with the generic RISC-V INTC and ACPI, add a chip parameter toriscv_intc_init_common(), so it can be passed to theirq_domain_set_info()as private data.Andes hart-level interrupt controller 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; }; };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]>---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Return-ENXIOif no valid compatible INTC found
- Allow falling back to generic RISC-V INTC
Changes v3 -> v4: (Suggested by Thomas [1])
- Add comment to andes irq chip function
- Refine code flow to share with generic RISC-V INTC and ACPI
- Move Andes specific definitions toinclude/linux/soc/andes/irq.h
Changes v4 -> v5: (Suggested by Thomas)
- Fix commit message
- SubtractANDES_SLI_CAUSE_BASEfromd->hwirqto calculate the value of mask
- Do not setchip_datato the chip itself withirq_domain_set_info()
- Follow reverse fir tree order variable declarations[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
--- drivers/irqchip/irq-riscv-intc.c | 53 ++++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 17 ++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 include/linux/soc/andes/irq.hdrivers/irqchip/irq-riscv-intc.c +21
-0@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/smp.h> +#include <linux/soc/andes/irq.h> static struct irq_domain *intc_domain;@@ -46,6 +47,31 @@ 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) +{ +/* +* Andes specific S-mode local interrupt causes (hwirq) +* are defined as (256 + n) and controlled by n-th bit +* of SLIE. +*/ +unsigned int mask =BIT (d->hwirq -ANDES_SLI_CAUSE_BASE ); + +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 -ANDES_SLI_CAUSE_BASE ); + +if (d->hwirq <ANDES_SLI_CAUSE_BASE )Quoted 8 lines
drivers/irqchip/irq-riscv-intc.c static void riscv_intc_irq_unmask(struct irq_data *d) · line 72
Quoted 3 lines
drivers/irqchip/irq-riscv-intc.c +3
-0+csr_set (CSR_IE , mask); + else +csr_set (ANDES_CSR_SLIE ,mask );Clearly, Andes does not have any CSR for:
XLEN <= local interrupt <ANDES_SLI_CAUSE_BASE
andANDES_SLI_CAUSE_BASE+ XLEN <= local interrupt
Quoted 2 lines
Ah, what am I doing here.
sorry for that silly patch.
This patch is okay only if we can guarantee that
hwirq is within accepted range.
For example, riscv_intc_domain_alloc() can deny
invalid local interrupts.
Regards,
Anup
PATCH v5 4/16 dt-bindings: riscv: Add Andes interrupt controller compatible string
In reply to Yu Chien Peter LinAdd "andestech,cpu-intc" compatible string to indicate 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
Changes v3 -> v4:
- Add const entry instead of enum (Suggested by Conor)
Changes v4 -> v5:
- Include Conor's Acked-by
- Include Prabhakar's Reviewed-by
--- Documentation/devicetree/bindings/riscv/cpus.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/riscv/cpus.yaml +5 -1
@@ -100,7 +100,11 @@ properties: const: 1 compatible: - const: riscv,cpu-intc + oneOf: + - items: + - const: andestech,cpu-intc + - const: riscv,cpu-intc + - const: riscv,cpu-intc interrupt-controller: true
Signature · 1 line
2.34.1
PATCH v5 5/16 riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes INTC
In reply to Yu Chien Peter LinThe Andes hart-level interrupt controller (Andes INTC) allows AX45MP cores to handle custom local interrupts, such as the performance counter overflow interrupt.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Fixed possible compatibles for Andes INTC
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Geert's Reviewed-by
- Include Prabhakar's Reviewed/Tested-by
--- arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/renesas/r9a07g043f.dtsi +1 -1
@@ -38,7 +38,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 v5 6/16 perf: RISC-V: Eliminate redundant interrupt enable/disable operations
In reply to Yu Chien Peter LinThe interrupt 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(). It can be done only once.
---
This patch allows us to drop unnecessary ALT_SBI_PMU_OVF_{DISABLE,ENABLE} in the initial PATCH3 [1].
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- No change
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- No change
--- drivers/perf/riscv_pmu_sbi.c | 2 -- 1 file changed, 2 deletions(-)
drivers/perf/riscv_pmu_sbi.c +0 -2
@@ -781,7 +781,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 ); }
@@ -792,7 +791,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
PATCH v5 7/16 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 diverting the bits and register reserved for future standard, a set of custom registers 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.
---
Changes v1 -> v2:
- New patch
Changes v2 -> v3:
- Removed m{vendor/arch/imp}id checks in pmu_sbi_setup_irqs()
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Guo's Reviewed-by
- Let THEAD_CUSTOM_PMU depend on ARCH_THEAD
--- 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
@@ -86,17 +86,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
@@ -57,6 +57,7 @@#define RISCV_ISA_EXT_ZIHPM 42#define RISCV_ISA_EXT_SMSTATEEN 43#define RISCV_ISA_EXT_ZICOND 44 +#define RISCV_ISA_EXT_XTHEADPMU 45#define RISCV_ISA_EXT_MAX 64
arch/riscv/kernel/cpufeature.c +1 -0
@@ -185,6 +185,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 ARCH_THEAD && 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/cpufeature.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
@@ -808,10 +819,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: [PATCH v5 07/16] RISC-V: Move T-Head PMU to CPU feature alternative framework
Quoted 6 lines · Yu Chien Peter Lin
The custom PMU extension aims to support perf event sampling prior to the ratification of Sscofpmf. Instead of diverting the bits and register reserved for future standard, a set of custom registers is added. Hence, we may consider it as a CPU feature rather than an erratum.
Quoted 6 lines
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.Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Guo Ren <[email protected]>
Cheers,
Conor.
Re: [PATCH v5 07/16] RISC-V: Move T-Head PMU to CPU feature alternative framework
Quoted 7 lines · Conor Dooley
Quoted 6 lines · Yu Chien Peter Lin
The custom PMU extension aims to support perf event sampling prior to the ratification of Sscofpmf. Instead of diverting the bits and register reserved for future standard, a set of custom registers is added. Hence, we may consider it as a CPU feature rather than an erratum.
Quoted 8 lines
Quoted 6 lines
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.Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Guo Ren <[email protected]>Reviewed-by Conor Dooley <[email protected]>
I think it is also worth mentioning that the only SoC, to my knowledge, that works with a mainline kernel, and supports the SBI PMU is the D1, and only recently has the OpenSBI port for the SoC been fixed to actually work correctly, and that has apparently not yet made it to a release of OpenSBI, making the "damage" caused by requiring a DT property for PMU support not all that bad since the firmware needs to be changed anyway.
Thanks for your work on this,
Conor.
PATCH v5 8/16 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()
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Let ANDES_CUSTOM_PMU depend on ARCH_RENESAS
- Include Prabhakar's Reviewed/Tested-by
--- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + drivers/perf/Kconfig | 14 ++++++++++++++ drivers/perf/riscv_pmu_sbi.c | 30 +++++++++++++++++++++++++----- 4 files changed, 41 insertions(+), 5 deletions(-)
arch/riscv/include/asm/hwcap.h +1 -0
@@ -58,6 +58,7 @@#define RISCV_ISA_EXT_SMSTATEEN 43#define RISCV_ISA_EXT_ZICOND 44#define RISCV_ISA_EXT_XTHEADPMU 45 +#define RISCV_ISA_EXT_XANDESPMU 46#define RISCV_ISA_EXT_MAX 64
arch/riscv/kernel/cpufeature.c +1 -0
@@ -185,6 +185,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 ARCH_RENESAS && 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 ARCH_THEAD && RISCV_ALTERNATIVE && RISCV_PMU_SBI
drivers/perf/riscv_pmu_sbi.c +25 -5
@@ -19,6 +19,7 @@#include <linux/of.h> #include <linux/cpu_pm.h> #include <linux/sched/clock.h> +#include <linux/soc/andes/irq.h> #include <asm/sbi.h> #include <asm/cpufeature.h>
@@ -27,14 +28,26 @@#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5#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 +85,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 */
@@ -705,7 +719,7 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) 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 ; }
@@ -719,7 +733,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)
@@ -791,7 +805,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 ); }
@@ -823,8 +837,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
PATCH v5 9/16 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
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Guo's Reviewed-by
- Include Inochi's Reviewed-by
- Update to C910 documentation with its commit hash
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +6 -0
@@ -258,5 +258,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, as ratified + in commit 4c4981 ("Initial commit") of Xuantie C910 user manual. + https://github.com/T-head-Semi/openc910/tree/main/doc + additionalProperties: true ...
Signature · 1 line
2.34.1
Re: [PATCH v5 09/16] dt-bindings: riscv: Add T-Head PMU extension description
Quoted 24 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]>Reviewed-by Guo Ren <[email protected]>Reviewed-by Inochi Amaoto <[email protected]>---
Changes v2 -> v3:
- New patch
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Guo's Reviewed-by
- Include Inochi's Reviewed-by
- Update to C910 documentation with its commit hash--- 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 263
Quoted 6 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +3
-0@@ -258,5 +258,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, as ratified
I'm not sure that "ratified" here is the right word, probably "documented" is better, but I don't think that is worth a resend.
Cheers,
Conor.
Quoted 8 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +3
-0+ in commit 4c4981 ("Initial commit") of Xuantie C910 user manual. + https://github.com/T-head-Semi/openc910/tree/main/doc + additionalProperties: trueSignature · 1 line
2.34.1
PATCH v5 10/16 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
Changes v3 -> v4:
- Include Conor's Acked-by
Changes v4 -> v5:
- Include Prabhakar's Reviewed-by
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +7 -0
@@ -258,6 +258,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, as ratified
Signature · 1 line
2.34.1
PATCH v5 11/16 riscv: dts: allwinner: Add T-Head PMU extension for sun20i-d1s
In reply to Yu Chien Peter Linxtheadpmu stands for T-Head Performance Monitor Unit extension. Based 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
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Guo's Reviewed-by
--- 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 v5 12/16 riscv: dts: sophgo: Add T-Head PMU extension for cv1800b
In reply to Yu Chien Peter Linxtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
---
Changes v4 -> v5:
- New patch
--- arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/sophgo/cv1800b.dtsi +1 -1
@@ -29,7 +29,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"; cpu0_intc: interrupt-controller { compatible = "riscv,cpu-intc";
Signature · 1 line
2.34.1
Re: [PATCH v5 12/16] riscv: dts: sophgo: Add T-Head PMU extension for cv1800b
Quoted 5 lines · Yu Chien Peter Lin
xtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
Signed-off-by Yu Chien Peter Lin <[email protected]>
Cheers,
Conor.
Quoted 23 lines
---
Changes v4 -> v5:
- New patch--- arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/boot/dts/sophgo/cv1800b.dtsi +1
-1@@ -29,7 +29,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"; cpu0_intc: interrupt-controller { compatible = "riscv,cpu-intc";Signature · 1 line
2.34.1
PATCH v5 13/16 riscv: dts: sophgo: Add T-Head PMU extension for sg2042
In reply to Yu Chien Peter Linxtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
---
Changes v4 -> v5:
- New patch
--- arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi | 128 ++++++++++---------- 1 file changed, 64 insertions(+), 64 deletions(-)
arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi +64 -64
@@ -260,7 +260,7 @@ cpu0: cpu@0 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <0>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -285,7 +285,7 @@ cpu1: cpu@1 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <1>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -310,7 +310,7 @@ cpu2: cpu@2 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <2>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -335,7 +335,7 @@ cpu3: cpu@3 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <3>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -360,7 +360,7 @@ cpu4: cpu@4 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <4>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -385,7 +385,7 @@ cpu5: cpu@5 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <5>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -410,7 +410,7 @@ cpu6: cpu@6 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <6>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -435,7 +435,7 @@ cpu7: cpu@7 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <7>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -460,7 +460,7 @@ cpu8: cpu@8 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <8>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -485,7 +485,7 @@ cpu9: cpu@9 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <9>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -510,7 +510,7 @@ cpu10: cpu@10 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <10>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -535,7 +535,7 @@ cpu11: cpu@11 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <11>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -560,7 +560,7 @@ cpu12: cpu@12 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <12>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -585,7 +585,7 @@ cpu13: cpu@13 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <13>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -610,7 +610,7 @@ cpu14: cpu@14 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <14>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -635,7 +635,7 @@ cpu15: cpu@15 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <15>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -660,7 +660,7 @@ cpu16: cpu@16 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <16>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -685,7 +685,7 @@ cpu17: cpu@17 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <17>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -710,7 +710,7 @@ cpu18: cpu@18 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <18>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -735,7 +735,7 @@ cpu19: cpu@19 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <19>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -760,7 +760,7 @@ cpu20: cpu@20 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <20>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -785,7 +785,7 @@ cpu21: cpu@21 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <21>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -810,7 +810,7 @@ cpu22: cpu@22 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <22>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -835,7 +835,7 @@ cpu23: cpu@23 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <23>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -860,7 +860,7 @@ cpu24: cpu@24 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <24>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -885,7 +885,7 @@ cpu25: cpu@25 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <25>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -910,7 +910,7 @@ cpu26: cpu@26 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <26>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -935,7 +935,7 @@ cpu27: cpu@27 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <27>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -960,7 +960,7 @@ cpu28: cpu@28 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <28>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -985,7 +985,7 @@ cpu29: cpu@29 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <29>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1010,7 +1010,7 @@ cpu30: cpu@30 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <30>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1035,7 +1035,7 @@ cpu31: cpu@31 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <31>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1060,7 +1060,7 @@ cpu32: cpu@32 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <32>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1085,7 +1085,7 @@ cpu33: cpu@33 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <33>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1110,7 +1110,7 @@ cpu34: cpu@34 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <34>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1135,7 +1135,7 @@ cpu35: cpu@35 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <35>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1160,7 +1160,7 @@ cpu36: cpu@36 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <36>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1185,7 +1185,7 @@ cpu37: cpu@37 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <37>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1210,7 +1210,7 @@ cpu38: cpu@38 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <38>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1235,7 +1235,7 @@ cpu39: cpu@39 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <39>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1260,7 +1260,7 @@ cpu40: cpu@40 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <40>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1285,7 +1285,7 @@ cpu41: cpu@41 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <41>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1310,7 +1310,7 @@ cpu42: cpu@42 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <42>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1335,7 +1335,7 @@ cpu43: cpu@43 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <43>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1360,7 +1360,7 @@ cpu44: cpu@44 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <44>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1385,7 +1385,7 @@ cpu45: cpu@45 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <45>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1410,7 +1410,7 @@ cpu46: cpu@46 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <46>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1435,7 +1435,7 @@ cpu47: cpu@47 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <47>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1460,7 +1460,7 @@ cpu48: cpu@48 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <48>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1485,7 +1485,7 @@ cpu49: cpu@49 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <49>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1510,7 +1510,7 @@ cpu50: cpu@50 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <50>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1535,7 +1535,7 @@ cpu51: cpu@51 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <51>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1560,7 +1560,7 @@ cpu52: cpu@52 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <52>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1585,7 +1585,7 @@ cpu53: cpu@53 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <53>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1610,7 +1610,7 @@ cpu54: cpu@54 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <54>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1635,7 +1635,7 @@ cpu55: cpu@55 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <55>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1660,7 +1660,7 @@ cpu56: cpu@56 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <56>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1685,7 +1685,7 @@ cpu57: cpu@57 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <57>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1710,7 +1710,7 @@ cpu58: cpu@58 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <58>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1735,7 +1735,7 @@ cpu59: cpu@59 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <59>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1760,7 +1760,7 @@ cpu60: cpu@60 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <60>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1785,7 +1785,7 @@ cpu61: cpu@61 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <61>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1810,7 +1810,7 @@ cpu62: cpu@62 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <62>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -1835,7 +1835,7 @@ cpu63: cpu@63 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xtheadpmu"; reg = <63>; i-cache-block-size = <64>; i-cache-size = <65536>;
Signature · 1 line
2.34.1
Re: [PATCH v5 13/16] riscv: dts: sophgo: Add T-Head PMU extension for sg2042
Quoted 5 lines · Yu Chien Peter Lin
xtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
Signed-off-by Yu Chien Peter Lin <[email protected]>
Cheers,
Conor.
PATCH v5 14/16 riscv: dts: thead: Add T-Head PMU extension for th1520
In reply to Yu Chien Peter Linxtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
---
Changes v4 -> v5:
- New patch
--- arch/riscv/boot/dts/thead/th1520.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/riscv/boot/dts/thead/th1520.dtsi +4 -4
@@ -22,7 +22,7 @@ c910_0: 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"; reg = <0>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -46,7 +46,7 @@ c910_1: cpu@1 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <1>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -70,7 +70,7 @@ c910_2: cpu@2 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <2>; i-cache-block-size = <64>; i-cache-size = <65536>;
@@ -94,7 +94,7 @@ c910_3: cpu@3 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <3>; i-cache-block-size = <64>; i-cache-size = <65536>;
Signature · 1 line
2.34.1
Re: [PATCH v5 14/16] riscv: dts: thead: Add T-Head PMU extension for th1520
Quoted 5 lines · Yu Chien Peter Lin
xtheadpmu stands for T-Head Performance Monitor Unit extension. Based on the added T-Head PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
Signed-off-by Yu Chien Peter Lin <[email protected]>
Cheers,
Conor.
Quoted 50 lines
---
Changes v4 -> v5:
- New patch--- arch/riscv/boot/dts/thead/th1520.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/riscv/boot/dts/thead/th1520.dtsi +4
-4@@ -22,7 +22,7 @@ c910_0: 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"; reg = <0>; i-cache-block-size = <64>; i-cache-size = <65536>;@@ -46,7 +46,7 @@ c910_1: cpu@1 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <1>; i-cache-block-size = <64>; i-cache-size = <65536>;@@ -70,7 +70,7 @@ c910_2: cpu@2 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <2>; i-cache-block-size = <64>; i-cache-size = <65536>;@@ -94,7 +94,7 @@ c910_3: cpu@3 { riscv,isa = "rv64imafdc"; riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", - "zifencei", "zihpm"; + "zifencei", "zihpm", "xtheadpmu"; reg = <3>; i-cache-block-size = <64>; i-cache-size = <65536>;Signature · 1 line
2.34.1
PATCH v5 15/16 riscv: dts: renesas: Add Andes PMU extension for r9a07g043f
In reply to Yu Chien Peter Linxandespmu stands for Andes Performance Monitor Unit extension. Based 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
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Geert's Reviewed-by
- Include Prabhakar's Reviewed/Tested-by
--- 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
Re: [PATCH v5 15/16] riscv: dts: renesas: Add Andes PMU extension for r9a07g043f
Quoted 8 lines · Yu Chien Peter Lin
xandespmu stands for Andes Performance Monitor Unit extension. Based on the added Andes PMU ISA string, the SBI PMU driver will make use of the non-standard irq source.
Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Reviewed-by Lad Prabhakar <[email protected]>Tested-by Lad Prabhakar <[email protected]>
Cheers,
Conor.
PATCH v5 16/16 riscv: andes: Support specifying symbolic firmware and hardware raw events
In reply to Yu Chien Peter LinFrom: Locus Wei-Han Chen <[email protected]>
Add the Andes AX45 JSON files that allows specifying symbolic event names for the raw PMU events.
---
Changes v1 -> v2:
- No change
Changes v2 -> v3:
- No change
Changes v3 -> v4:
- No change
Changes v4 -> v5:
- Include Prabhakar's Tested-by
--- .../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