From: Jianyong Wu <jianyong.wu@arm.com> To: netdev@vger.kernel.org, pbonzini@redhat.com, sean.j.christopherson@intel.com, maz@kernel.org, richardcochran@gmail.com, Mark.Rutland@arm.com, Will.Deacon@arm.com, suzuki.poulose@arm.com Cc: linux-kernel@vger.kernel.org, Steve.Capper@arm.com, Kaly.Xin@arm.com, justin.he@arm.com, jianyong.wu@arm.com, nd@arm.com, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 1/6] Export psci_ops.conduit symbol as modules will use it. Date: Tue, 17 Sep 2019 07:24:25 -0400 [thread overview] Message-ID: <20190917112430.45680-2-jianyong.wu@arm.com> (raw) In-Reply-To: <20190917112430.45680-1-jianyong.wu@arm.com> If arm_smccc_1_1_invoke used in modules, psci_ops.conduit should be export. Signed-off-by: Jianyong Wu <jianyong.wu@arm.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Jianyong Wu <jianyong.wu@arm.com> To: netdev@vger.kernel.org, pbonzini@redhat.com, sean.j.christopherson@intel.com, maz@kernel.org, richardcochran@gmail.com, Mark.Rutland@arm.com, Will.Deacon@arm.com, suzuki.poulose@arm.com Cc: justin.he@arm.com, Steve.Capper@arm.com, jianyong.wu@arm.com, linux-kernel@vger.kernel.org, Kaly.Xin@arm.com, nd@arm.com, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 1/6] Export psci_ops.conduit symbol as modules will use it. Date: Tue, 17 Sep 2019 07:24:25 -0400 [thread overview] Message-ID: <20190917112430.45680-2-jianyong.wu@arm.com> (raw) In-Reply-To: <20190917112430.45680-1-jianyong.wu@arm.com> If arm_smccc_1_1_invoke used in modules, psci_ops.conduit should be export. Signed-off-by: Jianyong Wu <jianyong.wu@arm.com> --- 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 _______________________________________________ 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:[~2019-09-17 11:25 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-17 11:24 [RFC PATCH v2 0/6] Enable ptp_kvm for arm64 Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu [this message] 2019-09-17 11:24 ` [RFC PATCH v2 1/6] Export psci_ops.conduit symbol as modules will use it Jianyong Wu 2019-09-17 11:24 ` [RFC PATCH v2 2/6] reorganize ptp_kvm modules to make it arch-independent Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu 2019-09-17 11:24 ` [PATCH 3/6] Timer: expose monotonic clock and counter value Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu 2019-09-17 17:10 ` Marc Zyngier 2019-09-17 17:10 ` Marc Zyngier 2019-09-18 2:50 ` Jianyong Wu (Arm Technology China) 2019-09-18 2:50 ` Jianyong Wu (Arm Technology China) 2019-09-18 3:42 ` Richard Cochran 2019-09-18 3:42 ` Richard Cochran 2019-09-18 6:01 ` Jianyong Wu (Arm Technology China) 2019-09-18 6:01 ` Jianyong Wu (Arm Technology China) 2019-09-17 11:24 ` [RFC PATCH v2 4/6] arm64: Add hvc call service for ptp_kvm Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu 2019-09-17 11:24 ` [RFC PATCH V2 5/6] Enable ptp_kvm for arm64 Jianyong Wu 2019-09-17 11:24 ` Jianyong Wu 2019-09-17 11:24 ` [PATCH 6/6] kvm: add kvm ptp capability extension " Jianyong Wu 2019-09-17 11:24 ` 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=20190917112430.45680-2-jianyong.wu@arm.com \ --to=jianyong.wu@arm.com \ --cc=Kaly.Xin@arm.com \ --cc=Mark.Rutland@arm.com \ --cc=Steve.Capper@arm.com \ --cc=Will.Deacon@arm.com \ --cc=justin.he@arm.com \ --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=suzuki.poulose@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.