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)