From patchwork Tue Feb 28 21:10:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9596877 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 58145600CB for ; Tue, 28 Feb 2017 21:21:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E2DE28576 for ; Tue, 28 Feb 2017 21:21:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F2FB28593; Tue, 28 Feb 2017 21:21:12 +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 6B5342858F for ; Tue, 28 Feb 2017 21:21:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751473AbdB1VVK (ORCPT ); Tue, 28 Feb 2017 16:21:10 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:50329 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbdB1VVF (ORCPT ); Tue, 28 Feb 2017 16:21:05 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LrsPm-1cJpsW0Kq6-013fy9; Tue, 28 Feb 2017 22:10:30 +0100 From: Arnd Bergmann To: Ohad Ben-Cohen , Bjorn Andersson Cc: Arnd Bergmann , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] remoteproc: qcom: fix QCOM_SMD dependencies Date: Tue, 28 Feb 2017 22:10:05 +0100 Message-Id: <20170228211025.3619144-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:dGvyzomoSy/BnOjxPJMiGRoRbtfWPpH455sQnu/fN9gb/so/ljU xE8Vqfxku3pb1LXchcefl+jpL3HtQ5vqCFoU3Kwu4yHxRl3QNOuZoOPXoDimS4tEOqqKYK0 cSuFCLOCgALgnwwEWfdaGIMiuh7WIZ6TCcNJGnscnyDsFRQD0wcJ7b0WR7F3pVO9ifsutrC WBFj7IOvROF3vS/Ol2lSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:l+09J0Wef0o=:rDDFey3TosyCtRuzARS3ra /SfAiitBwpSzQK8tF5Wvzdh41GXPQHZekOlhsZwO+INqyVJvv4kLVCr+lpI/Bl/xvhddGpi5W Vch6RvnH5DsFshmXRmjCJShOWfVqQrX/rPipniZaGB4tqaxO5rv8ydAKiyoXnDrTh+268py4q NO1x0aORIXGZlOnyBxFJGYLHcM72EnutTJu9nqraWE1gkp3pqFkvDs0hedsKce6Rhu1sVoAL+ WfAEOesoN1VMJ7VSGoMF5e/WvRpbT5X9hiS3bses51ncS5f0adc/f/+yB2pKbxlIXma2bH7nd BGJjvae2WSzsDBr9jqwVpRYUYFi0i0rTdqYY9DqEkk+xalJlqlhn7Xi1wBPPhkKIbLTWsvSXs ZfD/eT6o3vdL87XLh5uxbbhTKnibh8OZoqJVT/Te4XdS86EaZ2iycuvm4ZVrxUW/ALTC9LMx1 ruFFTUhuDaYi+4FtaoVNn8+625Kc6Q3dv9uAY9/NUVqIAXTRRD0MXM2StRnZ8SZswODh66eId 8wLHwQgi9k/7qM0hdrcWwc2duhiFeh9bK/J72dcHdUb3ZskjsuZdFjGgcPo42UDcgdKf/JvBp u7euo5lEqM+K7kAvpQ/pxyd25l+Dg0cIXzg3wyU+CwlBQ6cNYe3S7U4nhi54riFqaX7B7zgn1 w4R/Y69JDDhUYl7zv2V/1K/KG//Ae6ZJ27nBWxY5s8S3jFNr7JZ0yLyRWfiD/5u/szkg= 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 --- 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