firmware: arm: Group interface drivers under arm/
Subsystems (9)
Sudeep Holla
maintainerRFC PATCH 1/1 firmware: arm: Group interface drivers under arm/
Arm firmware interface drivers currently live directly under drivers/firmware/. Some use an arm_ prefix while others use generic names. More Arm firmware interface drivers, such as
[1] Realm Management Monitor(RMM) Realm Management Interface (RMMI)
[2] Live Firmware Activation (LFA)
expected soon, which would further crowd the top-level directory.
There are couple of other interfaces whose usage within the kernel was challenged in the past or is currently being explored.
Create drivers/firmware/arm/ as the common home for Arm firmware interface drivers. Move FF-A, SCMI, PSCI and SMCCC under it, drop the redundant arm_ prefix from the FF-A and SCMI directory names. Update the Kconfig, Kbuild, maintainer and documentation paths.
The resulting hierarchy provides room for upcoming interfaces without continuing to add Arm-specific directories at the firmware root.
---
Hi,
This is just to get a feedback/opinions.
Regards,
Sudeep
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
Documentation/tee/ts-tee.rst | 2 +-
MAINTAINERS | 10 +++++-----
drivers/firmware/Kconfig | 5 +----
drivers/firmware/Makefile | 5 +----
drivers/firmware/arm/Kconfig | 6 ++++++
drivers/firmware/arm/Makefile | 6 ++++++
drivers/firmware/{arm_ffa => arm/ffa}/Kconfig | 0
drivers/firmware/{arm_ffa => arm/ffa}/Makefile | 0
drivers/firmware/{arm_ffa => arm/ffa}/bus.c | 0
drivers/firmware/{arm_ffa => arm/ffa}/common.h | 0
drivers/firmware/{arm_ffa => arm/ffa}/driver.c | 0
drivers/firmware/{arm_ffa => arm/ffa}/smccc.c | 0
drivers/firmware/{ => arm}/psci/Kconfig | 0
drivers/firmware/{ => arm}/psci/Makefile | 0
drivers/firmware/{ => arm}/psci/psci.c | 0
drivers/firmware/{ => arm}/psci/psci_checker.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/Kconfig | 4 ++--
drivers/firmware/{arm_scmi => arm/scmi}/Makefile | 0
drivers/firmware/{arm_scmi => arm/scmi}/base.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/bus.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/clock.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/common.h | 0
drivers/firmware/{arm_scmi => arm/scmi}/driver.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/msg.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/notify.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/notify.h | 0
drivers/firmware/{arm_scmi => arm/scmi}/perf.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/pinctrl.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/power.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/powercap.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/protocols.h | 0
drivers/firmware/{arm_scmi => arm/scmi}/quirks.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/quirks.h | 0
drivers/firmware/{arm_scmi => arm/scmi}/raw_mode.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/raw_mode.h | 0
drivers/firmware/{arm_scmi => arm/scmi}/reset.c | 0
.../{arm_scmi => arm/scmi}/scmi_power_control.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/sensors.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/shmem.c | 0
drivers/firmware/{arm_scmi => arm/scmi}/system.c | 0
.../firmware/{arm_scmi => arm/scmi}/transports/Kconfig | 0
.../{arm_scmi => arm/scmi}/transports/Makefile | 0
.../{arm_scmi => arm/scmi}/transports/mailbox.c | 0
.../firmware/{arm_scmi => arm/scmi}/transports/optee.c | 0
.../firmware/{arm_scmi => arm/scmi}/transports/smc.c | 0
.../{arm_scmi => arm/scmi}/transports/virtio.c | 0
.../{arm_scmi => arm/scmi}/vendors/imx/Kconfig | 0
.../{arm_scmi => arm/scmi}/vendors/imx/Makefile | 0
.../{arm_scmi => arm/scmi}/vendors/imx/imx-sm-bbm.c | 0
.../{arm_scmi => arm/scmi}/vendors/imx/imx-sm-cpu.c | 0
.../{arm_scmi => arm/scmi}/vendors/imx/imx-sm-lmm.c | 0
.../{arm_scmi => arm/scmi}/vendors/imx/imx-sm-misc.c | 0
.../{arm_scmi => arm/scmi}/vendors/imx/imx95.rst | 0
drivers/firmware/{arm_scmi => arm/scmi}/voltage.c | 0
drivers/firmware/{ => arm}/smccc/Kconfig | 0
drivers/firmware/{ => arm}/smccc/Makefile | 0
drivers/firmware/{ => arm}/smccc/kvm_guest.c | 0
drivers/firmware/{ => arm}/smccc/smccc.c | 0
drivers/firmware/{ => arm}/smccc/soc_id.c | 0
59 files changed, 22 insertions(+), 16 deletions(-)
create mode 100644 drivers/firmware/arm/Kconfig
create mode 100644 drivers/firmware/arm/Makefile
rename drivers/firmware/{arm_ffa => arm/ffa}/Kconfig (100%)
rename drivers/firmware/{arm_ffa => arm/ffa}/Makefile (100%)
rename drivers/firmware/{arm_ffa => arm/ffa}/bus.c (100%)
rename drivers/firmware/{arm_ffa => arm/ffa}/common.h (100%)
rename drivers/firmware/{arm_ffa => arm/ffa}/driver.c (100%)
rename drivers/firmware/{arm_ffa => arm/ffa}/smccc.c (100%)
rename drivers/firmware/{ => arm}/psci/Kconfig (100%)
rename drivers/firmware/{ => arm}/psci/Makefile (100%)
rename drivers/firmware/{ => arm}/psci/psci.c (100%)
rename drivers/firmware/{ => arm}/psci/psci_checker.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/Kconfig (97%)
rename drivers/firmware/{arm_scmi => arm/scmi}/Makefile (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/base.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/bus.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/clock.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/common.h (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/driver.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/msg.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/notify.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/notify.h (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/perf.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/pinctrl.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/power.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/powercap.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/protocols.h (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/quirks.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/quirks.h (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/raw_mode.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/raw_mode.h (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/reset.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/scmi_power_control.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/sensors.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/shmem.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/system.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/Kconfig (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/Makefile (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/mailbox.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/optee.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/smc.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/transports/virtio.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/Kconfig (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/Makefile (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/imx-sm-bbm.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/imx-sm-cpu.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/imx-sm-lmm.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/imx-sm-misc.c (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/vendors/imx/imx95.rst (100%)
rename drivers/firmware/{arm_scmi => arm/scmi}/voltage.c (100%)
rename drivers/firmware/{ => arm}/smccc/Kconfig (100%)
rename drivers/firmware/{ => arm}/smccc/Makefile (100%)
rename drivers/firmware/{ => arm}/smccc/kvm_guest.c (100%)
rename drivers/firmware/{ => arm}/smccc/smccc.c (100%)
rename drivers/firmware/{ => arm}/smccc/soc_id.c (100%)Documentation/tee/ts-tee.rst +1 -1
@@ -62,7 +62,7 @@ References [3] https://www.arm.com/architecture/security-features/platform-security -[4] drivers/firmware/arm_ffa/ +[4] drivers/firmware/arm/ffa/ [5] https://trusted-services.readthedocs.io/en/v1.0.0/developer/service-access-protocols.html#abi
MAINTAINERS +5 -5
@@ -10119,7 +10119,7 @@ FIRMWARE FRAMEWORK FOR ARMV8-A M: Sudeep Holla <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained -F: drivers/firmware/arm_ffa/ +F: drivers/firmware/arm/ffa/ F: include/linux/arm_ffa.h FIRMWARE LOADER (request_firmware)
@@ -21534,7 +21534,7 @@ M: Lorenzo Pieralisi <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/arm/psci.yaml -F: drivers/firmware/psci/ +F: drivers/firmware/arm/psci/ F: include/linux/psci.h F: include/uapi/linux/psci.h
@@ -24465,7 +24465,7 @@ M: Lorenzo Pieralisi <[email protected]> M: Sudeep Holla <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained -F: drivers/firmware/smccc/ +F: drivers/firmware/arm/smccc/ F: include/linux/arm-smccc.h SECURITY CONTACT
@@ -26294,7 +26294,7 @@ S: Maintained F: Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml F: drivers/clk/clk-sc[mp]i.c F: drivers/cpufreq/sc[mp]i-cpufreq.c -F: drivers/firmware/arm_scmi/ +F: drivers/firmware/arm/scmi/ F: drivers/firmware/arm_scpi.c F: drivers/hwmon/scmi-hwmon.c F: drivers/pinctrl/pinctrl-scmi.c
@@ -26313,7 +26313,7 @@ L: [email protected] L: [email protected] (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/firmware/nxp,*scmi.yaml -F: drivers/firmware/arm_scmi/vendors/imx/ +F: drivers/firmware/arm/scmi/vendors/imx/ SYSTEM RESET/SHUTDOWN DRIVERS M: Sebastian Reichel <[email protected]>
drivers/firmware/Kconfig +1 -4
@@ -6,7 +6,7 @@ menu "Firmware Drivers" -source "drivers/firmware/arm_scmi/Kconfig" +source "drivers/firmware/arm/Kconfig" config ARM_SCPI_PROTOCOL tristate "ARM System Control and Power Interface (SCPI) Message Protocol"
@@ -287,7 +287,6 @@ config TURRIS_MOX_RWTM_KEYCTL endif # TURRIS_MOX_RWTM -source "drivers/firmware/arm_ffa/Kconfig" source "drivers/firmware/broadcom/Kconfig" source "drivers/firmware/cirrus/Kconfig" source "drivers/firmware/google/Kconfig"
@@ -295,10 +294,8 @@ source "drivers/firmware/efi/Kconfig" source "drivers/firmware/imx/Kconfig" source "drivers/firmware/meson/Kconfig" source "drivers/firmware/microchip/Kconfig" -source "drivers/firmware/psci/Kconfig" source "drivers/firmware/qcom/Kconfig" source "drivers/firmware/samsung/Kconfig" -source "drivers/firmware/smccc/Kconfig" source "drivers/firmware/tegra/Kconfig" source "drivers/firmware/xilinx/Kconfig"
drivers/firmware/Makefile +1 -4
@@ -23,8 +23,7 @@ obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o obj-$(CONFIG_TURRIS_MOX_RWTM) += turris-mox-rwtm.o -obj-y += arm_ffa/ -obj-y += arm_scmi/ +obj-y += arm/ obj-y += broadcom/ obj-y += cirrus/ obj-y += meson/
@@ -32,9 +31,7 @@ obj-y += microchip/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ obj-y += efi/ obj-y += imx/ -obj-y += psci/ obj-y += qcom/ obj-y += samsung/ -obj-y += smccc/ obj-y += tegra/ obj-y += xilinx/
drivers/firmware/arm/Kconfig new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/firmware/arm/scmi/Kconfig" +source "drivers/firmware/arm/ffa/Kconfig" +source "drivers/firmware/arm/psci/Kconfig" +source "drivers/firmware/arm/smccc/Kconfig"
drivers/firmware/arm/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += scmi/ +obj-y += ffa/ +obj-y += psci/ +obj-y += smccc/
drivers/firmware/arm/ffa/Kconfig renamed from drivers/firmware/arm_ffa/Kconfig +0 -0
drivers/firmware/arm/ffa/Makefile renamed from drivers/firmware/arm_ffa/Makefile +0 -0
drivers/firmware/arm/ffa/bus.c renamed from drivers/firmware/arm_ffa/bus.c +0 -0
drivers/firmware/arm/ffa/common.h renamed from drivers/firmware/arm_ffa/common.h +0 -0
drivers/firmware/arm/ffa/driver.c renamed from drivers/firmware/arm_ffa/driver.c +0 -0
drivers/firmware/arm/ffa/smccc.c renamed from drivers/firmware/arm_ffa/smccc.c +0 -0
drivers/firmware/arm/psci/Kconfig renamed from drivers/firmware/psci/Kconfig +0 -0
drivers/firmware/arm/psci/Makefile renamed from drivers/firmware/psci/Makefile +0 -0
drivers/firmware/arm/psci/psci.c renamed from drivers/firmware/psci/psci.c +0 -0
drivers/firmware/arm/psci/psci_checker.c renamed from drivers/firmware/psci/psci_checker.c +0 -0
drivers/firmware/arm/scmi/Kconfig renamed from drivers/firmware/arm_scmi/Kconfig +2 -2
@@ -82,8 +82,8 @@ config ARM_SCMI_QUIRKS depending on the SCMI firmware advertised versions and/or machine compatibles. -source "drivers/firmware/arm_scmi/transports/Kconfig" -source "drivers/firmware/arm_scmi/vendors/imx/Kconfig" +source "drivers/firmware/arm/scmi/transports/Kconfig" +source "drivers/firmware/arm/scmi/vendors/imx/Kconfig" endif #ARM_SCMI_PROTOCOL
drivers/firmware/arm/scmi/Makefile renamed from drivers/firmware/arm_scmi/Makefile +0 -0
drivers/firmware/arm/scmi/base.c renamed from drivers/firmware/arm_scmi/base.c +0 -0
drivers/firmware/arm/scmi/bus.c renamed from drivers/firmware/arm_scmi/bus.c +0 -0
drivers/firmware/arm/scmi/clock.c renamed from drivers/firmware/arm_scmi/clock.c +0 -0
drivers/firmware/arm/scmi/common.h renamed from drivers/firmware/arm_scmi/common.h +0 -0
drivers/firmware/arm/scmi/driver.c renamed from drivers/firmware/arm_scmi/driver.c +0 -0
drivers/firmware/arm/scmi/msg.c renamed from drivers/firmware/arm_scmi/msg.c +0 -0
drivers/firmware/arm/scmi/notify.c renamed from drivers/firmware/arm_scmi/notify.c +0 -0
drivers/firmware/arm/scmi/notify.h renamed from drivers/firmware/arm_scmi/notify.h +0 -0
drivers/firmware/arm/scmi/perf.c renamed from drivers/firmware/arm_scmi/perf.c +0 -0
drivers/firmware/arm/scmi/pinctrl.c renamed from drivers/firmware/arm_scmi/pinctrl.c +0 -0
drivers/firmware/arm/scmi/power.c renamed from drivers/firmware/arm_scmi/power.c +0 -0
drivers/firmware/arm/scmi/powercap.c renamed from drivers/firmware/arm_scmi/powercap.c +0 -0
drivers/firmware/arm/scmi/protocols.h renamed from drivers/firmware/arm_scmi/protocols.h +0 -0
drivers/firmware/arm/scmi/quirks.c renamed from drivers/firmware/arm_scmi/quirks.c +0 -0
drivers/firmware/arm/scmi/quirks.h renamed from drivers/firmware/arm_scmi/quirks.h +0 -0
drivers/firmware/arm/scmi/raw_mode.c renamed from drivers/firmware/arm_scmi/raw_mode.c +0 -0
drivers/firmware/arm/scmi/raw_mode.h renamed from drivers/firmware/arm_scmi/raw_mode.h +0 -0
drivers/firmware/arm/scmi/reset.c renamed from drivers/firmware/arm_scmi/reset.c +0 -0
drivers/firmware/arm/scmi/scmi_power_control.c renamed from drivers/firmware/arm_scmi/scmi_power_control.c +0 -0
drivers/firmware/arm/scmi/sensors.c renamed from drivers/firmware/arm_scmi/sensors.c +0 -0
drivers/firmware/arm/scmi/shmem.c renamed from drivers/firmware/arm_scmi/shmem.c +0 -0
drivers/firmware/arm/scmi/system.c renamed from drivers/firmware/arm_scmi/system.c +0 -0
drivers/firmware/arm/scmi/transports/Kconfig renamed from drivers/firmware/arm_scmi/transports/Kconfig +0 -0
drivers/firmware/arm/scmi/transports/Makefile renamed from drivers/firmware/arm_scmi/transports/Makefile +0 -0
drivers/firmware/arm/scmi/transports/mailbox.c renamed from drivers/firmware/arm_scmi/transports/mailbox.c +0 -0
drivers/firmware/arm/scmi/transports/optee.c renamed from drivers/firmware/arm_scmi/transports/optee.c +0 -0
drivers/firmware/arm/scmi/transports/smc.c renamed from drivers/firmware/arm_scmi/transports/smc.c +0 -0
drivers/firmware/arm/scmi/transports/virtio.c renamed from drivers/firmware/arm_scmi/transports/virtio.c +0 -0
drivers/firmware/arm/scmi/vendors/imx/Kconfig renamed from drivers/firmware/arm_scmi/vendors/imx/Kconfig +0 -0
drivers/firmware/arm/scmi/vendors/imx/Makefile renamed from drivers/firmware/arm_scmi/vendors/imx/Makefile +0 -0
drivers/firmware/arm/scmi/vendors/imx/imx-sm-bbm.c renamed from drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c +0 -0
drivers/firmware/arm/scmi/vendors/imx/imx-sm-cpu.c renamed from drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c +0 -0
drivers/firmware/arm/scmi/vendors/imx/imx-sm-lmm.c renamed from drivers/firmware/arm_scmi/vendors/imx/imx-sm-lmm.c +0 -0
drivers/firmware/arm/scmi/vendors/imx/imx-sm-misc.c renamed from drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c +0 -0
drivers/firmware/arm/scmi/vendors/imx/imx95.rst renamed from drivers/firmware/arm_scmi/vendors/imx/imx95.rst +0 -0
drivers/firmware/arm/scmi/voltage.c renamed from drivers/firmware/arm_scmi/voltage.c +0 -0
drivers/firmware/arm/smccc/Kconfig renamed from drivers/firmware/smccc/Kconfig +0 -0
drivers/firmware/arm/smccc/Makefile renamed from drivers/firmware/smccc/Makefile +0 -0
drivers/firmware/arm/smccc/kvm_guest.c renamed from drivers/firmware/smccc/kvm_guest.c +0 -0
drivers/firmware/arm/smccc/smccc.c renamed from drivers/firmware/smccc/smccc.c +0 -0
drivers/firmware/arm/smccc/soc_id.c renamed from drivers/firmware/smccc/soc_id.c +0 -0
Signature · 1 line
2.43.0
Sudeep Holla
maintainerQuoted 18 lines · Sudeep Holla
Arm firmware interface drivers currently live directly under
drivers/firmware/. Some use anarm_prefix while others use generic names. More Arm firmware interface drivers, such as
[1] Realm Management Monitor(RMM) Realm Management Interface (RMMI)
[2] Live Firmware Activation (LFA)
expected soon, which would further crowd the top-level directory.There are couple of other interfaces whose usage within the kernel was challenged in the past or is currently being explored.
Create
drivers/firmware/arm/as the common home for Arm firmware interface drivers. Move FF-A, SCMI, PSCI and SMCCC under it, drop the redundantarm_prefix from the FF-A and SCMI directory names. Update theKconfig,Kbuild, maintainer and documentation paths.The resulting hierarchy provides room for upcoming interfaces without continuing to add Arm-specific directories at the firmware root.
Quoted 6 lines
Signed-off-by Sudeep Holla <[email protected]>---
Hi,
This is just to get a feedback/opinions.
Arnd,
Any opinion ?
Signature · 2 lines
Regards, Sudeep