Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/fdt_cppc_rpmi: Fix compile error with LLVM

Browse Source 
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: 591a98bdd5 ("lib: utils/cppc: Add RPMI CPPC driver")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
This commit is contained in:
Anup Patel
2024-12-10 09:04:43 +05:30
committed by Anup Patel
parent c2acc5e5b0
commit 74c6ea014d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils/cppc/fdt_cppc_rpmi.c
View File

@@ -59,6 +59,11 @@ static void rpmi_cppc_fc_db_trigger(struct rpmi_cppc *cppc)
u8 db_val_u8 = 0; u8 db_val_u8 = 0;
u16 db_val_u16 = 0; u16 db_val_u16 = 0;
u32 db_val_u32 = 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) { switch (cppc->fc_db_width) {
case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_8: case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_8:
@@ -84,14 +89,12 @@ static void rpmi_cppc_fc_db_trigger(struct rpmi_cppc *cppc)
break; break;
case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_64: case RPMI_CPPC_FAST_CHANNEL_DB_WIDTH_64:
#if __riscv_xlen != 32 #if __riscv_xlen != 32
u64 db_val_u64 = 0;
db_val_u64 = readq((void *)cppc->fc_db_addr); db_val_u64 = readq((void *)cppc->fc_db_addr);
db_val_u64 = cppc->fc_db_setmask | db_val_u64 = cppc->fc_db_setmask |
(db_val_u64 & cppc->fc_db_preservemask); (db_val_u64 & cppc->fc_db_preservemask);
writeq(db_val_u64, (void *)cppc->fc_db_addr); writeq(db_val_u64, (void *)cppc->fc_db_addr);
#else #else
u32 db_val_u32_hi = 0;
db_val_u32 = readl((void *)cppc->fc_db_addr); db_val_u32 = readl((void *)cppc->fc_db_addr);
db_val_u32_hi = readl((void *)(cppc->fc_db_addr + 4)); db_val_u32_hi = readl((void *)(cppc->fc_db_addr + 4));