lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 127/200] remoteproc: qcom: q6v5: fix service routines build errors
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit eee412e968f7b950564880bc6a7a9f00f49034da ]

    When CONFIG_QCOM_AOSS_QMP=m and CONFIG_QCOM_Q6V5_MSS=y, the builtin
    driver cannot call into the loadable module's low-level service
    functions. Trying to build with that config combo causes linker errors.

    There are two problems here. First, drivers/remoteproc/qcom_q6v5.c
    should #include <linux/soc/qcom/qcom_aoss.h> for the definitions of
    the service functions, depending on whether CONFIG_QCOM_AOSS_QMP is
    set/enabled or not. Second, the qcom remoteproc drivers should depend
    on QCOM_AOSS_QMP iff it is enabled (=y or =m) so that the qcom
    remoteproc drivers can be built properly.

    This prevents these build errors:

    aarch64-linux-ld: drivers/remoteproc/qcom_q6v5.o: in function `q6v5_load_state_toggle':
    qcom_q6v5.c:(.text+0xc4): undefined reference to `qmp_send'
    aarch64-linux-ld: drivers/remoteproc/qcom_q6v5.o: in function `qcom_q6v5_deinit':
    (.text+0x2e4): undefined reference to `qmp_put'
    aarch64-linux-ld: drivers/remoteproc/qcom_q6v5.o: in function `qcom_q6v5_init':
    (.text+0x778): undefined reference to `qmp_get'
    aarch64-linux-ld: (.text+0x7d8): undefined reference to `qmp_put'

    Fixes: c1fe10d238c0 ("remoteproc: qcom: q6v5: Use qmp_send to update co-processor load state")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Reported-by: kernel test robot <lkp@intel.com>
    Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
    Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
    Cc: linux-remoteproc@vger.kernel.org
    Cc: Sibi Sankar <sibis@codeaurora.org>
    Cc: Stephen Boyd <swboyd@chromium.org>
    Reviewed-by: Stephen Boyd <swboyd@chromium.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20220115011338.2973-1-rdunlap@infradead.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/Kconfig | 4 ++++
    drivers/remoteproc/qcom_q6v5.c | 1 +
    2 files changed, 5 insertions(+)

    diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
    index f2e961f998ca2..341156e2a29b9 100644
    --- a/drivers/remoteproc/Kconfig
    +++ b/drivers/remoteproc/Kconfig
    @@ -180,6 +180,7 @@ config QCOM_Q6V5_ADSP
    depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
    depends on QCOM_SYSMON || QCOM_SYSMON=n
    depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
    + depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
    select MFD_SYSCON
    select QCOM_PIL_INFO
    select QCOM_MDT_LOADER
    @@ -199,6 +200,7 @@ config QCOM_Q6V5_MSS
    depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
    depends on QCOM_SYSMON || QCOM_SYSMON=n
    depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
    + depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
    select MFD_SYSCON
    select QCOM_MDT_LOADER
    select QCOM_PIL_INFO
    @@ -218,6 +220,7 @@ config QCOM_Q6V5_PAS
    depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
    depends on QCOM_SYSMON || QCOM_SYSMON=n
    depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
    + depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
    select MFD_SYSCON
    select QCOM_PIL_INFO
    select QCOM_MDT_LOADER
    @@ -239,6 +242,7 @@ config QCOM_Q6V5_WCSS
    depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
    depends on QCOM_SYSMON || QCOM_SYSMON=n
    depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
    + depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
    select MFD_SYSCON
    select QCOM_MDT_LOADER
    select QCOM_PIL_INFO
    diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
    index eada7e34f3af5..442a388f81028 100644
    --- a/drivers/remoteproc/qcom_q6v5.c
    +++ b/drivers/remoteproc/qcom_q6v5.c
    @@ -10,6 +10,7 @@
    #include <linux/platform_device.h>
    #include <linux/interrupt.h>
    #include <linux/module.h>
    +#include <linux/soc/qcom/qcom_aoss.h>
    #include <linux/soc/qcom/smem.h>
    #include <linux/soc/qcom/smem_state.h>
    #include <linux/remoteproc.h>
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-31 13:09    [W:4.119 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site