Re: [PATCH 05/17] firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_desc

[Vinod Koul]

On 04-11-19, 17:27, Elliot Berman wrote:
> Service, command, and owner IDs are all part of qcom_scm_desc struct and
> have no special reason to be a function argument (or hard-coded in the
> case of owner). Moving them to be part of qcom_scm_desc struct improves
> readability.
> 
> Signed-off-by: Elliot Berman <eberman@xxxxxxxxxxxxxx>
> ---
>  drivers/firmware/qcom_scm-64.c | 192 +++++++++++++++++++++++++----------------
>  1 file changed, 120 insertions(+), 72 deletions(-)
> 
> diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c
> index ead0b5f..76412a5 100644
> --- a/drivers/firmware/qcom_scm-64.c
> +++ b/drivers/firmware/qcom_scm-64.c
> @@ -46,8 +46,11 @@ enum qcom_scm_arg_types {
>   * @res:	The values returned by the secure syscall
>   */
>  struct qcom_scm_desc {
> +	u32 svc;
> +	u32 cmd;
>  	u32 arginfo;
>  	u64 args[MAX_QCOM_SCM_ARGS];
> +	u32 owner;
>  };
>  
>  static u64 qcom_smccc_convention = -1;
> @@ -62,14 +65,16 @@ static DEFINE_MUTEX(qcom_scm_lock);
>  #define SMCCC_N_EXT_ARGS	(MAX_QCOM_SCM_ARGS - SMCCC_N_REG_ARGS + 1)
>  
>  static void __qcom_scm_call_do_quirk(const struct qcom_scm_desc *desc,
> -			       struct arm_smccc_res *res, u32 fn_id,
> -			       u64 x5, u32 type)
> +			       struct arm_smccc_res *res, u64 x5, u32 type)
>  {
>  	u64 cmd;
>  	struct arm_smccc_quirk quirk = { .id = ARM_SMCCC_QUIRK_QCOM_A6 };
>  
> -	cmd = ARM_SMCCC_CALL_VAL(type, qcom_smccc_convention,
> -				 ARM_SMCCC_OWNER_SIP, fn_id);
> +	cmd = ARM_SMCCC_CALL_VAL(
> +		type,
> +		qcom_smccc_convention,
> +		desc->owner,
> +		SMCCC_FUNCNUM(desc->svc, desc->cmd));
>  
>  	quirk.state.a6 = 0;
>  
> @@ -85,22 +90,19 @@ static void __qcom_scm_call_do_quirk(const struct qcom_scm_desc *desc,
>  }
>  
>  static void qcom_scm_call_do_smccc(const struct qcom_scm_desc *desc,
> -			     struct arm_smccc_res *res, u32 fn_id,
> -			     u64 x5, bool atomic)
> +			     struct arm_smccc_res *res, u64 x5, bool atomic)
>  {
>  	int retry_count = 0;
>  
>  	if (atomic) {
> -		__qcom_scm_call_do_quirk(desc, res, fn_id, x5,
> -					 ARM_SMCCC_FAST_CALL);
> +		__qcom_scm_call_do_quirk(desc, res, x5, ARM_SMCCC_FAST_CALL);
>  		return;
>  	}
>  
>  	do {
>  		mutex_lock(&qcom_scm_lock);
>  
> -		__qcom_scm_call_do_quirk(desc, res, fn_id, x5,
> -					 ARM_SMCCC_STD_CALL);
> +		__qcom_scm_call_do_quirk(desc, res, x5, ARM_SMCCC_STD_CALL);
>  
>  		mutex_unlock(&qcom_scm_lock);
>  
> @@ -112,13 +114,12 @@ static void qcom_scm_call_do_smccc(const struct qcom_scm_desc *desc,
>  	}  while (res->a0 == QCOM_SCM_V2_EBUSY);
>  }
>  
> -static int ___qcom_scm_call_smccc(struct device *dev, u32 svc_id, u32 cmd_id,
> +static int ___qcom_scm_call_smccc(struct device *dev,
>  				  const struct qcom_scm_desc *desc,
>  				  struct arm_smccc_res *res, bool atomic)
>  {
>  	int arglen = desc->arginfo & 0xf;
>  	int i;
> -	u32 fn_id = SMCCC_FUNCNUM(svc_id, cmd_id);
>  	u64 x5 = desc->args[SMCCC_N_REG_ARGS - 1];
>  	dma_addr_t args_phys = 0;
>  	void *args_virt = NULL;
> @@ -157,7 +158,7 @@ static int ___qcom_scm_call_smccc(struct device *dev, u32 svc_id, u32 cmd_id,
>  		x5 = args_phys;
>  	}
>  
> -	qcom_scm_call_do_smccc(desc, res, fn_id, x5, atomic);
> +	qcom_scm_call_do_smccc(desc, res, x5, atomic);
>  
>  	if (args_virt) {
>  		dma_unmap_single(dev, args_phys, alloc_len, DMA_TO_DEVICE);
> @@ -180,12 +181,11 @@ static int ___qcom_scm_call_smccc(struct device *dev, u32 svc_id, u32 cmd_id,
>   * Sends a command to the SCM and waits for the command to finish processing.
>   * This should *only* be called in pre-emptible context.
>   */
> -static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
> -			 const struct qcom_scm_desc *desc,
> +static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc,
>  			 struct arm_smccc_res *res)
>  {
>  	might_sleep();
> -	return ___qcom_scm_call_smccc(dev, svc_id, cmd_id, desc, res, false);
> +	return ___qcom_scm_call_smccc(dev, desc, res, false);
>  }
>  
>  /**
> @@ -199,11 +199,11 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
>   * Sends a command to the SCM and waits for the command to finish processing.
>   * This can be called in atomic context.
>   */
> -static int qcom_scm_call_atomic(struct device *dev, u32 svc_id, u32 cmd_id,
> +static int qcom_scm_call_atomic(struct device *dev,
>  				const struct qcom_scm_desc *desc,
>  				struct arm_smccc_res *res)
>  {
> -	return ___qcom_scm_call_smccc(dev, svc_id, cmd_id, desc, res, true);
> +	return ___qcom_scm_call_smccc(dev, desc, res, true);
>  }
>  
>  /**
> @@ -248,7 +248,11 @@ void __qcom_scm_cpu_power_down(u32 flags)
>  
>  int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id)
>  {
> -	struct qcom_scm_desc desc = {0};
> +	struct qcom_scm_desc desc = {
> +		.svc = QCOM_SCM_SVC_BOOT,
> +		.cmd = QCOM_SCM_BOOT_SET_REMOTE_STATE,
> +		.owner = ARM_SMCCC_OWNER_SIP,

Does this not leave some fields of desc uninitialized? Would it make
sense to do memset here first and then initialize. And since this
pattern seems used repeatedly, why not do:

        struct qcom_scm_desc desc;
        ...
        ACOM_INIT_SCM_DESC(desc, QCOM_SCM_SVC_BOOT,
                           QCOM_SCM_BOOT_SET_REMOTE_STATE,
                           ARM_SMCCC_OWNER_SIP);

Where:

#define ACOM_INIT_SCM_DESC(_desc, arg1, arg2, arg3)             \
        {                                                       \
                memset(_desc, 0, sizeof(*_desc));               \
                desc->svc = arg1;                               \
                desc->cmd = arg2;                               \
                desc->wner = arg3;                              \
        }

Or a function to do so...

-- 
~Vinod