Add CPPC extension support in OpenSBI
v2 cover Add CPPC extension support in OpenSBI
The latest proposal of SBI CPPC extension can be found at:
https://lists.riscv.org/g/tech-prs/message/301
This series implements SBI CPPC extension support in OpenSBI as-per above draft proposal.
To test these patches,
Qemu patches can be found in,aia_plic_cppc_v1 branch at: https://github.com/vlsunil/qemu.git
Linux patches can be found inaia_plic_cppc_v1 branch at: https://github.com/vlsunil/linux.git
These OpenSBI patches can also be found in aia_plic_cppc_v1 branch at: https://github.com/vlsunil/opensbi.git
Changes since v1:
1) Addresses Drew's feedback
a) Updated common functions to handle most of the errors.
b) Added is_reserved, readable, writable helpers as per Drew's feedback.
c) Updated macro name to SBI_CPPC_ENERGY_PERF_PREFERENCE
2) Updated RB tags
Sunil V L (4):
include: Add defines for SBI CPPC extension
lib: sbi: Implement SBI CPPC extension
lib: sbi: Print the CPPC device name
NOT_FOR_MERGE: Add test code to emulate CPPC extension
include/sbi/sbi_cppc.h | 37 ++++++ include/sbi/sbi_ecall_interface.h | 34 +++++ lib/sbi/Kconfig | 4 + lib/sbi/objects.mk | 4 + lib/sbi/sbi_cppc.c | 124 ++++++++++++++++++ lib/sbi/sbi_ecall_cppc.c | 63 +++++++++ lib/sbi/sbi_init.c | 5 + platform/generic/objects.mk | 1 + platform/generic/platform.c | 6 + platform/generic/test_cppc.c | 204 ++++++++++++++++++++++++++++++ 10 files changed, 482 insertions(+) create mode 100644 include/sbi/sbi_cppc.h create mode 100644 lib/sbi/sbi_cppc.c create mode 100644 lib/sbi/sbi_ecall_cppc.c create mode 100644 platform/generic/test_cppc.c
Signature · 1 line
2.34.1
RFC PATCH v2 1/4 include: Add defines for SBI CPPC extension
Add SBI CPPC extension related defines to the
SBI ecall interface header.
--- include/sbi/sbi_ecall_interface.h | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
include/sbi/sbi_ecall_interface.h +34 -0
@@ -31,6 +31,7 @@#define SBI_EXT_PMU 0x504D55#define SBI_EXT_DBCN 0x4442434E#define SBI_EXT_SUSP 0x53555350 +#define SBI_EXT_CPPC 0x43505043/* SBI function IDs for BASE extension*/ #define SBI_EXT_BASE_GET_SPEC_VERSION 0x0
@@ -256,6 +257,39 @@ enum sbi_pmu_ctr_type {#define SBI_SUSP_SLEEP_TYPE_LAST SBI_SUSP_SLEEP_TYPE_SUSPEND#define SBI_SUSP_PLATFORM_SLEEP_START 0x80000000 +/* SBI function IDs for CPPC extension */ +#define SBI_EXT_CPPC_PROBE 0x0 +#define SBI_EXT_CPPC_READ 0x1 +#define SBI_EXT_CPPC_READ_HI 0x2 +#define SBI_EXT_CPPC_WRITE 0x3 + +enum sbi_cppc_reg_id { +SBI_CPPC_HIGHEST_PERF =0x00000000 , +SBI_CPPC_NOMINAL_PERF =0x00000001 , +SBI_CPPC_LOW_NON_LINEAR_PERF =0x00000002 , +SBI_CPPC_LOWEST_PERF =0x00000003 , +SBI_CPPC_GUARANTEED_PERF =0x00000004 , +SBI_CPPC_DESIRED_PERF =0x00000005 , +SBI_CPPC_MIN_PERF =0x00000006 , +SBI_CPPC_MAX_PERF =0x00000007 , +SBI_CPPC_PERF_REDUC_TOLERANCE =0x00000008 , +SBI_CPPC_TIME_WINDOW =0x00000009 , +SBI_CPPC_CTR_WRAP_TIME =0x0000000A , +SBI_CPPC_REFERENCE_CTR =0x0000000B , +SBI_CPPC_DELIVERED_CTR =0x0000000C , +SBI_CPPC_PERF_LIMITED =0x0000000D , +SBI_CPPC_ENABLE =0x0000000E , +SBI_CPPC_AUTO_SEL_ENABLE =0x0000000F , +SBI_CPPC_AUTO_ACT_WINDOW =0x00000010 , +SBI_CPPC_ENERGY_PERF_PREFERENCE =0x00000011 , +SBI_CPPC_REFERENCE_PERF =0x00000012 , +SBI_CPPC_LOWEST_FREQ =0x00000013 , +SBI_CPPC_NOMINAL_FREQ =0x00000014 , +SBI_CPPC_ACPI_LAST =SBI_CPPC_NOMINAL_FREQ , +SBI_CPPC_TRANSITION_LATENCY =0x80000000 , +SBI_CPPC_NON_ACPI_LAST =SBI_CPPC_TRANSITION_LATENCY , +}; +/* SBI base specification related macros */ #define SBI_SPEC_VERSION_MAJOR_OFFSET 24#define SBI_SPEC_VERSION_MAJOR_MASK 0x7f
Signature · 1 line
2.34.1
RFC PATCH v2 1/4 include: Add defines for SBI CPPC extension
? 2023-03-23???? 14:33 +0530?Sunil V L???
Quoted 25 lines
Add SBI CPPC extension related defines to the
SBI ecall interface header.Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>---
?include/sbi/sbi_ecall_interface.h | 34 +++++++++++++++++++++++++++++++ ?1 file changed, 34 insertions(+)include/sbi/sbi_ecall_interface.h +0
-0@@ -31,6 +31,7 @@?#define SBI_EXT_PMU????????????????????????????0x504D55 ?#define SBI_EXT_DBCN???????????????????????????0x4442434E ?#define SBI_EXT_SUSP???????????????????????????0x53555350 +#define SBI_EXT_CPPC???????????????????????????0x43505043 ?
?/* SBI function IDs for BASE extension*/ ?#define SBI_EXT_BASE_GET_SPEC_VERSION??????????0x0include/sbi/sbi_ecall_interface.h +0
-0@@ -256,6 +257,39 @@ enum sbi_pmu_ctr_type {?#define SBI_SUSP_SLEEP_TYPE_LAST???????????????SBI_SUSP_SLEEP_TYPE_SUSPEND ?#define SBI_SUSP_PLATFORM_SLEEP_START??????????0x80000000
?
include/sbi/sbi_ecall_interface.h
Quoted 5 lines
include/sbi/sbi_ecall_interface.h +5
-0+/* SBI function IDs for CPPC extension */ +#define SBI_EXT_CPPC_PROBE ?????????????????????0x0 +#define SBI_EXT_CPPC_READ ??????????????????????0x1 +#define SBI_EXT_CPPC_READ_HI ???????????????????0x2 +#define SBI_EXT_CPPC_WRITE ?????????????????????0x3
The FID is specified in the documentation:
https://docs.google.com/document/d/16FLCZtW_JVrN7fnTivHRLH2E7hGdRjMfzDWzsvPRLEc
sbi_cppc_read 0sbi_cppc_read_hi 1sbi_cppc_write 2
We need to modify SBI_EXT_CPPC_PROBE to 0x3
Regards,
Xiang W
Quoted 35 lines
include/sbi/sbi_ecall_interface.h +28
-0+ +enum sbi_cppc_reg_id { +???????SBI_CPPC_HIGHEST_PERF???????????= 0x00000000, +???????SBI_CPPC_NOMINAL_PERF???????????= 0x00000001, +???????SBI_CPPC_LOW_NON_LINEAR_PERF????= 0x00000002, +???????SBI_CPPC_LOWEST_PERF????????????= 0x00000003, +???????SBI_CPPC_GUARANTEED_PERF????????= 0x00000004, +???????SBI_CPPC_DESIRED_PERF???????????= 0x00000005, +???????SBI_CPPC_MIN_PERF???????????????= 0x00000006, +???????SBI_CPPC_MAX_PERF???????????????= 0x00000007, +???????SBI_CPPC_PERF_REDUC_TOLERANCE???= 0x00000008, +???????SBI_CPPC_TIME_WINDOW????????????= 0x00000009, +???????SBI_CPPC_CTR_WRAP_TIME??????????= 0x0000000A, +???????SBI_CPPC_REFERENCE_CTR??????????= 0x0000000B, +???????SBI_CPPC_DELIVERED_CTR??????????= 0x0000000C, +???????SBI_CPPC_PERF_LIMITED???????????= 0x0000000D, +???????SBI_CPPC_ENABLE?????????????????= 0x0000000E, +???????SBI_CPPC_AUTO_SEL_ENABLE????????= 0x0000000F, +???????SBI_CPPC_AUTO_ACT_WINDOW????????= 0x00000010, +???????SBI_CPPC_ENERGY_PERF_PREFERENCE?= 0x00000011, +???????SBI_CPPC_REFERENCE_PERF?????????= 0x00000012, +???????SBI_CPPC_LOWEST_FREQ????????????= 0x00000013, +???????SBI_CPPC_NOMINAL_FREQ???????????= 0x00000014, +???????SBI_CPPC_ACPI_LAST??????????????= SBI_CPPC_NOMINAL_FREQ, +???????SBI_CPPC_TRANSITION_LATENCY?????= 0x80000000, +???????SBI_CPPC_NON_ACPI_LAST??????????= SBI_CPPC_TRANSITION_LATENCY, +}; +?/* SBI base specification related macros */ ?#define SBI_SPEC_VERSION_MAJOR_OFFSET??????????24 ?#define SBI_SPEC_VERSION_MAJOR_MASK????????????0x7f
Signature · 1 line
2.34.1
RFC PATCH v2 1/4 include: Add defines for SBI CPPC extension
? 2023-03-27???? 16:27 +0800?Xiang W???
Quoted 35 lines
? 2023-03-23???? 14:33 +0530?Sunil V L???
Quoted 25 lines
Add SBI CPPC extension related defines to the
SBI ecall interface header.Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>---
?include/sbi/sbi_ecall_interface.h | 34 +++++++++++++++++++++++++++++++ ?1 file changed, 34 insertions(+)include/sbi/sbi_ecall_interface.h +0
-0@@ -31,6 +31,7 @@?#define SBI_EXT_PMU????????????????????????????0x504D55 ?#define SBI_EXT_DBCN???????????????????????????0x4442434E ?#define SBI_EXT_SUSP???????????????????????????0x53555350 +#define SBI_EXT_CPPC???????????????????????????0x43505043 ?
?/* SBI function IDs for BASE extension*/ ?#define SBI_EXT_BASE_GET_SPEC_VERSION??????????0x0include/sbi/sbi_ecall_interface.h +0
-0@@ -256,6 +257,39 @@ enum sbi_pmu_ctr_type {?#define SBI_SUSP_SLEEP_TYPE_LAST???????????????SBI_SUSP_SLEEP_TYPE_SUSPEND ?#define SBI_SUSP_PLATFORM_SLEEP_START??????????0x80000000
?include/sbi/sbi_ecall_interface.h
Quoted 5 lines
include/sbi/sbi_ecall_interface.h +5
-0+/* SBI function IDs for CPPC extension */ +#define SBI_EXT_CPPC_PROBE ?????????????????????0x0 +#define SBI_EXT_CPPC_READ ??????????????????????0x1 +#define SBI_EXT_CPPC_READ_HI ???????????????????0x2 +#define SBI_EXT_CPPC_WRITE ?????????????????????0x3The FID is specified in the documentation:
https://docs.google.com/document/d/16FLCZtW_JVrN7fnTivHRLH2E7hGdRjMfzDWzsvPRLEc
Quoted 5 lines
sbi_cppc_read??? 0sbi_cppc_read_hi1sbi_cppc_write?? 2We need to modify
SBI_EXT_CPPC_PROBEto0x3
Maybe it's better to change it to 0x8000 to leave space for extending the FID
Quoted 39 lines
Regards,
Xiang WQuoted 35 lines
include/sbi/sbi_ecall_interface.h +28
-0+ +enum sbi_cppc_reg_id { +???????SBI_CPPC_HIGHEST_PERF???????????= 0x00000000, +???????SBI_CPPC_NOMINAL_PERF???????????= 0x00000001, +???????SBI_CPPC_LOW_NON_LINEAR_PERF????= 0x00000002, +???????SBI_CPPC_LOWEST_PERF????????????= 0x00000003, +???????SBI_CPPC_GUARANTEED_PERF????????= 0x00000004, +???????SBI_CPPC_DESIRED_PERF???????????= 0x00000005, +???????SBI_CPPC_MIN_PERF???????????????= 0x00000006, +???????SBI_CPPC_MAX_PERF???????????????= 0x00000007, +???????SBI_CPPC_PERF_REDUC_TOLERANCE???= 0x00000008, +???????SBI_CPPC_TIME_WINDOW????????????= 0x00000009, +???????SBI_CPPC_CTR_WRAP_TIME??????????= 0x0000000A, +???????SBI_CPPC_REFERENCE_CTR??????????= 0x0000000B, +???????SBI_CPPC_DELIVERED_CTR??????????= 0x0000000C, +???????SBI_CPPC_PERF_LIMITED???????????= 0x0000000D, +???????SBI_CPPC_ENABLE?????????????????= 0x0000000E, +???????SBI_CPPC_AUTO_SEL_ENABLE????????= 0x0000000F, +???????SBI_CPPC_AUTO_ACT_WINDOW????????= 0x00000010, +???????SBI_CPPC_ENERGY_PERF_PREFERENCE?= 0x00000011, +???????SBI_CPPC_REFERENCE_PERF?????????= 0x00000012, +???????SBI_CPPC_LOWEST_FREQ????????????= 0x00000013, +???????SBI_CPPC_NOMINAL_FREQ???????????= 0x00000014, +???????SBI_CPPC_ACPI_LAST??????????????= SBI_CPPC_NOMINAL_FREQ, +???????SBI_CPPC_TRANSITION_LATENCY?????= 0x80000000, +???????SBI_CPPC_NON_ACPI_LAST??????????= SBI_CPPC_TRANSITION_LATENCY, +}; +?/* SBI base specification related macros */ ?#define SBI_SPEC_VERSION_MAJOR_OFFSET??????????24 ?#define SBI_SPEC_VERSION_MAJOR_MASK????????????0x7f
Signature · 1 line
2.34.1
RFC PATCH v2 1/4 include: Add defines for SBI CPPC extension
Quoted 36 lines · Xiang W
? 2023-03-27???? 16:27 +0800?Xiang W???
Quoted 35 lines
? 2023-03-23???? 14:33 +0530?Sunil V L???
Quoted 25 lines
Add SBI CPPC extension related defines to the
SBI ecall interface header.Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>---
?include/sbi/sbi_ecall_interface.h | 34 +++++++++++++++++++++++++++++++ ?1 file changed, 34 insertions(+)include/sbi/sbi_ecall_interface.h +0
-0@@ -31,6 +31,7 @@?#define SBI_EXT_PMU????????????????????????????0x504D55 ?#define SBI_EXT_DBCN???????????????????????????0x4442434E ?#define SBI_EXT_SUSP???????????????????????????0x53555350 +#define SBI_EXT_CPPC???????????????????????????0x43505043 ?
?/* SBI function IDs for BASE extension*/ ?#define SBI_EXT_BASE_GET_SPEC_VERSION??????????0x0include/sbi/sbi_ecall_interface.h +0
-0@@ -256,6 +257,39 @@ enum sbi_pmu_ctr_type {?#define SBI_SUSP_SLEEP_TYPE_LAST???????????????SBI_SUSP_SLEEP_TYPE_SUSPEND ?#define SBI_SUSP_PLATFORM_SLEEP_START??????????0x80000000
?include/sbi/sbi_ecall_interface.h
Quoted 5 lines
include/sbi/sbi_ecall_interface.h +5
-0+/* SBI function IDs for CPPC extension */ +#define SBI_EXT_CPPC_PROBE ?????????????????????0x0 +#define SBI_EXT_CPPC_READ ??????????????????????0x1 +#define SBI_EXT_CPPC_READ_HI ???????????????????0x2 +#define SBI_EXT_CPPC_WRITE ?????????????????????0x3The FID is specified in the documentation:
https://docs.google.com/document/d/16FLCZtW_JVrN7fnTivHRLH2E7hGdRjMfzDWzsvPRLEc
Quoted 7 lines
Quoted 5 lines
sbi_cppc_read??? 0sbi_cppc_read_hi1sbi_cppc_write?? 2We need to modify
SBI_EXT_CPPC_PROBEto0x3Maybe it's better to change it to
0x8000to leave space for extending the FIDQuoted 1 line
Hi Xiang!,
The gdoc is outdated and have stopped updating it since the review is happening now via regular adoc patch. Please refer to
https://lists.riscv.org/g/tech-prs/message/301 for the latest proposal.
Thanks!
Sunil
Quoted 39 lines
Quoted 38 lines
Regards,
Xiang WQuoted 35 lines
include/sbi/sbi_ecall_interface.h +28
-0+ +enum sbi_cppc_reg_id { +???????SBI_CPPC_HIGHEST_PERF???????????= 0x00000000, +???????SBI_CPPC_NOMINAL_PERF???????????= 0x00000001, +???????SBI_CPPC_LOW_NON_LINEAR_PERF????= 0x00000002, +???????SBI_CPPC_LOWEST_PERF????????????= 0x00000003, +???????SBI_CPPC_GUARANTEED_PERF????????= 0x00000004, +???????SBI_CPPC_DESIRED_PERF???????????= 0x00000005, +???????SBI_CPPC_MIN_PERF???????????????= 0x00000006, +???????SBI_CPPC_MAX_PERF???????????????= 0x00000007, +???????SBI_CPPC_PERF_REDUC_TOLERANCE???= 0x00000008, +???????SBI_CPPC_TIME_WINDOW????????????= 0x00000009, +???????SBI_CPPC_CTR_WRAP_TIME??????????= 0x0000000A, +???????SBI_CPPC_REFERENCE_CTR??????????= 0x0000000B, +???????SBI_CPPC_DELIVERED_CTR??????????= 0x0000000C, +???????SBI_CPPC_PERF_LIMITED???????????= 0x0000000D, +???????SBI_CPPC_ENABLE?????????????????= 0x0000000E, +???????SBI_CPPC_AUTO_SEL_ENABLE????????= 0x0000000F, +???????SBI_CPPC_AUTO_ACT_WINDOW????????= 0x00000010, +???????SBI_CPPC_ENERGY_PERF_PREFERENCE?= 0x00000011, +???????SBI_CPPC_REFERENCE_PERF?????????= 0x00000012, +???????SBI_CPPC_LOWEST_FREQ????????????= 0x00000013, +???????SBI_CPPC_NOMINAL_FREQ???????????= 0x00000014, +???????SBI_CPPC_ACPI_LAST??????????????= SBI_CPPC_NOMINAL_FREQ, +???????SBI_CPPC_TRANSITION_LATENCY?????= 0x80000000, +???????SBI_CPPC_NON_ACPI_LAST??????????= SBI_CPPC_TRANSITION_LATENCY, +}; +?/* SBI base specification related macros */ ?#define SBI_SPEC_VERSION_MAJOR_OFFSET??????????24 ?#define SBI_SPEC_VERSION_MAJOR_MASK????????????0x7f
Signature · 1 line
2.34.1
RFC PATCH v2 2/4 lib: sbi: Implement SBI CPPC extension
In reply to Sunil V LImplement SBI CPPC extension. This extension is only available when OpenSBI platform provides a CPPC device to generic library.
--- include/sbi/sbi_cppc.h | 35 +++++++++++ lib/sbi/Kconfig | 4 ++ lib/sbi/objects.mk | 4 ++ lib/sbi/sbi_cppc.c | 124 +++++++++++++++++++++++++++++++++++++++ lib/sbi/sbi_ecall_cppc.c | 63 ++++++++++++++++++++ 5 files changed, 230 insertions(+) create mode 100644 include/sbi/sbi_cppc.h create mode 100644 lib/sbi/sbi_cppc.c create mode 100644 lib/sbi/sbi_ecall_cppc.c
include/sbi/sbi_cppc.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2023 Ventana Micro Systems Inc. +* +*/ + +#ifndef __SBI_CPPC_H__ +#define __SBI_CPPC_H__ + +#include <sbi/sbi_types.h> + +/** CPPC device */ +struct sbi_cppc_device { +/** Name of the CPPC device */ +char name[32 ]; + +/** probe - returns register width if implemented, 0 otherwise */ +int (*cppc_probe)(unsigned long reg); + +/** read the cppc register*/ +int (*cppc_read)(unsigned long reg,uint64_t *val); + +/** write to the cppc register*/ +int (*cppc_write)(unsigned long reg,uint64_t val); +}; + +int sbi_cppc_probe (unsigned long reg); +int sbi_cppc_read (unsigned long reg,uint64_t *val); +int sbi_cppc_write (unsigned long reg,uint64_t val); + +const struct sbi_cppc_device *sbi_cppc_get_device (void ); +void sbi_cppc_set_device (const struct sbi_cppc_device *dev); + +#endif
lib/sbi/Kconfig +4 -0
@@ -34,6 +34,10 @@ config SBI_ECALL_DBCN bool "Debug Console extension" default y +config SBI_ECALL_CPPC + bool "CPPC extension" + default y + config SBI_ECALL_LEGACY bool "SBI v0.1 legacy extensions" default y
lib/sbi/objects.mk +4 -0
@@ -43,6 +43,9 @@ libsbi-objs-$(CONFIG_SBI_ECALL_PMU) += sbi_ecall_pmu.o carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_DBCN) += ecall_dbcn libsbi-objs-$(CONFIG_SBI_ECALL_DBCN) += sbi_ecall_dbcn.o +carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_CPPC) += ecall_cppc +libsbi-objs-$(CONFIG_SBI_ECALL_CPPC) += sbi_ecall_cppc.o + carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_LEGACY) += ecall_legacy libsbi-objs-$(CONFIG_SBI_ECALL_LEGACY) += sbi_ecall_legacy.o
@@ -74,3 +77,4 @@ libsbi-objs-y += sbi_tlb.o libsbi-objs-y += sbi_trap.o libsbi-objs-y += sbi_unpriv.o libsbi-objs-y += sbi_expected_trap.o +libsbi-objs-y += sbi_cppc.o
lib/sbi/sbi_cppc.c new file +124 -0
124 lines not on this page · raw message
lib/sbi/sbi_ecall_cppc.c new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC PATCH v2 2/4 lib: sbi: Implement SBI CPPC extension
Quoted 164 lines · Sunil V L
Implement SBI CPPC extension. This extension is only available when OpenSBI platform provides a CPPC device to generic library.
Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- include/sbi/sbi_cppc.h | 35 +++++++++++ lib/sbi/Kconfig | 4 ++ lib/sbi/objects.mk | 4 ++ lib/sbi/sbi_cppc.c | 124 +++++++++++++++++++++++++++++++++++++++ lib/sbi/sbi_ecall_cppc.c | 63 ++++++++++++++++++++ 5 files changed, 230 insertions(+) create mode 100644 include/sbi/sbi_cppc.h create mode 100644 lib/sbi/sbi_cppc.c create mode 100644 lib/sbi/sbi_ecall_cppc.cinclude/sbi/sbi_cppc.h new file +35
-0@@ -0,0 +1,35 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2023 Ventana Micro Systems Inc. +* +*/ + +#ifndef __SBI_CPPC_H__ +#define __SBI_CPPC_H__ + +#include <sbi/sbi_types.h> + +/** CPPC device */ +struct sbi_cppc_device { +/** Name of the CPPC device */ +char name[32 ]; + +/** probe - returns register width if implemented, 0 otherwise */ +int (*cppc_probe)(unsigned long reg); + +/** read the cppc register*/ +int (*cppc_read)(unsigned long reg,uint64_t *val); + +/** write to the cppc register*/ +int (*cppc_write)(unsigned long reg,uint64_t val); +}; + +int sbi_cppc_probe (unsigned long reg); +int sbi_cppc_read (unsigned long reg,uint64_t *val); +int sbi_cppc_write (unsigned long reg,uint64_t val); + +const struct sbi_cppc_device *sbi_cppc_get_device (void ); +void sbi_cppc_set_device (const struct sbi_cppc_device *dev); + +#endif lib/sbi/Kconfig +4
-0@@ -34,6 +34,10 @@ config SBI_ECALL_DBCN bool "Debug Console extension" default y +config SBI_ECALL_CPPC + bool "CPPC extension" + default y + config SBI_ECALL_LEGACY bool "SBI v0.1 legacy extensions" default ylib/sbi/objects.mk +4
-0@@ -43,6 +43,9 @@ libsbi-objs-$(CONFIG_SBI_ECALL_PMU) += sbi_ecall_pmu.o carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_DBCN) += ecall_dbcn libsbi-objs-$(CONFIG_SBI_ECALL_DBCN) += sbi_ecall_dbcn.o +carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_CPPC) += ecall_cppc +libsbi-objs-$(CONFIG_SBI_ECALL_CPPC) += sbi_ecall_cppc.o + carray-sbi_ecall_exts-$(CONFIG_SBI_ECALL_LEGACY) += ecall_legacy libsbi-objs-$(CONFIG_SBI_ECALL_LEGACY) += sbi_ecall_legacy.o@@ -74,3 +77,4 @@ libsbi-objs-y += sbi_tlb.o libsbi-objs-y += sbi_trap.o libsbi-objs-y += sbi_unpriv.o libsbi-objs-y += sbi_expected_trap.o +libsbi-objs-y += sbi_cppc.olib/sbi/sbi_cppc.c new file +67
-0@@ -0,0 +1,124 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2023 Ventana Micro Systems Inc. +* +*/ + +#include <sbi/sbi_error.h> +#include <sbi/sbi_cppc.h> + +static const struct sbi_cppc_device *cppc_dev =NULL ; + +const struct sbi_cppc_device *sbi_cppc_get_device (void ) +{ +return cppc_dev; +} + +void sbi_cppc_set_device (const struct sbi_cppc_device *dev) +{ +if (!dev || cppc_dev) +return ; + + cppc_dev = dev; +} + +static bool sbi_cppc_is_reserved (unsigned long reg) +{ +if ((reg >SBI_CPPC_ACPI_LAST && reg <SBI_CPPC_TRANSITION_LATENCY ) || + reg >SBI_CPPC_NON_ACPI_LAST ) +return true; + +return false; +} + +static bool sbi_cppc_readable (unsigned long reg) +{ +/* there are no write-only cppc registers currently */ +return true; +} + +static bool sbi_cppc_writable (unsigned long reg) +{ +switch (reg) { +case SBI_CPPC_HIGHEST_PERF : +case SBI_CPPC_NOMINAL_PERF : +case SBI_CPPC_LOW_NON_LINEAR_PERF : +case SBI_CPPC_LOWEST_PERF : +case SBI_CPPC_GUARANTEED_PERF : +case SBI_CPPC_CTR_WRAP_TIME : +case SBI_CPPC_REFERENCE_CTR : +case SBI_CPPC_DELIVERED_CTR : +case SBI_CPPC_REFERENCE_PERF : +case SBI_CPPC_LOWEST_FREQ : +case SBI_CPPC_NOMINAL_FREQ : +case SBI_CPPC_TRANSITION_LATENCY : +return false; + } + +return true; +} + +int sbi_cppc_probe (unsigned long reg) +{ +int ret; + +if (!cppc_dev || !cppc_dev->cppc_probe) +return SBI_EFAIL ;
lib/sbi/sbi_cppc.c line 77
Quoted 10 lines
lib/sbi/sbi_cppc.c new file +10
-0+ +/* Check whether register is reserved */ +if (sbi_cppc_is_reserved (reg)) +return SBI_ERR_INVALID_PARAM ; + + ret = cppc_dev->cppc_probe (reg); +if (ret >=0 ) +return ret; +else +return SBI_ERR_FAILED ;
nit: Can drop 'else'. Comment applies to next two functions as well.
Quoted 119 lines
lib/sbi/sbi_cppc.c new file +47
-0+} + +int sbi_cppc_read (unsigned long reg,uint64_t *val) +{ +if (!cppc_dev || !cppc_dev->cppc_read || !cppc_dev->cppc_probe) +return SBI_EFAIL ; + +/* Check whether register is reserved */ +if (sbi_cppc_is_reserved (reg)) +return SBI_ERR_INVALID_PARAM ; + +/* Check whether register is implemented */ +if (!cppc_dev->cppc_probe (reg)) +return SBI_ERR_NOT_SUPPORTED ; + +/* Check whether the register is write-only */ +if (!sbi_cppc_readable (reg)) +return SBI_ERR_DENIED ; + +if (!cppc_dev->cppc_read (reg, val)) +return SBI_SUCCESS ; +else +return SBI_ERR_FAILED ; +} + +int sbi_cppc_write (unsigned long reg,uint64_t val) +{ +if (!cppc_dev || !cppc_dev->cppc_write || !cppc_dev->cppc_probe) +return SBI_EFAIL ; + +/* Check whether register is reserved */ +if (sbi_cppc_is_reserved (reg)) +return SBI_ERR_INVALID_PARAM ; + +/* Check whether register is implemented */ +if (!cppc_dev->cppc_probe (reg)) +return SBI_ERR_NOT_SUPPORTED ; + +/* Check whether the register is read-only */ +if (!sbi_cppc_writable (reg)) +return SBI_ERR_DENIED ; + +if (!cppc_dev->cppc_write (reg, val)) +return SBI_SUCCESS ; +else +return SBI_ERR_FAILED ; +}lib/sbi/sbi_ecall_cppc.c new file +63
-0@@ -0,0 +1,63 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2023 Ventana Micro Systems Inc. +* +*/ + +#include <sbi/sbi_ecall.h> +#include <sbi/sbi_ecall_interface.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_trap.h> +#include <sbi/sbi_cppc.h> + +static int sbi_ecall_cppc_handler (unsigned long extid,unsigned long funcid, +const struct sbi_trap_regs *regs, +unsigned long *out_val, +struct sbi_trap_info *out_trap) +{ +int ret =0 ; +uint64_t temp; + +switch (funcid) { +case SBI_EXT_CPPC_READ : + ret =sbi_cppc_read (regs->a0, &temp); + *out_val = temp; +break ; +case SBI_EXT_CPPC_READ_HI : +#if __riscv_xlen ==32 + ret =sbi_cppc_read (regs->a0, &temp); + *out_val = temp >>32 ; +#else + *out_val =0 ; +#endif +break ; +case SBI_EXT_CPPC_WRITE : + ret =sbi_cppc_write (regs->a0, regs->a1); +break ; +case SBI_EXT_CPPC_PROBE : + ret =sbi_cppc_probe (regs->a0); +if (ret >=0 ) { + *out_val = ret; + ret =0 ; + } +break ; +default : + ret =SBI_ENOTSUPP ; + } + +return ret; +} + +static int sbi_ecall_cppc_probe (unsigned long extid,unsigned long *out_val) +{ + *out_val =sbi_cppc_get_device () ?1 :0 ; +return 0 ; +} + +struct sbi_ecall_extension ecall_cppc = { + .extid_start =SBI_EXT_CPPC , + .extid_end =SBI_EXT_CPPC , + .handle = sbi_ecall_cppc_handler, + .probe = sbi_ecall_cppc_probe, +};Signature · 1 line
2.34.1
Thanks,
drew
RFC PATCH v2 3/4 lib: sbi: Print the CPPC device name
In reply to Sunil V LIf CPPC device is registered by the platform, print its name.
--- lib/sbi/sbi_init.c | 5 +++++ 1 file changed, 5 insertions(+)
lib/sbi/sbi_init.c +5 -0
@@ -12,6 +12,7 @@#include <sbi/riscv_barrier.h> #include <sbi/riscv_locks.h> #include <sbi/sbi_console.h> +#include <sbi/sbi_cppc.h> #include <sbi/sbi_domain.h> #include <sbi/sbi_ecall.h> #include <sbi/sbi_hart.h>
@@ -70,6 +71,7 @@ static void sbi_boot_print_general(struct sbi_scratch *scratch)const struct sbi_console_device *cdev;const struct sbi_system_reset_device *srdev;const struct sbi_system_suspend_device *susp_dev; +const struct sbi_cppc_device *cppc_dev;const struct sbi_platform *plat =sbi_platform_ptr (scratch);if (scratch->options &SBI_SCRATCH_NO_BOOT_PRINTS )
@@ -107,6 +109,9 @@ static void sbi_boot_print_general(struct sbi_scratch *scratch) susp_dev =sbi_system_suspend_get_device ();sbi_printf ("Platform Suspend Device : %s\n" , (susp_dev) ? susp_dev->name :"---" ); + cppc_dev =sbi_cppc_get_device (); +sbi_printf ("Platform CPPC Device : %s\n" , + (cppc_dev) ? cppc_dev->name :"---" );/* Firmware details */ sbi_printf ("Firmware Base : 0x%lx\n" , scratch->fw_start);
Signature · 1 line
2.34.1
RFC PATCH v2 4/4 NOT_FOR_MERGE: Add test code to emulate CPPC extension
In reply to Sunil V LThis is a test code to emulate the CPPC extension and it is not for merge.
--- include/sbi/sbi_cppc.h | 2 + platform/generic/objects.mk | 1 + platform/generic/platform.c | 6 ++ platform/generic/test_cppc.c | 204 +++++++++++++++++++++++++++++++++++ 4 files changed, 213 insertions(+) create mode 100644 platform/generic/test_cppc.c
include/sbi/sbi_cppc.h +2 -0
@@ -32,4 +32,6 @@ int sbi_cppc_write(unsigned long reg, uint64_t val);const struct sbi_cppc_device *sbi_cppc_get_device (void );void sbi_cppc_set_device (const struct sbi_cppc_device *dev); +int test_cppc_init (void ); +#endif
platform/generic/objects.mk +1 -0
@@ -20,6 +20,7 @@ platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M virt -m 256M \ # Objects to build platform-objs-y += platform.o platform-objs-y += platform_override_modules.o +platform-objs-$(CONFIG_SBI_ECALL_CPPC) += test_cppc.o # Blobs to build FW_TEXT_START=0x80000000
platform/generic/platform.c +6 -0
@@ -14,6 +14,7 @@#include <sbi/sbi_platform.h> #include <sbi/sbi_string.h> #include <sbi/sbi_system.h> +#include <sbi/sbi_cppc.h> #include <sbi_utils/fdt/fdt_domain.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_helper.h>
@@ -166,6 +167,11 @@ static int generic_final_init(bool cold_boot)if (!cold_boot)return 0 ; +#ifdef CONFIG_SBI_ECALL_CPPC +if (!generic_plat) +test_cppc_init (); +#endif + fdt =fdt_get_address ();fdt_cpu_fixup (fdt);
platform/generic/test_cppc.c new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC PATCH v2 4/4 NOT_FOR_MERGE: Add test code to emulate CPPC extension
Quoted 202 lines · Sunil V L
This is a test code to emulate the CPPC extension and it is not for merge.
Signed-off-by Sunil V L <[email protected]>--- include/sbi/sbi_cppc.h | 2 + platform/generic/objects.mk | 1 + platform/generic/platform.c | 6 ++ platform/generic/test_cppc.c | 204 +++++++++++++++++++++++++++++++++++ 4 files changed, 213 insertions(+) create mode 100644 platform/generic/test_cppc.cinclude/sbi/sbi_cppc.h +2
-0@@ -32,4 +32,6 @@ int sbi_cppc_write(unsigned long reg, uint64_t val);const struct sbi_cppc_device *sbi_cppc_get_device (void );void sbi_cppc_set_device (const struct sbi_cppc_device *dev); +int test_cppc_init (void ); +#endif platform/generic/objects.mk +1
-0@@ -20,6 +20,7 @@ platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M virt -m 256M \ # Objects to build platform-objs-y += platform.o platform-objs-y += platform_override_modules.o +platform-objs-$(CONFIG_SBI_ECALL_CPPC) += test_cppc.o # Blobs to build FW_TEXT_START=0x80000000platform/generic/platform.c +6
-0@@ -14,6 +14,7 @@#include <sbi/sbi_platform.h> #include <sbi/sbi_string.h> #include <sbi/sbi_system.h> +#include <sbi/sbi_cppc.h> #include <sbi_utils/fdt/fdt_domain.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_helper.h> @@ -166,6 +167,11 @@ static int generic_final_init(bool cold_boot)if (!cold_boot)return 0 ; +#ifdef CONFIG_SBI_ECALL_CPPC +if (!generic_plat) +test_cppc_init (); +#endif + fdt =fdt_get_address ();fdt_cpu_fixup (fdt);platform/generic/test_cppc.c new file +137
-0@@ -0,0 +1,204 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2023 Ventana Micro Systems Inc. +* +*/ + +#include <sbi/sbi_ecall_interface.h> +#include <sbi/sbi_console.h> +#include <sbi/sbi_cppc.h> +#include <sbi/sbi_error.h> +#include <sbi/sbi_scratch.h> +#include <sbi/sbi_string.h> +#include <sbi/sbi_timer.h> + +struct perf_channel { +unsigned int highest_perf; +unsigned int nominal_perf; +unsigned int lowest_nonlinear_perf; +unsigned int lowest_perf; +unsigned int desired_perf; +unsigned int perf_limited; +unsigned int reference_perf; +unsigned int lowest_freq; +unsigned int nominal_freq; +unsigned int transition_latency; +}; + +static unsigned long cppc_offset; + +static int sbi_cppc_test_read (unsigned long reg,uint64_t *val) +{ +struct sbi_scratch *scratch; +struct perf_channel *cppc; +unsigned long hartid; +int ret =SBI_SUCCESS ; + + hartid =current_hartid (); + + scratch =sbi_hartid_to_scratch (hartid); + cppc =sbi_scratch_offset_ptr (scratch, cppc_offset); + +switch (reg) { +case SBI_CPPC_HIGHEST_PERF : + *val = cppc->highest_perf; +break ; +case SBI_CPPC_NOMINAL_PERF : + *val = cppc->nominal_perf; +break ; +case SBI_CPPC_LOW_NON_LINEAR_PERF : + *val = cppc->lowest_nonlinear_perf; +break ; +case SBI_CPPC_LOWEST_PERF : + *val = cppc->lowest_perf; +break ; +case SBI_CPPC_DESIRED_PERF : + *val = cppc->desired_perf; +break ; +case SBI_CPPC_REFERENCE_CTR : + *val =sbi_timer_value (); +break ; +case SBI_CPPC_DELIVERED_CTR : +/* +* Can't use CYCLE CSR properly in qemu, so just return +* TIME itself so that delta(delivered) / delta(ref) = 1 +*/ + *val =sbi_timer_value (); +break ; +case SBI_CPPC_PERF_LIMITED : + *val = cppc->perf_limited; +break ; +case SBI_CPPC_REFERENCE_PERF : + *val = cppc->reference_perf; +break ; +case SBI_CPPC_LOWEST_FREQ : + *val = cppc->lowest_freq; +break ; +case SBI_CPPC_NOMINAL_FREQ : + *val = cppc->nominal_freq; +break ; +case SBI_CPPC_TRANSITION_LATENCY : + *val = cppc->transition_latency; +break ; +default : +return -1 ; + } + +return ret; +} + +static int sbi_cppc_test_write (unsigned long reg,uint64_t val) +{ +struct sbi_scratch *scratch; +struct perf_channel *cppc; +unsigned long hartid; +int ret =SBI_SUCCESS ; + + hartid =current_hartid (); + + scratch =sbi_hartid_to_scratch (hartid); + cppc =sbi_scratch_offset_ptr (scratch, cppc_offset); + +switch (reg) { +case SBI_CPPC_DESIRED_PERF : + cppc->desired_perf = val; +break ; +case SBI_CPPC_PERF_LIMITED : + cppc->perf_limited = val; +break ; +default : +return -1 ; + } + +return ret; +} + +static int sbi_cppc_test_probe (unsigned long reg) +{ +switch (reg) { +case SBI_CPPC_DESIRED_PERF : +case SBI_CPPC_PERF_LIMITED : +case SBI_CPPC_HIGHEST_PERF : +case SBI_CPPC_NOMINAL_PERF : +case SBI_CPPC_LOW_NON_LINEAR_PERF : +case SBI_CPPC_LOWEST_PERF : +case SBI_CPPC_REFERENCE_PERF : +case SBI_CPPC_LOWEST_FREQ : +case SBI_CPPC_NOMINAL_FREQ : +case SBI_CPPC_TRANSITION_LATENCY : +return 32 ; +case SBI_CPPC_REFERENCE_CTR : +case SBI_CPPC_DELIVERED_CTR : +return 64 ; +case SBI_CPPC_GUARANTEED_PERF : +case SBI_CPPC_MIN_PERF : +case SBI_CPPC_MAX_PERF : +case SBI_CPPC_PERF_REDUC_TOLERANCE :
platform/generic/test_cppc.c line 147
Quoted 10 lines
platform/generic/test_cppc.c new file +10
-0+case SBI_CPPC_TIME_WINDOW : +case SBI_CPPC_CTR_WRAP_TIME : +case SBI_CPPC_ENABLE : +case SBI_CPPC_AUTO_SEL_ENABLE : +case SBI_CPPC_AUTO_ACT_WINDOW : +case SBI_CPPC_ENERGY_PERF_PREFERENCE : +return 0 ; + } + +return -1 ;
I think there was a misunderstanding as to what I was suggesting for probe. I was thinking the common probe could handle everything that doesn't change from the spec itself. There was also a misunderstanding on what I was thinking for read/write, since they can still return SBI errors rather than 0/-1. Here's a patch that applies on top of this series which illustrates what I'm thinking.
lib/sbi/sbi_cppc.c +28 -10
@@ -73,8 +73,32 @@ int sbi_cppc_probe(unsigned long reg) ret = cppc_dev->cppc_probe (reg);if (ret >=0 )return ret; -else -return SBI_ERR_FAILED ; + +switch (reg) { +case SBI_CPPC_HIGHEST_PERF : +case SBI_CPPC_NOMINAL_PERF : +case SBI_CPPC_LOW_NON_LINEAR_PERF : +case SBI_CPPC_LOWEST_PERF : +case SBI_CPPC_GUARANTEED_PERF : +case SBI_CPPC_DESIRED_PERF : +case SBI_CPPC_MIN_PERF : +case SBI_CPPC_MAX_PERF : +case SBI_CPPC_PERF_REDUC_TOLERANCE : +case SBI_CPPC_TIME_WINDOW : +case SBI_CPPC_PERF_LIMITED : +case SBI_CPPC_ENABLE : +case SBI_CPPC_AUTO_SEL_ENABLE : +case SBI_CPPC_AUTO_ACT_WINDOW : +case SBI_CPPC_ENERGY_PERF_PREFERENCE : +case SBI_CPPC_REFERENCE_PERF : +case SBI_CPPC_LOWEST_FREQ : +case SBI_CPPC_NOMINAL_FREQ : +case SBI_CPPC_TRANSITION_LATENCY : +case SBI_CPPC_NON_ACPI_LAST : +return 32 ; + } + +return SBI_ERR_FAILED ; }int sbi_cppc_read (unsigned long reg,uint64_t *val)
@@ -94,10 +118,7 @@ int sbi_cppc_read(unsigned long reg, uint64_t *val)if (!sbi_cppc_readable (reg))return SBI_ERR_DENIED ; -if (!cppc_dev->cppc_read (reg, val)) -return SBI_SUCCESS ; -else -return SBI_ERR_FAILED ; +return cppc_dev->cppc_read (reg, val); }int sbi_cppc_write (unsigned long reg,uint64_t val)
@@ -117,8 +138,5 @@ int sbi_cppc_write(unsigned long reg, uint64_t val)if (!sbi_cppc_writable (reg))return SBI_ERR_DENIED ; -if (!cppc_dev->cppc_write (reg, val)) -return SBI_SUCCESS ; -else -return SBI_ERR_FAILED ; +return cppc_dev->cppc_write (reg, val); }
platform/generic/test_cppc.c +4 -17
@@ -33,7 +33,6 @@ static int sbi_cppc_test_read(unsigned long reg, uint64_t *val)struct sbi_scratch *scratch;struct perf_channel *cppc;unsigned long hartid; -int ret =SBI_SUCCESS ; hartid =current_hartid ();
@@ -82,10 +81,10 @@ static int sbi_cppc_test_read(unsigned long reg, uint64_t *val) *val = cppc->transition_latency;break ;default : -return -1 ; +return SBI_ERR_FAILED ; } -return ret; +return SBI_SUCCESS ; }static int sbi_cppc_test_write (unsigned long reg,uint64_t val)
@@ -93,7 +92,6 @@ static int sbi_cppc_test_write(unsigned long reg, uint64_t val)struct sbi_scratch *scratch;struct perf_channel *cppc;unsigned long hartid; -int ret =SBI_SUCCESS ; hartid =current_hartid ();
@@ -108,26 +106,15 @@ static int sbi_cppc_test_write(unsigned long reg, uint64_t val) cppc->perf_limited = val;break ;default : -return -1 ; +return SBI_ERR_FAILED ; } -return ret; +return SBI_SUCCESS ; }static int sbi_cppc_test_probe (unsigned long reg) {switch (reg) { -case SBI_CPPC_DESIRED_PERF : -case SBI_CPPC_PERF_LIMITED : -case SBI_CPPC_HIGHEST_PERF : -case SBI_CPPC_NOMINAL_PERF : -case SBI_CPPC_LOW_NON_LINEAR_PERF : -case SBI_CPPC_LOWEST_PERF : -case SBI_CPPC_REFERENCE_PERF : -case SBI_CPPC_LOWEST_FREQ : -case SBI_CPPC_NOMINAL_FREQ : -case SBI_CPPC_TRANSITION_LATENCY : -return 32 ;case SBI_CPPC_REFERENCE_CTR :case SBI_CPPC_DELIVERED_CTR :return 64 ;
Thanks,
drew