Skip to content

Commit 244c18f

Browse files
Andrew Jonespalmer-dabbelt
authored andcommitted
riscv: hwprobe: export Zawrs ISA extension
Export Zawrs ISA extension through hwprobe. [Palmer: there's a gap in the numbers here as there will be a merge conflict when this is picked up. To avoid confusion I just set the hwprobe ID to match what it would be post-merge.] Signed-off-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Clément Léger <cleger@rivosinc.com> Link: https://lore.kernel.org/r/20240426100820.14762-12-ajones@ventanamicro.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent b8ddb0d commit 244c18f

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

Documentation/arch/riscv/hwprobe.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ The following keys are defined:
188188
manual starting from commit 95cf1f9 ("Add changes requested by Ved
189189
during signoff")
190190

191+
* :c:macro:`RISCV_HWPROBE_EXT_ZAWRS`: The Zawrs extension is supported as
192+
ratified in commit 98918c844281 ("Merge pull request #1217 from
193+
riscv/zawrs") of riscv-isa-manual.
194+
191195
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance
192196
information about the selected set of processors.
193197

arch/riscv/include/uapi/asm/hwprobe.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ struct riscv_hwprobe {
5959
#define RISCV_HWPROBE_EXT_ZTSO (1ULL << 33)
6060
#define RISCV_HWPROBE_EXT_ZACAS (1ULL << 34)
6161
#define RISCV_HWPROBE_EXT_ZICOND (1ULL << 35)
62+
#define RISCV_HWPROBE_EXT_ZAWRS (1ULL << 48)
6263
#define RISCV_HWPROBE_KEY_CPUPERF_0 5
6364
#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)
6465
#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)

arch/riscv/kernel/sys_hwprobe.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
111111
EXT_KEY(ZTSO);
112112
EXT_KEY(ZACAS);
113113
EXT_KEY(ZICOND);
114+
EXT_KEY(ZAWRS);
114115

115116
if (has_vector()) {
116117
EXT_KEY(ZVBB);

0 commit comments

Comments
 (0)