From: Mark Rutland <mark.rutland@arm.com>
To: David Brazdil <dbrazdil@google.com>
Cc: kvmarm@lists.cs.columbia.edu, Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Dennis Zhou <dennis@kernel.org>, Tejun Heo <tj@kernel.org>,
Christoph Lameter <cl@linux.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, kernel-team@android.com
Subject: Re: [PATCH v4 04/26] psci: Split functions to v0.1 and v0.2+ variants
Date: Thu, 3 Dec 2020 10:42:46 +0000 [thread overview]
Message-ID: <20201203104246.GA96754@C02TD0UTHF1T.local> (raw)
In-Reply-To: <20201202184122.26046-5-dbrazdil@google.com>
On Wed, Dec 02, 2020 at 06:41:00PM +0000, David Brazdil wrote:
> Refactor implementation of v0.1+ functions (CPU_SUSPEND, CPU_OFF,
> CPU_ON, MIGRATE) to have two functions psci_0_1_foo / psci_0_2_foo that
> select the function ID and call a common helper __psci_foo.
>
> This is a small cleanup so that the function ID array is only used for
> v0.1 configurations.
>
> Signed-off-by: David Brazdil <dbrazdil@google.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> drivers/firmware/psci/psci.c | 94 +++++++++++++++++++++++-------------
> 1 file changed, 60 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index ace5b9ac676c..13b9ed71b446 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -168,46 +168,80 @@ int psci_set_osi_mode(bool enable)
> return psci_to_linux_errno(err);
> }
>
> -static int psci_cpu_suspend(u32 state, unsigned long entry_point)
> +static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point)
> {
> int err;
> - u32 fn;
>
> - fn = psci_function_id[PSCI_FN_CPU_SUSPEND];
> err = invoke_psci_fn(fn, state, entry_point, 0);
> return psci_to_linux_errno(err);
> }
>
> -static int psci_cpu_off(u32 state)
> +static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point)
> +{
> + return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND],
> + state, entry_point);
> +}
> +
> +static int psci_0_2_cpu_suspend(u32 state, unsigned long entry_point)
> +{
> + return __psci_cpu_suspend(PSCI_FN_NATIVE(0_2, CPU_SUSPEND),
> + state, entry_point);
> +}
> +
> +static int __psci_cpu_off(u32 fn, u32 state)
> {
> int err;
> - u32 fn;
>
> - fn = psci_function_id[PSCI_FN_CPU_OFF];
> err = invoke_psci_fn(fn, state, 0, 0);
> return psci_to_linux_errno(err);
> }
>
> -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point)
> +static int psci_0_1_cpu_off(u32 state)
> +{
> + return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state);
> +}
> +
> +static int psci_0_2_cpu_off(u32 state)
> +{
> + return __psci_cpu_off(PSCI_0_2_FN_CPU_OFF, state);
> +}
> +
> +static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point)
> {
> int err;
> - u32 fn;
>
> - fn = psci_function_id[PSCI_FN_CPU_ON];
> err = invoke_psci_fn(fn, cpuid, entry_point, 0);
> return psci_to_linux_errno(err);
> }
>
> -static int psci_migrate(unsigned long cpuid)
> +static int psci_0_1_cpu_on(unsigned long cpuid, unsigned long entry_point)
> +{
> + return __psci_cpu_on(psci_function_id[PSCI_FN_CPU_ON], cpuid, entry_point);
> +}
> +
> +static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point)
> +{
> + return __psci_cpu_on(PSCI_FN_NATIVE(0_2, CPU_ON), cpuid, entry_point);
> +}
> +
> +static int __psci_migrate(u32 fn, unsigned long cpuid)
> {
> int err;
> - u32 fn;
>
> - fn = psci_function_id[PSCI_FN_MIGRATE];
> err = invoke_psci_fn(fn, cpuid, 0, 0);
> return psci_to_linux_errno(err);
> }
>
> +static int psci_0_1_migrate(unsigned long cpuid)
> +{
> + return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid);
> +}
> +
> +static int psci_0_2_migrate(unsigned long cpuid)
> +{
> + return __psci_migrate(PSCI_FN_NATIVE(0_2, MIGRATE), cpuid);
> +}
> +
> static int psci_affinity_info(unsigned long target_affinity,
> unsigned long lowest_affinity_level)
> {
> @@ -352,7 +386,7 @@ static void __init psci_init_system_suspend(void)
>
> static void __init psci_init_cpu_suspend(void)
> {
> - int feature = psci_features(psci_function_id[PSCI_FN_CPU_SUSPEND]);
> + int feature = psci_features(PSCI_FN_NATIVE(0_2, CPU_SUSPEND));
>
> if (feature != PSCI_RET_NOT_SUPPORTED)
> psci_cpu_suspend_feature = feature;
> @@ -426,24 +460,16 @@ static void __init psci_init_smccc(void)
> static void __init psci_0_2_set_functions(void)
> {
> pr_info("Using standard PSCI v0.2 function IDs\n");
> - psci_ops.get_version = psci_0_2_get_version;
> -
> - psci_function_id[PSCI_FN_CPU_SUSPEND] =
> - PSCI_FN_NATIVE(0_2, CPU_SUSPEND);
> - psci_ops.cpu_suspend = psci_cpu_suspend;
> -
> - psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF;
> - psci_ops.cpu_off = psci_cpu_off;
> -
> - psci_function_id[PSCI_FN_CPU_ON] = PSCI_FN_NATIVE(0_2, CPU_ON);
> - psci_ops.cpu_on = psci_cpu_on;
>
> - psci_function_id[PSCI_FN_MIGRATE] = PSCI_FN_NATIVE(0_2, MIGRATE);
> - psci_ops.migrate = psci_migrate;
> -
> - psci_ops.affinity_info = psci_affinity_info;
> -
> - psci_ops.migrate_info_type = psci_migrate_info_type;
> + psci_ops = (struct psci_operations){
> + .get_version = psci_0_2_get_version,
> + .cpu_suspend = psci_0_2_cpu_suspend,
> + .cpu_off = psci_0_2_cpu_off,
> + .cpu_on = psci_0_2_cpu_on,
> + .migrate = psci_0_2_migrate,
> + .affinity_info = psci_affinity_info,
> + .migrate_info_type = psci_migrate_info_type,
> + };
>
> arm_pm_restart = psci_sys_reset;
>
> @@ -523,22 +549,22 @@ static int __init psci_0_1_init(struct device_node *np)
>
> if (!of_property_read_u32(np, "cpu_suspend", &id)) {
> psci_function_id[PSCI_FN_CPU_SUSPEND] = id;
> - psci_ops.cpu_suspend = psci_cpu_suspend;
> + psci_ops.cpu_suspend = psci_0_1_cpu_suspend;
> }
>
> if (!of_property_read_u32(np, "cpu_off", &id)) {
> psci_function_id[PSCI_FN_CPU_OFF] = id;
> - psci_ops.cpu_off = psci_cpu_off;
> + psci_ops.cpu_off = psci_0_1_cpu_off;
> }
>
> if (!of_property_read_u32(np, "cpu_on", &id)) {
> psci_function_id[PSCI_FN_CPU_ON] = id;
> - psci_ops.cpu_on = psci_cpu_on;
> + psci_ops.cpu_on = psci_0_1_cpu_on;
> }
>
> if (!of_property_read_u32(np, "migrate", &id)) {
> psci_function_id[PSCI_FN_MIGRATE] = id;
> - psci_ops.migrate = psci_migrate;
> + psci_ops.migrate = psci_0_1_migrate;
> }
>
> return 0;
> --
> 2.29.2.454.gaff20da3a2-goog
>
next prev parent reply other threads:[~2020-12-03 10:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 18:40 [PATCH v4 00/26] Opt-in always-on nVHE hypervisor David Brazdil
2020-12-02 18:40 ` [PATCH v4 01/26] kvm: arm64: Add kvm-arm.mode early kernel parameter David Brazdil
2020-12-02 18:40 ` [PATCH v4 02/26] kvm: arm64: Add ARM64_KVM_PROTECTED_MODE CPU capability David Brazdil
2020-12-02 18:40 ` [PATCH v4 03/26] psci: Support psci_ops.get_version for v0.1 David Brazdil
2020-12-02 18:41 ` [PATCH v4 04/26] psci: Split functions to v0.1 and v0.2+ variants David Brazdil
2020-12-03 10:42 ` Mark Rutland [this message]
2020-12-02 18:41 ` [PATCH v4 05/26] psci: Replace psci_function_id array with a struct David Brazdil
2020-12-03 10:43 ` Mark Rutland
2020-12-02 18:41 ` [PATCH v4 06/26] psci: Add accessor for psci_0_1_function_ids David Brazdil
2020-12-03 10:47 ` Mark Rutland
2020-12-03 10:51 ` David Brazdil
2020-12-02 18:41 ` [PATCH v4 07/26] arm64: Make cpu_logical_map() take unsigned int David Brazdil
2020-12-02 18:41 ` [PATCH v4 08/26] arm64: Extract parts of el2_setup into a macro David Brazdil
2020-12-02 18:41 ` [PATCH v4 09/26] kvm: arm64: Remove vector_ptr param of hyp-init David Brazdil
2020-12-02 18:41 ` [PATCH v4 10/26] kvm: arm64: Move hyp-init params to a per-CPU struct David Brazdil
2020-12-02 18:41 ` [PATCH v4 11/26] kvm: arm64: Init MAIR/TCR_EL2 from params struct David Brazdil
2020-12-02 18:41 ` [PATCH v4 12/26] kvm: arm64: Add .hyp.data..ro_after_init ELF section David Brazdil
2020-12-02 18:41 ` [PATCH v4 13/26] kvm: arm64: Support per_cpu_ptr in nVHE hyp code David Brazdil
2020-12-02 18:41 ` [PATCH v4 14/26] kvm: arm64: Create nVHE copy of cpu_logical_map David Brazdil
2020-12-02 18:41 ` [PATCH v4 15/26] kvm: arm64: Add SMC handler in nVHE EL2 David Brazdil
2020-12-03 13:31 ` Marc Zyngier
2020-12-02 18:41 ` [PATCH v4 16/26] kvm: arm64: Bootstrap PSCI " David Brazdil
2020-12-03 10:55 ` Mark Rutland
2020-12-03 13:46 ` Marc Zyngier
2020-12-02 18:41 ` [PATCH v4 17/26] kvm: arm64: Add offset for hyp VA <-> PA conversion David Brazdil
2020-12-07 22:29 ` Qian Cai
2020-12-08 10:08 ` David Brazdil
2020-12-02 18:41 ` [PATCH v4 18/26] kvm: arm64: Forward safe PSCI SMCs coming from host David Brazdil
2020-12-02 18:41 ` [PATCH v4 19/26] kvm: arm64: Extract __do_hyp_init into a helper function David Brazdil
2020-12-02 18:41 ` [PATCH v4 20/26] kvm: arm64: Add function to enter host from KVM nVHE hyp code David Brazdil
2020-12-02 18:41 ` [PATCH v4 21/26] kvm: arm64: Intercept host's CPU_ON SMCs David Brazdil
2020-12-02 18:41 ` [PATCH v4 22/26] kvm: arm64: Intercept host's CPU_SUSPEND PSCI SMCs David Brazdil
2020-12-02 18:41 ` [PATCH v4 23/26] kvm: arm64: Intercept host's SYSTEM_SUSPEND " David Brazdil
2020-12-02 18:41 ` [PATCH v4 24/26] kvm: arm64: Keep nVHE EL2 vector installed David Brazdil
2020-12-02 18:41 ` [PATCH v4 25/26] kvm: arm64: Trap host SMCs in protected mode David Brazdil
2020-12-02 18:41 ` [PATCH v4 26/26] kvm: arm64: Fix EL2 mode availability checks David Brazdil
2020-12-03 19:23 ` [PATCH v4 00/26] Opt-in always-on nVHE hypervisor Marc Zyngier
2020-12-08 19:14 ` David Brazdil
2020-12-08 20:12 ` 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=20201203104246.GA96754@C02TD0UTHF1T.local \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dbrazdil@google.com \
--cc=dennis@kernel.org \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=maz@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tj@kernel.org \
--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).