From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> To: Marc Zyngier <marc.zyngier@arm.com> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Peter Maydell <peter.maydell@linaro.org>, Christoffer Dall <christoffer.dall@linaro.org>, Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Jon Masters <jcm@redhat.com> Subject: Re: [PATCH v2 13/16] firmware/psci: Expose SMCCC version through psci_ops Date: Mon, 29 Jan 2018 18:39:33 +0000 [thread overview] Message-ID: <20180129183933.GB24577@e107981-ln.cambridge.arm.com> (raw) In-Reply-To: <20180129174559.1866-14-marc.zyngier@arm.com> On Mon, Jan 29, 2018 at 05:45:56PM +0000, 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. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/firmware/psci.c | 21 +++++++++++++++++++++ > include/linux/psci.h | 6 ++++++ > 2 files changed, 27 insertions(+) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index e9493da2b111..dd035aaa1c33 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -511,6 +511,26 @@ 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 = PSCI_RET_NOT_SUPPORTED; > + > + if (PSCI_VERSION_MAJOR(ver) >= 1) > + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); > + > + if (feature == PSCI_RET_NOT_SUPPORTED) { > + psci_ops.variant = SMCCC_VARIANT_1_0; > + } else { > + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > + if (ver != ARM_SMCCC_VERSION_1_1) > + psci_ops.variant = SMCCC_VARIANT_1_0; > + else > + psci_ops.variant = SMCCC_VARIANT_1_1; > + } > + > + pr_info("SMC Calling Convention v1.%d\n", psci_ops.variant); > +} > + > static void __init psci_0_2_set_functions(void) > { > pr_info("Using standard PSCI v0.2 function IDs\n"); > @@ -557,6 +577,7 @@ static int __init psci_probe(void) > psci_0_2_set_functions(); > > psci_init_migrate(); > + psci_init_smccc(ver); Given that SMCCC_VARIANT_1_0 is already the default value (unless you do the same we did with the conduit) we can move psci_init_smccc() call inside the if below (that is there to detect a callable psci_features()) and remove the check in psci_init_smccc(), up to you. > > if (PSCI_VERSION_MAJOR(ver) >= 1) { > psci_init_cpu_suspend(); > diff --git a/include/linux/psci.h b/include/linux/psci.h > index f2679e5faa4f..83fd16a37be3 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -31,6 +31,11 @@ enum psci_conduit { > PSCI_CONDUIT_HVC, > }; > > +enum smccc_variant { > + SMCCC_VARIANT_1_0, > + SMCCC_VARIANT_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_variant variant; Nit: I would add an smccc_ prefix to the variant field (or rename it to smccc_version). You can add my: Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
WARNING: multiple messages have this Message-ID (diff)
From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 13/16] firmware/psci: Expose SMCCC version through psci_ops Date: Mon, 29 Jan 2018 18:39:33 +0000 [thread overview] Message-ID: <20180129183933.GB24577@e107981-ln.cambridge.arm.com> (raw) In-Reply-To: <20180129174559.1866-14-marc.zyngier@arm.com> On Mon, Jan 29, 2018 at 05:45:56PM +0000, 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. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > drivers/firmware/psci.c | 21 +++++++++++++++++++++ > include/linux/psci.h | 6 ++++++ > 2 files changed, 27 insertions(+) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index e9493da2b111..dd035aaa1c33 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -511,6 +511,26 @@ 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 = PSCI_RET_NOT_SUPPORTED; > + > + if (PSCI_VERSION_MAJOR(ver) >= 1) > + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); > + > + if (feature == PSCI_RET_NOT_SUPPORTED) { > + psci_ops.variant = SMCCC_VARIANT_1_0; > + } else { > + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > + if (ver != ARM_SMCCC_VERSION_1_1) > + psci_ops.variant = SMCCC_VARIANT_1_0; > + else > + psci_ops.variant = SMCCC_VARIANT_1_1; > + } > + > + pr_info("SMC Calling Convention v1.%d\n", psci_ops.variant); > +} > + > static void __init psci_0_2_set_functions(void) > { > pr_info("Using standard PSCI v0.2 function IDs\n"); > @@ -557,6 +577,7 @@ static int __init psci_probe(void) > psci_0_2_set_functions(); > > psci_init_migrate(); > + psci_init_smccc(ver); Given that SMCCC_VARIANT_1_0 is already the default value (unless you do the same we did with the conduit) we can move psci_init_smccc() call inside the if below (that is there to detect a callable psci_features()) and remove the check in psci_init_smccc(), up to you. > > if (PSCI_VERSION_MAJOR(ver) >= 1) { > psci_init_cpu_suspend(); > diff --git a/include/linux/psci.h b/include/linux/psci.h > index f2679e5faa4f..83fd16a37be3 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -31,6 +31,11 @@ enum psci_conduit { > PSCI_CONDUIT_HVC, > }; > > +enum smccc_variant { > + SMCCC_VARIANT_1_0, > + SMCCC_VARIANT_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_variant variant; Nit: I would add an smccc_ prefix to the variant field (or rename it to smccc_version). You can add my: Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
next prev parent reply other threads:[~2018-01-29 18:39 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-29 17:45 [PATCH v2 00/16] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 01/16] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 02/16] arm: " Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 03/16] arm/arm64: KVM: Consolidate the PSCI include files Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 04/16] arm/arm64: KVM: Add PSCI_VERSION helper Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 13:15 ` Robin Murphy 2018-01-30 13:15 ` Robin Murphy 2018-01-30 14:52 ` Marc Zyngier 2018-01-30 14:52 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 05/16] arm/arm64: KVM: Add smccc accessors to PSCI code Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 06/16] arm/arm64: KVM: Implement PSCI 1.0 support Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 07/16] arm/arm64: KVM: Add PSCI version selection API Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-31 17:38 ` Andrew Jones 2018-01-31 17:38 ` Andrew Jones 2018-01-31 17:45 ` Marc Zyngier 2018-01-31 17:45 ` Marc Zyngier 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:36 ` Marc Zyngier 2018-01-31 18:36 ` Marc Zyngier 2018-01-31 19:15 ` Andrew Jones 2018-01-31 19:15 ` Andrew Jones 2018-01-31 18:11 ` kbuild test robot 2018-01-31 18:11 ` kbuild test robot 2018-01-29 17:45 ` [PATCH v2 08/16] arm/arm64: KVM: Advertise SMCCC v1.1 Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 0:23 ` Russell King - ARM Linux 2018-01-30 0:23 ` Russell King - ARM Linux 2018-01-30 12:28 ` Marc Zyngier 2018-01-30 12:28 ` Marc Zyngier 2018-01-30 12:28 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 09/16] arm/arm64: KVM: Turn kvm_psci_version into a static inline Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 10/16] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 12:38 ` Robin Murphy 2018-01-30 12:38 ` Robin Murphy 2018-01-29 17:45 ` [PATCH v2 11/16] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 12/16] firmware/psci: Expose PSCI conduit Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:55 ` Lorenzo Pieralisi 2018-01-29 17:55 ` Lorenzo Pieralisi 2018-01-29 17:45 ` [PATCH v2 13/16] firmware/psci: Expose SMCCC version through psci_ops Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 18:39 ` Lorenzo Pieralisi [this message] 2018-01-29 18:39 ` Lorenzo Pieralisi 2018-01-30 12:09 ` Marc Zyngier 2018-01-30 12:09 ` Marc Zyngier 2018-01-30 12:55 ` Robin Murphy 2018-01-30 12:55 ` Robin Murphy 2018-01-30 13:51 ` Marc Zyngier 2018-01-30 13:51 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 14/16] arm/arm64: smccc: Make function identifiers an unsigned quantity Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 15/16] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 19:07 ` Robin Murphy 2018-01-29 19:07 ` Robin Murphy 2018-01-30 8:54 ` Marc Zyngier 2018-01-30 8:54 ` Marc Zyngier 2018-01-29 21:45 ` Ard Biesheuvel 2018-01-29 21:45 ` Ard Biesheuvel 2018-01-30 12:27 ` Marc Zyngier 2018-01-30 12:27 ` Marc Zyngier 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-29 17:45 ` [PATCH v2 16/16] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 19:41 ` Ard Biesheuvel 2018-01-29 19:41 ` Ard Biesheuvel 2018-01-30 12:10 ` Marc Zyngier 2018-01-30 12:10 ` Marc Zyngier 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 14:11 ` Marc Zyngier 2018-01-31 14:11 ` Marc Zyngier 2018-01-31 14:35 ` Ard Biesheuvel 2018-01-31 14:35 ` Ard Biesheuvel 2018-01-31 14:38 ` Ard Biesheuvel 2018-01-31 14:38 ` Ard Biesheuvel 2018-01-31 15:05 ` Marc Zyngier 2018-01-31 15:05 ` Marc Zyngier 2018-02-01 2:40 ` Hanjun Guo 2018-02-01 2:40 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 8:53 ` Marc Zyngier 2018-02-01 8:53 ` Marc Zyngier 2018-02-02 3:43 ` Hanjun Guo 2018-02-02 3:43 ` Hanjun Guo 2018-06-09 13:22 ` [PATCH v2 00/16] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Jon Masters 2018-06-09 13:22 ` Jon Masters 2018-06-09 14:06 ` Marc Zyngier 2018-06-09 14:06 ` Marc Zyngier 2018-06-09 14:06 ` 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=20180129183933.GB24577@e107981-ln.cambridge.arm.com \ --to=lorenzo.pieralisi@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=jcm@redhat.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=peter.maydell@linaro.org \ --cc=robin.murphy@arm.com \ --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.