From: Steven Price <steven.price@arm.com>
To: Sudeep Holla <sudeep.holla@arm.com>,
linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org, harb@amperecomputing.com,
Will Deacon <will@kernel.org>
Subject: Re: [PATCH 3/5] arm/arm64: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead
Date: Fri, 1 May 2020 15:48:33 +0100 [thread overview]
Message-ID: <e3878c66-3767-1208-a2e7-4219d9cb7c0c@arm.com> (raw)
In-Reply-To: <20200430114814.14116-4-sudeep.holla@arm.com>
On 30/04/2020 12:48, Sudeep Holla wrote:
> Instead of maintaining 2 sets of enums/macros for tracking SMCCC version,
> let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly
> instead.
>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Steven Price <steven.price@arm.com>
> ---
> arch/arm64/kernel/paravirt.c | 2 +-
> drivers/firmware/psci/psci.c | 8 ++++----
> include/linux/psci.h | 7 +------
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm64/kernel/paravirt.c b/arch/arm64/kernel/paravirt.c
> index 1ef702b0be2d..295d66490584 100644
> --- a/arch/arm64/kernel/paravirt.c
> +++ b/arch/arm64/kernel/paravirt.c
> @@ -120,7 +120,7 @@ static bool has_pv_steal_clock(void)
> struct arm_smccc_res res;
>
> /* To detect the presence of PV time support we require SMCCC 1.1+ */
> - if (psci_ops.smccc_version < SMCCC_VERSION_1_1)
> + if (arm_smccc_1_1_get_conduit() == SMCCC_CONDUIT_NONE)
> return false;
>
> arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index 2937d44b5df4..6a56d7196697 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -54,12 +54,12 @@ bool psci_tos_resident_on(int cpu)
>
> struct psci_operations psci_ops = {
> .conduit = SMCCC_CONDUIT_NONE,
> - .smccc_version = SMCCC_VERSION_1_0,
> + .smccc_version = ARM_SMCCC_VERSION_1_0,
> };
>
> enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)
> {
> - if (psci_ops.smccc_version < SMCCC_VERSION_1_1)
> + if (psci_ops.smccc_version < ARM_SMCCC_VERSION_1_1)
> return SMCCC_CONDUIT_NONE;
>
> return psci_ops.conduit;
> @@ -411,8 +411,8 @@ static void __init psci_init_smccc(void)
> if (feature != PSCI_RET_NOT_SUPPORTED) {
> u32 ret;
> ret = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0);
> - if (ret == ARM_SMCCC_VERSION_1_1) {
> - psci_ops.smccc_version = SMCCC_VERSION_1_1;
> + if (ret >= ARM_SMCCC_VERSION_1_1) {
> + psci_ops.smccc_version = ret;
> ver = ret;
> }
> }
> diff --git a/include/linux/psci.h b/include/linux/psci.h
> index a67712b73b6c..29bd0671e5bb 100644
> --- a/include/linux/psci.h
> +++ b/include/linux/psci.h
> @@ -21,11 +21,6 @@ bool psci_power_state_is_valid(u32 state);
> int psci_set_osi_mode(void);
> bool psci_has_osi_support(void);
>
> -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);
> @@ -36,7 +31,7 @@ struct psci_operations {
> unsigned long lowest_affinity_level);
> int (*migrate_info_type)(void);
> enum arm_smccc_conduit conduit;
> - enum smccc_version smccc_version;
> + u32 smccc_version;
> };
>
> extern struct psci_operations psci_ops;
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-01 14:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 11:48 [PATCH 0/5] arm/arm64: smccc: Add ARCH_SOC_ID support Sudeep Holla
2020-04-30 11:48 ` [PATCH 1/5] arm/arm64: smccc: Update link to latest SMCCC specification Sudeep Holla
2020-05-01 14:46 ` Steven Price
2020-04-30 11:48 ` [PATCH 2/5] arm/arm64: smccc: Add the definition for SMCCCv1.2 version/error codes Sudeep Holla
2020-05-01 14:46 ` Steven Price
2020-04-30 11:48 ` [PATCH 3/5] arm/arm64: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead Sudeep Holla
2020-05-01 14:48 ` Steven Price [this message]
2020-04-30 11:48 ` [PATCH 4/5] firmware: psci: Add function to fetch SMCCC version Sudeep Holla
2020-04-30 11:48 ` [PATCH 5/5] arm/arm64: smccc: Add ARCH_SOC_ID support Sudeep Holla
2020-05-01 15:07 ` Steven Price
2020-05-01 15:57 ` Sudeep Holla
2020-05-01 15:25 ` John Garry
2020-05-01 16:05 ` Sudeep Holla
2020-05-01 16:40 ` John Garry
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=e3878c66-3767-1208-a2e7-4219d9cb7c0c@arm.com \
--to=steven.price@arm.com \
--cc=catalin.marinas@arm.com \
--cc=harb@amperecomputing.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=sudeep.holla@arm.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).