soc: qcom: smem: Add stubs for CONFIG_QCOM_SMEM=n
PATCH 1/1 soc: qcom: smem: Add stubs for CONFIG_QCOM_SMEM=n
drivers/soc/qcom/ubwc_config.c calls qcom_smem_is_available() and qcom_smem_dram_get_hbb() unconditionally. These symbols are provided by the QCOM_SMEM module, but QCOM_UBWC_CONFIG can be selected by DRM_MSM even on non-Qcom platforms (e.g. with SOC_IMX5) thus resulting in the following link error:
arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x2c): undefined
reference to 'qcom_smem_is_available'
arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x4c): undefined
reference to 'qcom_smem_dram_get_hbb'
Add static inline stub definitions for the !CONFIG_QCOM_SMEM case for all qcom_smem_ functions in order to fix the issue above.
--- include/linux/soc/qcom/smem.h | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
include/linux/soc/qcom/smem.h +51 -0
@@ -4,6 +4,8 @@#define QCOM_SMEM_HOST_ANY -1 +#if IS_ENABLED (CONFIG_QCOM_SMEM ) +bool qcom_smem_is_available (void );int qcom_smem_alloc (unsigned host,unsigned item,size_t size);void *qcom_smem_get (unsigned host,unsigned item,size_t *size);
@@ -19,4 +21,53 @@ int qcom_smem_bust_hwspin_lock_by_host(unsigned int host);int qcom_smem_dram_get_hbb (void ); +#else + +static inline bool qcom_smem_is_available (void ) +{ +return false; +} + +static inline int qcom_smem_alloc (unsigned int host,unsigned int item,size_t size) +{ +return -ENODEV ; +} + +static inline void *qcom_smem_get (unsigned int host,unsigned int item,size_t *size) +{ +return ERR_PTR (-ENODEV ); +} + +static inline int qcom_smem_get_free_space (unsigned int host) +{ +return -ENODEV ; +} + +static inline phys_addr_t qcom_smem_virt_to_phys (void *p) +{ +return 0 ; +} + +static inline int qcom_smem_get_soc_id (u32 *id) +{ +return -ENODEV ; +} + +static inline int qcom_smem_get_feature_code (u32 *code) +{ +return -ENODEV ; +} + +static inline int qcom_smem_bust_hwspin_lock_by_host (unsigned int host) +{ +return -ENODEV ; +} + +static inline int qcom_smem_dram_get_hbb (void ) +{ +return -ENODATA ; +} + +#endif /* CONFIG_QCOM_SMEM */ +#endif
Signature · 1 line
2.45.2
Quoted 11 lines · Daniel Baluta
drivers/soc/qcom/ubwc_config.ccallsqcom_smem_is_available()andqcom_smem_dram_get_hbb()unconditionally. These symbols are provided by theQCOM_SMEMmodule, butQCOM_UBWC_CONFIGcan be selected byDRM_MSMeven on non-Qcom platforms (e.g. withSOC_IMX5) thus resulting in the following link error:arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x2c): undefined
reference to 'qcom_smem_is_available'
arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x4c): undefined
reference to 'qcom_smem_dram_get_hbb'
Quoted 8 lines
Add static inline stub definitions for the !CONFIG_QCOM_SMEM case for all
qcom_smem_functions in order to fix the issue above.Fixes 1b445022d1d0 ("soc: qcom: ubwc: Get HBB from SMEM")Signed-off-by Daniel Baluta <[email protected]>--- include/linux/soc/qcom/smem.h | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
I think a proper fix would be to relax drm/msm dependency on UBWC_CONFIG (limiting it to ARM64 && ARCH_QCOM) and letting UBWC_CONFIG have strict dependency on QCOM_SMEM. WDYT?
Signature · 2 lines
With best wishes Dmitry
Quoted 21 lines · Dmitry Baryshkov
Quoted 11 lines · Daniel Baluta
drivers/soc/qcom/ubwc_config.ccallsqcom_smem_is_available()andqcom_smem_dram_get_hbb()unconditionally. These symbols are provided by theQCOM_SMEMmodule, butQCOM_UBWC_CONFIGcan be selected byDRM_MSMeven on non-Qcom platforms (e.g. withSOC_IMX5) thus resulting in the following link error:arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x2c): undefined
reference to 'qcom_smem_is_available'
arm-linux-gnueabihf-ld: ubwc_config.c:(.text+0x4c): undefined
reference to 'qcom_smem_dram_get_hbb'Quoted 8 lines
Add static inline stub definitions for the !CONFIG_QCOM_SMEM case for all
qcom_smem_functions in order to fix the issue above.Fixes 1b445022d1d0 ("soc: qcom: ubwc: Get HBB from SMEM")Signed-off-by Daniel Baluta <[email protected]>--- include/linux/soc/qcom/smem.h | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
Quoted 4 lines
I think a proper fix would be to relax drm/msm dependency on
UBWC_CONFIG(limiting it to ARM64 &&ARCH_QCOM) and lettingUBWC_CONFIGhave strict dependency onQCOM_SMEM. WDYT?
Yes, that would work.