From: Robin Murphy <robin.murphy@arm.com> To: Marc Zyngier <marc.zyngier@arm.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Peter Maydell <peter.maydell@linaro.org>, Christoffer Dall <christoffer.dall@linaro.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Andrew Jones <drjones@redhat.com>, Hanjun Guo <guohanjun@huawei.com>, Jayachandran C <jnair@caviumnetworks.com>, Jon Masters <jcm@redhat.com>, Russell King - ARM Linux <linux@armlinux.org.uk> Subject: Re: [PATCH v3 14/18] firmware/psci: Expose SMCCC version through psci_ops Date: Thu, 1 Feb 2018 12:32:31 +0000 [thread overview] Message-ID: <87705115-ca05-4d35-a169-51e1f3676133@arm.com> (raw) In-Reply-To: <20180201114657.7323-15-marc.zyngier@arm.com> On 01/02/18 11:46, Marc Zyngier wrote: > Since PSCI 1.0 allows the SMCCC version to be (indirectly) probed, > let's do that at boot time, and expose the version of the calling > convention as part of the psci_ops structure. > > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/firmware/psci.c | 19 +++++++++++++++++++ > include/linux/psci.h | 6 ++++++ > 2 files changed, 25 insertions(+) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index e9493da2b111..8631906c414c 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -61,6 +61,7 @@ bool psci_tos_resident_on(int cpu) > > struct psci_operations psci_ops = { > .conduit = PSCI_CONDUIT_NONE, > + .smccc_version = SMCCC_VERSION_1_0, > }; > > typedef unsigned long (psci_fn)(unsigned long, unsigned long, > @@ -511,6 +512,23 @@ static void __init psci_init_migrate(void) > pr_info("Trusted OS resident on physical CPU 0x%lx\n", cpuid); > } > > +static void __init psci_init_smccc(u32 ver) > +{ > + int feature; > + > + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); > + > + if (feature != PSCI_RET_NOT_SUPPORTED) { > + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > + if (ver != ARM_SMCCC_VERSION_1_1) > + psci_ops.smccc_version = SMCCC_VERSION_1_0; AFAICS, unless you somehow run psci_probe() twice *and* have schizophrenic firmware, this assignment now does precisely nothing. With the condition flipped and the redundant else case removed (or an explanation of why I'm wrong...) Reviewed-by: Robin Murphy <robin.murphy@arm.com> > + else > + psci_ops.smccc_version = SMCCC_VERSION_1_1; > + } > + > + pr_info("SMC Calling Convention v1.%d\n", psci_ops.smccc_version); > +} > + > static void __init psci_0_2_set_functions(void) > { > pr_info("Using standard PSCI v0.2 function IDs\n"); > @@ -559,6 +577,7 @@ static int __init psci_probe(void) > psci_init_migrate(); > > if (PSCI_VERSION_MAJOR(ver) >= 1) { > + psci_init_smccc(ver); > psci_init_cpu_suspend(); > psci_init_system_suspend(); > } > diff --git a/include/linux/psci.h b/include/linux/psci.h > index f2679e5faa4f..8b1b3b5935ab 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -31,6 +31,11 @@ enum psci_conduit { > PSCI_CONDUIT_HVC, > }; > > +enum smccc_version { > + SMCCC_VERSION_1_0, > + SMCCC_VERSION_1_1, > +}; > + > struct psci_operations { > u32 (*get_version)(void); > int (*cpu_suspend)(u32 state, unsigned long entry_point); > @@ -41,6 +46,7 @@ struct psci_operations { > unsigned long lowest_affinity_level); > int (*migrate_info_type)(void); > enum psci_conduit conduit; > + enum smccc_version smccc_version; > }; > > extern struct psci_operations psci_ops; >
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 14/18] firmware/psci: Expose SMCCC version through psci_ops Date: Thu, 1 Feb 2018 12:32:31 +0000 [thread overview] Message-ID: <87705115-ca05-4d35-a169-51e1f3676133@arm.com> (raw) In-Reply-To: <20180201114657.7323-15-marc.zyngier@arm.com> On 01/02/18 11:46, Marc Zyngier wrote: > Since PSCI 1.0 allows the SMCCC version to be (indirectly) probed, > let's do that at boot time, and expose the version of the calling > convention as part of the psci_ops structure. > > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/firmware/psci.c | 19 +++++++++++++++++++ > include/linux/psci.h | 6 ++++++ > 2 files changed, 25 insertions(+) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index e9493da2b111..8631906c414c 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -61,6 +61,7 @@ bool psci_tos_resident_on(int cpu) > > struct psci_operations psci_ops = { > .conduit = PSCI_CONDUIT_NONE, > + .smccc_version = SMCCC_VERSION_1_0, > }; > > typedef unsigned long (psci_fn)(unsigned long, unsigned long, > @@ -511,6 +512,23 @@ static void __init psci_init_migrate(void) > pr_info("Trusted OS resident on physical CPU 0x%lx\n", cpuid); > } > > +static void __init psci_init_smccc(u32 ver) > +{ > + int feature; > + > + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); > + > + if (feature != PSCI_RET_NOT_SUPPORTED) { > + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > + if (ver != ARM_SMCCC_VERSION_1_1) > + psci_ops.smccc_version = SMCCC_VERSION_1_0; AFAICS, unless you somehow run psci_probe() twice *and* have schizophrenic firmware, this assignment now does precisely nothing. With the condition flipped and the redundant else case removed (or an explanation of why I'm wrong...) Reviewed-by: Robin Murphy <robin.murphy@arm.com> > + else > + psci_ops.smccc_version = SMCCC_VERSION_1_1; > + } > + > + pr_info("SMC Calling Convention v1.%d\n", psci_ops.smccc_version); > +} > + > static void __init psci_0_2_set_functions(void) > { > pr_info("Using standard PSCI v0.2 function IDs\n"); > @@ -559,6 +577,7 @@ static int __init psci_probe(void) > psci_init_migrate(); > > if (PSCI_VERSION_MAJOR(ver) >= 1) { > + psci_init_smccc(ver); > psci_init_cpu_suspend(); > psci_init_system_suspend(); > } > diff --git a/include/linux/psci.h b/include/linux/psci.h > index f2679e5faa4f..8b1b3b5935ab 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -31,6 +31,11 @@ enum psci_conduit { > PSCI_CONDUIT_HVC, > }; > > +enum smccc_version { > + SMCCC_VERSION_1_0, > + SMCCC_VERSION_1_1, > +}; > + > struct psci_operations { > u32 (*get_version)(void); > int (*cpu_suspend)(u32 state, unsigned long entry_point); > @@ -41,6 +46,7 @@ struct psci_operations { > unsigned long lowest_affinity_level); > int (*migrate_info_type)(void); > enum psci_conduit conduit; > + enum smccc_version smccc_version; > }; > > extern struct psci_operations psci_ops; >
next prev parent reply other threads:[~2018-02-01 12:32 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-01 11:46 [PATCH v3 00/18] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` [PATCH v3 01/18] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` [PATCH v3 02/18] arm: " Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` [PATCH v3 03/18] arm64: KVM: Increment PC after handling an SMC trap Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 04/18] arm/arm64: KVM: Consolidate the PSCI include files Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 05/18] arm/arm64: KVM: Add PSCI_VERSION helper Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 06/18] arm/arm64: KVM: Add smccc accessors to PSCI code Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 07/18] arm/arm64: KVM: Implement PSCI 1.0 support Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 12:33 ` Christoffer Dall 2018-02-02 12:33 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 08/18] arm/arm64: KVM: Add PSCI version selection API Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 20:17 ` Andrew Jones 2018-02-02 20:17 ` Andrew Jones 2018-02-02 20:17 ` Andrew Jones 2018-02-03 11:59 ` Marc Zyngier 2018-02-03 11:59 ` Marc Zyngier 2018-02-03 11:59 ` Marc Zyngier 2018-02-04 12:37 ` Christoffer Dall 2018-02-04 12:37 ` Christoffer Dall 2018-02-05 9:24 ` Marc Zyngier 2018-02-05 9:24 ` Marc Zyngier 2018-02-05 9:24 ` Marc Zyngier 2018-02-05 9:58 ` Andrew Jones 2018-02-05 9:58 ` Andrew Jones 2018-02-05 9:58 ` Andrew Jones 2018-02-05 10:42 ` Marc Zyngier 2018-02-05 10:42 ` Marc Zyngier 2018-02-05 10:50 ` Christoffer Dall 2018-02-05 10:50 ` Christoffer Dall 2018-02-05 11:08 ` Marc Zyngier 2018-02-05 11:08 ` Marc Zyngier 2018-02-05 9:47 ` Andrew Jones 2018-02-05 9:47 ` Andrew Jones 2018-02-05 9:47 ` Andrew Jones 2018-02-05 9:25 ` Andrew Jones 2018-02-05 9:25 ` Andrew Jones 2018-02-04 12:38 ` Christoffer Dall 2018-02-04 12:38 ` Christoffer Dall 2018-02-05 9:30 ` Marc Zyngier 2018-02-05 9:30 ` Marc Zyngier 2018-02-01 11:46 ` [PATCH v3 09/18] arm/arm64: KVM: Advertise SMCCC v1.1 Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-04 18:38 ` Christoffer Dall 2018-02-04 18:38 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 10/18] arm/arm64: KVM: Turn kvm_psci_version into a static inline Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-04 18:38 ` Christoffer Dall 2018-02-04 18:38 ` Christoffer Dall 2018-02-04 18:38 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 11/18] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-04 18:39 ` Christoffer Dall 2018-02-04 18:39 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 12/18] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-04 18:39 ` Christoffer Dall 2018-02-04 18:39 ` Christoffer Dall 2018-02-05 9:08 ` Marc Zyngier 2018-02-05 9:08 ` Marc Zyngier 2018-02-05 9:08 ` Marc Zyngier 2018-02-05 10:18 ` Christoffer Dall 2018-02-05 10:18 ` Christoffer Dall 2018-02-05 10:18 ` Christoffer Dall 2018-02-01 11:46 ` [PATCH v3 13/18] firmware/psci: Expose PSCI conduit Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 12:25 ` Robin Murphy 2018-02-01 12:25 ` Robin Murphy 2018-02-01 11:46 ` [PATCH v3 14/18] firmware/psci: Expose SMCCC version through psci_ops Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 12:32 ` Robin Murphy [this message] 2018-02-01 12:32 ` Robin Murphy 2018-02-01 12:48 ` Marc Zyngier 2018-02-01 12:48 ` Marc Zyngier 2018-02-01 12:48 ` Marc Zyngier 2018-02-01 21:17 ` Ard Biesheuvel 2018-02-01 21:17 ` Ard Biesheuvel 2018-02-01 11:46 ` [PATCH v3 15/18] arm/arm64: smccc: Make function identifiers an unsigned quantity Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 12:40 ` Robin Murphy 2018-02-01 12:40 ` Robin Murphy 2018-02-01 12:40 ` Robin Murphy 2018-02-01 12:44 ` Ard Biesheuvel 2018-02-01 12:44 ` Ard Biesheuvel 2018-02-01 11:46 ` [PATCH v3 16/18] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 13:34 ` Robin Murphy 2018-02-01 13:34 ` Robin Murphy 2018-02-01 13:54 ` Marc Zyngier 2018-02-01 13:54 ` Marc Zyngier 2018-02-01 14:18 ` Robin Murphy 2018-02-01 14:18 ` Robin Murphy 2018-02-01 11:46 ` [PATCH v3 17/18] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-01 11:46 ` [PATCH v3 18/18] arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Marc Zyngier 2018-02-01 11:46 ` Marc Zyngier 2018-02-02 4:05 ` Hanjun Guo 2018-02-02 4:05 ` Hanjun Guo 2018-02-02 4:05 ` Hanjun Guo 2018-02-02 13:17 ` Marc Zyngier 2018-02-02 13:17 ` Marc Zyngier 2018-02-02 13:17 ` Marc Zyngier 2018-02-01 13:59 ` [PATCH v3 00/18] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Ard Biesheuvel 2018-02-01 13:59 ` Ard Biesheuvel 2018-02-01 14:20 ` Marc Zyngier 2018-02-01 14:20 ` Marc Zyngier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87705115-ca05-4d35-a169-51e1f3676133@arm.com \ --to=robin.murphy@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=drjones@redhat.com \ --cc=guohanjun@huawei.com \ --cc=jcm@redhat.com \ --cc=jnair@caviumnetworks.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=lorenzo.pieralisi@arm.com \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=peter.maydell@linaro.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.