Skip to contentSkip to conversation

RISC-V: hwprobe: Use BIT macro to avoid warnings

PATCH In review Jesse Taube 4 participants 5 messages Aug 22, 2024 – Feb 6, 2025 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 RISC-V: hwprobe: Use BIT macro to avoid warnings

In uapi/asm/hwprobe.h file, (1 << N) is used to define the bit field which causes checkpatch to warn. Use BIT(N) and BIT_ULL(N) to avoid these warnings.

---
V1 -> V2:
- Reword commit message

---
 arch/riscv/include/uapi/asm/hwprobe.h | 102 +++++++++++++-------------
 1 file changed, 51 insertions(+), 51 deletions(-)
arch/riscv/include/uapi/asm/hwprobe.h +51 -51
index b706c8e47b02..d0874ff2fd37 100644
@@ -21,57 +21,57 @@ struct riscv_hwprobe {
 #define RISCV_HWPROBE_KEY_MARCHID	1
 #define RISCV_HWPROBE_KEY_MIMPID	2
 #define RISCV_HWPROBE_KEY_BASE_BEHAVIOR	3
-#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	(1 << 0)
+#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	BIT_ULL(0)
 #define RISCV_HWPROBE_KEY_IMA_EXT_0	4
-#define		RISCV_HWPROBE_IMA_FD		(1 << 0)
-#define		RISCV_HWPROBE_IMA_C		(1 << 1)
-#define		RISCV_HWPROBE_IMA_V		(1 << 2)
-#define		RISCV_HWPROBE_EXT_ZBA		(1 << 3)
-#define		RISCV_HWPROBE_EXT_ZBB		(1 << 4)
-#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_EXT_ZVBB		(1 << 17)
-#define		RISCV_HWPROBE_EXT_ZVBC		(1 << 18)
-#define		RISCV_HWPROBE_EXT_ZVKB		(1 << 19)
-#define		RISCV_HWPROBE_EXT_ZVKG		(1 << 20)
-#define		RISCV_HWPROBE_EXT_ZVKNED	(1 << 21)
-#define		RISCV_HWPROBE_EXT_ZVKNHA	(1 << 22)
-#define		RISCV_HWPROBE_EXT_ZVKNHB	(1 << 23)
-#define		RISCV_HWPROBE_EXT_ZVKSED	(1 << 24)
-#define		RISCV_HWPROBE_EXT_ZVKSH		(1 << 25)
-#define		RISCV_HWPROBE_EXT_ZVKT		(1 << 26)
-#define		RISCV_HWPROBE_EXT_ZFH		(1 << 27)
-#define		RISCV_HWPROBE_EXT_ZFHMIN	(1 << 28)
-#define		RISCV_HWPROBE_EXT_ZIHINTNTL	(1 << 29)
-#define		RISCV_HWPROBE_EXT_ZVFH		(1 << 30)
-#define		RISCV_HWPROBE_EXT_ZVFHMIN	(1ULL << 31)
-#define		RISCV_HWPROBE_EXT_ZFA		(1ULL << 32)
-#define		RISCV_HWPROBE_EXT_ZTSO		(1ULL << 33)
-#define		RISCV_HWPROBE_EXT_ZACAS		(1ULL << 34)
-#define		RISCV_HWPROBE_EXT_ZICOND	(1ULL << 35)
-#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	(1ULL << 36)
-#define		RISCV_HWPROBE_EXT_ZVE32X	(1ULL << 37)
-#define		RISCV_HWPROBE_EXT_ZVE32F	(1ULL << 38)
-#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_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_EXT_ZCMOP		(1ULL << 47)
-#define		RISCV_HWPROBE_EXT_ZAWRS		(1ULL << 48)
+#define		RISCV_HWPROBE_IMA_FD		BIT_ULL(0)
+#define		RISCV_HWPROBE_IMA_C		BIT_ULL(1)
+#define		RISCV_HWPROBE_IMA_V		BIT_ULL(2)
+#define		RISCV_HWPROBE_EXT_ZBA		BIT_ULL(3)
+#define		RISCV_HWPROBE_EXT_ZBB		BIT_ULL(4)
+#define		RISCV_HWPROBE_EXT_ZBS		BIT_ULL(5)
+#define		RISCV_HWPROBE_EXT_ZICBOZ	BIT_ULL(6)
+#define		RISCV_HWPROBE_EXT_ZBC		BIT_ULL(7)
+#define		RISCV_HWPROBE_EXT_ZBKB		BIT_ULL(8)
+#define		RISCV_HWPROBE_EXT_ZBKC		BIT_ULL(9)
+#define		RISCV_HWPROBE_EXT_ZBKX		BIT_ULL(10)
+#define		RISCV_HWPROBE_EXT_ZKND		BIT_ULL(11)
+#define		RISCV_HWPROBE_EXT_ZKNE		BIT_ULL(12)
+#define		RISCV_HWPROBE_EXT_ZKNH		BIT_ULL(13)
+#define		RISCV_HWPROBE_EXT_ZKSED		BIT_ULL(14)
+#define		RISCV_HWPROBE_EXT_ZKSH		BIT_ULL(15)
+#define		RISCV_HWPROBE_EXT_ZKT		BIT_ULL(16)
+#define		RISCV_HWPROBE_EXT_ZVBB		BIT_ULL(17)
+#define		RISCV_HWPROBE_EXT_ZVBC		BIT_ULL(18)
+#define		RISCV_HWPROBE_EXT_ZVKB		BIT_ULL(19)
+#define		RISCV_HWPROBE_EXT_ZVKG		BIT_ULL(20)
+#define		RISCV_HWPROBE_EXT_ZVKNED	BIT_ULL(21)
+#define		RISCV_HWPROBE_EXT_ZVKNHA	BIT_ULL(22)
+#define		RISCV_HWPROBE_EXT_ZVKNHB	BIT_ULL(23)
+#define		RISCV_HWPROBE_EXT_ZVKSED	BIT_ULL(24)
+#define		RISCV_HWPROBE_EXT_ZVKSH		BIT_ULL(25)
+#define		RISCV_HWPROBE_EXT_ZVKT		BIT_ULL(26)
+#define		RISCV_HWPROBE_EXT_ZFH		BIT_ULL(27)
+#define		RISCV_HWPROBE_EXT_ZFHMIN	BIT_ULL(28)
+#define		RISCV_HWPROBE_EXT_ZIHINTNTL	BIT_ULL(29)
+#define		RISCV_HWPROBE_EXT_ZVFH		BIT_ULL(30)
+#define		RISCV_HWPROBE_EXT_ZVFHMIN	BIT_ULL(31)
+#define		RISCV_HWPROBE_EXT_ZFA		BIT_ULL(32)
+#define		RISCV_HWPROBE_EXT_ZTSO		BIT_ULL(33)
+#define		RISCV_HWPROBE_EXT_ZACAS		BIT_ULL(34)
+#define		RISCV_HWPROBE_EXT_ZICOND	BIT_ULL(35)
+#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	BIT_ULL(36)
+#define		RISCV_HWPROBE_EXT_ZVE32X	BIT_ULL(37)
+#define		RISCV_HWPROBE_EXT_ZVE32F	BIT_ULL(38)
+#define		RISCV_HWPROBE_EXT_ZVE64X	BIT_ULL(39)
+#define		RISCV_HWPROBE_EXT_ZVE64F	BIT_ULL(40)
+#define		RISCV_HWPROBE_EXT_ZVE64D	BIT_ULL(41)
+#define		RISCV_HWPROBE_EXT_ZIMOP		BIT_ULL(42)
+#define		RISCV_HWPROBE_EXT_ZCA		BIT_ULL(43)
+#define		RISCV_HWPROBE_EXT_ZCB		BIT_ULL(44)
+#define		RISCV_HWPROBE_EXT_ZCD		BIT_ULL(45)
+#define		RISCV_HWPROBE_EXT_ZCF		BIT_ULL(46)
+#define		RISCV_HWPROBE_EXT_ZCMOP		BIT_ULL(47)
+#define		RISCV_HWPROBE_EXT_ZAWRS		BIT_ULL(48)
 #define RISCV_HWPROBE_KEY_CPUPERF_0	5
 #define		RISCV_HWPROBE_MISALIGNED_UNKNOWN	(0 << 0)
 #define		RISCV_HWPROBE_MISALIGNED_EMULATED	(1 << 0)
@@ -85,6 +85,6 @@ struct riscv_hwprobe {
 /* Increase RISCV_HWPROBE_MAX_KEY when adding items. */
 
 /* Flags */
-#define RISCV_HWPROBE_WHICH_CPUS	(1 << 0)
+#define RISCV_HWPROBE_WHICH_CPUS	BIT(0)
 
 #endif
Signature · 1 line
2.45.2
#1 lore raw

Hi Jesse,

Quoted 116 lines · Jesse Taube

In uapi/asm/hwprobe.h file, (1 << N) is used to define the bit field which causes checkpatch to warn. Use BIT(N) and BIT_ULL(N) to avoid these warnings.

---
V1 -> V2:
- Reword commit message

---
  arch/riscv/include/uapi/asm/hwprobe.h | 102 +++++++++++++-------------
  1 file changed, 51 insertions(+), 51 deletions(-)
arch/riscv/include/uapi/asm/hwprobe.h +43 -50
index b706c8e47b02..d0874ff2fd37 100644
@@ -21,57 +21,57 @@ struct riscv_hwprobe {
  #define RISCV_HWPROBE_KEY_MARCHID	1
  #define RISCV_HWPROBE_KEY_MIMPID	2
  #define RISCV_HWPROBE_KEY_BASE_BEHAVIOR	3
-#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	(1 << 0)
+#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	BIT_ULL(0)
  #define RISCV_HWPROBE_KEY_IMA_EXT_0	4
-#define		RISCV_HWPROBE_IMA_FD		(1 << 0)
-#define		RISCV_HWPROBE_IMA_C		(1 << 1)
-#define		RISCV_HWPROBE_IMA_V		(1 << 2)
-#define		RISCV_HWPROBE_EXT_ZBA		(1 << 3)
-#define		RISCV_HWPROBE_EXT_ZBB		(1 << 4)
-#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_EXT_ZVBB		(1 << 17)
-#define		RISCV_HWPROBE_EXT_ZVBC		(1 << 18)
-#define		RISCV_HWPROBE_EXT_ZVKB		(1 << 19)
-#define		RISCV_HWPROBE_EXT_ZVKG		(1 << 20)
-#define		RISCV_HWPROBE_EXT_ZVKNED	(1 << 21)
-#define		RISCV_HWPROBE_EXT_ZVKNHA	(1 << 22)
-#define		RISCV_HWPROBE_EXT_ZVKNHB	(1 << 23)
-#define		RISCV_HWPROBE_EXT_ZVKSED	(1 << 24)
-#define		RISCV_HWPROBE_EXT_ZVKSH		(1 << 25)
-#define		RISCV_HWPROBE_EXT_ZVKT		(1 << 26)
-#define		RISCV_HWPROBE_EXT_ZFH		(1 << 27)
-#define		RISCV_HWPROBE_EXT_ZFHMIN	(1 << 28)
-#define		RISCV_HWPROBE_EXT_ZIHINTNTL	(1 << 29)
-#define		RISCV_HWPROBE_EXT_ZVFH		(1 << 30)
-#define		RISCV_HWPROBE_EXT_ZVFHMIN	(1ULL << 31)
-#define		RISCV_HWPROBE_EXT_ZFA		(1ULL << 32)
-#define		RISCV_HWPROBE_EXT_ZTSO		(1ULL << 33)
-#define		RISCV_HWPROBE_EXT_ZACAS		(1ULL << 34)
-#define		RISCV_HWPROBE_EXT_ZICOND	(1ULL << 35)
-#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	(1ULL << 36)
-#define		RISCV_HWPROBE_EXT_ZVE32X	(1ULL << 37)
-#define		RISCV_HWPROBE_EXT_ZVE32F	(1ULL << 38)
-#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_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_EXT_ZCMOP		(1ULL << 47)
-#define		RISCV_HWPROBE_EXT_ZAWRS		(1ULL << 48)
+#define		RISCV_HWPROBE_IMA_FD		BIT_ULL(0)
+#define		RISCV_HWPROBE_IMA_C		BIT_ULL(1)
+#define		RISCV_HWPROBE_IMA_V		BIT_ULL(2)
+#define		RISCV_HWPROBE_EXT_ZBA		BIT_ULL(3)
+#define		RISCV_HWPROBE_EXT_ZBB		BIT_ULL(4)
+#define		RISCV_HWPROBE_EXT_ZBS		BIT_ULL(5)
+#define		RISCV_HWPROBE_EXT_ZICBOZ	BIT_ULL(6)
+#define		RISCV_HWPROBE_EXT_ZBC		BIT_ULL(7)
+#define		RISCV_HWPROBE_EXT_ZBKB		BIT_ULL(8)
+#define		RISCV_HWPROBE_EXT_ZBKC		BIT_ULL(9)
+#define		RISCV_HWPROBE_EXT_ZBKX		BIT_ULL(10)
+#define		RISCV_HWPROBE_EXT_ZKND		BIT_ULL(11)
+#define		RISCV_HWPROBE_EXT_ZKNE		BIT_ULL(12)
+#define		RISCV_HWPROBE_EXT_ZKNH		BIT_ULL(13)
+#define		RISCV_HWPROBE_EXT_ZKSED		BIT_ULL(14)
+#define		RISCV_HWPROBE_EXT_ZKSH		BIT_ULL(15)
+#define		RISCV_HWPROBE_EXT_ZKT		BIT_ULL(16)
+#define		RISCV_HWPROBE_EXT_ZVBB		BIT_ULL(17)
+#define		RISCV_HWPROBE_EXT_ZVBC		BIT_ULL(18)
+#define		RISCV_HWPROBE_EXT_ZVKB		BIT_ULL(19)
+#define		RISCV_HWPROBE_EXT_ZVKG		BIT_ULL(20)
+#define		RISCV_HWPROBE_EXT_ZVKNED	BIT_ULL(21)
+#define		RISCV_HWPROBE_EXT_ZVKNHA	BIT_ULL(22)
+#define		RISCV_HWPROBE_EXT_ZVKNHB	BIT_ULL(23)
+#define		RISCV_HWPROBE_EXT_ZVKSED	BIT_ULL(24)
+#define		RISCV_HWPROBE_EXT_ZVKSH		BIT_ULL(25)
+#define		RISCV_HWPROBE_EXT_ZVKT		BIT_ULL(26)
+#define		RISCV_HWPROBE_EXT_ZFH		BIT_ULL(27)
+#define		RISCV_HWPROBE_EXT_ZFHMIN	BIT_ULL(28)
+#define		RISCV_HWPROBE_EXT_ZIHINTNTL	BIT_ULL(29)
+#define		RISCV_HWPROBE_EXT_ZVFH		BIT_ULL(30)
+#define		RISCV_HWPROBE_EXT_ZVFHMIN	BIT_ULL(31)
+#define		RISCV_HWPROBE_EXT_ZFA		BIT_ULL(32)
+#define		RISCV_HWPROBE_EXT_ZTSO		BIT_ULL(33)
+#define		RISCV_HWPROBE_EXT_ZACAS		BIT_ULL(34)
+#define		RISCV_HWPROBE_EXT_ZICOND	BIT_ULL(35)
+#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	BIT_ULL(36)
+#define		RISCV_HWPROBE_EXT_ZVE32X	BIT_ULL(37)
+#define		RISCV_HWPROBE_EXT_ZVE32F	BIT_ULL(38)
+#define		RISCV_HWPROBE_EXT_ZVE64X	BIT_ULL(39)
+#define		RISCV_HWPROBE_EXT_ZVE64F	BIT_ULL(40)
+#define		RISCV_HWPROBE_EXT_ZVE64D	BIT_ULL(41)

arch/riscv/include/uapi/asm/hwprobe.h struct riscv_hwprobe { · line 77

Quoted 10 lines
arch/riscv/include/uapi/asm/hwprobe.h +7 -0
+#define		RISCV_HWPROBE_EXT_ZIMOP		BIT_ULL(42)
+#define		RISCV_HWPROBE_EXT_ZCA		BIT_ULL(43)
+#define		RISCV_HWPROBE_EXT_ZCB		BIT_ULL(44)
+#define		RISCV_HWPROBE_EXT_ZCD		BIT_ULL(45)
+#define		RISCV_HWPROBE_EXT_ZCF		BIT_ULL(46)
+#define		RISCV_HWPROBE_EXT_ZCMOP		BIT_ULL(47)
+#define		RISCV_HWPROBE_EXT_ZAWRS		BIT_ULL(48)
  #define RISCV_HWPROBE_KEY_CPUPERF_0	5
  #define		RISCV_HWPROBE_MISALIGNED_UNKNOWN	(0 << 0)
  #define		RISCV_HWPROBE_MISALIGNED_EMULATED	(1 << 0)

Why isn't this one ^ converted too? I did not look but are there other occurrences in this file that should be converted too?

And what about the rest of the riscv sources?

Thanks,

Alex

Quoted 8 lines
arch/riscv/include/uapi/asm/hwprobe.h +1 -1
@@ -85,6 +85,6 @@ struct riscv_hwprobe {
  /* Increase RISCV_HWPROBE_MAX_KEY when adding items. */
 
  /* Flags */
-#define RISCV_HWPROBE_WHICH_CPUS	(1 << 0)
+#define RISCV_HWPROBE_WHICH_CPUS	BIT(0)
 
  #endif
maintainer
#2 lore raw
Quoted 125 lines · On Sun, 25 Aug 2024 23:28:17 PDT (-0700), [email protected] wrote:

Hi Jesse,

Quoted 122 lines · Jesse Taube

In uapi/asm/hwprobe.h file, (1 << N) is used to define the bit field which causes checkpatch to warn. Use BIT(N) and BIT_ULL(N) to avoid these warnings.

---
V1 -> V2:
- Reword commit message

---
  arch/riscv/include/uapi/asm/hwprobe.h | 102 +++++++++++++-------------
  1 file changed, 51 insertions(+), 51 deletions(-)
arch/riscv/include/uapi/asm/hwprobe.h +49 -50
index b706c8e47b02..d0874ff2fd37 100644
@@ -21,57 +21,57 @@ struct riscv_hwprobe {
  #define RISCV_HWPROBE_KEY_MARCHID	1
  #define RISCV_HWPROBE_KEY_MIMPID	2
  #define RISCV_HWPROBE_KEY_BASE_BEHAVIOR	3
-#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	(1 << 0)
+#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	BIT_ULL(0)
  #define RISCV_HWPROBE_KEY_IMA_EXT_0	4
-#define		RISCV_HWPROBE_IMA_FD		(1 << 0)
-#define		RISCV_HWPROBE_IMA_C		(1 << 1)
-#define		RISCV_HWPROBE_IMA_V		(1 << 2)
-#define		RISCV_HWPROBE_EXT_ZBA		(1 << 3)
-#define		RISCV_HWPROBE_EXT_ZBB		(1 << 4)
-#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_EXT_ZVBB		(1 << 17)
-#define		RISCV_HWPROBE_EXT_ZVBC		(1 << 18)
-#define		RISCV_HWPROBE_EXT_ZVKB		(1 << 19)
-#define		RISCV_HWPROBE_EXT_ZVKG		(1 << 20)
-#define		RISCV_HWPROBE_EXT_ZVKNED	(1 << 21)
-#define		RISCV_HWPROBE_EXT_ZVKNHA	(1 << 22)
-#define		RISCV_HWPROBE_EXT_ZVKNHB	(1 << 23)
-#define		RISCV_HWPROBE_EXT_ZVKSED	(1 << 24)
-#define		RISCV_HWPROBE_EXT_ZVKSH		(1 << 25)
-#define		RISCV_HWPROBE_EXT_ZVKT		(1 << 26)
-#define		RISCV_HWPROBE_EXT_ZFH		(1 << 27)
-#define		RISCV_HWPROBE_EXT_ZFHMIN	(1 << 28)
-#define		RISCV_HWPROBE_EXT_ZIHINTNTL	(1 << 29)
-#define		RISCV_HWPROBE_EXT_ZVFH		(1 << 30)
-#define		RISCV_HWPROBE_EXT_ZVFHMIN	(1ULL << 31)
-#define		RISCV_HWPROBE_EXT_ZFA		(1ULL << 32)
-#define		RISCV_HWPROBE_EXT_ZTSO		(1ULL << 33)
-#define		RISCV_HWPROBE_EXT_ZACAS		(1ULL << 34)
-#define		RISCV_HWPROBE_EXT_ZICOND	(1ULL << 35)
-#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	(1ULL << 36)
-#define		RISCV_HWPROBE_EXT_ZVE32X	(1ULL << 37)
-#define		RISCV_HWPROBE_EXT_ZVE32F	(1ULL << 38)
-#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_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_EXT_ZCMOP		(1ULL << 47)
-#define		RISCV_HWPROBE_EXT_ZAWRS		(1ULL << 48)
+#define		RISCV_HWPROBE_IMA_FD		BIT_ULL(0)
+#define		RISCV_HWPROBE_IMA_C		BIT_ULL(1)
+#define		RISCV_HWPROBE_IMA_V		BIT_ULL(2)
+#define		RISCV_HWPROBE_EXT_ZBA		BIT_ULL(3)
+#define		RISCV_HWPROBE_EXT_ZBB		BIT_ULL(4)
+#define		RISCV_HWPROBE_EXT_ZBS		BIT_ULL(5)
+#define		RISCV_HWPROBE_EXT_ZICBOZ	BIT_ULL(6)
+#define		RISCV_HWPROBE_EXT_ZBC		BIT_ULL(7)
+#define		RISCV_HWPROBE_EXT_ZBKB		BIT_ULL(8)
+#define		RISCV_HWPROBE_EXT_ZBKC		BIT_ULL(9)
+#define		RISCV_HWPROBE_EXT_ZBKX		BIT_ULL(10)
+#define		RISCV_HWPROBE_EXT_ZKND		BIT_ULL(11)
+#define		RISCV_HWPROBE_EXT_ZKNE		BIT_ULL(12)
+#define		RISCV_HWPROBE_EXT_ZKNH		BIT_ULL(13)
+#define		RISCV_HWPROBE_EXT_ZKSED		BIT_ULL(14)
+#define		RISCV_HWPROBE_EXT_ZKSH		BIT_ULL(15)
+#define		RISCV_HWPROBE_EXT_ZKT		BIT_ULL(16)
+#define		RISCV_HWPROBE_EXT_ZVBB		BIT_ULL(17)
+#define		RISCV_HWPROBE_EXT_ZVBC		BIT_ULL(18)
+#define		RISCV_HWPROBE_EXT_ZVKB		BIT_ULL(19)
+#define		RISCV_HWPROBE_EXT_ZVKG		BIT_ULL(20)
+#define		RISCV_HWPROBE_EXT_ZVKNED	BIT_ULL(21)
+#define		RISCV_HWPROBE_EXT_ZVKNHA	BIT_ULL(22)
+#define		RISCV_HWPROBE_EXT_ZVKNHB	BIT_ULL(23)
+#define		RISCV_HWPROBE_EXT_ZVKSED	BIT_ULL(24)
+#define		RISCV_HWPROBE_EXT_ZVKSH		BIT_ULL(25)
+#define		RISCV_HWPROBE_EXT_ZVKT		BIT_ULL(26)
+#define		RISCV_HWPROBE_EXT_ZFH		BIT_ULL(27)
+#define		RISCV_HWPROBE_EXT_ZFHMIN	BIT_ULL(28)
+#define		RISCV_HWPROBE_EXT_ZIHINTNTL	BIT_ULL(29)
+#define		RISCV_HWPROBE_EXT_ZVFH		BIT_ULL(30)
+#define		RISCV_HWPROBE_EXT_ZVFHMIN	BIT_ULL(31)
+#define		RISCV_HWPROBE_EXT_ZFA		BIT_ULL(32)
+#define		RISCV_HWPROBE_EXT_ZTSO		BIT_ULL(33)
+#define		RISCV_HWPROBE_EXT_ZACAS		BIT_ULL(34)
+#define		RISCV_HWPROBE_EXT_ZICOND	BIT_ULL(35)
+#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	BIT_ULL(36)
+#define		RISCV_HWPROBE_EXT_ZVE32X	BIT_ULL(37)
+#define		RISCV_HWPROBE_EXT_ZVE32F	BIT_ULL(38)
+#define		RISCV_HWPROBE_EXT_ZVE64X	BIT_ULL(39)
+#define		RISCV_HWPROBE_EXT_ZVE64F	BIT_ULL(40)
+#define		RISCV_HWPROBE_EXT_ZVE64D	BIT_ULL(41)
+#define		RISCV_HWPROBE_EXT_ZIMOP		BIT_ULL(42)
+#define		RISCV_HWPROBE_EXT_ZCA		BIT_ULL(43)
+#define		RISCV_HWPROBE_EXT_ZCB		BIT_ULL(44)
+#define		RISCV_HWPROBE_EXT_ZCD		BIT_ULL(45)
+#define		RISCV_HWPROBE_EXT_ZCF		BIT_ULL(46)
+#define		RISCV_HWPROBE_EXT_ZCMOP		BIT_ULL(47)
Quoted 8 lines

arch/riscv/include/uapi/asm/hwprobe.h struct riscv_hwprobe { · line 77

Quoted 4 lines
arch/riscv/include/uapi/asm/hwprobe.h +1 -0
+#define		RISCV_HWPROBE_EXT_ZAWRS		BIT_ULL(48)
  #define RISCV_HWPROBE_KEY_CPUPERF_0	5
  #define		RISCV_HWPROBE_MISALIGNED_UNKNOWN	(0 << 0)
  #define		RISCV_HWPROBE_MISALIGNED_EMULATED	(1 << 0)

Why isn't this one ^ converted too? I did not look but are there other occurrences in this file that should be converted too?

They're multi-bit values, I poked around looking for a macro and couldn't find any. That said, the "<< 0" doesn't do anything -- it was there from back when we though we'd pack multiple values into this, but we screwed up some of the value/bitmask on this one so it's deprecated.

So I'm just dropping the "<< 0"

Quoted 1 line

And what about the rest of the riscv sources?

Probably Jesse was just squashing the checkpatch warnings in the files she touched. Either way I think it's a reasonable cleanup, I'll send a v2.

Quoted 14 lines

Thanks,

Alex

Quoted 8 lines
arch/riscv/include/uapi/asm/hwprobe.h +1 -1
@@ -85,6 +85,6 @@ struct riscv_hwprobe {
  /* Increase RISCV_HWPROBE_MAX_KEY when adding items. */
 
  /* Flags */
-#define RISCV_HWPROBE_WHICH_CPUS	(1 << 0)
+#define RISCV_HWPROBE_WHICH_CPUS	BIT(0)
 
  #endif
#3 lore raw
Quoted 123 lines · Palmer Dabbelt
Quoted 122 lines · On Sun, 25 Aug 2024 23:28:17 PDT (-0700), [email protected] wrote:

Hi Jesse,

Quoted 119 lines · Jesse Taube

In uapi/asm/hwprobe.h file, (1 << N) is used to define the bit field which causes checkpatch to warn. Use BIT(N) and BIT_ULL(N) to avoid these warnings.

---
V1 -> V2:
  - Reword commit message
---
  arch/riscv/include/uapi/asm/hwprobe.h | 102 +++++++++++++-------------

  1 file changed, 51 insertions(+), 51 deletions(-)
arch/riscv/ renamed from arch/riscv/include/uapi/asm/hwprobe.h +0 -0

include/uapi/asm/hwprobe.h
index b706c8e47b02..d0874ff2fd37 100644

arch/riscv/include/uapi/asm/hwprobe.h +45 -50
@@ -21,57 +21,57 @@ struct riscv_hwprobe {
   #define RISCV_HWPROBE_KEY_MARCHID    1
   #define RISCV_HWPROBE_KEY_MIMPID    2
   #define RISCV_HWPROBE_KEY_BASE_BEHAVIOR    3
-#define        RISCV_HWPROBE_BASE_BEHAVIOR_IMA    (1 << 0)
+#define        RISCV_HWPROBE_BASE_BEHAVIOR_IMA    BIT_ULL(0)
   #define RISCV_HWPROBE_KEY_IMA_EXT_0    4
-#define        RISCV_HWPROBE_IMA_FD        (1 << 0)
-#define        RISCV_HWPROBE_IMA_C        (1 << 1)
-#define        RISCV_HWPROBE_IMA_V        (1 << 2)
-#define        RISCV_HWPROBE_EXT_ZBA        (1 << 3)
-#define        RISCV_HWPROBE_EXT_ZBB        (1 << 4)
-#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_EXT_ZVBB        (1 << 17)
-#define        RISCV_HWPROBE_EXT_ZVBC        (1 << 18)
-#define        RISCV_HWPROBE_EXT_ZVKB        (1 << 19)
-#define        RISCV_HWPROBE_EXT_ZVKG        (1 << 20)
-#define        RISCV_HWPROBE_EXT_ZVKNED    (1 << 21)
-#define        RISCV_HWPROBE_EXT_ZVKNHA    (1 << 22)
-#define        RISCV_HWPROBE_EXT_ZVKNHB    (1 << 23)
-#define        RISCV_HWPROBE_EXT_ZVKSED    (1 << 24)
-#define        RISCV_HWPROBE_EXT_ZVKSH        (1 << 25)
-#define        RISCV_HWPROBE_EXT_ZVKT        (1 << 26)
-#define        RISCV_HWPROBE_EXT_ZFH        (1 << 27)
-#define        RISCV_HWPROBE_EXT_ZFHMIN    (1 << 28)
-#define        RISCV_HWPROBE_EXT_ZIHINTNTL    (1 << 29)
-#define        RISCV_HWPROBE_EXT_ZVFH        (1 << 30)
-#define        RISCV_HWPROBE_EXT_ZVFHMIN    (1ULL << 31)
-#define        RISCV_HWPROBE_EXT_ZFA        (1ULL << 32)
-#define        RISCV_HWPROBE_EXT_ZTSO        (1ULL << 33)
-#define        RISCV_HWPROBE_EXT_ZACAS        (1ULL << 34)
-#define        RISCV_HWPROBE_EXT_ZICOND    (1ULL << 35)
-#define        RISCV_HWPROBE_EXT_ZIHINTPAUSE    (1ULL << 36)
-#define        RISCV_HWPROBE_EXT_ZVE32X    (1ULL << 37)
-#define        RISCV_HWPROBE_EXT_ZVE32F    (1ULL << 38)
-#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_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_EXT_ZCMOP        (1ULL << 47)
-#define        RISCV_HWPROBE_EXT_ZAWRS        (1ULL << 48)
+#define        RISCV_HWPROBE_IMA_FD        BIT_ULL(0)
+#define        RISCV_HWPROBE_IMA_C        BIT_ULL(1)
+#define        RISCV_HWPROBE_IMA_V        BIT_ULL(2)
+#define        RISCV_HWPROBE_EXT_ZBA        BIT_ULL(3)
+#define        RISCV_HWPROBE_EXT_ZBB        BIT_ULL(4)
+#define        RISCV_HWPROBE_EXT_ZBS        BIT_ULL(5)
+#define        RISCV_HWPROBE_EXT_ZICBOZ    BIT_ULL(6)
+#define        RISCV_HWPROBE_EXT_ZBC        BIT_ULL(7)
+#define        RISCV_HWPROBE_EXT_ZBKB        BIT_ULL(8)
+#define        RISCV_HWPROBE_EXT_ZBKC        BIT_ULL(9)
+#define        RISCV_HWPROBE_EXT_ZBKX        BIT_ULL(10)
+#define        RISCV_HWPROBE_EXT_ZKND        BIT_ULL(11)
+#define        RISCV_HWPROBE_EXT_ZKNE        BIT_ULL(12)
+#define        RISCV_HWPROBE_EXT_ZKNH        BIT_ULL(13)
+#define        RISCV_HWPROBE_EXT_ZKSED        BIT_ULL(14)
+#define        RISCV_HWPROBE_EXT_ZKSH        BIT_ULL(15)
+#define        RISCV_HWPROBE_EXT_ZKT        BIT_ULL(16)
+#define        RISCV_HWPROBE_EXT_ZVBB        BIT_ULL(17)
+#define        RISCV_HWPROBE_EXT_ZVBC        BIT_ULL(18)
+#define        RISCV_HWPROBE_EXT_ZVKB        BIT_ULL(19)
+#define        RISCV_HWPROBE_EXT_ZVKG        BIT_ULL(20)
+#define        RISCV_HWPROBE_EXT_ZVKNED    BIT_ULL(21)
+#define        RISCV_HWPROBE_EXT_ZVKNHA    BIT_ULL(22)
+#define        RISCV_HWPROBE_EXT_ZVKNHB    BIT_ULL(23)
+#define        RISCV_HWPROBE_EXT_ZVKSED    BIT_ULL(24)
+#define        RISCV_HWPROBE_EXT_ZVKSH        BIT_ULL(25)
+#define        RISCV_HWPROBE_EXT_ZVKT        BIT_ULL(26)
+#define        RISCV_HWPROBE_EXT_ZFH        BIT_ULL(27)
+#define        RISCV_HWPROBE_EXT_ZFHMIN    BIT_ULL(28)
+#define        RISCV_HWPROBE_EXT_ZIHINTNTL    BIT_ULL(29)
+#define        RISCV_HWPROBE_EXT_ZVFH        BIT_ULL(30)
+#define        RISCV_HWPROBE_EXT_ZVFHMIN    BIT_ULL(31)
+#define        RISCV_HWPROBE_EXT_ZFA        BIT_ULL(32)
+#define        RISCV_HWPROBE_EXT_ZTSO        BIT_ULL(33)
+#define        RISCV_HWPROBE_EXT_ZACAS        BIT_ULL(34)
+#define        RISCV_HWPROBE_EXT_ZICOND    BIT_ULL(35)
+#define        RISCV_HWPROBE_EXT_ZIHINTPAUSE    BIT_ULL(36)
+#define        RISCV_HWPROBE_EXT_ZVE32X    BIT_ULL(37)
+#define        RISCV_HWPROBE_EXT_ZVE32F    BIT_ULL(38)
+#define        RISCV_HWPROBE_EXT_ZVE64X    BIT_ULL(39)
+#define        RISCV_HWPROBE_EXT_ZVE64F    BIT_ULL(40)
+#define        RISCV_HWPROBE_EXT_ZVE64D    BIT_ULL(41)
+#define        RISCV_HWPROBE_EXT_ZIMOP        BIT_ULL(42)
+#define        RISCV_HWPROBE_EXT_ZCA        BIT_ULL(43)
Quoted 8 lines
Quoted 8 lines

arch/riscv/include/uapi/asm/hwprobe.h struct riscv_hwprobe { · line 77

Quoted 8 lines
arch/riscv/include/uapi/asm/hwprobe.h +5 -0
+#define        RISCV_HWPROBE_EXT_ZCB        BIT_ULL(44)
+#define        RISCV_HWPROBE_EXT_ZCD        BIT_ULL(45)
+#define        RISCV_HWPROBE_EXT_ZCF        BIT_ULL(46)
+#define        RISCV_HWPROBE_EXT_ZCMOP        BIT_ULL(47)
+#define        RISCV_HWPROBE_EXT_ZAWRS        BIT_ULL(48)
   #define RISCV_HWPROBE_KEY_CPUPERF_0    5
   #define        RISCV_HWPROBE_MISALIGNED_UNKNOWN    (0 << 0)
   #define        RISCV_HWPROBE_MISALIGNED_EMULATED    (1 << 0)

UAPI headers should use _BITULL/_BITUL instead of BIT_ULL/BIT_UL which are not defined for uapi headers (at least once installed for userspace)

Clément

Quoted 31 lines
Quoted 4 lines

Why isn't this one ^ converted too? I did not look but are there other occurrences in this file that should be converted too?

They're multi-bit values, I poked around looking for a macro and couldn't find any.  That said, the "<< 0" doesn't do anything -- it was there from back when we though we'd pack multiple values into this, but we screwed up some of the value/bitmask on this one so it's deprecated.

So I'm just dropping the "<< 0"

Quoted 1 line

And what about the rest of the riscv sources?

Probably Jesse was just squashing the checkpatch warnings in the files she touched.  Either way I think it's a reasonable cleanup, I'll send a v2.

Quoted 14 lines

Thanks,

Alex

Quoted 8 lines
arch/riscv/include/uapi/asm/hwprobe.h +1 -1
@@ -85,6 +85,6 @@ struct riscv_hwprobe {
   /* Increase RISCV_HWPROBE_MAX_KEY when adding items. */
 
   /* Flags */
-#define RISCV_HWPROBE_WHICH_CPUS    (1 << 0)
+#define RISCV_HWPROBE_WHICH_CPUS    BIT(0)
 
   #endif
#4 lore raw
In reply to Jesse Taube
Quoted 113 lines · Jesse Taube

In uapi/asm/hwprobe.h file, (1 << N) is used to define the bit field which causes checkpatch to warn. Use BIT(N) and BIT_ULL(N) to avoid these warnings.

---
V1 -> V2:
- Reword commit message

---
 arch/riscv/include/uapi/asm/hwprobe.h | 102 +++++++++++++-------------
 1 file changed, 51 insertions(+), 51 deletions(-)
arch/riscv/include/uapi/asm/hwprobe.h +40 -50
index b706c8e47b02..d0874ff2fd37 100644
@@ -21,57 +21,57 @@ struct riscv_hwprobe {
 #define RISCV_HWPROBE_KEY_MARCHID	1
 #define RISCV_HWPROBE_KEY_MIMPID	2
 #define RISCV_HWPROBE_KEY_BASE_BEHAVIOR	3
-#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	(1 << 0)
+#define		RISCV_HWPROBE_BASE_BEHAVIOR_IMA	BIT_ULL(0)
 #define RISCV_HWPROBE_KEY_IMA_EXT_0	4
-#define		RISCV_HWPROBE_IMA_FD		(1 << 0)
-#define		RISCV_HWPROBE_IMA_C		(1 << 1)
-#define		RISCV_HWPROBE_IMA_V		(1 << 2)
-#define		RISCV_HWPROBE_EXT_ZBA		(1 << 3)
-#define		RISCV_HWPROBE_EXT_ZBB		(1 << 4)
-#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_EXT_ZVBB		(1 << 17)
-#define		RISCV_HWPROBE_EXT_ZVBC		(1 << 18)
-#define		RISCV_HWPROBE_EXT_ZVKB		(1 << 19)
-#define		RISCV_HWPROBE_EXT_ZVKG		(1 << 20)
-#define		RISCV_HWPROBE_EXT_ZVKNED	(1 << 21)
-#define		RISCV_HWPROBE_EXT_ZVKNHA	(1 << 22)
-#define		RISCV_HWPROBE_EXT_ZVKNHB	(1 << 23)
-#define		RISCV_HWPROBE_EXT_ZVKSED	(1 << 24)
-#define		RISCV_HWPROBE_EXT_ZVKSH		(1 << 25)
-#define		RISCV_HWPROBE_EXT_ZVKT		(1 << 26)
-#define		RISCV_HWPROBE_EXT_ZFH		(1 << 27)
-#define		RISCV_HWPROBE_EXT_ZFHMIN	(1 << 28)
-#define		RISCV_HWPROBE_EXT_ZIHINTNTL	(1 << 29)
-#define		RISCV_HWPROBE_EXT_ZVFH		(1 << 30)
-#define		RISCV_HWPROBE_EXT_ZVFHMIN	(1ULL << 31)
-#define		RISCV_HWPROBE_EXT_ZFA		(1ULL << 32)
-#define		RISCV_HWPROBE_EXT_ZTSO		(1ULL << 33)
-#define		RISCV_HWPROBE_EXT_ZACAS		(1ULL << 34)
-#define		RISCV_HWPROBE_EXT_ZICOND	(1ULL << 35)
-#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	(1ULL << 36)
-#define		RISCV_HWPROBE_EXT_ZVE32X	(1ULL << 37)
-#define		RISCV_HWPROBE_EXT_ZVE32F	(1ULL << 38)
-#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_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_EXT_ZCMOP		(1ULL << 47)
-#define		RISCV_HWPROBE_EXT_ZAWRS		(1ULL << 48)
+#define		RISCV_HWPROBE_IMA_FD		BIT_ULL(0)
+#define		RISCV_HWPROBE_IMA_C		BIT_ULL(1)
+#define		RISCV_HWPROBE_IMA_V		BIT_ULL(2)
+#define		RISCV_HWPROBE_EXT_ZBA		BIT_ULL(3)
+#define		RISCV_HWPROBE_EXT_ZBB		BIT_ULL(4)
+#define		RISCV_HWPROBE_EXT_ZBS		BIT_ULL(5)
+#define		RISCV_HWPROBE_EXT_ZICBOZ	BIT_ULL(6)
+#define		RISCV_HWPROBE_EXT_ZBC		BIT_ULL(7)
+#define		RISCV_HWPROBE_EXT_ZBKB		BIT_ULL(8)
+#define		RISCV_HWPROBE_EXT_ZBKC		BIT_ULL(9)
+#define		RISCV_HWPROBE_EXT_ZBKX		BIT_ULL(10)
+#define		RISCV_HWPROBE_EXT_ZKND		BIT_ULL(11)
+#define		RISCV_HWPROBE_EXT_ZKNE		BIT_ULL(12)
+#define		RISCV_HWPROBE_EXT_ZKNH		BIT_ULL(13)
+#define		RISCV_HWPROBE_EXT_ZKSED		BIT_ULL(14)
+#define		RISCV_HWPROBE_EXT_ZKSH		BIT_ULL(15)
+#define		RISCV_HWPROBE_EXT_ZKT		BIT_ULL(16)
+#define		RISCV_HWPROBE_EXT_ZVBB		BIT_ULL(17)
+#define		RISCV_HWPROBE_EXT_ZVBC		BIT_ULL(18)
+#define		RISCV_HWPROBE_EXT_ZVKB		BIT_ULL(19)
+#define		RISCV_HWPROBE_EXT_ZVKG		BIT_ULL(20)
+#define		RISCV_HWPROBE_EXT_ZVKNED	BIT_ULL(21)
+#define		RISCV_HWPROBE_EXT_ZVKNHA	BIT_ULL(22)
+#define		RISCV_HWPROBE_EXT_ZVKNHB	BIT_ULL(23)
+#define		RISCV_HWPROBE_EXT_ZVKSED	BIT_ULL(24)
+#define		RISCV_HWPROBE_EXT_ZVKSH		BIT_ULL(25)
+#define		RISCV_HWPROBE_EXT_ZVKT		BIT_ULL(26)
+#define		RISCV_HWPROBE_EXT_ZFH		BIT_ULL(27)
+#define		RISCV_HWPROBE_EXT_ZFHMIN	BIT_ULL(28)
+#define		RISCV_HWPROBE_EXT_ZIHINTNTL	BIT_ULL(29)
+#define		RISCV_HWPROBE_EXT_ZVFH		BIT_ULL(30)
+#define		RISCV_HWPROBE_EXT_ZVFHMIN	BIT_ULL(31)
+#define		RISCV_HWPROBE_EXT_ZFA		BIT_ULL(32)
+#define		RISCV_HWPROBE_EXT_ZTSO		BIT_ULL(33)
+#define		RISCV_HWPROBE_EXT_ZACAS		BIT_ULL(34)
+#define		RISCV_HWPROBE_EXT_ZICOND	BIT_ULL(35)
+#define		RISCV_HWPROBE_EXT_ZIHINTPAUSE	BIT_ULL(36)
+#define		RISCV_HWPROBE_EXT_ZVE32X	BIT_ULL(37)
+#define		RISCV_HWPROBE_EXT_ZVE32F	BIT_ULL(38)

arch/riscv/include/uapi/asm/hwprobe.h struct riscv_hwprobe { · line 74

Quoted 10 lines
arch/riscv/include/uapi/asm/hwprobe.h +10 -0
+#define		RISCV_HWPROBE_EXT_ZVE64X	BIT_ULL(39)
+#define		RISCV_HWPROBE_EXT_ZVE64F	BIT_ULL(40)
+#define		RISCV_HWPROBE_EXT_ZVE64D	BIT_ULL(41)
+#define		RISCV_HWPROBE_EXT_ZIMOP		BIT_ULL(42)
+#define		RISCV_HWPROBE_EXT_ZCA		BIT_ULL(43)
+#define		RISCV_HWPROBE_EXT_ZCB		BIT_ULL(44)
+#define		RISCV_HWPROBE_EXT_ZCD		BIT_ULL(45)
+#define		RISCV_HWPROBE_EXT_ZCF		BIT_ULL(46)
+#define		RISCV_HWPROBE_EXT_ZCMOP		BIT_ULL(47)
+#define		RISCV_HWPROBE_EXT_ZAWRS		BIT_ULL(48)$

Hi Jessie,

If I remember correctly, files that are in include/uapi/ should not used defines that are in include/linux/. In that case, _BITULL() should be used instead of BIT_ULL() (from include/uapi/linux/const.h)

Thanks,

Clément

Quoted 11 lines
arch/riscv/include/uapi/asm/hwprobe.h +1 -1
 #define RISCV_HWPROBE_KEY_CPUPERF_0	5
 #define		RISCV_HWPROBE_MISALIGNED_UNKNOWN	(0 << 0)
 #define		RISCV_HWPROBE_MISALIGNED_EMULATED	(1 << 0)
@@ -85,6 +85,6 @@ struct riscv_hwprobe {
 /* Increase RISCV_HWPROBE_MAX_KEY when adding items. */
 
 /* Flags */
-#define RISCV_HWPROBE_WHICH_CPUS	(1 << 0)
+#define RISCV_HWPROBE_WHICH_CPUS	BIT(0)
 
 #endif