[PATCH v2 11/17] drivers/firmware/sdei: Introduce sdei_do_local_call()

[Gavin Shan]

Hi Jonathan,

On 7/24/20 1:25 AM, Jonathan Cameron wrote:
> On Wed, 22 Jul 2020 19:57:34 +1000
> Gavin Shan <gshan at redhat.com> wrote:
> 
>> During the CPU hotplug, the private events are registered, enabled
>> or unregistered on the specific CPU. It repeats the same steps:
>> initializing cross call argument, make function call on local CPU,
>> check the returned error.
>>
>> This introduces sdei_do_local_call() to cover the first steps. The
>> other benefit is to make CROSSCALL_INIT and struct sdei_crosscall_args
>> are only visible to sddi_do_{cross, local}_call().
>>
>> Signed-off-by: Gavin Shan <gshan at redhat.com>
> One comment inline.
> 
> Jonathan
> 
>> ---
>>   drivers/firmware/arm_sdei.c | 43 ++++++++++++++++++++++---------------
>>   1 file changed, 26 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
>> index 04dc144a8f31..da0e0d5591a8 100644
>> --- a/drivers/firmware/arm_sdei.c
>> +++ b/drivers/firmware/arm_sdei.c
>> @@ -85,7 +85,18 @@ struct sdei_crosscall_args {
>>   		atomic_set(&arg.errors, 0);	\
>>   	} while (0)
>>   
>> -static inline int sdei_do_cross_call(void *fn, struct sdei_event * event)
>> +static inline int sdei_do_local_call(void *fn, struct sdei_event *event)
> 
> Can we now give the function parameter it's full type and avoid the nasty
> looking cast below?
> 

Nice idea. I will use smp_call_func_t defined as below in include/linux/smp.h

typedef void (*smp_call_func_t)(void *info);

>> +{
>> +	struct sdei_crosscall_args arg;
>> +	void (*func)(void *) = fn;
>> +
>> +	CROSSCALL_INIT(arg, event);
>> +	func(&arg);
>> +
>> +	return arg.first_error;
>> +}
>> +
>> +static inline int sdei_do_cross_call(void *fn, struct sdei_event *event)
>>   {
>>   	struct sdei_crosscall_args arg;
>>   
>> @@ -675,7 +686,7 @@ static int sdei_reregister_shared(void)
>>   static int sdei_cpuhp_down(unsigned int cpu)
>>   {
>>   	struct sdei_event *event;
>> -	struct sdei_crosscall_args arg;
>> +	int err;
>>   
>>   	/* un-register private events */
>>   	spin_lock(&sdei_list_lock);
>> @@ -683,12 +694,11 @@ static int sdei_cpuhp_down(unsigned int cpu)
>>   		if (event->type == SDEI_EVENT_TYPE_SHARED)
>>   			continue;
>>   
>> -		CROSSCALL_INIT(arg, event);
>> -		/* call the cross-call function locally... */
>> -		_local_event_unregister(&arg);
>> -		if (arg.first_error)
>> +		err = sdei_do_local_call(_local_event_unregister, event);
>> +		if (err) {
>>   			pr_err("Failed to unregister event %u: %d\n",
>> -			       event->event_num, arg.first_error);
>> +			       event->event_num, err);
>> +		}
>>   	}
>>   	spin_unlock(&sdei_list_lock);
>>   
>> @@ -698,7 +708,7 @@ static int sdei_cpuhp_down(unsigned int cpu)
>>   static int sdei_cpuhp_up(unsigned int cpu)
>>   {
>>   	struct sdei_event *event;
>> -	struct sdei_crosscall_args arg;
>> +	int err;
>>   
>>   	/* re-register/enable private events */
>>   	spin_lock(&sdei_list_lock);
>> @@ -707,20 +717,19 @@ static int sdei_cpuhp_up(unsigned int cpu)
>>   			continue;
>>   
>>   		if (event->reregister) {
>> -			CROSSCALL_INIT(arg, event);
>> -			/* call the cross-call function locally... */
>> -			_local_event_register(&arg);
>> -			if (arg.first_error)
>> +			err = sdei_do_local_call(_local_event_register, event);
>> +			if (err) {
>>   				pr_err("Failed to re-register event %u: %d\n",
>> -				       event->event_num, arg.first_error);
>> +				       event->event_num, err);
>> +			}
>>   		}
>>   
>>   		if (event->reenable) {
>> -			CROSSCALL_INIT(arg, event);
>> -			_local_event_enable(&arg);
>> -			if (arg.first_error)
>> +			err = sdei_do_local_call(_local_event_enable, event);
>> +			if (err) {
>>   				pr_err("Failed to re-enable event %u: %d\n",
>> -				       event->event_num, arg.first_error);
>> +				       event->event_num, err);
>> +			}
>>   		}
>>   	}
>>   	spin_unlock(&sdei_list_lock);

Thanks,
Gavin