firmware: arm_scmi: fix i.MX build dependency
Subsystems (5)
PATCH 1/1 firmware: arm_scmi: fix i.MX build dependency
From: Arnd Bergmann <[email protected]>
The newly added SCMI vendor driver references functions in the protocol driver but needs a Kconfig dependency to ensure it can link, essentially the Kconfig dependency needs to be reversed to match the link time dependency:
arm-linux-gnueabi-ld: sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld: sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'
This however only works after changing the dependency in the SND_SOC_FSL_MQS driver as well, which uses 'select IMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.
To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if IMX_SCMI_MISC_DRV is a loadable module but not depend on it if that is disabled.
---
I'm not sure this is the version we want to go with in the end, without having read the code in detail, but the version in linux-next is clearly wrong in multiple ways and this is the best I could come up with so far.
If we can agree on this approach, it needs to go through the ASoC tree as that contains the 101c9023594a commit at the moment.
--- drivers/firmware/arm_scmi/vendors/imx/Kconfig | 1 + drivers/firmware/imx/Kconfig | 1 - sound/soc/fsl/Kconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/arm_scmi/vendors/imx/Kconfig +1 -0
@@ -15,6 +15,7 @@ config IMX_SCMI_BBM_EXT config IMX_SCMI_MISC_EXT tristate "i.MX SCMI MISC EXTENSION" depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) + depends on IMX_SCMI_MISC_DRV default y if ARCH_MXC help This enables i.MX System MISC control logic such as gpio expander
drivers/firmware/imx/Kconfig +0 -1
@@ -25,7 +25,6 @@ config IMX_SCU config IMX_SCMI_MISC_DRV tristate "IMX SCMI MISC Protocol driver" - depends on IMX_SCMI_MISC_EXT || COMPILE_TEST default y if ARCH_MXC help The System Controller Management Interface firmware (SCMI FW) is
sound/soc/fsl/Kconfig +1 -1
@@ -29,8 +29,8 @@ config SND_SOC_FSL_SAI config SND_SOC_FSL_MQS tristate "Medium Quality Sound (MQS) module support" depends on SND_SOC_FSL_SAI + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select REGMAP_MMIO - select IMX_SCMI_MISC_DRV if IMX_SCMI_MISC_EXT !=n help Say Y if you want to add Medium Quality Sound (MQS) support for the Freescale CPUs.
Signature · 1 line
2.39.5
Quoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'selectIMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but not depend on it if that is disabled.Fixes 61c9f03e22fc ("firmware: arm_scmi: Add initial support for i.MX MISC protocol")Fixes 101c9023594a ("ASoC: fsl_mqs: Support accessing registers by scmi interface")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
---
I'm not sure this is the version we want to go with in the end, without having read the code in detail, but the version in linux-next is clearly wrong in multiple ways and this is the best I could come up with so far.If we can agree on this approach, it needs to go through the ASoC tree as that contains the
101c9023594acommit at the moment.
Thanks for spotting and fixing, Arnd!
Unless Peng has objection to this change, I'm good with it.
Shawn
Cristian Marussi
reviewerQuoted 2 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Hi Arnd,
Quoted 10 lines
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'
The SCMI drivers, like the newly added IMX_SCMI_MISC_DRV, generally make ue of the related vendor protocol like IMX_SCMI_MISC_EXT, BUT the SCMI stack is designed in a way that NO symbols are needed to be exported by the protocol layer (to avoid a huge and growing number of symbols exports)...so usually the current DRV-->PROTO dependency is fine.
In this case, AFAIU, it is the SCMI driver that in turn exports a few helpers that are used by another driver fsl_mqs, which in turn could be compiled and work with or without the SCMI stack, so with this patch we are artificially reversing the DRV<--PROTO dependency to solve this scenario in all the compillation scenarios...
....BUT given that the IMX_SCMI_MISC_DRV is the one that should export the missing symbols could NOT this solved in a cleaner way, without adding the fake reverse dependency, by instead modifying the header of the driver with something like the classic:
--->8-----
include/linux/firmware/imx/sm.h +12 -0
@@ -17,7 +17,19 @@#define SCMI_IMX_CTRL_SAI4_MCLK 4/* WAKE SAI4 MCLK */ #define SCMI_IMX_CTRL_SAI5_MCLK 5/* WAKE SAI5 MCLK */ +#ifdef IMX_SCMI_MISC_DRV int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val);int scmi_imx_misc_ctrl_set (u32 id,u32 val); +#else +static inline int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val) +{ +return 0 ; +} + +static inline int scmi_imx_misc_ctrl_set (u32 id,u32 val) +{ +return 0 ; +} +#endif #endif
----->8-----------
....to just support compilation in all the scenarios.
Quoted 10 lines
This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'selectIMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but not depend on it if that is disabled.
...and maybe with the above additions you could avoid also these other dep changes...
...not sure if I am missing something and I have definitely not tested any of my babbling above...
Thanks,
Cristian
Quoted 38 lines · Cristian Marussi
Quoted 6 lines · Arnd Bergmann
arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'The SCMI drivers, like the newly added
IMX_SCMI_MISC_DRV, generally make ue of the related vendor protocol likeIMX_SCMI_MISC_EXT, BUT the SCMI stack is designed in a way that NO symbols are needed to be exported by the protocol layer (to avoid a huge and growing number of symbols exports)...so usually the current DRV-->PROTO dependency is fine.In this case, AFAIU, it is the SCMI driver that in turn exports a few helpers that are used by another driver
fsl_mqs, which in turn could be compiled and work with or without the SCMI stack, so with this patch we are artificially reversing the DRV<--PROTO dependency to solve this scenario in all the compillation scenarios.......BUT given that the
IMX_SCMI_MISC_DRVis the one that should export the missing symbols could NOT this solved in a cleaner way, without adding the fake reverse dependency, by instead modifying the header of the driver with something like the classic:--->8-----
include/linux/firmware/imx/sm.h +2
-0@@ -17,7 +17,19 @@#define SCMI_IMX_CTRL_SAI4_MCLK 4/* WAKE SAI4 MCLK */ #define SCMI_IMX_CTRL_SAI5_MCLK 5/* WAKE SAI5 MCLK */ +#ifdef IMX_SCMI_MISC_DRV int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val);int scmi_imx_misc_ctrl_set (u32 id,u32 val); +#else
include/linux/firmware/imx/sm.h line 33
Quoted 10 lines
include/linux/firmware/imx/sm.h +10
-0+static inline int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val) +{ +return 0 ; +} + +static inline int scmi_imx_misc_ctrl_set (u32 id,u32 val) +{ +return 0 ; +} +#endif
This usually doesn't work if the provider of these interfaces can be in a loadable module. The #ifdef above means this won't be usable when CONFIG_IMX_SCMI_MISC_DRV=m, while changing it to IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) still produces a link error when the consumer is built-in. Changing it to IS_REACHABLE() in turn is even worse because it avoids the link failure but makes it silently do the wrong thing in some configurations.
Quoted 16 lines
include/linux/firmware/imx/sm.h +0
-1#endif ----->8-----------....to just support compilation in all the scenarios.
Quoted 10 lines
This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'selectIMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but not depend on it if that is disabled.
Quoted 5 lines
...and maybe with the above additions you could avoid also these other dep changes...
...not sure if I am missing something and I have definitely not tested any of my babbling above...
In my experience, there is no way to avoid reflecting the dependencies correctly in Kconfig: if one driver has an EXPORT_SYMBOL that gets picked up by another driver, you need a matching 'depends on'.
Arnd
Peng Fan
maintainerQuoted 94 lines
Subject: Re: [PATCH] firmware:
arm_scmi: fix i.MX build dependencyQuoted 3 lines · Cristian Marussi
Quoted 2 lines · Arnd Bergmann
arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function`fsl_mqs_sm_write':
Quoted 1 line
Quoted 1 line
fsl_mqs.c:(.text+0x1aa): undefined reference to
`scmi_imx_misc_ctrl_set'
Quoted 1 line
Quoted 1 line
arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function`fsl_mqs_sm_read':
Quoted 1 line
Quoted 1 line
fsl_mqs.c:(.text+0x1ee): undefined reference to
`scmi_imx_misc_ctrl_get'
Quoted 3 lines
Quoted 1 line
The SCMI drivers, like the newly added
IMX_SCMI_MISC_DRV,generally
Quoted 1 line
make ue of the related vendor protocol like
IMX_SCMI_MISC_EXT,BUT the
Quoted 2 lines
SCMI stack is designed in a way that NO symbols are needed to be exported by the protocol layer (to avoid a huge and growing number
of
Quoted 1 line
symbols exports)...so usually the current DRV-->PROTO dependency is
fine.
Quoted 8 lines
In this case, AFAIU, it is the SCMI driver that in turn exports a few helpers that are used by another driver
fsl_mqs, which in turn could be compiled and work with or without the SCMI stack, so with this patch we are artificially reversing the DRV<--PROTO dependency to solve this scenario in all the compillation scenarios.......BUT given that the
IMX_SCMI_MISC_DRVis the one that shouldexport
Quoted 2 lines
the missing symbols could NOT this solved in a cleaner way, without adding the fake reverse dependency, by instead modifying the header
of
Quoted 5 lines
the driver with something like the classic:
--->8-----
(quoted diff) +0
-0
b/include/linux/firmware/imx/sm.hindex
9b85a3f028d1..3a7a3ec367c5include/linux/firmware/imx/sm.h line 17
Quoted 5 lines
100644
include/linux/firmware/imx/sm.h +0
-0@@ -17,7 +17,19 @@#define SCMI_IMX_CTRL_SAI4_MCLK 4/* WAKE SAI4 MCLK */
include/linux/firmware/imx/sm.h line 18
Quoted 1 line
include/linux/firmware/imx/sm.h +0
-0#define SCMI_IMX_CTRL_SAI5_MCLK 5/* WAKE SAI5 MCLK */
Quoted 4 lines
include/linux/firmware/imx/sm.h +1
-0+#ifdef IMX_SCMI_MISC_DRV int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val);int scmi_imx_misc_ctrl_set (u32 id,u32 val);include/linux/firmware/imx/sm.h line 33
Quoted 10 lines
include/linux/firmware/imx/sm.h +10
-0+#else +static inline int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val) +{ +return 0 ; +} + +static inline int scmi_imx_misc_ctrl_set (u32 id,u32 val) { +return 0 ; +} +#endif This usually doesn't work if the provider of these interfaces can be in a loadable module. The #ifdef above means this won't be usable when
CONFIG_IMX_SCMI_MISC_DRV=m, while changing it toIS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV)still produces a link error when the consumer is built-in. Changing it toIS_REACHABLE()in turn is even worse because it avoids the link failure but makes it silently do the wrong thing in some configurations.Quoted 7 lines
include/linux/firmware/imx/sm.h +0
-1#endif ----->8-----------....to just support compilation in all the scenarios.
Quoted 2 lines
This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'select
IMX_SCMI_MISC_DRV'Quoted 4 lines
Quoted 4 lines
to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.
To allow the ASoC driver to keep building with the SCMI support,
this
Quoted 2 lines
Quoted 2 lines
needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but notdepend
Quoted 4 lines
Quoted 2 lines
on it if that is disabled.
...and maybe with the above additions you could avoid also these
other
Quoted 8 lines
Quoted 4 lines
dep changes...
...not sure if I am missing something and I have definitely not tested any of my babbling above...
In my experience, there is no way to avoid reflecting the dependencies correctly in
Kconfig: if one driver has anEXPORT_SYMBOLthat gets picked up by another driver, you need a matching 'depends on'.
Oh. Thanks for sharing the knowledge. I am ok with your change.
Thanks,
Peng.
Quoted 2 lines
Arnd
Peng Fan
maintainerQuoted 58 lines
Subject: Re: [PATCH] firmware:
arm_scmi: fix i.MX build dependencyQuoted 2 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Hi Arnd,
Quoted 3 lines
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to matchthe
Quoted 3 lines
link time dependency:
arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function`fsl_mqs_sm_write':
Quoted 1 line
fsl_mqs.c:(.text+0x1aa): undefined reference to
`scmi_imx_misc_ctrl_set'
Quoted 1 line
arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function`fsl_mqs_sm_read':
Quoted 1 line
fsl_mqs.c:(.text+0x1ee): undefined reference to
`scmi_imx_misc_ctrl_get'
Quoted 1 line
The SCMI drivers, like the newly added
IMX_SCMI_MISC_DRV, generally make ue of the related vendor protocol likeIMX_SCMI_MISC_EXT, BUT the SCMI stack is designed in a way that NO symbols are needed to be exported by the protocol layer (to avoid a huge and growing number of symbols exports)...so usually the current DRV-->PROTO dependency is fine.In this case, AFAIU, it is the SCMI driver that in turn exports a few helpers that are used by another driver
fsl_mqs, which in turn could be compiled and work with or without the SCMI stack, so with this patch we are artificially reversing the DRV<--PROTO dependency to solve this scenario in all the compillation scenarios.......BUT given that the
IMX_SCMI_MISC_DRVis the one that should export the missing symbols could NOT this solved in a cleaner way, without adding the fake reverse dependency, by instead modifying the header of the driver with something like the classic:--->8-----
(quoted diff) +0
-0
b/include/linux/firmware/imx/sm.hindex9b85a3f028d1..3a7a3ec367c5100644include/linux/firmware/imx/sm.h +0
-0@@ -17,7 +17,19 @@#define SCMI_IMX_CTRL_SAI4_MCLK 4/* WAKE SAI4 MCLK */
#defineSCMI_IMX_CTRL_SAI5_MCLK5 /* WAKE SAI5
MCLK */+#ifdef
IMX_SCMI_MISC_DRV
intscmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val); intscmi_imx_misc_ctrl_set(u32 id, u32 val);
include/linux/firmware/imx/sm.h line 33
Quoted 9 lines
include/linux/firmware/imx/sm.h +9
-0+#else +static inline int scmi_imx_misc_ctrl_get (u32 id,u32 *num,u32 *val) { +return 0 ; +} + +static inline int scmi_imx_misc_ctrl_set (u32 id,u32 val) { +return 0 ; +} +#endif
This change is good to me. With just a difference that in downstream we use -EOPNOTSUPP
https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/include/linux/firmware/imx/sm.h#L19
Thanks,
Peng.
Quoted 26 lines
#endif
----->8-----------....to just support compilation in all the scenarios.
Quoted 2 lines
This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'select
IMX_SCMI_MISC_DRV'Quoted 6 lines
to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.
To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but notdepend on
Quoted 2 lines
it if that is disabled.
...and maybe with the above additions you could avoid also these other dep changes...
...not sure if I am missing something and I have definitely not tested any of my babbling above...
Thanks,
Cristian
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:
Quoted 18 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'selectIMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.
Quoted 8 lines
To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but not depend on it if that is disabled.Fixes 61c9f03e22fc ("firmware: arm_scmi: Add initial support for i.MX MISC protocol")Fixes 101c9023594a ("ASoC: fsl_mqs: Support accessing registers by scmi interface")Signed-off-by Arnd Bergmann <[email protected]>
Best regards
Shengjiu Wang
Quoted 55 lines
---
I'm not sure this is the version we want to go with in the end, without having read the code in detail, but the version in linux-next is clearly wrong in multiple ways and this is the best I could come up with so far.If we can agree on this approach, it needs to go through the ASoC tree as that contains the
101c9023594acommit at the moment.--- drivers/firmware/arm_scmi/vendors/imx/Kconfig | 1 + drivers/firmware/imx/Kconfig | 1 - sound/soc/fsl/Kconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-)drivers/firmware/arm_scmi/vendors/imx/Kconfig +1
-0@@ -15,6 +15,7 @@ config IMX_SCMI_BBM_EXT config IMX_SCMI_MISC_EXT tristate "i.MX SCMI MISC EXTENSION" depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) + depends on IMX_SCMI_MISC_DRV default y if ARCH_MXC help This enables i.MX System MISC control logic such as gpio expanderdrivers/firmware/imx/Kconfig +0
-1@@ -25,7 +25,6 @@ config IMX_SCU config IMX_SCMI_MISC_DRV tristate "IMX SCMI MISC Protocol driver" - depends on IMX_SCMI_MISC_EXT || COMPILE_TEST default y if ARCH_MXC help The System Controller Management Interface firmware (SCMI FW) issound/soc/fsl/Kconfig +1
-2@@ -29,8 +29,8 @@ config SND_SOC_FSL_SAI config SND_SOC_FSL_MQS tristate "Medium Quality Sound (MQS) module support" depends on SND_SOC_FSL_SAI + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select REGMAP_MMIO - select IMX_SCMI_MISC_DRV if IMX_SCMI_MISC_EXT !=n help Say Y if you want to add Medium Quality Sound (MQS) support for the Freescale CPUs. --2.39.5
Quoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'This however only works after changing the dependency in the
SND_SOC_FSL_MQSdriver as well, which uses 'selectIMX_SCMI_MISC_DRV' to turn on a driver it depends on. This is generally a bad idea, so the best solution is to change that into a dependency.To allow the ASoC driver to keep building with the SCMI support, this needs to be an optional dependency that enforces the link-time dependency if
IMX_SCMI_MISC_DRVis a loadable module but not depend on it if that is disabled.Fixes 61c9f03e22fc ("firmware: arm_scmi: Add initial support for i.MX MISC protocol")Fixes 101c9023594a ("ASoC: fsl_mqs: Support accessing registers by scmi interface")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
---
I'm not sure this is the version we want to go with in the end, without having read the code in detail, but the version in linux-next is clearly wrong in multiple ways and this is the best I could come up with so far.If we can agree on this approach, it needs to go through the ASoC tree as that contains the
101c9023594acommit at the moment.
Sorry for the late response, was away for a while. I am fine with the change, but bit confused as Mark Brown has acked the change instead by which I assume he is not taking it through his tree.
I can can take it at -rc1 or if Mark B is happy to pull it, here is my ack.
--
Regards,
Sudeep
Sudeep Holla
AppliedQuoted 11 lines · Arnd Bergmann
The newly added SCMI vendor driver references functions in the protocol driver but needs a
Kconfigdependency to ensure it can link, essentially theKconfigdependency needs to be reversed to match the link time dependency:arm-linux-gnueabi-ld:
sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_write':
fsl_mqs.c:(.text+0x1aa): undefined reference to `scmi_imx_misc_ctrl_set'
arm-linux-gnueabi-ld:sound/soc/fsl/fsl_mqs.o: in function `fsl_mqs_sm_read':
fsl_mqs.c:(.text+0x1ee): undefined reference to `scmi_imx_misc_ctrl_get'[...]
Applied to sudeep.holla/linux (for-next/scmi/fixes), thanks!
[1/1] firmware: arm_scmi: fix i.MX build dependency
https://git.kernel.org/sudeep.holla/c/514b2262ade4
--
Regards,
Sudeep