| Message ID | 20250205204129.10639-3-palmer@rivosinc.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V: Use BIT_ULL(x) instead of 1ULL << x | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | success | Success |
| bjorn/build-rv32-defconfig | success | build-rv32-defconfig |
| bjorn/build-rv64-clang-allmodconfig | success | build-rv64-clang-allmodconfig |
| bjorn/build-rv64-gcc-allmodconfig | success | build-rv64-gcc-allmodconfig |
| bjorn/build-rv64-nommu-k210-defconfig | success | build-rv64-nommu-k210-defconfig |
| bjorn/build-rv64-nommu-k210-virt | success | build-rv64-nommu-k210-virt |
| bjorn/checkpatch | success | checkpatch |
| bjorn/dtb-warn-rv64 | success | dtb-warn-rv64 |
| bjorn/header-inline | success | header-inline |
| bjorn/kdoc | success | kdoc |
| bjorn/module-param | success | module-param |
| bjorn/verify-fixes | success | verify-fixes |
| bjorn/verify-signedoff | success | verify-signedoff |
On Wed, Feb 05, 2025 at 12:40:27PM -0800, Palmer Dabbelt wrote: > There were a few of these outside hwprobe, so I figured it was easier to > just clean them up too. > > Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> > --- > arch/riscv/include/asm/csr.h | 10 +++++----- > arch/riscv/include/asm/kasan.h | 2 +- > tools/arch/riscv/include/asm/csr.h | 20 ++++++++++---------- > 3 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h > index 6fed42e37705..181867da7fe3 100644 > --- a/arch/riscv/include/asm/csr.h > +++ b/arch/riscv/include/asm/csr.h > @@ -221,15 +221,15 @@ > > /* Smstateen bits */ > #define SMSTATEEN0_AIA_IMSIC_SHIFT 58 > -#define SMSTATEEN0_AIA_IMSIC (_ULL(1) << SMSTATEEN0_AIA_IMSIC_SHIFT) > +#define SMSTATEEN0_AIA_IMSIC BIT_ULL(SMSTATEEN0_AIA_IMSIC_SHIFT) > #define SMSTATEEN0_AIA_SHIFT 59 > -#define SMSTATEEN0_AIA (_ULL(1) << SMSTATEEN0_AIA_SHIFT) > +#define SMSTATEEN0_AIA BIT_ULL(SMSTATEEN0_AIA_SHIFT) > #define SMSTATEEN0_AIA_ISEL_SHIFT 60 > -#define SMSTATEEN0_AIA_ISEL (_ULL(1) << SMSTATEEN0_AIA_ISEL_SHIFT) > +#define SMSTATEEN0_AIA_ISEL BIT_ULL(SMSTATEEN0_AIA_ISEL_SHIFT) > #define SMSTATEEN0_HSENVCFG_SHIFT 62 > -#define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) > +#define SMSTATEEN0_HSENVCFG BIT_ULL(SMSTATEEN0_HSENVCFG_SHIFT) > #define SMSTATEEN0_SSTATEEN0_SHIFT 63 > -#define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) > +#define SMSTATEEN0_SSTATEEN0 BIT_ULL(SMSTATEEN0_SSTATEEN0_SHIFT) > > /* mseccfg bits */ > #define MSECCFG_PMM ENVCFG_PMM > diff --git a/arch/riscv/include/asm/kasan.h b/arch/riscv/include/asm/kasan.h > index e6a0071bdb56..70660f431f8f 100644 > --- a/arch/riscv/include/asm/kasan.h > +++ b/arch/riscv/include/asm/kasan.h > @@ -25,7 +25,7 @@ > */ > #define KASAN_SHADOW_SCALE_SHIFT 3 > > -#define KASAN_SHADOW_SIZE (UL(1) << ((VA_BITS - 1) - KASAN_SHADOW_SCALE_SHIFT)) > +#define KASAN_SHADOW_SIZE BIT_ULL((VA_BITS - 1) - KASAN_SHADOW_SCALE_SHIFT) > /* > * Depending on the size of the virtual address space, the region may not be > * aligned on PGDIR_SIZE, so force its alignment to ease its population. > diff --git a/tools/arch/riscv/include/asm/csr.h b/tools/arch/riscv/include/asm/csr.h > index 0dfc09254f99..902d607c282e 100644 > --- a/tools/arch/riscv/include/asm/csr.h > +++ b/tools/arch/riscv/include/asm/csr.h > @@ -203,16 +203,16 @@ > #define ENVCFG_FIOM _AC(0x1, UL) > > /* Smstateen bits */ > -#define SMSTATEEN0_AIA_IMSIC_SHIFT 58 > -#define SMSTATEEN0_AIA_IMSIC (_ULL(1) << SMSTATEEN0_AIA_IMSIC_SHIFT) > -#define SMSTATEEN0_AIA_SHIFT 59 > -#define SMSTATEEN0_AIA (_ULL(1) << SMSTATEEN0_AIA_SHIFT) > -#define SMSTATEEN0_AIA_ISEL_SHIFT 60 > -#define SMSTATEEN0_AIA_ISEL (_ULL(1) << SMSTATEEN0_AIA_ISEL_SHIFT) > -#define SMSTATEEN0_HSENVCFG_SHIFT 62 > -#define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) > -#define SMSTATEEN0_SSTATEEN0_SHIFT 63 > -#define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) > +#define SMSTATEEN0_AIA_IMSIC_SHIFT BIT_ULL(58) > +#define SMSTATEEN0_AIA_IMSIC BIT_ULL(SMSTATEEN0_AIA_IMSIC_SHIFT) > +#define SMSTATEEN0_AIA_SHIFT BIT_ULL(59) > +#define SMSTATEEN0_AIA BIT_ULL(SMSTATEEN0_AIA_SHIFT) > +#define SMSTATEEN0_AIA_ISEL_SHIFT BIT_ULL(60) > +#define SMSTATEEN0_AIA_ISEL BIT_ULL(SMSTATEEN0_AIA_ISEL_SHIFT) > +#define SMSTATEEN0_HSENVCFG_SHIFT BIT_ULL(62) > +#define SMSTATEEN0_HSENVCFG BIT_ULL(SMSTATEEN0_HSENVCFG_SHIFT) > +#define SMSTATEEN0_SSTATEEN0_SHIFT BIT_ULL(63) > +#define SMSTATEEN0_SSTATEEN0 BIT_ULL(SMSTATEEN0_SSTATEEN0_SHIFT) > Do not wrap _SHIFT values with BIT_ULL(). Likely caused by too aggressive `sed //`. best, - Tomasz > /* symbolic CSR names: */ > #define CSR_CYCLE 0xc00 > -- > 2.45.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 6fed42e37705..181867da7fe3 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -221,15 +221,15 @@ /* Smstateen bits */ #define SMSTATEEN0_AIA_IMSIC_SHIFT 58 -#define SMSTATEEN0_AIA_IMSIC (_ULL(1) << SMSTATEEN0_AIA_IMSIC_SHIFT) +#define SMSTATEEN0_AIA_IMSIC BIT_ULL(SMSTATEEN0_AIA_IMSIC_SHIFT) #define SMSTATEEN0_AIA_SHIFT 59 -#define SMSTATEEN0_AIA (_ULL(1) << SMSTATEEN0_AIA_SHIFT) +#define SMSTATEEN0_AIA BIT_ULL(SMSTATEEN0_AIA_SHIFT) #define SMSTATEEN0_AIA_ISEL_SHIFT 60 -#define SMSTATEEN0_AIA_ISEL (_ULL(1) << SMSTATEEN0_AIA_ISEL_SHIFT) +#define SMSTATEEN0_AIA_ISEL BIT_ULL(SMSTATEEN0_AIA_ISEL_SHIFT) #define SMSTATEEN0_HSENVCFG_SHIFT 62 -#define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) +#define SMSTATEEN0_HSENVCFG BIT_ULL(SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 -#define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +#define SMSTATEEN0_SSTATEEN0 BIT_ULL(SMSTATEEN0_SSTATEEN0_SHIFT) /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM diff --git a/arch/riscv/include/asm/kasan.h b/arch/riscv/include/asm/kasan.h index e6a0071bdb56..70660f431f8f 100644 --- a/arch/riscv/include/asm/kasan.h +++ b/arch/riscv/include/asm/kasan.h @@ -25,7 +25,7 @@ */ #define KASAN_SHADOW_SCALE_SHIFT 3 -#define KASAN_SHADOW_SIZE (UL(1) << ((VA_BITS - 1) - KASAN_SHADOW_SCALE_SHIFT)) +#define KASAN_SHADOW_SIZE BIT_ULL((VA_BITS - 1) - KASAN_SHADOW_SCALE_SHIFT) /* * Depending on the size of the virtual address space, the region may not be * aligned on PGDIR_SIZE, so force its alignment to ease its population. diff --git a/tools/arch/riscv/include/asm/csr.h b/tools/arch/riscv/include/asm/csr.h index 0dfc09254f99..902d607c282e 100644 --- a/tools/arch/riscv/include/asm/csr.h +++ b/tools/arch/riscv/include/asm/csr.h @@ -203,16 +203,16 @@ #define ENVCFG_FIOM _AC(0x1, UL) /* Smstateen bits */ -#define SMSTATEEN0_AIA_IMSIC_SHIFT 58 -#define SMSTATEEN0_AIA_IMSIC (_ULL(1) << SMSTATEEN0_AIA_IMSIC_SHIFT) -#define SMSTATEEN0_AIA_SHIFT 59 -#define SMSTATEEN0_AIA (_ULL(1) << SMSTATEEN0_AIA_SHIFT) -#define SMSTATEEN0_AIA_ISEL_SHIFT 60 -#define SMSTATEEN0_AIA_ISEL (_ULL(1) << SMSTATEEN0_AIA_ISEL_SHIFT) -#define SMSTATEEN0_HSENVCFG_SHIFT 62 -#define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) -#define SMSTATEEN0_SSTATEEN0_SHIFT 63 -#define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +#define SMSTATEEN0_AIA_IMSIC_SHIFT BIT_ULL(58) +#define SMSTATEEN0_AIA_IMSIC BIT_ULL(SMSTATEEN0_AIA_IMSIC_SHIFT) +#define SMSTATEEN0_AIA_SHIFT BIT_ULL(59) +#define SMSTATEEN0_AIA BIT_ULL(SMSTATEEN0_AIA_SHIFT) +#define SMSTATEEN0_AIA_ISEL_SHIFT BIT_ULL(60) +#define SMSTATEEN0_AIA_ISEL BIT_ULL(SMSTATEEN0_AIA_ISEL_SHIFT) +#define SMSTATEEN0_HSENVCFG_SHIFT BIT_ULL(62) +#define SMSTATEEN0_HSENVCFG BIT_ULL(SMSTATEEN0_HSENVCFG_SHIFT) +#define SMSTATEEN0_SSTATEEN0_SHIFT BIT_ULL(63) +#define SMSTATEEN0_SSTATEEN0 BIT_ULL(SMSTATEEN0_SSTATEEN0_SHIFT) /* symbolic CSR names: */ #define CSR_CYCLE 0xc00
There were a few of these outside hwprobe, so I figured it was easier to just clean them up too. Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> --- arch/riscv/include/asm/csr.h | 10 +++++----- arch/riscv/include/asm/kasan.h | 2 +- tools/arch/riscv/include/asm/csr.h | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-)