firmware: arm_scmi: Convert u32 to unsigned long to align with arm_smccc_1_1_invoke()

All the parameters to arm_smccc_1_1_invoke() are unsigned long which
aligns well on both 32-bit and 64-bit Arm based platforms. Let us store
all the members in the structure scmi_smc used as the parameters to the
arm_smccc_1_1_invoke() call as unsigned long.

Cc: Cristian Marussi <cristian.marussi@arm.com>
Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Link: https://lore.kernel.org/r/20231009152049.1428872-1-sudeep.holla@arm.com
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c
index c193516a254d9e056ae34116e3c1d10a048d01cb..8eba60a419754a08b8f99914f4369c04c70d7fe2 100644 (file)
--- a/drivers/firmware/arm_scmi/smc.c
+++ b/drivers/firmware/arm_scmi/smc.c
@@ -60,9 +60,9 @@ struct scmi_smc {
        struct mutex shmem_lock;
 #define INFLIGHT_NONE  MSG_TOKEN_MAX
        atomic_t inflight;
-       u32 func_id;
-       u32 param_page;
-       u32 param_offset;
+       unsigned long func_id;
+       unsigned long param_page;
+       unsigned long param_offset;
 };
 
 static irqreturn_t smc_msg_done_isr(int irq, void *data)
@@ -211,8 +211,6 @@ static int smc_send_message(struct scmi_chan_info *cinfo,
 {
        struct scmi_smc *scmi_info = cinfo->transport_info;
        struct arm_smccc_res res;
-       unsigned long page = scmi_info->param_page;
-       unsigned long offset = scmi_info->param_offset;
 
        /*
         * Channel will be released only once response has been
@@ -222,8 +220,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo,
 
        shmem_tx_prepare(scmi_info->shmem, xfer, cinfo);
 
-       arm_smccc_1_1_invoke(scmi_info->func_id, page, offset, 0, 0, 0, 0, 0,
-                            &res);
+       arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->param_page,
+                            scmi_info->param_offset, 0, 0, 0, 0, 0, &res);
 
        /* Only SMCCC_RET_NOT_SUPPORTED is valid error code */
        if (res.a0) {