From: Mark Rutland <mark.rutland@arm.com>
To: Jianyong Wu <jianyong.wu@arm.com>
Cc: maz@kernel.org, justin.he@arm.com, kvm@vger.kernel.org,
netdev@vger.kernel.org, richardcochran@gmail.com,
linux-kernel@vger.kernel.org, sean.j.christopherson@intel.com,
john.stultz@linaro.org, yangbo.lu@nxp.com, pbonzini@redhat.com,
tglx@linutronix.de, nd@arm.com, will@kernel.org,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5 1/6] psci: Export psci_ops.conduit symbol as modules will use it.
Date: Tue, 15 Oct 2019 18:24:53 +0100 [thread overview]
Message-ID: <20191015172453.GE24604@lakrids.cambridge.arm.com> (raw)
In-Reply-To: <20191015104822.13890-2-jianyong.wu@arm.com>
On Tue, Oct 15, 2019 at 06:48:17PM +0800, Jianyong Wu wrote:
> If arm_smccc_1_1_invoke used in modules, psci_ops.conduit should
> be export.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
I have a patch queued [1] in the arm64 tree which adds
arm_smccc_1_1_get_conduit() for this purpose.
Please use that, adding an EXPORT_SYMBOL() if necessary.
Thanks,
Mark.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/commit/?h=for-next/smccc-conduit-cleanup&id=6b7fe77c334ae59fed9500140e08f4f896b36871
> ---
> drivers/firmware/psci/psci.c | 6 ++++++
> include/linux/arm-smccc.h | 2 +-
> include/linux/psci.h | 1 +
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index f82ccd39a913..35c4eaab1451 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -212,6 +212,12 @@ static unsigned long psci_migrate_info_up_cpu(void)
> 0, 0, 0);
> }
>
> +enum psci_conduit psci_get_conduit(void)
> +{
> + return psci_ops.conduit;
> +}
> +EXPORT_SYMBOL(psci_get_conduit);
> +
> static void set_conduit(enum psci_conduit conduit)
> {
> switch (conduit) {
> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> index 552cbd49abe8..a6e4d3e3d10a 100644
> --- a/include/linux/arm-smccc.h
> +++ b/include/linux/arm-smccc.h
> @@ -357,7 +357,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
> * The return value also provides the conduit that was used.
> */
> #define arm_smccc_1_1_invoke(...) ({ \
> - int method = psci_ops.conduit; \
> + int method = psci_get_conduit(); \
> switch (method) { \
> case PSCI_CONDUIT_HVC: \
> arm_smccc_1_1_hvc(__VA_ARGS__); \
> diff --git a/include/linux/psci.h b/include/linux/psci.h
> index a8a15613c157..e5cedc986049 100644
> --- a/include/linux/psci.h
> +++ b/include/linux/psci.h
> @@ -42,6 +42,7 @@ struct psci_operations {
> enum smccc_version smccc_version;
> };
>
> +extern enum psci_conduit psci_get_conduit(void);
> extern struct psci_operations psci_ops;
>
> #if defined(CONFIG_ARM_PSCI_FW)
> --
> 2.17.1
>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2019-10-15 17:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 10:48 [RFC PATCH v5 0/6] Enable ptp_kvm for arm64 Jianyong Wu
2019-10-15 10:48 ` [PATCH v5 1/6] psci: Export psci_ops.conduit symbol as modules will use it Jianyong Wu
2019-10-15 17:24 ` Mark Rutland [this message]
2019-10-16 3:54 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 2/6] ptp: Reorganize ptp_kvm modules to make it arch-independent Jianyong Wu
2019-10-16 7:10 ` Paolo Bonzini
2019-10-16 10:04 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 3/6] timekeeping: Add clocksource to system_time_snapshot Jianyong Wu
2019-10-15 16:37 ` Paolo Bonzini
2019-10-15 20:13 ` Thomas Gleixner
2019-10-15 22:36 ` Paolo Bonzini
2019-10-16 7:28 ` Thomas Gleixner
2019-10-16 9:48 ` Jianyong Wu (Arm Technology China)
2019-10-16 10:23 ` Thomas Gleixner
2019-10-15 20:12 ` Thomas Gleixner
2019-10-15 22:35 ` Paolo Bonzini
2019-10-16 10:01 ` Jianyong Wu (Arm Technology China)
2019-10-16 10:26 ` Thomas Gleixner
2019-10-15 10:48 ` [PATCH v5 4/6] psci: Add hvc call service for ptp_kvm Jianyong Wu
2019-10-16 7:24 ` Paolo Bonzini
2019-10-16 7:31 ` Thomas Gleixner
2019-10-16 7:42 ` Paolo Bonzini
2019-10-16 10:20 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 5/6] ptp: arm64: Enable ptp_kvm for arm64 Jianyong Wu
2019-10-15 16:39 ` Paolo Bonzini
2019-10-16 3:52 ` Jianyong Wu (Arm Technology China)
2019-10-16 7:10 ` Paolo Bonzini
2019-10-16 7:13 ` Paolo Bonzini
2019-10-16 10:11 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 6/6] kvm: arm64: Add capability check extension for ptp_kvm Jianyong Wu
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=20191015172453.GE24604@lakrids.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=jianyong.wu@arm.com \
--cc=john.stultz@linaro.org \
--cc=justin.he@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=nd@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=yangbo.lu@nxp.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: 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).