Re: [RESEND][PATCH v2] firmware/psci: add support for SYSTEM_RESET2

[Sudeep Holla <sudeep.holla@arm.com>]

On Thu, Apr 11, 2019 at 12:03:04PM +0100, Mark Rutland wrote:
> On Thu, Apr 11, 2019 at 11:33:46AM +0100, Sudeep Holla wrote:
> > PSCI v1.1 introduced SYSTEM_RESET2 to allow both architectural resets
> > where the semantics are described by the PSCI specification itself as
> > well as vendor-specific resets. Currently only system warm reset
> > semantics is defined as part of architectural resets by the specification.
> > 
> > This patch implements support for SYSTEM_RESET2 by making using of
> > reboot_mode passed by the reboot infrastructure in the kernel.
> > 
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> > ---
> >  drivers/firmware/psci.c   | 21 +++++++++++++++++++++
> >  include/uapi/linux/psci.h |  2 ++
> >  2 files changed, 23 insertions(+)
> > 
> > Resending [1] based on the request. I hope to get some testing this time.
> > Last time Xilinx asked multiple times but never got any review or testing
> > https://lore.kernel.org/lkml/1525257003-8608-1-git-send-email-sudeep.holla@arm.com/
> > 
> > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> > index c80ec1d03274..91748725534e 100644
> > --- a/drivers/firmware/psci.c
> > +++ b/drivers/firmware/psci.c
> > @@ -88,6 +88,7 @@ static u32 psci_function_id[PSCI_FN_MAX];
> >  				PSCI_1_0_EXT_POWER_STATE_TYPE_MASK)
> > 
> >  static u32 psci_cpu_suspend_feature;
> > +static bool psci_system_reset2_supported;
> > 
> >  static inline bool psci_has_ext_power_state(void)
> >  {
> > @@ -253,6 +254,15 @@ static int get_set_conduit_method(struct device_node *np)
> > 
> >  static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
> >  {
> > +	if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) &&
> > +	    psci_system_reset2_supported)
> > +		/*
> > +		 * reset_type[31] = 0 (architectural)
> > +		 * reset_type[30:0] = 0 (SYSTEM_WARM_RESET)
> > +		 * cookie = 0 (ignored by the implementation)
> > +		 */
> > +		invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0);
> 
> Since the comment and invocation span multiple lines, could we please
> wrap them in braces?
>

Yes, that would be better, will update it.

> Other than that, this looks good to me, so:
> 
> Acked-by: Mark Rutland <mark.rutland@arm.com>
> 

Thanks.

--
Regards,
Sudeep