Support Andes PMU extension
Subsystems (9)
v9 cover Support Andes PMU extension
Hi All,
This patch series introduces the Andes PMU extension, which serves the same purpose as Sscofpmf and Smcntrpmf. Its non-standard local interrupt is assigned to bit 18 in the custom S-mode local interrupt enable and pending registers (slie/slip), while the interrupt cause is (256 + 18).
The series can be found on Andes Technology GitHub:
- https://github.com/andestech/linux/commits/andes-pmu-support-v9
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 (9):
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
perf: RISC-V: Introduce Andes PMU to support perf event sampling
dt-bindings: riscv: Add Andes PMU extension description
riscv: dts: renesas: Add Andes PMU extension for r9a07g043f
.../devicetree/bindings/riscv/cpus.yaml | 6 +- .../devicetree/bindings/riscv/extensions.yaml | 7 + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 +- arch/riscv/errata/andes/errata.c | 10 +- arch/riscv/include/asm/errata_list.h | 13 +- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/asm/vendorid_list.h | 2 +- arch/riscv/kernel/alternative.c | 2 +- arch/riscv/kernel/cpufeature.c | 1 + drivers/irqchip/irq-riscv-intc.c | 82 +++++++++-- drivers/perf/Kconfig | 14 ++ drivers/perf/riscv_pmu_sbi.c | 37 ++++- include/linux/soc/andes/irq.h | 18 +++ .../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 + 18 files changed, 488 insertions(+), 39 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 v9 1/10 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
--- 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 v9 2/10 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 the hardware interrupt number, with a maximum of 64 interrupts. However, the platform can expand the interrupt number further for custom local interrupts.
To fully utilize the available local interrupt sources, switch to using irq_domain_create_tree() that creates the radix tree map, add global variables (riscv_intc_nr_irqs, riscv_intc_custom_base and riscv_intc_custom_nr_irqs) to determine the valid range of local interrupt number (hwirq).
---
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
Changes v5 -> v6: (Suggested by Anup [2])
- Add riscv_intc_* global variables for checking the range of valid interrupt number in riscv_intc_domain_alloc()
- Advertise the number of interrupts allowed
Changes v6 -> v7:
- No functional change
Changes v7 -> v8:
- Include Reviewed-by tags from Anup and Atish
Changes v8 -> v9 (Suggested by Thomas [3]):
- Fix coding style
- Update hwirq range checks
- Update riscv_intc_* global variables initialization
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25573085
[2] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25636589
[3] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/#25710584
--- drivers/irqchip/irq-riscv-intc.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/irqchip/irq-riscv-intc.c +19 -7
@@ -19,15 +19,16 @@#include <linux/smp.h> static struct irq_domain *intc_domain; +static unsigned int riscv_intc_nr_irqs__ro_after_init =BITS_PER_LONG ; +static unsigned int riscv_intc_custom_base__ro_after_init =BITS_PER_LONG ; +static unsigned int riscv_intc_custom_nr_irqs__ro_after_init ; 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); }/*
@@ -93,6 +94,14 @@ static int riscv_intc_domain_alloc(struct irq_domain *domain,if (ret)return ret; +/* +* Only allow hwirq for which we have corresponding standard or +* custom interrupt enable register. +*/ +if ((hwirq >= riscv_intc_nr_irqs && hwirq < riscv_intc_custom_base) || + (hwirq >= riscv_intc_custom_base + riscv_intc_custom_nr_irqs)) +return -EINVAL ; +for (i =0 ; i < nr_irqs; i++) { ret =riscv_intc_domain_map (domain, virq + i, hwirq + i);if (ret)
@@ -117,8 +126,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,7 +140,11 @@ 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 ); +pr_info ("%d local interrupts mapped\n" , riscv_intc_nr_irqs); +if (riscv_intc_custom_nr_irqs) { +pr_info ("%d custom local interrupts mapped\n" , + riscv_intc_custom_nr_irqs); + }return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH v9 02/10] irqchip/riscv-intc: Allow large non-standard interrupt number
Quoted 11 lines · Yu Chien Peter Lin
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as the hardware interrupt number, with a maximum of 64 interrupts. However, the platform can expand the interrupt number further for custom local interrupts.
To fully utilize the available local interrupt sources, switch to using
irq_domain_create_tree()that creates the radix tree map, add global variables (riscv_intc_nr_irqs,riscv_intc_custom_baseandriscv_intc_custom_nr_irqs) to determine the valid range of local interrupt number (hwirq).
Quoted 4 lines
Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Randolph <[email protected]>Reviewed-by Anup Patel <[email protected]>Reviewed-by Atish Patra <[email protected]>
[tip: irq/msi] irqchip/riscv-intc: Allow large non-standard interrupt number
In reply to Yu Chien Peter LinThe following commit has been merged into the irq/msi branch of tip:
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: 96303bcb401c21dc1426d8d9bb1fc74aae5c02a9 Gitweb: https://git.kernel.org/tip/96303bcb401c21dc1426d8d9bb1fc74aae5c02a9 Author: Yu Chien Peter Lin <[email protected]> AuthorDate: Thu, 22 Feb 2024 16:39:38 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 23 Feb 2024 09:57:42 +01:00
irqchip/riscv-intc: Allow large non-standard interrupt number
Currently, the implementation of the RISC-V INTC driver uses the interrupt cause as the hardware interrupt number, with a maximum of 64 interrupts. However, the platform can expand the interrupt number further for custom local interrupts.
To fully utilize the available local interrupt sources, switch to using irq_domain_create_tree() that creates the radix tree map, add global variables (riscv_intc_nr_irqs, riscv_intc_custom_base and riscv_intc_custom_nr_irqs) to determine the valid range of local interrupt number (hwirq).
--- drivers/irqchip/irq-riscv-intc.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/irqchip/irq-riscv-intc.c +19 -7
@@ -19,15 +19,16 @@#include <linux/smp.h> static struct irq_domain *intc_domain; +static unsigned int riscv_intc_nr_irqs__ro_after_init =BITS_PER_LONG ; +static unsigned int riscv_intc_custom_base__ro_after_init =BITS_PER_LONG ; +static unsigned int riscv_intc_custom_nr_irqs__ro_after_init ; 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); }/*
@@ -93,6 +94,14 @@ static int riscv_intc_domain_alloc(struct irq_domain *domain,if (ret)return ret; +/* +* Only allow hwirq for which we have corresponding standard or +* custom interrupt enable register. +*/ +if ((hwirq >= riscv_intc_nr_irqs && hwirq < riscv_intc_custom_base) || + (hwirq >= riscv_intc_custom_base + riscv_intc_custom_nr_irqs)) +return -EINVAL ; +for (i =0 ; i < nr_irqs; i++) { ret =riscv_intc_domain_map (domain, virq + i, hwirq + i);if (ret)
@@ -117,8 +126,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,7 +140,11 @@ 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 ); +pr_info ("%d local interrupts mapped\n" , riscv_intc_nr_irqs); +if (riscv_intc_custom_nr_irqs) { +pr_info ("%d custom local interrupts mapped\n" , + riscv_intc_custom_nr_irqs); + }return 0 ; }
PATCH v9 3/10 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. The base of custom interrupt number is set to 256.
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 a private data.
Andes hart-level interrupt controller requires the "andestech,cpu-intc" compatible string to be present in interrupt-controller of cpu node to enable the use of custom local interrupt source.
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
Changes v5 -> v6:
- To follow the naming on datasheet, rename ANDES_RV_IRQ_PMU to ANDES_RV_IRQ_PMOVI
- Initialize the riscv_intc_* global variables for Andes INTC (Suggested by Anup)
- Use BITS_PER_LONG to compute the bit mask of SIE/SLIE as they are 64-bit registers (32-bit for RV32)
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- Include Reviewed-by tags from Anup
Changes v8 -> v9:
- No functional change
[1] https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
--- drivers/irqchip/irq-riscv-intc.c | 58 ++++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 18 ++++++++++ 2 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 include/linux/soc/andes/irq.h
drivers/irqchip/irq-riscv-intc.c +51 -7
@@ -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;static unsigned int riscv_intc_nr_irqs__ro_after_init =BITS_PER_LONG ;
@@ -48,6 +49,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 %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) {/*
@@ -71,12 +97,21 @@ 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, - handle_percpu_devid_irq,NULL ,NULL ); +irq_domain_set_info (d, irq, hwirq, chip,NULL , handle_percpu_devid_irq, +NULL ,NULL );return 0 ; }
@@ -122,11 +157,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 ;
@@ -152,8 +188,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 ) {
@@ -178,10 +215,17 @@ 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" )) { + riscv_intc_custom_base =ANDES_SLI_CAUSE_BASE ; + riscv_intc_custom_nr_irqs =ANDES_RV_IRQ_LAST ; + 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
@@ -208,7 +252,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 +18 -0
@@ -0,0 +1,18 @@ +/* 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_PMOVI 18 +#define ANDES_RV_IRQ_LAST ANDES_RV_IRQ_PMOVI +#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 v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 25 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. The base of custom interrupt number is set to 256.
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 a private data.Andes hart-level interrupt controller requires the "andestech,cpu-intc" compatible string to be present in interrupt-controller of cpu node to enable the use of custom local interrupt source.
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; }; };
Quoted 3 lines
Signed-off-by Yu Chien Peter Lin <[email protected]>Reviewed-by Randolph <[email protected]>Reviewed-by Anup Patel <[email protected]>
Palmer, feel free to take this through the riscv tree. I have no other changes pending against that driver.
Thanks,
tglx
Re: [PATCH v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 2 lines · Thomas Gleixner
Palmer, feel free to take this through the riscv tree. I have no other changes pending against that driver.
Aargh. Spoken too early. This conflicts with Anups AIA series.
https://lore.kernel.org/all/[email protected]
So I rather take the pile through my tree and deal with the conflicts localy than inflicting it on next.
Palmer?
Thanks,
tglx
Re: [PATCH v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 4 lines · Thomas Gleixner
Quoted 2 lines · Thomas Gleixner
Palmer, feel free to take this through the riscv tree. I have no other changes pending against that driver.
Quoted 8 lines
Aargh. Spoken too early. This conflicts with Anups AIA series.
https://lore.kernel.org/all/[email protected]
So I rather take the pile through my tree and deal with the conflicts localy than inflicting it on next.
Palmer?
Nah. I just apply the two intc patches localy and give you a tag to pull from so we carry both the same commits. Then I can deal with the conflicts on my side trivially.
Thanks,
tglx
Re: [PATCH v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 9 lines · Thomas Gleixner
Quoted 8 lines · Thomas Gleixner
Quoted 2 lines · Thomas Gleixner
Palmer, feel free to take this through the riscv tree. I have no other changes pending against that driver.
Aargh. Spoken too early. This conflicts with Anups AIA series.
Quoted 8 lines
Quoted 4 lines
So I rather take the pile through my tree and deal with the conflicts localy than inflicting it on next.
Palmer?
Nah. I just apply the two intc patches localy and give you a tag to pull from so we carry both the same commits. Then I can deal with the conflicts on my side trivially.
Here you go:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-for-riscv-02-23-24
Contains:
f4cc33e78ba8 ("irqchip/riscv-intc: Introduce Andes hart-level interrupt controller") 96303bcb401c ("irqchip/riscv-intc: Allow large non-standard interrupt number")
on top of v6.8-rc1
Thanks,
tglx
Palmer Dabbelt
maintainerRe: [PATCH v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 21 lines · On Fri, 23 Feb 2024 01:06:44 PST (-0800), [email protected] wrote:
Quoted 9 lines · Thomas Gleixner
Quoted 8 lines · Thomas Gleixner
Quoted 2 lines · Thomas Gleixner
Palmer, feel free to take this through the riscv tree. I have no other changes pending against that driver.
Aargh. Spoken too early. This conflicts with Anups AIA series.
Quoted 8 lines
Quoted 4 lines
So I rather take the pile through my tree and deal with the conflicts localy than inflicting it on next.
Palmer?
Nah. I just apply the two intc patches localy and give you a tag to pull from so we carry both the same commits. Then I can deal with the conflicts on my side trivially.
Here you go:
Quoted 8 lines
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitirq-for-riscv-02-23-24Contains:
f4cc33e78ba8("irqchip/riscv-intc: Introduce Andes hart-level interrupt controller")96303bcb401c("irqchip/riscv-intc: Allow large non-standard interrupt number")on top of v6.8-rc1
Sorry I missed this. I just merged this into my testing tree, it might take a bit to show up because I've managed to break my VPN so I can't poke the tester box right now...
Quoted 4 lines
Thanks,
tglx
Re: [PATCH v9 03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Quoted 11 lines · Palmer Dabbelt
Quoted 6 lines · On Fri, 23 Feb 2024 01:06:44 PST (-0800), [email protected] wrote:
Contains:
f4cc33e78ba8("irqchip/riscv-intc: Introduce Andes hart-level interrupt controller")96303bcb401c("irqchip/riscv-intc: Allow large non-standard interrupt number")on top of v6.8-rc1
Sorry I missed this. I just merged this into my testing tree, it might take a bit to show up because I've managed to break my VPN so I can't poke the tester box right now...
Alternatively you can just rebase on Linus tree. The interrupt changes are already merged.
[tip: irq/msi] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
In reply to Yu Chien Peter LinThe following commit has been merged into the irq/msi branch of tip:
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: f4cc33e78ba8624a79ba8dea98ce5c85aa9ca33c Gitweb: https://git.kernel.org/tip/f4cc33e78ba8624a79ba8dea98ce5c85aa9ca33c Author: Yu Chien Peter Lin <[email protected]> AuthorDate: Thu, 22 Feb 2024 16:39:39 +08:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 23 Feb 2024 09:57:42 +01:00
irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
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. The base of custom interrupt number is set to 256.
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 a private data.
Andes hart-level interrupt controller requires the "andestech,cpu-intc" compatible string to be present in interrupt-controller of cpu node to enable the use of custom local interrupt source.
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;
};
};--- drivers/irqchip/irq-riscv-intc.c | 58 +++++++++++++++++++++++++++---- include/linux/soc/andes/irq.h | 18 ++++++++++- 2 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 include/linux/soc/andes/irq.h
drivers/irqchip/irq-riscv-intc.c +51 -7
@@ -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;static unsigned int riscv_intc_nr_irqs__ro_after_init =BITS_PER_LONG ;
@@ -48,6 +49,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 %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) {/*
@@ -71,12 +97,21 @@ 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, - handle_percpu_devid_irq,NULL ,NULL ); +irq_domain_set_info (d, irq, hwirq, chip,NULL , handle_percpu_devid_irq, +NULL ,NULL );return 0 ; }
@@ -122,11 +157,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 ;
@@ -152,8 +188,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 ) {
@@ -178,10 +215,17 @@ 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" )) { + riscv_intc_custom_base =ANDES_SLI_CAUSE_BASE ; + riscv_intc_custom_nr_irqs =ANDES_RV_IRQ_LAST ; + 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
@@ -208,7 +252,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 +18 -0
@@ -0,0 +1,18 @@ +/* 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_PMOVI 18 +#define ANDES_RV_IRQ_LAST ANDES_RV_IRQ_PMOVI +#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 */
PATCH v9 4/10 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 which 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
--- Documentation/devicetree/bindings/riscv/cpus.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/riscv/cpus.yaml +5 -1
@@ -106,7 +106,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 v9 5/10 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- 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
@@ -39,7 +39,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
Re: [PATCH v9 05/10] riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes INTC
Quoted 18 lines · Yu Chien Peter Lin
The Andes hart-level interrupt controller (Andes INTC) allows AX45MP cores to handle custom local interrupts, such as the performance counter overflow interrupt.
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]>---
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
Quoted 8 lines
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
so Palmer can pick it up with the rest of the series (the Renesas tree imerge window for v6.9 has closed)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
PATCH v9 6/10 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- Include Reviewed-by tags from Atish
Changes v8 -> v9:
- 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 v9 7/10 perf: RISC-V: Introduce Andes PMU to support perf event sampling
In reply to Yu Chien Peter LinAssign riscv_pmu_irq_num the value of (256 + 18) for the custome PMU and add SSCOUNTOVF and SIP alternatives to ALT_SBI_PMU_OVERFLOW() and ALT_SBI_PMU_OVF_CLEAR_PENDING() macros, respectively.
To make use of Andes PMU extension, "xandespmu" needs to be appended to the riscv,isa-extensions for each cpu node in device-tree, and make sure CONFIG_ANDES_CUSTOM_PMU is enabled.
---
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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
--- arch/riscv/include/asm/errata_list.h | 9 ------- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + drivers/perf/Kconfig | 14 +++++++++++ drivers/perf/riscv_pmu_sbi.c | 35 +++++++++++++++++++++++++--- 5 files changed, 48 insertions(+), 12 deletions(-)
arch/riscv/include/asm/errata_list.h +0 -9
@@ -112,15 +112,6 @@ asm volatile(ALTERNATIVE( \#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
@@ -80,6 +80,7 @@#define RISCV_ISA_EXT_ZFA 71#define RISCV_ISA_EXT_ZTSO 72#define RISCV_ISA_EXT_ZACAS 73 +#define RISCV_ISA_EXT_XANDESPMU 74#define RISCV_ISA_EXT_MAX 128#define RISCV_ISA_EXT_INVALID U32_MAX
arch/riscv/kernel/cpufeature.c +1 -0
@@ -307,6 +307,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), };const size_t riscv_isa_ext_count =ARRAY_SIZE (riscv_isa_ext);
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 the PMU overflow extension very + similar to the standard Sscofpmf and Smcntrpmf extension. + + This will patch the overflow and pending CSRs 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 +32 -3
@@ -19,11 +19,33 @@#include <linux/of.h> #include <linux/cpu_pm.h> #include <linux/sched/clock.h> +#include <linux/soc/andes/irq.h> #include <asm/errata_list.h> #include <asm/sbi.h> #include <asm/cpufeature.h> +#define ALT_SBI_PMU_OVERFLOW (__ovl) \ +asm volatile(ALTERNATIVE_2( \ + "csrr %0, " __stringify(CSR_SSCOUNTOVF), \ + "csrr %0, " __stringify(THEAD_C9XX_CSR_SCOUNTEROF), \ + THEAD_VENDOR_ID, ERRATA_THEAD_PMU, \ + CONFIG_ERRATA_THEAD_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
@@ -61,6 +83,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 */
@@ -694,7 +717,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 ; }
@@ -708,7 +731,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)
@@ -780,7 +803,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 ); }
@@ -814,8 +837,14 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde riscv_cached_mimpid(0) == 0) { 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_PMOVI ; + 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 v9 8/10 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +7 -0
@@ -477,5 +477,12 @@ properties: latency, as ratified in commit 56ed795 ("Update riscv-crypto-spec-vector.adoc") of riscv-crypto. + - 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 + additionalProperties: true ...
Signature · 1 line
2.34.1
PATCH v9 9/10 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
Changes v5 -> v6:
- Include Conor's Acked-by
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- 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
@@ -27,7 +27,7 @@ cpu0: cpu@0 { riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", "zifencei", - "zihpm"; + "zihpm", "xandespmu"; mmu-type = "riscv,sv39"; i-cache-size = <0x8000>; i-cache-line-size = <0x40>;
Signature · 1 line
2.34.1
Re: [PATCH v9 09/10] riscv: dts: renesas: Add Andes PMU extension for r9a07g043f
Quoted 19 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]>Acked-by Conor Dooley <[email protected]>---
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
Quoted 8 lines
Changes v5 -> v6:
- Include Conor's Acked-by
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- No change
Changes v8 -> v9:
- No change
so Palmer can pick it up with the rest of the series (the Renesas tree merge window for v6.9 has closed)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
PATCH v9 10/10 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
Changes v5 -> v6:
- No change
Changes v6 -> v7:
- No change
Changes v7 -> v8:
- Include Atish's Acked-by
Changes v8 -> v9:
- Include Ian's Acked-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
@@ -17,3 +17,4 @@ 0x489-0x8000000000000007-0x[[:xdigit:]]+,v1,sifive/u74,core 0x5b7-0x0-0x0,v1,thead/c900-legacy,core 0x67e-0x80000000db0000[89]0-0x[[:xdigit:]]+,v1,starfive/dubhe-80,core +0x31e-0x8000000000008a45-0x[[:xdigit:]]+,v1,andes/ax45,core
Signature · 1 line
2.34.1
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 8 lines · On Thu, 22 Feb 2024 16:39:36 +0800 you wrote:
Hi All,
This patch series introduces the Andes PMU extension, which serves the same purpose as Sscofpmf and Smcntrpmf. Its non-standard local interrupt is assigned to bit 18 in the custom S-mode local interrupt enable and pending registers (slie/slip), while the interrupt cause is (256 + 18).
[...]
Here is the summary with links:
- [v9,01/10] riscv: errata: Rename defines for Andes
https://git.kernel.org/riscv/c/be5e8872b3fb - [v9,02/10] irqchip/riscv-intc: Allow large non-standard interrupt number https://git.kernel.org/riscv/c/96303bcb401c - [v9,03/10] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller https://git.kernel.org/riscv/c/f4cc33e78ba8 - [v9,04/10] dt-bindings: riscv: Add Andes interrupt controller compatible string https://git.kernel.org/riscv/c/b88727d554f0 - [v9,05/10] riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes INTC https://git.kernel.org/riscv/c/95113bb70515 - [v9,06/10] perf: RISC-V: Eliminate redundant interrupt enable/disable operations https://git.kernel.org/riscv/c/ea0e0178e101 - [v9,07/10] perf: RISC-V: Introduce Andes PMU to support perf event sampling https://git.kernel.org/riscv/c/bc969d6cc96a - [v9,08/10] dt-bindings: riscv: Add Andes PMU extension description https://git.kernel.org/riscv/c/61609bf2b29d - [v9,09/10] riscv: dts: renesas: Add Andes PMU extension for r9a07g043f https://git.kernel.org/riscv/c/270fc77e7b0e - [v9,10/10] riscv: andes: Support specifying symbolic firmware and hardware raw events https://git.kernel.org/riscv/c/f5102e31c209
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html