From 332798211e7232da60158b0545b23c61b5338516 Mon Sep 17 00:00:00 2001 From: wuliwen Date: Thu, 22 Oct 2026 10:05:25 +0800 Subject: [PATCH] include: mailbox: correct RPMI CPPC request field ordering Per the RPMI specification, CPPC_PROBE_REG, CPPC_READ_REG, and CPPC_WRITE_REG require REG_ID in word 0 and HART_ID in word 1. The current request structures have these fields swapped, causing incompatibility with spec-compliant RPMI servers. Swap the fields to match the specification and reorder the corresponding field assignments in lib for consistency. Fixes: 591a98bdd549 ("lib: utils/cppc: Add RPMI CPPC driver") Signed-off-by: wuliwen Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20261022020525.1503945-1-liwen.wu@spacemit.com Signed-off-by: Anup Patel --- include/sbi_utils/mailbox/rpmi_msgprot.h | 6 +++--- lib/utils/cppc/fdt_cppc_rpmi.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sbi_utils/mailbox/rpmi_msgprot.h b/include/sbi_utils/mailbox/rpmi_msgprot.h index b473e5f6..df4ac349 100644 --- a/include/sbi_utils/mailbox/rpmi_msgprot.h +++ b/include/sbi_utils/mailbox/rpmi_msgprot.h @@ -539,8 +539,8 @@ enum rpmi_cppc_service_id { }; struct rpmi_cppc_probe_req { - u32 hart_id; u32 reg_id; + u32 hart_id; }; struct rpmi_cppc_probe_resp { @@ -549,8 +549,8 @@ struct rpmi_cppc_probe_resp { }; struct rpmi_cppc_read_reg_req { - u32 hart_id; u32 reg_id; + u32 hart_id; }; struct rpmi_cppc_read_reg_resp { @@ -560,8 +560,8 @@ struct rpmi_cppc_read_reg_resp { }; struct rpmi_cppc_write_reg_req { - u32 hart_id; u32 reg_id; + u32 hart_id; u32 data_lo; u32 data_hi; }; diff --git a/lib/utils/cppc/fdt_cppc_rpmi.c b/lib/utils/cppc/fdt_cppc_rpmi.c index 15c89351..ef69ec17 100644 --- a/lib/utils/cppc/fdt_cppc_rpmi.c +++ b/lib/utils/cppc/fdt_cppc_rpmi.c @@ -116,8 +116,8 @@ static int rpmi_cppc_read(unsigned long reg, u64 *val) struct rpmi_cppc_read_reg_resp resp; struct rpmi_cppc *cppc; - req.hart_id = current_hartid(); req.reg_id = reg; + req.hart_id = current_hartid(); cppc = rpmi_cppc_get_pointer(req.hart_id); if ((reg == SBI_CPPC_DELIVERED_CTR) && cppc->fc_supported) { @@ -170,8 +170,8 @@ static int rpmi_cppc_write(unsigned long reg, u64 val) struct rpmi_cppc *cppc = rpmi_cppc_get_pointer(hart_id); if (reg != SBI_CPPC_DESIRED_PERF || !cppc->fc_supported) { - req.hart_id = hart_id; req.reg_id = reg; + req.hart_id = hart_id; req.data_lo = val & 0xFFFFFFFF; req.data_hi = val >> 32; @@ -197,8 +197,8 @@ static int rpmi_cppc_probe(unsigned long reg) struct rpmi_cppc_probe_resp resp; struct rpmi_cppc_probe_req req; - req.hart_id = current_hartid(); req.reg_id = reg; + req.hart_id = current_hartid(); cppc = rpmi_cppc_get_pointer(req.hart_id); if (!cppc)