Unverified Commit 794983f2 authored by Clément Léger's avatar Clément Léger Committed by Palmer Dabbelt
Browse files

riscv: hwprobe: add support for scalar crypto ISA extensions 



Export the following scalar crypto extensions through hwprobe:

- Zbkb
- Zbkc
- Zbkx
- Zknd
- Zkne
- Zknh
- Zksed
- Zksh
- Zkt

Signed-off-by: default avatarClément Léger <cleger@rivosinc.com>
Link: https://lore.kernel.org/r/20231114141256.126749-5-cleger@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 0d8295ed

Documentation/arch/riscv/hwprobe.rst

+27 −0
Original line number Diff line number Diff line
@@ -83,6 +83,33 @@ The following keys are defined: 
  * :c:macro:`RISCV_HWPROBE_EXT_ZBC` The Zbc extension is supported, as defined

       in version 1.0 of the Bit-Manipulation ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZBKB` The Zbkb extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZBKC` The Zbkc extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZBKX` The Zbkx extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKND` The Zknd extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKNE` The Zkne extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKNH` The Zknh extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKSED` The Zksed extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKSH` The Zksh extension is supported, as

       defined in version 1.0 of the Scalar Crypto ISA extensions.



  * :c:macro:`RISCV_HWPROBE_EXT_ZKT` The Zkt extension is supported, as defined

       in version 1.0 of the Scalar Crypto ISA extensions.



* :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

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ struct riscv_hwprobe { 
#define		RISCV_HWPROBE_EXT_ZBS		(1 << 5)

#define		RISCV_HWPROBE_EXT_ZICBOZ	(1 << 6)

#define		RISCV_HWPROBE_EXT_ZBC		(1 << 7)

#define		RISCV_HWPROBE_EXT_ZBKB		(1 << 8)

#define		RISCV_HWPROBE_EXT_ZBKC		(1 << 9)

#define		RISCV_HWPROBE_EXT_ZBKX		(1 << 10)

#define		RISCV_HWPROBE_EXT_ZKND		(1 << 11)

#define		RISCV_HWPROBE_EXT_ZKNE		(1 << 12)

#define		RISCV_HWPROBE_EXT_ZKNH		(1 << 13)

#define		RISCV_HWPROBE_EXT_ZKSED		(1 << 14)

#define		RISCV_HWPROBE_EXT_ZKSH		(1 << 15)

#define		RISCV_HWPROBE_EXT_ZKT		(1 << 16)

#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_riscv.c

+10 −0
Original line number Diff line number Diff line
@@ -163,6 +163,16 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, 
		EXT_KEY(ZBS);

		EXT_KEY(ZICBOZ);

		EXT_KEY(ZBC);



		EXT_KEY(ZBKB);

		EXT_KEY(ZBKC);

		EXT_KEY(ZBKX);

		EXT_KEY(ZKND);

		EXT_KEY(ZKNE);

		EXT_KEY(ZKNH);

		EXT_KEY(ZKSED);

		EXT_KEY(ZKSH);

		EXT_KEY(ZKT);

#undef EXT_KEY

	}