From patchwork Mon Mar 13 16:36:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9621517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2063960492 for ; Mon, 13 Mar 2017 16:42:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 121CF284D8 for ; Mon, 13 Mar 2017 16:42:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 070A4284F3; Mon, 13 Mar 2017 16:42:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B31ED284D8 for ; Mon, 13 Mar 2017 16:42:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905AbdCMQmU (ORCPT ); Mon, 13 Mar 2017 12:42:20 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60191 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719AbdCMQhB (ORCPT ); Mon, 13 Mar 2017 12:37:01 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LiCiR-1cR6Zr12Zv-00nMuH; Mon, 13 Mar 2017 17:36:44 +0100 From: Arnd Bergmann To: Ohad Ben-Cohen , Bjorn Andersson Cc: Arnd Bergmann , Peter Griffin , Vinod Koul , Loic Pallardy , Pavel Machek , Jean Delvare , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH] remoteproc: qcom: fix QCOM_SMD dependencies Date: Mon, 13 Mar 2017 17:36:25 +0100 Message-Id: <20170313163635.956380-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:l10z4UyklBA8fqY50iS/dPC9GQsxsJqF6aY9j9Bp4LsFWgBseCC VLhSxjoz9dzFWxUx837Lw/aov9a20jBzDAInmTZFwl0jP+kBMcIyK23dmTHZedDv8dkVKn7 vWgHoVDugRrME94O+zl6vV+u5h+0+dVncMfzNsNERIZa9CM67VMOhqNK/jLo+/3MaJPv2a1 4wFr2eWLSiIZFm//WV83A== X-UI-Out-Filterresults: notjunk:1; V01:K0:9G3Mkt3E4J4=:zwk9NHxdlwib+qa32I0S4Z h426FkrapTVABGHls4pcv9wXEevDK65RjUX0xUnO6GQDlFknOLpi1FmzRclX33U9aaXQyVSO4 bNzhQWpBM/XWOR6Ju6J6Dr6UqsJdE4A+KdfHxQIcFS8ONr4CIcB1NL8pDnSwp3dKiAlbwHjty 4jpMAj9iX4dfdRoGrUltluQ6Fpvh4YyXCPvOMVRQORaQKhekIsdHWbivW/izPH0hyXQi6J4Ku bMs7wP38FbLqWOECziQyzdVZEvIi/+XrA8p8EeqgEChGVfYS57dL+vUL9e3nVE14AJYFQcU3/ wMOlyTpThKRHA5rT2O2dwVwCXuo8TzfyR38nEMoRDub8tLbxjuarueCQ6AUQ2ROG+UEdAJexr 91O8c8i1/5IR1ZOC5SN1ioF9rhhzStJIn9Ls2aiT3yvXc+Ih3A7KUUPOZcgJd1gNW77rgzb2T qTkoi7LQg7Jfr7NZNpEtrewheqlAPevzf3ZdIwoziPA3EhF+fQI0pzv7hgPY6d5KgLs/bRVtd 3kpJefX8C5jzeml6exUwn1YSOZDj5GIdQttDTu30ZMv7RWJe1TPQjjWOrLgOysQ8m1VRX/ikG YmB6T9Akgsj1b0v+7n13D/NPz52iJ9HrdTT3CmS/pSKyOx44/sS8qz5EgTr7wNuaaffOhqNew WGxO/DzGQ29pAzPm9xfOOHi2SzOyvpO/58IZepVBs5wQ/XahyK0RCA4k82JAssJO7IDE= Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP qcom_smd_register_edge() is provided by either QCOM_SMD or RPMSG_QCOM_SMD, and if both of them are disabled, it does nothing. The check for the PIL drivers however only checks for QCOM_SMD, so it breaks with QCOM_SMD=n && RPMSG_QCOM_SMD=m: drivers/remoteproc/built-in.o: In function `smd_subdev_remove': qcom_wcnss_iris.c:(.text+0x231c): undefined reference to `qcom_smd_unregister_edge' drivers/remoteproc/built-in.o: In function `smd_subdev_probe': qcom_wcnss_iris.c:(.text+0x2344): undefined reference to `qcom_smd_register_edge' drivers/remoteproc/built-in.o: In function `smd_subdev_probe': qcom_q6v5_pil.c:(.text+0x3538): undefined reference to `qcom_smd_register_edge' qcom_q6v5_pil.c:(.text+0x3538): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `qcom_smd_register_edge' This clarifies the Kconfig dependency. Fixes: 4b48921a8f74 ("remoteproc: qcom: Use common SMD edge handler") Signed-off-by: Arnd Bergmann --- Submitted on Feb 28, still needed in mainline as of v4.11-rc2 --- drivers/remoteproc/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 65f86bc24c07..1dc43fc5f65f 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -76,7 +76,7 @@ config QCOM_ADSP_PIL depends on OF && ARCH_QCOM depends on REMOTEPROC depends on QCOM_SMEM - depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n) + depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n) select MFD_SYSCON select QCOM_MDT_LOADER select QCOM_RPROC_COMMON @@ -93,7 +93,7 @@ config QCOM_Q6V5_PIL depends on OF && ARCH_QCOM depends on QCOM_SMEM depends on REMOTEPROC - depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n) + depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n) select MFD_SYSCON select QCOM_RPROC_COMMON select QCOM_SCM @@ -104,7 +104,7 @@ config QCOM_Q6V5_PIL config QCOM_WCNSS_PIL tristate "Qualcomm WCNSS Peripheral Image Loader" depends on OF && ARCH_QCOM - depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n) + depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n) depends on QCOM_SMEM depends on REMOTEPROC select QCOM_MDT_LOADER