diff options
| author | Anup Patel <apatel@ventanamicro.com> | 2024-12-10 09:04:43 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2024-12-15 11:28:13 +0530 |
| commit | 74c6ea014db8fc7d56254ba9dd371b7454bd7220 (patch) | |
| tree | d201f1f2a8843dbfdece4cc6b1ef2a52a1e12aa4 | |
| parent | c2acc5e5b0d85166153032eaea181021c73e9752 (diff) | |
| download | opensbi-74c6ea014db8fc7d56254ba9dd371b7454bd7220.zip opensbi-74c6ea014db8fc7d56254ba9dd371b7454bd7220.tar.gz opensbi-74c6ea014db8fc7d56254ba9dd371b7454bd7220.tar.bz2 | |
lib: utils/fdt_cppc_rpmi: Fix compile error with LLVM
The following error is observed when compiling fdt_cppc_rpmi
driver using LLVM:
lib/utils/cppc/fdt_cppc_rpmi.c:87:3: error: label followed by a declaration is a C23 extension [-Werror,-Wc23-extensions]
87 | u64 db_val_u64 = 0;
To fix the above issue, move the variable declaration at the
start of function.
Fixes: 591a98bdd549 ("lib: utils/cppc: Add RPMI CPPC driver")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
| -rw-r--r-- | lib/utils/cppc/fdt_cppc_rpmi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/utils/cppc/fdt_cppc_rpmi.c b/lib/utils/cppc/fdt_cppc_rpmi.c index 26e2d4f..b678990 100644 --- a/lib/utils/cppc/fdt_cppc_rpmi.c +++ b/lib/utils/cppc/fdt_cppc_rpmi.c @@ -59,6 +59,11 @@ static void rpmi_cppc_fc_db_trigger(struct rpmi_cppc *cppc) u8 db_val_u8 = 0; u16 db_val_u16 = 0; u32 db_val_u32 = 0; +#if __riscv_xlen != 32 + u64 db_val_u64 = 0; +#else + u32 db_val_u32_hi = 0; +#endif switch (cppc->fc_db_width) { case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_8: @@ -84,14 +89,12 @@ static void rpmi_cppc_fc_db_trigger(struct rpmi_cppc *cppc) break; case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_64: #if __riscv_xlen != 32 - u64 db_val_u64 = 0; db_val_u64 = readq((void *)cppc->fc_db_addr); db_val_u64 = cppc->fc_db_setmask | (db_val_u64 & cppc->fc_db_preservemask); writeq(db_val_u64, (void *)cppc->fc_db_addr); #else - u32 db_val_u32_hi = 0; db_val_u32 = readl((void *)cppc->fc_db_addr); db_val_u32_hi = readl((void *)(cppc->fc_db_addr + 4)); |