Messages in this thread | | | Subject | Re: [PATCH 12/14] firmware/psci: Expose PSCI conduit | From | Marc Zyngier <> | Date | Mon, 29 Jan 2018 10:08:30 +0000 |
| |
On 29/01/18 10:04, Ard Biesheuvel wrote: > On 26 January 2018 at 14:28, Marc Zyngier <marc.zyngier@arm.com> wrote: >> In order to call into the firmware to apply workarounds, it is >> useful to find out whether we're using HVC or SMC. Let's expose >> this through the psci_ops. >> >> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> >> --- >> drivers/firmware/psci.c | 26 +++++++++++++++++++++----- >> include/linux/psci.h | 7 +++++++ >> 2 files changed, 28 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c >> index 8b25d31e8401..570187e5d084 100644 >> --- a/drivers/firmware/psci.c >> +++ b/drivers/firmware/psci.c >> @@ -59,7 +59,9 @@ bool psci_tos_resident_on(int cpu) >> return cpu == resident_cpu; >> } >> >> -struct psci_operations psci_ops; >> +struct psci_operations psci_ops = { >> + .conduit = PSCI_CONDUIT_NONE, >> +}; >> >> typedef unsigned long (psci_fn)(unsigned long, unsigned long, >> unsigned long, unsigned long); >> @@ -210,6 +212,20 @@ static unsigned long psci_migrate_info_up_cpu(void) >> 0, 0, 0); >> } >> >> +static void set_conduit(enum psci_conduit conduit) >> +{ >> + switch (conduit) { >> + case PSCI_CONDUIT_HVC: >> + invoke_psci_fn = __invoke_psci_fn_hvc; >> + break; >> + case PSCI_CONDUIT_SMC: >> + invoke_psci_fn = __invoke_psci_fn_smc; >> + break; > > I get a GCC warning here about PSCI_CONDUIT_NONE not being handled.
Yup, I fixed it already.
Thanks,
M. -- Jazz is not dead. It just smells funny...
| |