Add support for a few Zc* extensions, Zcmop and Zimop
Subsystems (6)
v7 cover Add support for a few Zc* extensions, Zcmop and Zimop
Add support for (yet again) more RVA23U64 missing extensions. Add support for Zimop, Zcmop, Zca, Zcf, Zcd and Zcb extensions ISA string parsing, hwprobe and kvm support. Zce, Zcmt and Zcmp extensions have been left out since they target microcontrollers/embedded CPUs and are not needed by RVA23U64.
Since Zc* extensions states that C implies Zca, Zcf (if F and RV32), Zcd (if D), this series modifies the way ISA string is parsed and now does it in two phases. First one parses the string and the second one validates it for the final ISA description.
---
v7:
- Rebased on riscv/for-next to fix conflicts
v6:
- Rebased on riscv/for-next
- Remove ternary operator to use 'if()' instead in extension checks
- v5: https://lore.kernel.org/all/20240517145302.971019-1-cleger at rivosinc.com/
v5:
- Merged in Zimop to avoid any uneeded series dependencies
- Rework dependency resolution loop to loop on source isa first rather than on all extension.
- Disabled extensions in source isa once set in resolved isa
- Rename riscv_resolve_isa() parameters
- v4: https://lore.kernel.org/all/20240429150553.625165-1-cleger at rivosinc.com/
v4:
- Modify validate() callbacks to return 0, -EPROBEDEFER or another error.
- v3: https://lore.kernel.org/all/20240423124326.2532796-1-cleger at rivosinc.com/
v3:
- Fix typo "exists" -> "exist"
- Remove C implies Zca, Zcd, Zcf, dt-bindings rules
- Rework ISA string resolver to handle dependencies
- v2: https://lore.kernel.org/all/20240418124300.1387978-1-cleger at rivosinc.com/
v2:
- Add Zc* dependencies validation in dt-bindings
- v1: https://lore.kernel.org/lkml/20240410091106.749233-1-cleger at rivosinc.com/
Cl?ment L?ger (16):
dt-bindings: riscv: add Zimop ISA extension description
riscv: add ISA extension parsing for Zimop
riscv: hwprobe: export Zimop ISA extension
RISC-V: KVM: Allow Zimop extension for Guest/VM
KVM: riscv: selftests: Add Zimop extension to get-reg-list test
dt-bindings: riscv: add Zca, Zcf, Zcd and Zcb ISA extension
description
riscv: add ISA extensions validation callback
riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb
riscv: hwprobe: export Zca, Zcf, Zcd and Zcb ISA extensions
RISC-V: KVM: Allow Zca, Zcf, Zcd and Zcb extensions for Guest/VM
KVM: riscv: selftests: Add some Zc* extensions to get-reg-list test
dt-bindings: riscv: add Zcmop ISA extension description
riscv: add ISA extension parsing for Zcmop
riscv: hwprobe: export Zcmop ISA extension
RISC-V: KVM: Allow Zcmop extension for Guest/VM
KVM: riscv: selftests: Add Zcmop extension to get-reg-list test
Documentation/arch/riscv/hwprobe.rst | 28 ++ .../devicetree/bindings/riscv/extensions.yaml | 95 ++++++ arch/riscv/include/asm/cpufeature.h | 1 + arch/riscv/include/asm/hwcap.h | 6 + arch/riscv/include/uapi/asm/hwprobe.h | 6 + arch/riscv/include/uapi/asm/kvm.h | 6 + arch/riscv/kernel/cpufeature.c | 277 ++++++++++++------ arch/riscv/kernel/sys_hwprobe.c | 6 + arch/riscv/kvm/vcpu_onereg.c | 12 + .../selftests/kvm/riscv/get-reg-list.c | 24 ++ 10 files changed, 375 insertions(+), 86 deletions(-)
Signature · 1 line
2.45.2
PATCH v7 1/16 dt-bindings: riscv: add Zimop ISA extension description
Add description for the Zimop (May-Be-Operations) ISA extension which was ratified in commit 58220614a5f of the riscv-isa-manual.
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +5 -0
@@ -363,6 +363,11 @@ properties: ratified in the 20191213 version of the unprivileged ISA specification. + - const: zimop + description: + The standard Zimop extension version 1.0, as ratified in commit + 58220614a5f ("Zimop is ratified/1.0") of the riscv-isa-manual. + - const: ztso description: The standard Ztso extension for total store ordering, as ratified
Signature · 1 line
2.45.2
Re: [PATCH v7 01/16] dt-bindings: riscv: add Zimop ISA extension description
Quoted 5 lines · Cl?ment L?ger
Add description for the Zimop (May-Be-Operations) ISA extension which was ratified in commit
58220614a5fof the riscv-isa-manual.Signed-off-by Cl?ment L?ger <[email protected]>Reviewed-by Charlie Jenkins <[email protected]>
Quoted 23 lines
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 5 +++++ 1 file changed, 5 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +5
-0@@ -363,6 +363,11 @@ properties: ratified in the 20191213 version of the unprivileged ISA specification. + - const: zimop + description: + The standard Zimop extension version 1.0, as ratified in commit + 58220614a5f ("Zimop is ratified/1.0") of the riscv-isa-manual. + - const: ztso description: The standard Ztso extension for total store ordering, as ratifiedSignature · 1 line
2.45.2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20240625/481cb18b/attachment.sig>
PATCH v7 2/16 riscv: add ISA extension parsing for Zimop
In reply to Clément LégerAdd parsing for Zimop ISA extension which was ratified in commit 58220614a5f of the riscv-isa-manual.
--- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + 2 files changed, 2 insertions(+)
arch/riscv/include/asm/hwcap.h +1 -0
@@ -86,6 +86,7 @@#define RISCV_ISA_EXT_ZVE64X 77#define RISCV_ISA_EXT_ZVE64F 78#define RISCV_ISA_EXT_ZVE64D 79 +#define RISCV_ISA_EXT_ZIMOP 80#define RISCV_ISA_EXT_XLINUXENVCFG 127
arch/riscv/kernel/cpufeature.c +1 -0
@@ -290,6 +290,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (zihintntl,RISCV_ISA_EXT_ZIHINTNTL ),__RISCV_ISA_EXT_DATA (zihintpause,RISCV_ISA_EXT_ZIHINTPAUSE ),__RISCV_ISA_EXT_DATA (zihpm,RISCV_ISA_EXT_ZIHPM ), +__RISCV_ISA_EXT_DATA (zimop,RISCV_ISA_EXT_ZIMOP ),__RISCV_ISA_EXT_DATA (zacas,RISCV_ISA_EXT_ZACAS ),__RISCV_ISA_EXT_DATA (zfa,RISCV_ISA_EXT_ZFA ), __RISCV_ISA_EXT_DATA(zfh, RISCV_ISA_EXT_ZFH),
Signature · 1 line
2.45.2
PATCH v7 3/16 riscv: hwprobe: export Zimop ISA extension
In reply to Clément LégerExport Zimop ISA extension through hwprobe.
--- Documentation/arch/riscv/hwprobe.rst | 4 ++++ arch/riscv/include/uapi/asm/hwprobe.h | 1 + arch/riscv/kernel/sys_hwprobe.c | 1 + 3 files changed, 6 insertions(+)
Documentation/arch/riscv/hwprobe.rst +4 -0
@@ -207,6 +207,10 @@ The following keys are defined: * :c:macro:`RISCV_HWPROBE_EXT_ZVE64D`: The Vector sub-extension Zve64d is supported, as defined by version 1.0 of the RISC-V Vector extension manual. + * :c:macro:`RISCV_HWPROBE_EXT_ZIMOP`: The Zimop May-Be-Operations extension is + supported as defined in the RISC-V ISA manual starting from commit + 58220614a5f ("Zimop is ratified/1.0"). + * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance information about the selected set of processors.
arch/riscv/include/uapi/asm/hwprobe.h +1 -0
@@ -65,6 +65,7 @@ struct riscv_hwprobe {#define RISCV_HWPROBE_EXT_ZVE64X (1ULL << 39)#define RISCV_HWPROBE_EXT_ZVE64F (1ULL << 40)#define RISCV_HWPROBE_EXT_ZVE64D (1ULL << 41) +#define RISCV_HWPROBE_EXT_ZIMOP (1ULL << 42)#define RISCV_HWPROBE_KEY_CPUPERF_0 5#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
arch/riscv/kernel/sys_hwprobe.c +1 -0
@@ -112,6 +112,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZACAS );EXT_KEY (ZICOND );EXT_KEY (ZIHINTPAUSE ); +EXT_KEY (ZIMOP );/* * All the following extensions must depend on the kernel
Signature · 1 line
2.45.2
PATCH v7 4/16 RISC-V: KVM: Allow Zimop extension for Guest/VM
In reply to Clément LégerExtend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zimop extension for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu_onereg.c | 2 ++ 2 files changed, 3 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +1 -0
@@ -168,6 +168,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZTSO ,KVM_RISCV_ISA_EXT_ZACAS ,KVM_RISCV_ISA_EXT_SSCOFPMF , +KVM_RISCV_ISA_EXT_ZIMOP , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +2 -0
@@ -61,6 +61,7 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZIHINTNTL ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ),KVM_ISA_EXT_ARR (ZIHPM ), +KVM_ISA_EXT_ARR (ZIMOP ),KVM_ISA_EXT_ARR (ZKND ),KVM_ISA_EXT_ARR (ZKNE ), KVM_ISA_EXT_ARR(ZKNH),
@@ -143,6 +144,7 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_ZIHINTNTL :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_RISCV_ISA_EXT_ZIHPM : +case KVM_RISCV_ISA_EXT_ZIMOP :case KVM_RISCV_ISA_EXT_ZKND :case KVM_RISCV_ISA_EXT_ZKNE :case KVM_RISCV_ISA_EXT_ZKNH :
Signature · 1 line
2.45.2
PATCH v7 5/16 KVM: riscv: selftests: Add Zimop extension to get-reg-list test
In reply to Clément LégerThe KVM RISC-V allows Zimop extension for Guest/VM so add this extension to get-reg-list test.
--- tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/kvm/riscv/get-reg-list.c +4 -0
@@ -68,6 +68,7 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZIHINTNTL :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZIHPM : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZIMOP :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZKND :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZKNE :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZKNH :
@@ -434,6 +435,7 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)KVM_ISA_EXT_ARR (ZIHINTNTL ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ),KVM_ISA_EXT_ARR (ZIHPM ), +KVM_ISA_EXT_ARR (ZIMOP ),KVM_ISA_EXT_ARR (ZKND ),KVM_ISA_EXT_ARR (ZKNE ), KVM_ISA_EXT_ARR(ZKNH),
@@ -958,6 +960,7 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zifencei, ZIFENCEI);KVM_ISA_EXT_SIMPLE_CONFIG (zihintntl,ZIHINTNTL );KVM_ISA_EXT_SIMPLE_CONFIG (zihintpause,ZIHINTPAUSE );KVM_ISA_EXT_SIMPLE_CONFIG (zihpm,ZIHPM ); +KVM_ISA_EXT_SIMPLE_CONFIG (zimop,ZIMOP );KVM_ISA_EXT_SIMPLE_CONFIG (zknd,ZKND );KVM_ISA_EXT_SIMPLE_CONFIG (zkne,ZKNE );KVM_ISA_EXT_SIMPLE_CONFIG (zknh,ZKNH );
@@ -1014,6 +1017,7 @@ struct vcpu_reg_list *vcpu_configs[] = { &config_zihintntl, &config_zihintpause, &config_zihpm, + &config_zimop, &config_zknd, &config_zkne, &config_zknh,
Signature · 1 line
2.45.2
PATCH v7 6/16 dt-bindings: riscv: add Zca, Zcf, Zcd and Zcb ISA extension description
In reply to Clément LégerAdd description for Zca, Zcf, Zcd and Zcb extensions which are part the Zc* standard extensions for code size reduction. Additional validation rules are added since Zcb depends on Zca, Zcf, depends on Zca and F, Zcd depends on Zca and D and finally, Zcf can not be present on rv64.
--- .../devicetree/bindings/riscv/extensions.yaml | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +78 -0
@@ -220,6 +220,38 @@ properties: instructions as ratified at commit 6d33919 ("Merge pull request #158 from hirooih/clmul-fix-loop-end-condition") of riscv-bitmanip. + - const: zca + description: | + The Zca extension part of Zc* standard extensions for code size + reduction, as ratified in commit 8be3419c1c0 ("Zcf doesn't exist on + RV64 as it contains no instructions") of riscv-code-size-reduction, + merged in the riscv-isa-manual by commit dbc79cf28a2 ("Initial seed + of zc.adoc to src tree."). + + - const: zcb + description: | + The Zcb extension part of Zc* standard extensions for code size + reduction, as ratified in commit 8be3419c1c0 ("Zcf doesn't exist on + RV64 as it contains no instructions") of riscv-code-size-reduction, + merged in the riscv-isa-manual by commit dbc79cf28a2 ("Initial seed + of zc.adoc to src tree."). + + - const: zcd + description: | + The Zcd extension part of Zc* standard extensions for code size + reduction, as ratified in commit 8be3419c1c0 ("Zcf doesn't exist on + RV64 as it contains no instructions") of riscv-code-size-reduction, + merged in the riscv-isa-manual by commit dbc79cf28a2 ("Initial seed + of zc.adoc to src tree."). + + - const: zcf + description: | + The Zcf extension part of Zc* standard extensions for code size + reduction, as ratified in commit 8be3419c1c0 ("Zcf doesn't exist on + RV64 as it contains no instructions") of riscv-code-size-reduction, + merged in the riscv-isa-manual by commit dbc79cf28a2 ("Initial seed + of zc.adoc to src tree."). + - const: zfa description: The standard Zfa extension for additional floating point
@@ -519,5 +551,51 @@ properties: Registers in the AX45MP datasheet. https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdf + allOf: + # Zcb depends on Zca + - if: + contains: + const: zcb + then: + contains: + const: zca + # Zcd depends on Zca and D + - if: + contains: + const: zcd + then: + allOf: + - contains: + const: zca + - contains: + const: d + # Zcf depends on Zca and F + - if: + contains: + const: zcf + then: + allOf: + - contains: + const: zca + - contains: + const: f + +allOf: + # Zcf extension does not exist on rv64 + - if: + properties: + riscv,isa-extensions: + contains: + const: zcf + riscv,isa-base: + contains: + const: rv64i + then: + properties: + riscv,isa-extensions: + not: + contains: + const: zcf + additionalProperties: true ...
Signature · 1 line
2.45.2
PATCH v7 7/16 riscv: add ISA extensions validation callback
In reply to Clément LégerSince a few extensions (Zicbom/Zicboz) already needs validation and future ones will need it as well (Zc*) add a validate() callback to struct riscv_isa_ext_data. This require to rework the way extensions are parsed and split it in two phases. First phase is isa string or isa extension list parsing and consists in enabling all the extensions in a temporary bitmask (source isa) without any validation. The second step "resolves" the final isa bitmap, handling potential missing dependencies. The mechanism is quite simple and simply validate each extension described in the source bitmap before enabling it in the resolved isa bitmap. validate() callbacks can return either 0 for success, -EPROBEDEFER if extension needs to be validated again at next loop. A previous ISA bitmap is kept to avoid looping multiple times if an extension dependencies are never satisfied until we reach a stable state. In order to avoid any potential infinite looping, allow looping a maximum of the number of extension we handle. Zicboz and Zicbom extensions are modified to use this validation mechanism.
--- arch/riscv/include/asm/cpufeature.h | 1 + arch/riscv/kernel/cpufeature.c | 220 +++++++++++++++++----------- 2 files changed, 136 insertions(+), 85 deletions(-)
arch/riscv/include/asm/cpufeature.h +1 -0
@@ -70,6 +70,7 @@ struct riscv_isa_ext_data {const char *property;const unsigned int *subset_ext_ids;const unsigned int subset_ext_size; +int (*validate)(const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap); };extern const struct riscv_isa_ext_data riscv_isa_ext[];
arch/riscv/kernel/cpufeature.c +135 -85
316 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v7 8/16 riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb
In reply to Clément LégerThe Zc* standard extension for code reduction introduces new extensions. This patch adds support for Zca, Zcf, Zcd and Zcb. Zce, Zcmt and Zcmp are left out of this patch since they are targeting microcontrollers/ embedded CPUs instead of application processors.
--- arch/riscv/include/asm/hwcap.h | 4 +++ arch/riscv/kernel/cpufeature.c | 55 +++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)
arch/riscv/include/asm/hwcap.h +4 -0
@@ -87,6 +87,10 @@#define RISCV_ISA_EXT_ZVE64F 78#define RISCV_ISA_EXT_ZVE64D 79#define RISCV_ISA_EXT_ZIMOP 80 +#define RISCV_ISA_EXT_ZCA 81 +#define RISCV_ISA_EXT_ZCB 82 +#define RISCV_ISA_EXT_ZCD 83 +#define RISCV_ISA_EXT_ZCF 84#define RISCV_ISA_EXT_XLINUXENVCFG 127
arch/riscv/kernel/cpufeature.c +54 -1
85 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH v7 08/16] riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb
Quoted 42 lines · Cl?ment L?ger
The Zc* standard extension for code reduction introduces new extensions. This patch adds support for Zca, Zcf, Zcd and Zcb. Zce, Zcmt and Zcmp are left out of this patch since they are targeting microcontrollers/ embedded CPUs instead of application processors.
Signed-off-by Cl?ment L?ger <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/include/asm/hwcap.h | 4 +++ arch/riscv/kernel/cpufeature.c | 55 +++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)arch/riscv/include/asm/hwcap.h +4
-0@@ -87,6 +87,10 @@#define RISCV_ISA_EXT_ZVE64F 78#define RISCV_ISA_EXT_ZVE64D 79#define RISCV_ISA_EXT_ZIMOP 80 +#define RISCV_ISA_EXT_ZCA 81 +#define RISCV_ISA_EXT_ZCB 82 +#define RISCV_ISA_EXT_ZCD 83 +#define RISCV_ISA_EXT_ZCF 84#define RISCV_ISA_EXT_XLINUXENVCFG 127arch/riscv/kernel/cpufeature.c +3
-0@@ -111,6 +111,9 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_DATA (_name, _id) _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, NULL) +#define __RISCV_ISA_EXT_DATA_VALIDATE (_name, _id, _validate) \ + _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, _validate) +/* Used to declare pure "lasso" extension (Zk for instance) */ #define __RISCV_ISA_EXT_BUNDLE (_name, _bundled_exts) \ _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \
arch/riscv/kernel/cpufeature.c static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data, · line 128
Quoted 4 lines
arch/riscv/kernel/cpufeature.c +1
-0@@ -122,6 +125,37 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_SUPERSET_VALIDATE (_name, _id, _sub_exts, _validate) \ _RISCV_ISA_EXT_DATA(_name, _id, _sub_exts, ARRAY_SIZE(_sub_exts), _validate) +static int riscv_ext_zca_depends(const struct riscv_isa_ext_data *data,
It's super minor, but my OCD doesn't like this being called "depends" when the others are all called "validate".
Quoted 19 lines
arch/riscv/kernel/cpufeature.c +19
-0+ const unsigned long *isa_bitmap) +{ +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA )) +return 0 ; + +return -EPROBE_DEFER ; +} +static int riscv_ext_zcd_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA ) && +__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_d)) +return 0 ; + +return -EPROBE_DEFER ; +} + +static int riscv_ext_zcf_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap)
arch/riscv/kernel/cpufeature.c static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data, · line 157
Quoted 10 lines
arch/riscv/kernel/cpufeature.c +10
-0+{ +if (IS_ENABLED (CONFIG_64BIT )) +return -EINVAL ; + +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA ) && +__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_f)) +return 0 ; + +return -EPROBE_DEFER ; +}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20240623/77846569/attachment.sig>
Re: [PATCH v7 08/16] riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb
Quoted 46 lines · Conor Dooley
Quoted 45 lines · Cl?ment L?ger
The Zc* standard extension for code reduction introduces new extensions. This patch adds support for Zca, Zcf, Zcd and Zcb. Zce, Zcmt and Zcmp are left out of this patch since they are targeting microcontrollers/ embedded CPUs instead of application processors.
Signed-off-by Cl?ment L?ger <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/include/asm/hwcap.h | 4 +++ arch/riscv/kernel/cpufeature.c | 55 +++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)arch/riscv/include/asm/hwcap.h +4
-0@@ -87,6 +87,10 @@#define RISCV_ISA_EXT_ZVE64F 78#define RISCV_ISA_EXT_ZVE64D 79#define RISCV_ISA_EXT_ZIMOP 80 +#define RISCV_ISA_EXT_ZCA 81 +#define RISCV_ISA_EXT_ZCB 82 +#define RISCV_ISA_EXT_ZCD 83 +#define RISCV_ISA_EXT_ZCF 84#define RISCV_ISA_EXT_XLINUXENVCFG 127arch/riscv/kernel/cpufeature.c +3
-0@@ -111,6 +111,9 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_DATA (_name, _id) _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, NULL) +#define __RISCV_ISA_EXT_DATA_VALIDATE (_name, _id, _validate) \ + _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, _validate) +/* Used to declare pure "lasso" extension (Zk for instance) */ #define __RISCV_ISA_EXT_BUNDLE (_name, _bundled_exts) \ _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \@@ -122,6 +125,37 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_SUPERSET_VALIDATE (_name, _id, _sub_exts, _validate) \ _RISCV_ISA_EXT_DATA(_name, _id, _sub_exts, ARRAY_SIZE(_sub_exts), _validate)
Quoted 4 lines
arch/riscv/kernel/cpufeature.c static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data, · line 128
Quoted 1 line
arch/riscv/kernel/cpufeature.c +1
-0+static int riscv_ext_zca_depends(const struct riscv_isa_ext_data *data,It's super minor, but my OCD doesn't like this being called "depends" when the others are all called "validate".
Ok, let's make a deal. You review patch 14/16 and I'll make the machine part of you happy and call this function validate ;)
Thanks,
Cl?ment
Quoted 30 lines
Quoted 30 lines
arch/riscv/kernel/cpufeature.c +29
-0+ const unsigned long *isa_bitmap) +{ +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA )) +return 0 ; + +return -EPROBE_DEFER ; +} +static int riscv_ext_zcd_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA ) && +__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_d)) +return 0 ; + +return -EPROBE_DEFER ; +} + +static int riscv_ext_zcf_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (IS_ENABLED (CONFIG_64BIT )) +return -EINVAL ; + +if (__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZCA ) && +__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_f)) +return 0 ; + +return -EPROBE_DEFER ; +}
Re: [PATCH v7 08/16] riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb
Quoted 49 lines · Cl?ment L?ger
Quoted 46 lines · Conor Dooley
Quoted 45 lines · Cl?ment L?ger
The Zc* standard extension for code reduction introduces new extensions. This patch adds support for Zca, Zcf, Zcd and Zcb. Zce, Zcmt and Zcmp are left out of this patch since they are targeting microcontrollers/ embedded CPUs instead of application processors.
Signed-off-by Cl?ment L?ger <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/include/asm/hwcap.h | 4 +++ arch/riscv/kernel/cpufeature.c | 55 +++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)arch/riscv/include/asm/hwcap.h +4
-0@@ -87,6 +87,10 @@#define RISCV_ISA_EXT_ZVE64F 78#define RISCV_ISA_EXT_ZVE64D 79#define RISCV_ISA_EXT_ZIMOP 80 +#define RISCV_ISA_EXT_ZCA 81 +#define RISCV_ISA_EXT_ZCB 82 +#define RISCV_ISA_EXT_ZCD 83 +#define RISCV_ISA_EXT_ZCF 84#define RISCV_ISA_EXT_XLINUXENVCFG 127arch/riscv/kernel/cpufeature.c +3
-0@@ -111,6 +111,9 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_DATA (_name, _id) _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, NULL) +#define __RISCV_ISA_EXT_DATA_VALIDATE (_name, _id, _validate) \ + _RISCV_ISA_EXT_DATA(_name, _id, NULL, 0, _validate) +/* Used to declare pure "lasso" extension (Zk for instance) */ #define __RISCV_ISA_EXT_BUNDLE (_name, _bundled_exts) \ _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \@@ -122,6 +125,37 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,#define __RISCV_ISA_EXT_SUPERSET_VALIDATE (_name, _id, _sub_exts, _validate) \ _RISCV_ISA_EXT_DATA(_name, _id, _sub_exts, ARRAY_SIZE(_sub_exts), _validate)
Quoted 7 lines
Quoted 4 lines
arch/riscv/kernel/cpufeature.c static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data, · line 128
Quoted 1 line
arch/riscv/kernel/cpufeature.c +1
-0+static int riscv_ext_zca_depends(const struct riscv_isa_ext_data *data,It's super minor, but my OCD doesn't like this being called "depends" when the others are all called "validate".
Ok, let's make a deal. You review patch 14/16 and I'll make the machine part of you happy and call this function validate ;)
I generally avoid the hwprobe patches intentionally :) I'm not even
expecting a respin for this tbh, I'd like to just get it in so that I
can do things on top of it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20240624/e997bb7c/attachment.sig>
PATCH v7 9/16 riscv: hwprobe: export Zca, Zcf, Zcd and Zcb ISA extensions
In reply to Clément LégerExport Zca, Zcf, Zcd and Zcb ISA extension through hwprobe.
--- Documentation/arch/riscv/hwprobe.rst | 20 ++++++++++++++++++++ arch/riscv/include/uapi/asm/hwprobe.h | 4 ++++ arch/riscv/kernel/sys_hwprobe.c | 4 ++++ 3 files changed, 28 insertions(+)
Documentation/arch/riscv/hwprobe.rst +20 -0
@@ -211,6 +211,26 @@ The following keys are defined: supported as defined in the RISC-V ISA manual starting from commit 58220614a5f ("Zimop is ratified/1.0"). + * :c:macro:`RISCV_HWPROBE_EXT_ZCA`: The Zca extension part of Zc* standard + extensions for code size reduction, as ratified in commit 8be3419c1c0 + ("Zcf doesn't exist on RV64 as it contains no instructions") of + riscv-code-size-reduction. + + * :c:macro:`RISCV_HWPROBE_EXT_ZCB`: The Zcb extension part of Zc* standard + extensions for code size reduction, as ratified in commit 8be3419c1c0 + ("Zcf doesn't exist on RV64 as it contains no instructions") of + riscv-code-size-reduction. + + * :c:macro:`RISCV_HWPROBE_EXT_ZCD`: The Zcd extension part of Zc* standard + extensions for code size reduction, as ratified in commit 8be3419c1c0 + ("Zcf doesn't exist on RV64 as it contains no instructions") of + riscv-code-size-reduction. + + * :c:macro:`RISCV_HWPROBE_EXT_ZCF`: The Zcf extension part of Zc* standard + extensions for code size reduction, as ratified in commit 8be3419c1c0 + ("Zcf doesn't exist on RV64 as it contains no instructions") of + riscv-code-size-reduction. + * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance information about the selected set of processors.
arch/riscv/include/uapi/asm/hwprobe.h +4 -0
@@ -66,6 +66,10 @@ struct riscv_hwprobe {#define RISCV_HWPROBE_EXT_ZVE64F (1ULL << 40)#define RISCV_HWPROBE_EXT_ZVE64D (1ULL << 41)#define RISCV_HWPROBE_EXT_ZIMOP (1ULL << 42) +#define RISCV_HWPROBE_EXT_ZCA (1ULL << 43) +#define RISCV_HWPROBE_EXT_ZCB (1ULL << 44) +#define RISCV_HWPROBE_EXT_ZCD (1ULL << 45) +#define RISCV_HWPROBE_EXT_ZCF (1ULL << 46)#define RISCV_HWPROBE_KEY_CPUPERF_0 5#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
arch/riscv/kernel/sys_hwprobe.c +4 -0
@@ -113,6 +113,8 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZICOND );EXT_KEY (ZIHINTPAUSE );EXT_KEY (ZIMOP ); +EXT_KEY (ZCA ); +EXT_KEY (ZCB );/* * All the following extensions must depend on the kernel
@@ -142,6 +144,8 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZFH );EXT_KEY (ZFHMIN );EXT_KEY (ZFA ); +EXT_KEY (ZCD ); +EXT_KEY (ZCF ); }#undef EXT_KEY }
Signature · 1 line
2.45.2
PATCH v7 10/16 RISC-V: KVM: Allow Zca, Zcf, Zcd and Zcb extensions for Guest/VM
In reply to Clément LégerExtend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zca, Zcf, Zcd and Zcb extensions for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 4 ++++ arch/riscv/kvm/vcpu_onereg.c | 8 ++++++++ 2 files changed, 12 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +4 -0
@@ -169,6 +169,10 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZACAS ,KVM_RISCV_ISA_EXT_SSCOFPMF ,KVM_RISCV_ISA_EXT_ZIMOP , +KVM_RISCV_ISA_EXT_ZCA , +KVM_RISCV_ISA_EXT_ZCB , +KVM_RISCV_ISA_EXT_ZCD , +KVM_RISCV_ISA_EXT_ZCF , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +8 -0
@@ -49,6 +49,10 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZBKC ),KVM_ISA_EXT_ARR (ZBKX ),KVM_ISA_EXT_ARR (ZBS ), +KVM_ISA_EXT_ARR (ZCA ), +KVM_ISA_EXT_ARR (ZCB ), +KVM_ISA_EXT_ARR (ZCD ), +KVM_ISA_EXT_ARR (ZCF ),KVM_ISA_EXT_ARR (ZFA ),KVM_ISA_EXT_ARR (ZFH ), KVM_ISA_EXT_ARR(ZFHMIN),
@@ -134,6 +138,10 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_ZBKC :case KVM_RISCV_ISA_EXT_ZBKX :case KVM_RISCV_ISA_EXT_ZBS : +case KVM_RISCV_ISA_EXT_ZCA : +case KVM_RISCV_ISA_EXT_ZCB : +case KVM_RISCV_ISA_EXT_ZCD : +case KVM_RISCV_ISA_EXT_ZCF :case KVM_RISCV_ISA_EXT_ZFA :case KVM_RISCV_ISA_EXT_ZFH :case KVM_RISCV_ISA_EXT_ZFHMIN :
Signature · 1 line
2.45.2
PATCH v7 11/16 KVM: riscv: selftests: Add some Zc* extensions to get-reg-list test
In reply to Clément LégerThe KVM RISC-V allows Zca, Zcf, Zcd and Zcb extensions for Guest/VM so add these extensions to get-reg-list test.
--- tools/testing/selftests/kvm/riscv/get-reg-list.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/testing/selftests/kvm/riscv/get-reg-list.c +16 -0
@@ -56,6 +56,10 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZBKC :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZBKX :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZBS : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCA : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCB : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCD : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCF :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFA :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFH :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFHMIN :
@@ -423,6 +427,10 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)KVM_ISA_EXT_ARR (ZBKC ),KVM_ISA_EXT_ARR (ZBKX ),KVM_ISA_EXT_ARR (ZBS ), +KVM_ISA_EXT_ARR (ZCA ), +KVM_ISA_EXT_ARR (ZCB ), +KVM_ISA_EXT_ARR (ZCD ), +KVM_ISA_EXT_ARR (ZCF ),KVM_ISA_EXT_ARR (ZFA ),KVM_ISA_EXT_ARR (ZFH ), KVM_ISA_EXT_ARR(ZFHMIN),
@@ -948,6 +956,10 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zbkb, ZBKB);KVM_ISA_EXT_SIMPLE_CONFIG (zbkc,ZBKC );KVM_ISA_EXT_SIMPLE_CONFIG (zbkx,ZBKX );KVM_ISA_EXT_SIMPLE_CONFIG (zbs,ZBS ); +KVM_ISA_EXT_SIMPLE_CONFIG (zca,ZCA ), +KVM_ISA_EXT_SIMPLE_CONFIG (zcb,ZCB ), +KVM_ISA_EXT_SIMPLE_CONFIG (zcd,ZCD ), +KVM_ISA_EXT_SIMPLE_CONFIG (zcf,ZCF ),KVM_ISA_EXT_SIMPLE_CONFIG (zfa,ZFA );KVM_ISA_EXT_SIMPLE_CONFIG (zfh,ZFH );KVM_ISA_EXT_SIMPLE_CONFIG (zfhmin,ZFHMIN );
@@ -1005,6 +1017,10 @@ struct vcpu_reg_list *vcpu_configs[] = { &config_zbkc, &config_zbkx, &config_zbs, + &config_zca, + &config_zcb, + &config_zcd, + &config_zcf, &config_zfa, &config_zfh, &config_zfhmin,
Signature · 1 line
2.45.2
PATCH v7 12/16 dt-bindings: riscv: add Zcmop ISA extension description
In reply to Clément LégerAdd description for the Zcmop (Compressed May-Be-Operations) ISA extension which was ratified in commit c732a4f39a4c ("Zcmop is ratified/1.0") of the riscv-isa-manual.
--- .../devicetree/bindings/riscv/extensions.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +12 -0
@@ -252,6 +252,11 @@ properties: merged in the riscv-isa-manual by commit dbc79cf28a2 ("Initial seed of zc.adoc to src tree."). + - const: zcmop + description: + The standard Zcmop extension version 1.0, as ratified in commit + c732a4f39a4 ("Zcmop is ratified/1.0") of the riscv-isa-manual. + - const: zfa description: The standard Zfa extension for additional floating point
@@ -579,6 +584,13 @@ properties: const: zca - contains: const: f + # Zcmop depends on Zca + - if: + contains: + const: zcmop + then: + contains: + const: zca allOf: # Zcf extension does not exist on rv64
Signature · 1 line
2.45.2
PATCH v7 13/16 riscv: add ISA extension parsing for Zcmop
In reply to Clément LégerAdd parsing for Zcmop ISA extension which was ratified in commit c732a4f39a4c ("Zcmop is ratified/1.0") of the riscv-isa-manual.
--- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + 2 files changed, 2 insertions(+)
arch/riscv/include/asm/hwcap.h +1 -0
@@ -91,6 +91,7 @@#define RISCV_ISA_EXT_ZCB 82#define RISCV_ISA_EXT_ZCD 83#define RISCV_ISA_EXT_ZCF 84 +#define RISCV_ISA_EXT_ZCMOP 85#define RISCV_ISA_EXT_XLINUXENVCFG 127
arch/riscv/kernel/cpufeature.c +1 -0
@@ -354,6 +354,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA_VALIDATE (zcb,RISCV_ISA_EXT_ZCB , riscv_ext_zca_depends),__RISCV_ISA_EXT_DATA_VALIDATE (zcd,RISCV_ISA_EXT_ZCD , riscv_ext_zcd_validate),__RISCV_ISA_EXT_DATA_VALIDATE (zcf,RISCV_ISA_EXT_ZCF , riscv_ext_zcf_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zcmop,RISCV_ISA_EXT_ZCMOP , riscv_ext_zca_depends),__RISCV_ISA_EXT_DATA (zba,RISCV_ISA_EXT_ZBA ),__RISCV_ISA_EXT_DATA (zbb,RISCV_ISA_EXT_ZBB ), __RISCV_ISA_EXT_DATA(zbc, RISCV_ISA_EXT_ZBC),
Signature · 1 line
2.45.2
PATCH v7 14/16 riscv: hwprobe: export Zcmop ISA extension
In reply to Clément LégerExport Zcmop ISA extension through hwprobe.
--- Documentation/arch/riscv/hwprobe.rst | 4 ++++ arch/riscv/include/uapi/asm/hwprobe.h | 1 + arch/riscv/kernel/sys_hwprobe.c | 1 + 3 files changed, 6 insertions(+)
Documentation/arch/riscv/hwprobe.rst +4 -0
@@ -231,6 +231,10 @@ The following keys are defined: ("Zcf doesn't exist on RV64 as it contains no instructions") of riscv-code-size-reduction. + * :c:macro:`RISCV_HWPROBE_EXT_ZCMOP`: The Zcmop May-Be-Operations extension is + supported as defined in the RISC-V ISA manual starting from commit + c732a4f39a4 ("Zcmop is ratified/1.0"). + * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance information about the selected set of processors.
arch/riscv/include/uapi/asm/hwprobe.h +1 -0
@@ -70,6 +70,7 @@ struct riscv_hwprobe {#define RISCV_HWPROBE_EXT_ZCB (1ULL << 44)#define RISCV_HWPROBE_EXT_ZCD (1ULL << 45)#define RISCV_HWPROBE_EXT_ZCF (1ULL << 46) +#define RISCV_HWPROBE_EXT_ZCMOP (1ULL << 47)#define RISCV_HWPROBE_KEY_CPUPERF_0 5#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
arch/riscv/kernel/sys_hwprobe.c +1 -0
@@ -115,6 +115,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZIMOP );EXT_KEY (ZCA );EXT_KEY (ZCB ); +EXT_KEY (ZCMOP );/* * All the following extensions must depend on the kernel
Signature · 1 line
2.45.2
Re: [PATCH v7 14/16] riscv: hwprobe: export Zcmop ISA extension
Quoted 4 lines · On Wed, Jun 19, 2024 at 4:41?AM Cl?ment L?ger <[email protected]> wrote:
Export Zcmop ISA extension through hwprobe.
Signed-off-by Cl?ment L?ger <[email protected]>
PATCH v7 15/16 RISC-V: KVM: Allow Zcmop extension for Guest/VM
In reply to Clément LégerExtend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zcmop extension for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu_onereg.c | 2 ++ 2 files changed, 3 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +1 -0
@@ -173,6 +173,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZCB ,KVM_RISCV_ISA_EXT_ZCD ,KVM_RISCV_ISA_EXT_ZCF , +KVM_RISCV_ISA_EXT_ZCMOP , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +2 -0
@@ -53,6 +53,7 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZCB ),KVM_ISA_EXT_ARR (ZCD ),KVM_ISA_EXT_ARR (ZCF ), +KVM_ISA_EXT_ARR (ZCMOP ),KVM_ISA_EXT_ARR (ZFA ),KVM_ISA_EXT_ARR (ZFH ), KVM_ISA_EXT_ARR(ZFHMIN),
@@ -142,6 +143,7 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_ZCB :case KVM_RISCV_ISA_EXT_ZCD :case KVM_RISCV_ISA_EXT_ZCF : +case KVM_RISCV_ISA_EXT_ZCMOP :case KVM_RISCV_ISA_EXT_ZFA :case KVM_RISCV_ISA_EXT_ZFH :case KVM_RISCV_ISA_EXT_ZFHMIN :
Signature · 1 line
2.45.2
PATCH v7 16/16 KVM: riscv: selftests: Add Zcmop extension to get-reg-list test
In reply to Clément LégerThe KVM RISC-V allows Zcmop extension for Guest/VM so add this extension to get-reg-list test.
--- tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/kvm/riscv/get-reg-list.c +4 -0
@@ -60,6 +60,7 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCB :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCD :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCF : +case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZCMOP :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFA :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFH :case KVM_REG_RISCV_ISA_EXT |KVM_REG_RISCV_ISA_SINGLE |KVM_RISCV_ISA_EXT_ZFHMIN :
@@ -431,6 +432,7 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)KVM_ISA_EXT_ARR (ZCB ),KVM_ISA_EXT_ARR (ZCD ),KVM_ISA_EXT_ARR (ZCF ), +KVM_ISA_EXT_ARR (ZCMOP ),KVM_ISA_EXT_ARR (ZFA ),KVM_ISA_EXT_ARR (ZFH ), KVM_ISA_EXT_ARR(ZFHMIN),
@@ -960,6 +962,7 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zca, ZCA),KVM_ISA_EXT_SIMPLE_CONFIG (zcb,ZCB ),KVM_ISA_EXT_SIMPLE_CONFIG (zcd,ZCD ),KVM_ISA_EXT_SIMPLE_CONFIG (zcf,ZCF ), +KVM_ISA_EXT_SIMPLE_CONFIG (zcmop,ZCMOP );KVM_ISA_EXT_SIMPLE_CONFIG (zfa,ZFA );KVM_ISA_EXT_SIMPLE_CONFIG (zfh,ZFH );KVM_ISA_EXT_SIMPLE_CONFIG (zfhmin,ZFHMIN );
@@ -1021,6 +1024,7 @@ struct vcpu_reg_list *vcpu_configs[] = { &config_zcb, &config_zcd, &config_zcf, + &config_zcmop, &config_zfa, &config_zfh, &config_zfhmin,
Signature · 1 line
2.45.2
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 6 lines · On Wed, 19 Jun 2024 13:35:10 +0200 you wrote:
Add support for (yet again) more RVA23U64 missing extensions. Add support for Zimop, Zcmop, Zca, Zcf, Zcd and Zcb extensions ISA string parsing, hwprobe and kvm support. Zce, Zcmt and Zcmp extensions have been left out since they target microcontrollers/embedded CPUs and are not needed by RVA23U64.
Quoted 6 lines
Since Zc* extensions states that C implies Zca, Zcf (if F and RV32), Zcd (if D), this series modifies the way ISA string is parsed and now does it in two phases. First one parses the string and the second one validates it for the final ISA description.
[...]
Here is the summary with links:
- [v7,01/16] dt-bindings: riscv: add Zimop ISA extension description
https://git.kernel.org/riscv/c/a57b68bc315c - [v7,02/16] riscv: add ISA extension parsing for Zimop https://git.kernel.org/riscv/c/2467c2104f1f - [v7,03/16] riscv: hwprobe: export Zimop ISA extension https://git.kernel.org/riscv/c/36f8960de887 - [v7,04/16] RISC-V: KVM: Allow Zimop extension for Guest/VM https://git.kernel.org/riscv/c/fb2a3d63efef - [v7,05/16] KVM: riscv: selftests: Add Zimop extension to get-reg-list test https://git.kernel.org/riscv/c/ca5446406914 - [v7,06/16] dt-bindings: riscv: add Zca, Zcf, Zcd and Zcb ISA extension description https://git.kernel.org/riscv/c/e9f9946cad7b - [v7,07/16] riscv: add ISA extensions validation callback https://git.kernel.org/riscv/c/625034abd52a - [v7,08/16] riscv: add ISA parsing for Zca, Zcf, Zcd and Zcb https://git.kernel.org/riscv/c/ba4cd855839d - [v7,09/16] riscv: hwprobe: export Zca, Zcf, Zcd and Zcb ISA extensions https://git.kernel.org/riscv/c/0ad70db5eb21 - [v7,10/16] RISC-V: KVM: Allow Zca, Zcf, Zcd and Zcb extensions for Guest/VM https://git.kernel.org/riscv/c/d964e8f2ae65 - [v7,11/16] KVM: riscv: selftests: Add some Zc* extensions to get-reg-list test https://git.kernel.org/riscv/c/d27c34a73514 - [v7,12/16] dt-bindings: riscv: add Zcmop ISA extension description https://git.kernel.org/riscv/c/700556a73bc7 - [v7,13/16] riscv: add ISA extension parsing for Zcmop https://git.kernel.org/riscv/c/164d644059cf - [v7,14/16] riscv: hwprobe: export Zcmop ISA extension https://git.kernel.org/riscv/c/fc078ea317cc - [v7,15/16] RISC-V: KVM: Allow Zcmop extension for Guest/VM https://git.kernel.org/riscv/c/29cf9b803e6e - [v7,16/16] KVM: riscv: selftests: Add Zcmop extension to get-reg-list test https://git.kernel.org/riscv/c/e212d92d1a86
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html