From: Peter Hilber <peter.hilber@opensynergy.com> To: <linux-arm-kernel@lists.infradead.org>, <devicetree@vger.kernel.org> Cc: Igor Skalkin <igor.skalkin@opensynergy.com>, Peter Hilber <peter.hilber@opensynergy.com>, Rob Herring <robh+dt@kernel.org>, <linux-kernel@vger.kernel.org>, <sudeep.holla@arm.com>, <souvik.chakravarty@arm.com>, <alex.bennee@linaro.org>, <jean-philippe@linaro.org>, <mikhail.golubev@opensynergy.com>, <anton.yakovlev@opensynergy.com>, Vasyl Vavrychuk <Vasyl.Vavrychuk@opensynergy.com>, Andriy Tryshnivskyy <Andriy.Tryshnivskyy@opensynergy.com>, Cristian Marussi <cristian.marussi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Jassi Brar <jassisinghbrar@gmail.com> Subject: [RFC PATCH v3 01/12] firmware: arm_scmi, smccc, mailbox: Make shmem based transports optional Date: Tue, 11 May 2021 02:20:29 +0200 [thread overview] Message-ID: <20210511002040.802226-2-peter.hilber@opensynergy.com> (raw) In-Reply-To: <20210511002040.802226-1-peter.hilber@opensynergy.com> From: Igor Skalkin <igor.skalkin@opensynergy.com> Upon adding the virtio transport in this patch series, SCMI will also work without shared memory based transports. Also, the mailbox transport may not be needed if the smc transport is used. - Compile shmem.c only if a shmem based transport is available. - Remove hard dependency of SCMI on mailbox. Signed-off-by: Igor Skalkin <igor.skalkin@opensynergy.com> [ Peter: Adapted patch for submission to upstream. ] Co-developed-by: Peter Hilber <peter.hilber@opensynergy.com> Signed-off-by: Peter Hilber <peter.hilber@opensynergy.com> --- drivers/firmware/Kconfig | 8 +++++++- drivers/firmware/arm_scmi/Makefile | 2 +- drivers/firmware/arm_scmi/common.h | 2 ++ drivers/firmware/arm_scmi/driver.c | 2 ++ drivers/firmware/smccc/Kconfig | 1 + drivers/mailbox/Kconfig | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index db0ea2d2d75a..80ff49dadf35 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" config ARM_SCMI_PROTOCOL tristate "ARM System Control and Management Interface (SCMI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST - depends on MAILBOX + depends on ARM_SCMI_HAVE_SHMEM help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are @@ -27,6 +27,12 @@ config ARM_SCMI_PROTOCOL This protocol library provides interface for all the client drivers making use of the features offered by the SCMI. +config ARM_SCMI_HAVE_SHMEM + bool + help + This declares whether a shared memory based transport for SCMI is + available. + config ARM_SCMI_POWER_DOMAIN tristate "SCMI power domain driver" depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile index 6a2ef63306d6..5a2d4c32e0ae 100644 --- a/drivers/firmware/arm_scmi/Makefile +++ b/drivers/firmware/arm_scmi/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only scmi-bus-y = bus.o scmi-driver-y = driver.o notify.o -scmi-transport-y = shmem.o +scmi-transport-$(CONFIG_ARM_SCMI_HAVE_SHMEM) = shmem.o scmi-transport-$(CONFIG_MAILBOX) += mailbox.o scmi-transport-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) += smc.o scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o system.o voltage.o diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 228bf4a71d23..94dcfb8c0176 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -330,7 +330,9 @@ struct scmi_desc { int max_msg_size; }; +#ifdef CONFIG_MAILBOX extern const struct scmi_desc scmi_mailbox_desc; +#endif #ifdef CONFIG_HAVE_ARM_SMCCC extern const struct scmi_desc scmi_smc_desc; #endif diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 66eb3f0e5daf..41d80bbaa9a2 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1567,7 +1567,9 @@ ATTRIBUTE_GROUPS(versions); /* Each compatible listed below must have descriptor associated with it */ static const struct of_device_id scmi_of_match[] = { +#ifdef CONFIG_MAILBOX { .compatible = "arm,scmi", .data = &scmi_mailbox_desc }, +#endif #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc}, #endif diff --git a/drivers/firmware/smccc/Kconfig b/drivers/firmware/smccc/Kconfig index 15e7466179a6..69c4d6cabf62 100644 --- a/drivers/firmware/smccc/Kconfig +++ b/drivers/firmware/smccc/Kconfig @@ -9,6 +9,7 @@ config HAVE_ARM_SMCCC_DISCOVERY bool depends on ARM_PSCI_FW default y + select ARM_SCMI_HAVE_SHMEM help SMCCC v1.0 lacked discoverability and hence PSCI v1.0 was updated to add SMCCC discovery mechanism though the PSCI firmware diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig index 68de2c6af727..fc02c38c0739 100644 --- a/drivers/mailbox/Kconfig +++ b/drivers/mailbox/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig MAILBOX bool "Mailbox Hardware Support" + select ARM_SCMI_HAVE_SHMEM help Mailbox is a framework to control hardware communication between on-chip processors through queued messages and interrupt driven -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Peter Hilber <peter.hilber@opensynergy.com> To: <linux-arm-kernel@lists.infradead.org>, <devicetree@vger.kernel.org> Cc: Igor Skalkin <igor.skalkin@opensynergy.com>, Peter Hilber <peter.hilber@opensynergy.com>, Rob Herring <robh+dt@kernel.org>, <linux-kernel@vger.kernel.org>, <sudeep.holla@arm.com>, <souvik.chakravarty@arm.com>, <alex.bennee@linaro.org>, <jean-philippe@linaro.org>, <mikhail.golubev@opensynergy.com>, <anton.yakovlev@opensynergy.com>, Vasyl Vavrychuk <Vasyl.Vavrychuk@opensynergy.com>, Andriy Tryshnivskyy <Andriy.Tryshnivskyy@opensynergy.com>, Cristian Marussi <cristian.marussi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Jassi Brar <jassisinghbrar@gmail.com> Subject: [RFC PATCH v3 01/12] firmware: arm_scmi, smccc, mailbox: Make shmem based transports optional Date: Tue, 11 May 2021 02:20:29 +0200 [thread overview] Message-ID: <20210511002040.802226-2-peter.hilber@opensynergy.com> (raw) In-Reply-To: <20210511002040.802226-1-peter.hilber@opensynergy.com> From: Igor Skalkin <igor.skalkin@opensynergy.com> Upon adding the virtio transport in this patch series, SCMI will also work without shared memory based transports. Also, the mailbox transport may not be needed if the smc transport is used. - Compile shmem.c only if a shmem based transport is available. - Remove hard dependency of SCMI on mailbox. Signed-off-by: Igor Skalkin <igor.skalkin@opensynergy.com> [ Peter: Adapted patch for submission to upstream. ] Co-developed-by: Peter Hilber <peter.hilber@opensynergy.com> Signed-off-by: Peter Hilber <peter.hilber@opensynergy.com> --- drivers/firmware/Kconfig | 8 +++++++- drivers/firmware/arm_scmi/Makefile | 2 +- drivers/firmware/arm_scmi/common.h | 2 ++ drivers/firmware/arm_scmi/driver.c | 2 ++ drivers/firmware/smccc/Kconfig | 1 + drivers/mailbox/Kconfig | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index db0ea2d2d75a..80ff49dadf35 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" config ARM_SCMI_PROTOCOL tristate "ARM System Control and Management Interface (SCMI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST - depends on MAILBOX + depends on ARM_SCMI_HAVE_SHMEM help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are @@ -27,6 +27,12 @@ config ARM_SCMI_PROTOCOL This protocol library provides interface for all the client drivers making use of the features offered by the SCMI. +config ARM_SCMI_HAVE_SHMEM + bool + help + This declares whether a shared memory based transport for SCMI is + available. + config ARM_SCMI_POWER_DOMAIN tristate "SCMI power domain driver" depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile index 6a2ef63306d6..5a2d4c32e0ae 100644 --- a/drivers/firmware/arm_scmi/Makefile +++ b/drivers/firmware/arm_scmi/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only scmi-bus-y = bus.o scmi-driver-y = driver.o notify.o -scmi-transport-y = shmem.o +scmi-transport-$(CONFIG_ARM_SCMI_HAVE_SHMEM) = shmem.o scmi-transport-$(CONFIG_MAILBOX) += mailbox.o scmi-transport-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) += smc.o scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o system.o voltage.o diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 228bf4a71d23..94dcfb8c0176 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -330,7 +330,9 @@ struct scmi_desc { int max_msg_size; }; +#ifdef CONFIG_MAILBOX extern const struct scmi_desc scmi_mailbox_desc; +#endif #ifdef CONFIG_HAVE_ARM_SMCCC extern const struct scmi_desc scmi_smc_desc; #endif diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 66eb3f0e5daf..41d80bbaa9a2 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1567,7 +1567,9 @@ ATTRIBUTE_GROUPS(versions); /* Each compatible listed below must have descriptor associated with it */ static const struct of_device_id scmi_of_match[] = { +#ifdef CONFIG_MAILBOX { .compatible = "arm,scmi", .data = &scmi_mailbox_desc }, +#endif #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc}, #endif diff --git a/drivers/firmware/smccc/Kconfig b/drivers/firmware/smccc/Kconfig index 15e7466179a6..69c4d6cabf62 100644 --- a/drivers/firmware/smccc/Kconfig +++ b/drivers/firmware/smccc/Kconfig @@ -9,6 +9,7 @@ config HAVE_ARM_SMCCC_DISCOVERY bool depends on ARM_PSCI_FW default y + select ARM_SCMI_HAVE_SHMEM help SMCCC v1.0 lacked discoverability and hence PSCI v1.0 was updated to add SMCCC discovery mechanism though the PSCI firmware diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig index 68de2c6af727..fc02c38c0739 100644 --- a/drivers/mailbox/Kconfig +++ b/drivers/mailbox/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig MAILBOX bool "Mailbox Hardware Support" + select ARM_SCMI_HAVE_SHMEM help Mailbox is a framework to control hardware communication between on-chip processors through queued messages and interrupt driven -- 2.25.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:[~2021-05-11 0:29 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-11 0:20 [RFC PATCH v3 00/12] firmware: arm_scmi: Add virtio transport Peter Hilber 2021-05-11 0:20 ` [virtio-dev] " Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` Peter Hilber [this message] 2021-05-11 0:20 ` [RFC PATCH v3 01/12] firmware: arm_scmi, smccc, mailbox: Make shmem based transports optional Peter Hilber 2021-06-21 4:09 ` Jassi Brar 2021-06-21 4:09 ` Jassi Brar 2021-06-21 8:54 ` Sudeep Holla 2021-06-21 8:54 ` Sudeep Holla 2021-06-21 9:01 ` Cristian Marussi 2021-06-21 9:01 ` Cristian Marussi 2021-05-11 0:20 ` [RFC PATCH v3 02/12] firmware: arm_scmi: Add transport init/deinit Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 03/12] firmware: arm_scmi: Add op to override max message # Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 04/12] firmware: arm_scmi: Add optional link_supplier() transport op Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 05/12] firmware: arm_scmi: Add per-device transport private info Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 06/12] firmware: arm_scmi: Add is_scmi_protocol_device() Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 07/12] firmware: arm_scmi: Add msg_handle to some transport ops Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 08/12] firmware: arm_scmi: Add optional drop_message() transport op Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 09/12] firmware: arm_scmi: Add message passing abstractions for transports Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-11 0:20 ` [RFC PATCH v3 10/12] dt-bindings: arm: Add virtio transport for SCMI Peter Hilber 2021-05-11 0:20 ` [virtio-dev] " Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-17 21:39 ` Rob Herring 2021-05-17 21:39 ` Rob Herring 2021-05-17 21:39 ` Rob Herring 2021-05-11 0:20 ` [RFC PATCH v3 11/12] firmware: arm_scmi: Add virtio transport Peter Hilber 2021-05-11 0:20 ` [virtio-dev] " Peter Hilber 2021-05-11 0:20 ` Peter Hilber 2021-05-18 8:08 ` Cristian Marussi 2021-05-18 8:08 ` Cristian Marussi 2021-05-26 14:40 ` Cristian Marussi 2021-05-26 14:40 ` Cristian Marussi 2021-06-04 9:19 ` Peter Hilber 2021-06-04 9:19 ` [virtio-dev] " Peter Hilber 2021-06-04 9:19 ` Peter Hilber 2021-06-04 11:56 ` Cristian Marussi 2021-06-04 11:56 ` Cristian Marussi 2021-06-01 14:53 ` Vincent Guittot 2021-06-01 14:53 ` Vincent Guittot 2021-06-02 8:25 ` Peter Hilber 2021-06-02 8:25 ` [virtio-dev] " Peter Hilber 2021-06-02 8:25 ` Peter Hilber 2021-06-02 8:33 ` Cristian Marussi 2021-06-02 8:33 ` Cristian Marussi 2021-06-02 8:34 ` Vincent Guittot 2021-06-02 8:34 ` Vincent Guittot 2021-05-11 0:20 ` [RFC PATCH v3 12/12] firmware: arm_scmi: Handle races between core and transport Peter Hilber 2021-05-11 0:20 ` Peter Hilber
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=20210511002040.802226-2-peter.hilber@opensynergy.com \ --to=peter.hilber@opensynergy.com \ --cc=Andriy.Tryshnivskyy@opensynergy.com \ --cc=Vasyl.Vavrychuk@opensynergy.com \ --cc=alex.bennee@linaro.org \ --cc=anton.yakovlev@opensynergy.com \ --cc=cristian.marussi@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=igor.skalkin@opensynergy.com \ --cc=jassisinghbrar@gmail.com \ --cc=jean-philippe@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=mark.rutland@arm.com \ --cc=mikhail.golubev@opensynergy.com \ --cc=robh+dt@kernel.org \ --cc=souvik.chakravarty@arm.com \ --cc=sudeep.holla@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.