drivers/perf: riscv_pmu_sbi: add support for PMU variant on T-Head C9xx cores
Subsystems (3)
PATCH v2 1/1 drivers/perf: riscv_pmu_sbi: add support for PMU variant on T-Head C9xx cores
With the T-HEAD C9XX cores being designed before or during the ratification to the SSCOFPMF extension, they implement functionality very similar but not equal to it. So add some adaptions to allow the C9XX to still handle its PMU through the regular SBI PMU interface instead of defining new interfaces or drivers.
To work properly, this requires a matching change in SBI, though the actual interface between kernel and SBI does not change.
The main differences are a the overflow CSR and irq number.
As the reading of the overflow-csr is in the hot-path during irq handling use an errata and alternatives to not introduce new conditionals there.
---
changes in v2:
- use alternatives for the CSR access
- make the irq num selection a bit nicer
There is of course a matching opensbi-part whose current implementation can be found on [0], but as comments show, this needs some more work still.
[0] https://patchwork.ozlabs.org/project/opensbi/cover/[email protected]/
arch/riscv/Kconfig.erratas | 14 ++++++++++++ arch/riscv/errata/thead/errata.c | 19 +++++++++++++++++ arch/riscv/include/asm/errata_list.h | 16 +++++++++++++- drivers/perf/riscv_pmu_sbi.c | 32 +++++++++++++++++++--------- 4 files changed, 70 insertions(+), 11 deletions(-)
arch/riscv/Kconfig.erratas +14 -0
@@ -66,4 +66,18 @@ 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 + depends on 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 +19 -0
@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif } +static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU +if (arch_id !=0 || impid !=0 ) +return false; + +if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) +return false; + +return true; +#else +return false; +#endif +} +static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {
@@ -55,6 +71,9 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |= (1U <<ERRATA_THEAD_CMO ); +if (errata_probe_pmu (stage, archid, impid)) + cpu_req_errata |= (1U <<ERRATA_THEAD_PMU ); +return cpu_req_errata; }
arch/riscv/include/asm/errata_list.h +15 -1
@@ -6,6 +6,7 @@#define ASM_ERRATA_LIST_H #include <asm/alternative.h> +#include <asm/csr.h> #include <asm/vendorid_list.h> #ifdef CONFIG_ERRATA_SIFIVE
@@ -17,7 +18,8 @@#ifdef CONFIG_ERRATA_THEAD #define ERRATA_THEAD_PBMT 0#define ERRATA_THEAD_CMO 1 -#define ERRATA_THEAD_NUMBER 2 +#define ERRATA_THEAD_PMU 2 +#define ERRATA_THEAD_NUMBER 3#endif #define CPUFEATURE_SVPBMT 0
@@ -142,6 +144,18 @@ 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
drivers/perf/riscv_pmu_sbi.c +22 -10
@@ -19,6 +19,7 @@#include <linux/of.h> #include <linux/cpu_pm.h> +#include <asm/errata_list.h> #include <asm/sbi.h> #include <asm/hwcap.h>
@@ -46,6 +47,8 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {* per_cpu in case of harts with different pmu counters */ 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;struct sbi_pmu_event_data {
@@ -575,7 +578,7 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) fidx =find_first_bit (cpu_hw_evt->used_hw_ctrs,RISCV_MAX_COUNTERS ); event = cpu_hw_evt->events[fidx];if (!event) { -csr_clear (CSR_SIP ,SIP_LCOFIP ); +csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num));return IRQ_NONE ; }
@@ -583,13 +586,13 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev)pmu_sbi_stop_hw_ctrs (pmu);/* Overflow status register should only be read after counter are stopped */ - overflow =csr_read (CSR_SSCOUNTOVF ); +ALT_SBI_PMU_OVERFLOW (overflow);/* * Overflow interrupt pending bit should only be cleared after stopping * all the counters to avoid any race condition. */ -csr_clear (CSR_SIP ,SIP_LCOFIP ); +csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num));/* No overflow bit is set */ if (!overflow)
@@ -651,10 +654,10 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)/* Stop all the counters so that they can be enabled from perf */ pmu_sbi_stop_all (pmu); -if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { +if (riscv_pmu_use_irq) { cpu_hw_evt->irq = riscv_pmu_irq; -csr_clear (CSR_IP ,BIT (RV_IRQ_PMU )); -csr_set (CSR_IE ,BIT (RV_IRQ_PMU )); +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 ); }
@@ -663,9 +666,9 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)static int pmu_sbi_dying_cpu (unsigned int cpu,struct hlist_node *node) { -if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { +if (riscv_pmu_use_irq) {disable_percpu_irq (riscv_pmu_irq); -csr_clear (CSR_IE ,BIT (RV_IRQ_PMU )); +csr_clear (CSR_IE ,BIT (riscv_pmu_irq_num)); }/* Disable all counters access for user mode now */
@@ -681,7 +684,16 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pdestruct device_node *cpu, *child;struct irq_domain *domain =NULL ; -if (!riscv_isa_extension_available (NULL ,SSCOFPMF )) +if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { + riscv_pmu_irq_num =RV_IRQ_PMU ; + riscv_pmu_use_irq = true; + }else if (sbi_get_mvendorid () ==THEAD_VENDOR_ID && +sbi_get_marchid () ==0 &&sbi_get_mimpid () ==0 ) { + riscv_pmu_irq_num =THEAD_C9XX_RV_IRQ_PMU ; + riscv_pmu_use_irq = true; + } + +if (!riscv_pmu_use_irq)return -EOPNOTSUPP ;for_each_of_cpu_node (cpu) {
@@ -703,7 +715,7 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pdereturn -ENODEV ; } - riscv_pmu_irq =irq_create_mapping (domain,RV_IRQ_PMU ); + riscv_pmu_irq =irq_create_mapping (domain, riscv_pmu_irq_num);if (!riscv_pmu_irq) {pr_err ("Failed to map PMU interrupt for node\n" );return -ENODEV ;
Signature · 1 line
2.35.1
Quoted 8 lines · Heiko Stuebner
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
With the T-HEAD C9XX cores being designed before or during the ratification to the SSCOFPMF extension, they implement functionality very similar but not equal to it. So add some adaptions to allow the C9XX to still handle its PMU through the regular SBI PMU interface instead of defining new interfaces or drivers.
Quoted 6 lines
To work properly, this requires a matching change in SBI, though the actual interface between kernel and SBI does not change.
The main differences are a the overflow CSR and irq number.
As the reading of the overflow-csr is in the hot-path during irq handling
Hey Heiko,
Very nitpicky, but I had to read this twice to get it.. If you respin, it'd be worth adding a comma after "handling".
Quoted 48 lines
use an errata and alternatives to not introduce new conditionals there.
Signed-off-by Heiko Stuebner <[email protected]>---
changes in v2:
- use alternatives for the CSR access
- make the irq num selection a bit nicerThere is of course a matching opensbi-part whose current implementation can be found on [0], but as comments show, this needs some more work still.
[0] https://patchwork.ozlabs.org/project/opensbi/cover/[email protected]/
arch/riscv/Kconfig.erratas | 14 ++++++++++++ arch/riscv/errata/thead/errata.c | 19 +++++++++++++++++ arch/riscv/include/asm/errata_list.h | 16 +++++++++++++- drivers/perf/riscv_pmu_sbi.c | 32 +++++++++++++++++++--------- 4 files changed, 70 insertions(+), 11 deletions(-)arch/riscv/Kconfig.erratas +14
-0@@ -66,4 +66,18 @@ 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 + depends on 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
-0
arch/riscv/errata/thead/errata.c static bool errata_probe_cmo(unsigned int stage, · line 50
Quoted 7 lines
arch/riscv/errata/thead/errata.c +4
-0@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif } +static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU
Is there a reason that all the alternatives use ifdef rather than if(IS_ENABLED())?
Quoted 16 lines
arch/riscv/errata/thead/errata.c +12
-0+if (arch_id !=0 || impid !=0 ) +return false; + +if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) +return false; + +return true; +#else +return false; +#endif +} +static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {
arch/riscv/errata/thead/errata.c static u32 thead_errata_probe(unsigned int stage, · line 75
Quoted 5 lines
arch/riscv/errata/thead/errata.c +2
-0@@ -55,6 +71,9 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |= (1U <<ERRATA_THEAD_CMO ); +if (errata_probe_pmu (stage, archid, impid)) + cpu_req_errata |= (1U <<ERRATA_THEAD_PMU );
BIT(ERRATA_THEAD_PMU), no? Ditto for the CMO I guess..
arch/riscv/errata/thead/errata.c static u32 thead_errata_probe(unsigned int stage, · line 79
Quoted 4 lines
arch/riscv/errata/thead/errata.c +1
-0+return cpu_req_errata; }
Thanks,
Conor.
Hi Conor,
Am Freitag, 26. August 2022, 19:57:33 CEST schrieb [email protected]:
Quoted 12 lines · Heiko Stuebner
Quoted 11 lines
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
With the T-HEAD C9XX cores being designed before or during the ratification to the SSCOFPMF extension, they implement functionality very similar but not equal to it. So add some adaptions to allow the C9XX to still handle its PMU through the regular SBI PMU interface instead of defining new interfaces or drivers.
To work properly, this requires a matching change in SBI, though the actual interface between kernel and SBI does not change.
Quoted 8 lines
Quoted 3 lines
The main differences are a the overflow CSR and irq number.
As the reading of the overflow-csr is in the hot-path during irq handling
Hey Heiko,
Very nitpicky, but I had to read this twice to get it.. If you respin, it'd be worth adding a comma after "handling".
ok :-)
Quoted 51 lines
Quoted 51 lines
use an errata and alternatives to not introduce new conditionals there.
Signed-off-by Heiko Stuebner <[email protected]>---
changes in v2:
- use alternatives for the CSR access
- make the irq num selection a bit nicerThere is of course a matching opensbi-part whose current implementation can be found on [0], but as comments show, this needs some more work still.
[0] https://patchwork.ozlabs.org/project/opensbi/cover/[email protected]/
arch/riscv/Kconfig.erratas | 14 ++++++++++++ arch/riscv/errata/thead/errata.c | 19 +++++++++++++++++ arch/riscv/include/asm/errata_list.h | 16 +++++++++++++- drivers/perf/riscv_pmu_sbi.c | 32 +++++++++++++++++++--------- 4 files changed, 70 insertions(+), 11 deletions(-)arch/riscv/Kconfig.erratas +14
-0@@ -66,4 +66,18 @@ 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 + depends on 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
-0@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif }
Quoted 7 lines
arch/riscv/errata/thead/errata.c static bool errata_probe_cmo(unsigned int stage, · line 50
Quoted 4 lines
arch/riscv/errata/thead/errata.c +4
-0+static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU Is there a reason that all the alternatives use ifdef rather than if(IS_ENABLED())?
no real reason I guess - more like not enough thinking :-)
Using IS_ENABLED also makes it way nicer as we can just do
if (!IS_ENABLED(CONFIG_ERRATA_THEAD_PMU)) return false;
Quoted 20 lines
Quoted 20 lines
arch/riscv/errata/thead/errata.c +12
-0+if (arch_id !=0 || impid !=0 ) +return false; + +if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) +return false; + +return true; +#else +return false; +#endif +} +static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {@@ -55,6 +71,9 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |= (1U <<ERRATA_THEAD_CMO );
Quoted 4 lines
arch/riscv/errata/thead/errata.c static u32 thead_errata_probe(unsigned int stage, · line 75
Quoted 2 lines
arch/riscv/errata/thead/errata.c +2
-0+if (errata_probe_pmu (stage, archid, impid)) + cpu_req_errata |= (1U <<ERRATA_THEAD_PMU );
BIT(ERRATA_THEAD_PMU), no? Ditto for the CMO I guess..
and also the memory types - makes things quite a bit nicer :-)
So I'll include these fixes into the next revision.
Thanks
Heiko
Quoted 11 lines
arch/riscv/errata/thead/errata.c static u32 thead_errata_probe(unsigned int stage, · line 79
Quoted 5 lines
arch/riscv/errata/thead/errata.c +1
-0+return cpu_req_errata; }Thanks,
Conor.
Am Dienstag, 30. August 2022, 16:33:27 CEST schrieb Heiko Stübner:
Quoted 18 lines
Am Freitag, 26. August 2022, 19:57:33 CEST schrieb [email protected]:
Quoted 9 lines · Heiko Stuebner
Quoted 8 lines
arch/riscv/errata/thead/errata.c +0
-0@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif }Quoted 7 lines
arch/riscv/errata/thead/errata.c static bool errata_probe_cmo(unsigned int stage, · line 50
Quoted 4 lines
arch/riscv/errata/thead/errata.c +4
-0+static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU Is there a reason that all the alternatives use ifdef rather than if(IS_ENABLED())?
Quoted 6 lines
no real reason I guess - more like not enough thinking :-)
Using
IS_ENABLEDalso makes it way nicer as we can just doif (!IS_ENABLED(CONFIG_ERRATA_THEAD_PMU)) return false;
Though at least for the CMO this is not possible, as the
riscv_noncoherent_supported()
is not defined in that case.
Though it might be nice to define a stub for the
not-CONFIG_RISCV_DMA_NONCOHERENT case
so that we don't need to #ifdef around it.
Quoted 28 lines · Heiko Stübner
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Am Dienstag, 30. August 2022, 16:33:27 CEST schrieb Heiko Stübner:
Quoted 18 lines
Am Freitag, 26. August 2022, 19:57:33 CEST schrieb [email protected]:
Quoted 9 lines · Heiko Stuebner
Quoted 8 lines
arch/riscv/errata/thead/errata.c +0
-0@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif }Quoted 7 lines
arch/riscv/errata/thead/errata.c static bool errata_probe_cmo(unsigned int stage, · line 50
Quoted 4 lines
arch/riscv/errata/thead/errata.c +4
-0+static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU Is there a reason that all the alternatives use ifdef rather than if(IS_ENABLED())?
Quoted 6 lines
no real reason I guess - more like not enough thinking :-)
Using
IS_ENABLEDalso makes it way nicer as we can just doif (!IS_ENABLED(CONFIG_ERRATA_THEAD_PMU)) return false;
Quoted 7 lines
Though at least for the CMO this is not possible, as the
riscv_noncoherent_supported()
is not defined in that case.Though it might be nice to define a stub for the
not-CONFIG_RISCV_DMA_NONCOHERENT case
so that we don't need to #ifdef around it.
Personally, I really like IS_ENABLED() & stubs as all the code gets compile tested at the very least. Maybe that is a future work item though, no need to rework the world for this series...
I'd take up arms along side you though, if you decided to wage war on ifdefs-that-could-be-IS_ENABLED() ;)
Conor.
A message that is not in the archive (sent off-list or not yet received): CAOnJCUKB2xu+RST2qh2zC7=vcLzBs_x7B3i49bTnkoBWu3-0xA@mail.gmail.com
Hi Atish,
Am Samstag, 27. August 2022, 00:39:32 CEST schrieb Atish Patra:
Quoted 9 lines · Heiko Stuebner
Quoted 8 lines
With the T-HEAD C9XX cores being designed before or during the ratification to the SSCOFPMF extension, they implement functionality very similar but not equal to it. So add some adaptions to allow the C9XX to still handle its PMU through the regular SBI PMU interface instead of defining new interfaces or drivers.
Quoted 3 lines
It would be good to include any reference to T-HEAD C9XX PMU details somewhere.
Does it support event filtering based on privilege mode as well ?
Looking at the docs ... it does, at least for machine and supervisor mode.
I.e. the mcountinhibit seems to be part of the base spec, but the c9xx also implement an scounterinhibit doing the same for supervisor mode.
Though there is no equivalent for user-mode.
Quoted 1 line
Because enabling
riscv_pmu_use_irqenables the filtering too.
From what I see in the current sbi-pmu driver this is just forwarded to the sbi-part, right? I.e. the part doing
if (event->attr.exclude_kernel) cflags |= SBI_PMU_CFG_FLAG_SET_SINH; if (event->attr.exclude_user) cflags |= SBI_PMU_CFG_FLAG_SET_UINH;
Though this is simply done independently of any kernel-side feature- detection it seems, so the would need to be handled on the sbi-side? [Which I need to update still].
Heiko
Quoted 247 lines
Quoted 244 lines
To work properly, this requires a matching change in SBI, though the actual interface between kernel and SBI does not change.
The main differences are a the overflow CSR and irq number.
As the reading of the overflow-csr is in the hot-path during irq handling use an errata and alternatives to not introduce new conditionals there.
Signed-off-by Heiko Stuebner <[email protected]>---
changes in v2:
- use alternatives for the CSR access
- make the irq num selection a bit nicerThere is of course a matching opensbi-part whose current implementation can be found on [0], but as comments show, this needs some more work still.
[0]
https://patchwork.ozlabs.org/project/opensbi/cover/[email protected]/arch/riscv/Kconfig.erratas | 14 ++++++++++++ arch/riscv/errata/thead/errata.c | 19 +++++++++++++++++ arch/riscv/include/asm/errata_list.h | 16 +++++++++++++- drivers/perf/riscv_pmu_sbi.c | 32 +++++++++++++++++++--------- 4 files changed, 70 insertions(+), 11 deletions(-)arch/riscv/Kconfig.erratas +14
-0@@ -66,4 +66,18 @@ 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 + depends on 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 +19
-0@@ -44,6 +44,22 @@ static bool errata_probe_cmo(unsigned int stage,#endif } +static bool errata_probe_pmu (unsigned int stage, +unsigned long arch_id,unsigned long impid) +{ +#ifdef CONFIG_ERRATA_THEAD_PMU +if (arch_id !=0 || impid !=0 ) +return false; + +if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) +return false; + +return true; +#else +return false; +#endif +} +static u32 thead_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) {@@ -55,6 +71,9 @@ static u32 thead_errata_probe(unsigned int stage,if (errata_probe_cmo (stage, archid, impid)) cpu_req_errata |= (1U <<ERRATA_THEAD_CMO ); +if (errata_probe_pmu (stage, archid, impid)) + cpu_req_errata |= (1U <<ERRATA_THEAD_PMU ); +return cpu_req_errata; }arch/riscv/include/asm/errata_list.h +15
-1@@ -6,6 +6,7 @@#define ASM_ERRATA_LIST_H #include <asm/alternative.h> +#include <asm/csr.h> #include <asm/vendorid_list.h> #ifdef CONFIG_ERRATA_SIFIVE @@ -17,7 +18,8 @@#ifdef CONFIG_ERRATA_THEAD #define ERRATA_THEAD_PBMT 0#define ERRATA_THEAD_CMO 1 -#define ERRATA_THEAD_NUMBER 2 +#define ERRATA_THEAD_PMU 2 +#define ERRATA_THEAD_NUMBER 3#endif #define CPUFEATURE_SVPBMT 0@@ -142,6 +144,18 @@ 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
drivers/perf/riscv_pmu_sbi.c +3
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <linux/cpu_pm.h> +#include <asm/errata_list.h> #include <asm/sbi.h> #include <asm/hwcap.h> @@ -46,6 +47,8 @@ static const struct attribute_group*riscv_pmu_attr_groups[] = { * per_cpu in case of harts with different pmu counters */ 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;struct
sbi_pmu_event_data{drivers/perf/riscv_pmu_sbi.c +1
-1@@ -575,7 +578,7 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) fidx =find_first_bit (cpu_hw_evt->used_hw_ctrs,RISCV_MAX_COUNTERS ); event = cpu_hw_evt->events[fidx];if (!event) { -csr_clear (CSR_SIP ,SIP_LCOFIP ); +csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num));return IRQ_NONE ;}drivers/perf/riscv_pmu_sbi.c +0
-0@@ -583,13 +586,13 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev)pmu_sbi_stop_hw_ctrs (pmu);/* Overflow status register should only be read after counter are stopped */
drivers/perf/riscv_pmu_sbi.c +1
-1- overflow =csr_read (CSR_SSCOUNTOVF ); +ALT_SBI_PMU_OVERFLOW (overflow);/* * Overflow interrupt pending bit should only be cleared after stopping
* all the counters to avoid any race condition. */drivers/perf/riscv_pmu_sbi.c +6
-6-csr_clear (CSR_SIP ,SIP_LCOFIP ); +csr_clear (CSR_SIP ,BIT (riscv_pmu_irq_num));/* No overflow bit is set */ if (!overflow)@@ -651,10 +654,10 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)/* Stop all the counters so that they can be enabled from perf */ pmu_sbi_stop_all (pmu ); -if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { +if (riscv_pmu_use_irq) { cpu_hw_evt->irq = riscv_pmu_irq; -csr_clear (CSR_IP ,BIT (RV_IRQ_PMU )); -csr_set (CSR_IE ,BIT (RV_IRQ_PMU )); +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 ); }@@ -663,9 +666,9 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)static int pmu_sbi_dying_cpu (unsigned int cpu,struct hlist_node *node) { -if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { +if (riscv_pmu_use_irq) {disable_percpu_irq (riscv_pmu_irq); -csr_clear (CSR_IE ,BIT (RV_IRQ_PMU )); +csr_clear (CSR_IE ,BIT (riscv_pmu_irq_num)); }/* Disable all counters access for user mode now */drivers/perf/riscv_pmu_sbi.c +0
-0@@ -681,7 +684,16 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu,struct
platform_device*pdestruct device_node *cpu, *child; struct irq_domain *domain = NULL;drivers/perf/riscv_pmu_sbi.c +10
-1-if (!riscv_isa_extension_available (NULL ,SSCOFPMF )) +if (riscv_isa_extension_available (NULL ,SSCOFPMF )) { + riscv_pmu_irq_num =RV_IRQ_PMU ; + riscv_pmu_use_irq = true; + }else if (sbi_get_mvendorid () ==THEAD_VENDOR_ID && +sbi_get_marchid () ==0 &&sbi_get_mimpid () ==0 ) { + riscv_pmu_irq_num =THEAD_C9XX_RV_IRQ_PMU ; + riscv_pmu_use_irq = true; + } + +if (!riscv_pmu_use_irq)return -EOPNOTSUPP ;for_each_of_cpu_node (cpu) {@@ -703,7 +715,7 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu,struct
platform_device*pdereturn -ENODEV; }drivers/perf/riscv_pmu_sbi.c +1
-2- riscv_pmu_irq =irq_create_mapping (domain,RV_IRQ_PMU ); + riscv_pmu_irq =irq_create_mapping (domain, riscv_pmu_irq_num);if (!riscv_pmu_irq) {pr_err ("Failed to map PMU interrupt for node\n" );return -ENODEV ; --2.35.1