[PATCH -next] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected

0day CI kernel test robot reported following build error with randconfig

aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0):
		undefined reference to `scmi_mailbox_desc'

Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc.

Cc: Etienne Carriere <redacted>
Cc: Cristian Marussi <cristian.marussi@arm.com>
Reported-by: kernel test robot <redacted>
Signed-off-by: Sudeep Holla <redacted>
---
 drivers/firmware/arm_scmi/driver.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 5e8e9337adc7..ca71568c5c41 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c

@@ -1571,7 +1571,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

-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Cristian Marussi <cristian.marussi@arm.com>

Cristian

On Thu, Jun 03, 2021 at 08:26:31AM +0100, Sudeep Holla wrote:

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Thu, 3 Jun 2021 at 14:55, Cristian Marussi [off-list ref] wrote:

Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Cristian Marussi <cristian.marussi@arm.com>

Likely related to "firmware: arm_scmi: fix deps arm-smccc-discovery
deps in Kconfig"
Thanks for the fix.

Reviewed-by: Etienne Carriere <redacted>

Regards,
Etienne

quoted

aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0):
              undefined reference to `scmi_mailbox_desc'

Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc.

Cc: Etienne Carriere <redacted>
Cc: Cristian Marussi <cristian.marussi@arm.com>
Reported-by: kernel test robot <redacted>
Signed-off-by: Sudeep Holla <redacted>
---
 drivers/firmware/arm_scmi/driver.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 5e8e9337adc7..ca71568c5c41 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c

@@ -1571,7 +1571,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
--

2.25.1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Thu, Jun 03, 2021 at 03:33:05PM +0200, Etienne Carriere wrote:

On Thu, 3 Jun 2021 at 14:55, Cristian Marussi [off-list ref] wrote:

quoted

Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Cristian Marussi <cristian.marussi@arm.com>

Likely related to "firmware: arm_scmi: fix deps arm-smccc-discovery
deps in Kconfig"
Thanks for the fix.

Reviewed-by: Etienne Carriere <redacted>

Thanks, indeed your patch triggered this but not it's fault though. That's
why though I initially thought of squashing this into your patch, decided
against it as this build fix must have been there once we abstracted
the mailbox transport. Hence I posted it as a separate patch.

-- 
Regards,
Sudeep

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Thu, 3 Jun 2021 08:26:31 +0100, Sudeep Holla wrote:

0day CI kernel test robot reported following build error with randconfig

aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0):
		undefined reference to `scmi_mailbox_desc'

Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc.

Applied to sudeep.holla/linux (for-next/scmi), thanks!

[1/1] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected
      https://git.kernel.org/sudeep.holla/c/ab7766b728

--
Regards,
Sudeep


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel