[PATCH v2 1/5] reset: scmi: define LOG_CATEGORY
Define LOG_CATEGORY to allow filtering with log command.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org ---
(no changes since v1)
drivers/reset/reset-scmi.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c index 1bff8075ee..ca0135a420 100644 --- a/drivers/reset/reset-scmi.c +++ b/drivers/reset/reset-scmi.c @@ -2,6 +2,9 @@ /* * Copyright (C) 2019-2020 Linaro Limited */ + +#define LOG_CATEGORY UCLASS_RESET + #include <common.h> #include <dm.h> #include <errno.h>
Define LOG_CATEGORY to allow filtering with log command.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org ---
(no changes since v1)
drivers/clk/clk_scmi.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/clk/clk_scmi.c b/drivers/clk/clk_scmi.c index 93a4819501..9a0a6f6643 100644 --- a/drivers/clk/clk_scmi.c +++ b/drivers/clk/clk_scmi.c @@ -2,6 +2,9 @@ /* * Copyright (C) 2019-2020 Linaro Limited */ + +#define LOG_CATEGORY UCLASS_CLK + #include <common.h> #include <clk-uclass.h> #include <dm.h>
Define LOG_CATEGORY to allow filtering with log command.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org ---
(no changes since v1)
drivers/power/regulator/scmi_regulator.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/power/regulator/scmi_regulator.c b/drivers/power/regulator/scmi_regulator.c index b3142bf4e1..3ddeaf4adc 100644 --- a/drivers/power/regulator/scmi_regulator.c +++ b/drivers/power/regulator/scmi_regulator.c @@ -2,6 +2,9 @@ /* * Copyright (C) 2020-2021 Linaro Limited */ + +#define LOG_CATEGORY UCLASS_REGULATOR + #include <common.h> #include <dm.h> #include <errno.h>
Add two configs CONFIG_SCMI_AGENT_MAILBOX and CONFIG_SCMI_AGENT_SMCCC to select the supported agents as all the agents are not supported.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org ---
Changes in v2: - fix typo s/compatibble/compatible/ - add acked by Etienne Carriere for the series
drivers/firmware/scmi/Kconfig | 16 ++++++++++++++++ drivers/firmware/scmi/Makefile | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/scmi/Kconfig b/drivers/firmware/scmi/Kconfig index c3a109beac..c33de87cd0 100644 --- a/drivers/firmware/scmi/Kconfig +++ b/drivers/firmware/scmi/Kconfig @@ -17,3 +17,19 @@ config SCMI_FIRMWARE based on message exchange. Messages can be exchange over tranport channels as a mailbox device or an Arm SMCCC service with some piece of identified shared memory. + +config SCMI_AGENT_MAILBOX + bool "Enable SCMI agent mailbox" + depends on SCMI_FIRMWARE && DM_MAILBOX + default y + help + Enable the SCMI communication channel based on mailbox + for compatible "arm,scmi". + +config SCMI_AGENT_SMCCC + bool "Enable SCMI agent SMCCC" + depends on SCMI_FIRMWARE && ARM_SMCCC + default y + help + Enable the SCMI communication channel based on Arm SMCCC service for + compatible "arm,scmi-smc". diff --git a/drivers/firmware/scmi/Makefile b/drivers/firmware/scmi/Makefile index 966475ec10..d6d6f89493 100644 --- a/drivers/firmware/scmi/Makefile +++ b/drivers/firmware/scmi/Makefile @@ -1,5 +1,5 @@ obj-y += scmi_agent-uclass.o obj-y += smt.o -obj-$(CONFIG_ARM_SMCCC) += smccc_agent.o -obj-$(CONFIG_DM_MAILBOX) += mailbox_agent.o +obj-$(SCMI_AGENT_SMCCC) += smccc_agent.o +obj-$(SCMI_AGENT_MAILBOX) += mailbox_agent.o obj-$(CONFIG_SANDBOX) += sandbox-scmi_agent.o sandbox-scmi_devices.o
On 10/28/21 4:57 PM, Patrick Delaunay wrote:
Add two configs CONFIG_SCMI_AGENT_MAILBOX and CONFIG_SCMI_AGENT_SMCCC to select the supported agents as all the agents are not supported.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org
Changes in v2:
fix typo s/compatibble/compatible/
add acked by Etienne Carriere for the series
drivers/firmware/scmi/Kconfig | 16 ++++++++++++++++ drivers/firmware/scmi/Makefile | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/scmi/Kconfig b/drivers/firmware/scmi/Kconfig index c3a109beac..c33de87cd0 100644 --- a/drivers/firmware/scmi/Kconfig +++ b/drivers/firmware/scmi/Kconfig @@ -17,3 +17,19 @@ config SCMI_FIRMWARE based on message exchange. Messages can be exchange over tranport channels as a mailbox device or an Arm SMCCC service with some piece of identified shared memory.
+config SCMI_AGENT_MAILBOX
- bool "Enable SCMI agent mailbox"
- depends on SCMI_FIRMWARE && DM_MAILBOX
- default y
- help
Enable the SCMI communication channel based on mailboxfor compatible "arm,scmi".+config SCMI_AGENT_SMCCC
- bool "Enable SCMI agent SMCCC"
- depends on SCMI_FIRMWARE && ARM_SMCCC
- default y
- help
Enable the SCMI communication channel based on Arm SMCCC service forcompatible "arm,scmi-smc".diff --git a/drivers/firmware/scmi/Makefile b/drivers/firmware/scmi/Makefile index 966475ec10..d6d6f89493 100644 --- a/drivers/firmware/scmi/Makefile +++ b/drivers/firmware/scmi/Makefile @@ -1,5 +1,5 @@ obj-y += scmi_agent-uclass.o obj-y += smt.o -obj-$(CONFIG_ARM_SMCCC) += smccc_agent.o -obj-$(CONFIG_DM_MAILBOX) += mailbox_agent.o +obj-$(SCMI_AGENT_SMCCC) += smccc_agent.o +obj-$(SCMI_AGENT_MAILBOX) += mailbox_agent.o
erreur here when I copy paste the configuration name
=> missing CONFIG_ in variable
+obj-$(CONFIG_SCMI_AGENT_SMCCC) += smccc_agent.o +obj-$(CONFIG_SCMI_AGENT_MAILBOX) += mailbox_agent.o
sorry, I will sent v3 !
Patrick
Deactivate the SCMI agent mailbox which is not used on STM32MP15 platforms.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com Acked-by: Etienne Carriere etienne.carriere@linaro.org ---
(no changes since v1)
configs/stm32mp15_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 2 files changed, 2 insertions(+)
diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig index 701b1510c5..e4989efad1 100644 --- a/configs/stm32mp15_defconfig +++ b/configs/stm32mp15_defconfig @@ -75,6 +75,7 @@ CONFIG_FASTBOOT_MMC_USER_NAME="mmc1" CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y +# CONFIG_SCMI_AGENT_MAILBOX is not set CONFIG_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index b4ed090e3f..a3d2a6e1b4 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -76,6 +76,7 @@ CONFIG_FASTBOOT_MMC_USER_NAME="mmc1" CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y +# CONFIG_SCMI_AGENT_MAILBOX is not set CONFIG_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y
participants (2)
-
Patrick DELAUNAY -
Patrick Delaunay