From patchwork Wed Apr 8 20:27:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480859 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7405E92A for ; Wed, 8 Apr 2020 20:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5AD5720753 for ; Wed, 8 Apr 2020 20:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730443AbgDHU1u (ORCPT ); Wed, 8 Apr 2020 16:27:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51355 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729333AbgDHU1u (ORCPT ); Wed, 8 Apr 2020 16:27:50 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mrh9Y-1izGjr3MlI-00nlSz; Wed, 08 Apr 2020 22:27:19 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 1/6] thunder: select PTP driver if possible Date: Wed, 8 Apr 2020 22:27:06 +0200 Message-Id: <20200408202711.1198966-2-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:mGlRd5xXvrWXjH5ARNufEZPCVL9cYj10ODbmPSRMgDrYtv3nXEc pnVt/hadqMl2XTMQZrC9iv1lQ3+3zV9clZ0cy+FrVsKbQDG5ydckomDupqtfWBpYAA5SL2b ejhseEmA9tAmYQ19vMw/qvPk1gTfisBagmO/idcL225eXQYT8xGDe7hLh2vIjswDKD8Vli+ 7ocNzTVy5ThHS8QujPL2Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:/nLZWXqnSdw=:phuLH7tle7YBo97T3huV5A vSH8xCo4twHU84eg4LvK4HOn2oFolsTYGZa7ROooND9YGt7MB5zz2Q8z9RTJodxFRn/XG9dOf NscqFwaOXSxVAUJsjy/uEB0hicWqQu8xEcUY+9DCLcd8q7SVpN/QIRF6ttpBP19m/PmXqyv1o /sw4SUqnEvUrNysy3IynuagA8enqZQ1TDbfjul2uZllbFNGXrRzMj3CA9CsLyU7yGTRu05J/h Xum24X+4IC4lg1k5fwt0nNHZ1IKTMePnwwC5oWsroAHgDqQDlNpK7uHI8IWHuuxRiqXQDJC5i z+Z6KtPdmG128SbnEbblbnbblKt+K9bXMhgogAp0DoMYf8J/qcCV3kf09stxpSqfuIGfPnjyU KOent5VLIkZCNlKvyHrEm+gyhPn2rQHBajpCCWXPu37pQX+vpEgCL7PneJc4fdlmbxS1iA1Cy RF+ad2EDQAkocPHNvigKWAAehlA9QRjVxipXwW31RnOhLwdgeuqgRecV/i/ggUl8gDViV1ymW lHuzosDGj+TVv+RYSfvxecxkdvTRsk1Bj817pcCuGTmzbESstAikpZM73nb9YhpZOjLZYC2NG twpAchLKYWWJ1aB4o/VhaSgn5omEitydCCPi4cdiCHgcn4MtniRDa6IFziUZiE93xzVPu7WHD 0EAtotW2BYHlSqsrQ9Yf+alqoXxf6PIWGHmGtlAAR43obUqNNiyRgVuuICZH38wVqqc0NVZi7 Rt1447uuSlKrrXx37E8+y7pfa28xD2eKt4O+BQMIHXWuBsFpiN6qOo0tMvcHmxjEFEKuijvCA BTb984lp4wcmvcR8Z0xnpylpFzuR7vyIDT9/98rJdVPKhEXJdw= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The 'imply' selection means the driver can still be a loadable module even if the main driver is built-in, leading to a link error: aarch64-linux-ld: drivers/net/ethernet/cavium/thunder/nicvf_main.o: in function `nicvf_remove': nicvf_main.c:(.text+0x25c): undefined reference to `cavium_ptp_put' aarch64-linux-ld: drivers/net/ethernet/cavium/thunder/nicvf_main.o: in function `nicvf_probe': nicvf_main.c:(.text+0x3080): undefined reference to `cavium_ptp_get' Use a 'select' statement instead. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 6a700d34019e..52806ef20d2d 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -27,7 +27,7 @@ config THUNDER_NIC_PF config THUNDER_NIC_VF tristate "Thunder Virtual function driver" - imply CAVIUM_PTP + select CAVIUM_PTP if POSIX_TIMERS depends on 64BIT && PCI ---help--- This driver supports Thunder's NIC virtual function From patchwork Wed Apr 8 20:27:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480849 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D494315AB for ; Wed, 8 Apr 2020 20:28:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC40C2078E for ; Wed, 8 Apr 2020 20:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730438AbgDHU15 (ORCPT ); Wed, 8 Apr 2020 16:27:57 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:37833 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728472AbgDHU1v (ORCPT ); Wed, 8 Apr 2020 16:27:51 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MnaY1-1ivA0D1Xk5-00jcjI; Wed, 08 Apr 2020 22:27:20 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 2/6] net/mlx5e: fix VXLAN dependency Date: Wed, 8 Apr 2020 22:27:07 +0200 Message-Id: <20200408202711.1198966-3-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:uksvWMPl7e6M4tD/Jwdoi/VMWCKlsBX2f2Iv1OdecI6D9qke0UX H8JDHSq9tH9gdAImB1WlOCwGw2juxksbW0T1qPC/P8/TcGZb/MCvO8DynkYcvjJ8nPSRDqN MW7IsSzrNXsuHRWtvMtvasLD+JPJGabCH2cqP5roVa2BQ766CRRiBekpQVNwmRgvG8cSVNn FzXdiP8/Lanh60jj+f2Ng== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:+pcOhHlaitk=:zKS80sKudtNtQuZ1iQybEO wR9woHPAZHzLc5HwPQBHERiTXNsHPvLlSFLLPyYLD2rLxRtJ0Mpr/58sYHIITmcsY/Kr9k1Vu cCbVLzrbl1zD3+n4O6enNKSBMWBevs2J2Y9MamrLlYrEiBuZOQGPOJM0XzBzb/PyzBYhhU5+c xIcDV3bkFc+wLZ1vC9/XsK5CBpa5pS64Z6ytzN0yJ3VF5KTFDZsz6466WnD89PacJbtMug/bL 8C8lnesNMro0k1UiKregFx5o6f3U6HY73wqmcGVdS00G2Iknb7Nslx3Bj96wqAWJjejMJR7xI H6HgOx0glLxanJ4WykB8tpm2yWxYqBMIFL8qxiS9hUx50qs7TJChcneGGt+2OZ45AKT3cn5Om UTu8AbTDWLWYnAApETQg38+ImM4r2Hws7U1FkqDsQi5Lz/Hsowg36urTW+kMe1+aJ55GPypXI zpQOgvlpPFO0fBWrauV4iQ8F6SjCNu/Q+zsV8SpAVvp+ESoYLma6GR2oTAJ1eJzV0IjKzU4iD GRDz0VvNwL3JtpjdesDHUS95Hdd4dS1r4bkxKdrS1KKXiLNciMj8OyY6+PEHTK4+d7LDBkJuF 6YgMtsw5FfLzm7UviRd1IkV5Dbd8L2DrU7pgp2uibPI9gJg5A4BTBMAkX3exImlErl+no4RVa t9sWJy2+yCx6SL6BGHCCPQD0fnNfQK2JcqnaEHTVOxZsnSwxdv/pyfgMIADONeZVilF6AEd7W 72LP2HuNDtWiGd56e8YlUH+iqDjcDEUW0ZbmQUJatHpliCkuFgCvZzgnDf/mtvTMKe9CiFIYH AmuXQn2RKNyCix3iwEGv808kO+9zjt/UKc1O4W2x3YXfaKSx8E= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The 'imply' statement does not prevent MLX5 to be built-in and fail when VXLAN=m: aarch64-linux-ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function `mlx5_init_once': main.c:(.text+0x7cc): undefined reference to `mlx5_vxlan_create' main.c:(.text+0x958): undefined reference to `mlx5_vxlan_destroy' Use a normal dependency instead. Fixes: c5791ab0abec ("net/mlx5e: vxlan.c depends on CONFIG_VXLAN") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index 312e0a1ad43d..849b0be0ca9a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -8,7 +8,7 @@ config MLX5_CORE depends on PCI select NET_DEVLINK imply PTP_1588_CLOCK - imply VXLAN + depends on VXLAN || !VXLAN imply MLXFW imply PCI_HYPERV_INTERFACE default n From patchwork Wed Apr 8 20:27:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480873 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5A191805 for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDBA520769 for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729832AbgDHU1s (ORCPT ); Wed, 8 Apr 2020 16:27:48 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:43153 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728221AbgDHU1r (ORCPT ); Wed, 8 Apr 2020 16:27:47 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MHGPA-1jZQRE3rtY-00DKmr; Wed, 08 Apr 2020 22:27:21 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 3/6] LiquidIO VF: add dependency for PTP_1588_CLOCK Date: Wed, 8 Apr 2020 22:27:08 +0200 Message-Id: <20200408202711.1198966-4-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:5gAXVieAiTDMVgOwMbM5A19MMx9acTKbfT3cm2YOhdzeb/EYJqs Te4CgqXnmQtMe+2OOhCDLGzIANrnZ90bJvbRpt7xp9tPopYPK34AYq2XwYjnPbCemctGCMx N+rTuDxeII+rMjAK7irDB1W8ndokokIDC2krQnC8xvnrVTQvZQFWn5Hrgw71ufxQQZ9KOIb TP8qo/XObsotxVQ27d5RA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:NRuTrC3phjI=:xaa2zTMfhPfNkIb3+uRvAz aOg1rZdZRmxxIc6g6+VG5HeTHmY1F7Z4l/de6QyK5vKhYfA3qz2OjA+rcwjt1nS463vOEuvHn f9p2Q7lWRUYsSHTXijhpB05u3xZ7R5lK+L8Ox6JCzrWJehS0UitxV6Q4qeI+GDlCr4P0a9O5B sr4hwwRsOkiwFhQBledXwf6Nwc28VN3epP5RXHdQWY0iFH3razZsmP7OKWbcDK+08IX6VRiEo De5Z1WflnClFpJVjM3e46r6H2d+8MMkk7nEA4GPWR5AJ4DGrTuSHHtfHHyNZ3V0mhzyils6QX 0BpRfqCNgru0vdl+zDCVmFMsKTG/jQl9IgapKImPnv3eHAGYWeRow6pgXpJjrqWGL4ifzW3GQ jdWzggVOZMjYStPc6g9OunbziB1Oazlh97E+SSwjIxsDLLRTiJTX+tJlBrtf3yL3BAyuvbXQk E8MBAxGXfuuxNNhtm4715Uwce/UGLAW3xqgf8hwyfqLqy8ZntI8aoe9hbkfl+JglQQd+dBG4n P4dehVuWxT9noRIrrqbj2FjxpDYrvhV7FknXKtaPr/NkZoNeS9sSQ7mUUbK4B0E7frN4sWdhp 8zrl/PiFPsrtJPqIMgWRO0ZHt7lS4fz9thQesQOYzcgXYXy6I1Ps4CHTaSlp0XrAvjRtJ7BNU L+HqTRIsrc62vZu+A3tCOjwHMYZBUjg7Vp/B++OdPCte8NMuxVbCKjIkcP5/AS8Lqzfm1i7au L9aLAOSr7a5Ra7Ih0p6IdsnwIhiwTyhYnjzScDb5J5P8LRHDaP04BDu1wrQXRZ7j3JpflN667 ura8Or9OeUg355x6QIVnmkKTzR4Vdr0dmLd1ifBX5y0q7LS8BQ= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The 'imply' keyword no longer does what it was originally introduced for: lio_ethtool.c:(.text+0xba8): undefined reference to `ptp_clock_index' Use a dependency instead. Fixes: cd7aeb1f9706 ("LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 52806ef20d2d..e483c3001dc6 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -66,7 +66,7 @@ config LIQUIDIO tristate "Cavium LiquidIO support" depends on 64BIT && PCI depends on PCI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select FW_LOADER select LIBCRC32C select NET_DEVLINK From patchwork Wed Apr 8 20:27:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480853 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36BAF92A for ; Wed, 8 Apr 2020 20:28:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E10620769 for ; Wed, 8 Apr 2020 20:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730452AbgDHU1u (ORCPT ); Wed, 8 Apr 2020 16:27:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51203 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730438AbgDHU1u (ORCPT ); Wed, 8 Apr 2020 16:27:50 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1M1HqM-1jJXCV1zju-002p3H; Wed, 08 Apr 2020 22:27:21 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 4/6] drm/bridge/sii8620: fix extcon dependency Date: Wed, 8 Apr 2020 22:27:09 +0200 Message-Id: <20200408202711.1198966-5-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:vV8vEqFFzBxDwbCUpevBksXzEnRG+4YylcxGZKW7vX+9eMNUg1m GTSrbKOi6FlzzBUHGBDpQR3uJHzbcRVL29ejotroODkZe9OPHSlxi90k/mXcQ4EwBxDqz+S fwAOPMaKXUvZqrRoIeRpqd1CCyTHjbL5K4harE/L5KNprHiRjOcSxfYcjG43V5CQGDOrMdP 0Zvp6NP7uN5f0uBgGxXEA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:MptYX3yueAQ=:b885v6hNqw1kQDiue/weO6 uP+3VRcZwHepB7aNKzqTfmN4RuwxLKcd3Ykn79jFhPBxl2wZfHWApXes3mbeDb/x1w+Vf3eXo q9YEc9yKSSVlxROHdqCSWcymhLpZ2EDGCdvQbKoMGTtFXTirZiv2DAe3FnAWFufrzLccql5PD EHa10ti3QaaWQoWarrhnR+u9A33uYjAF35zBqi6jQol9OPXkKAlO5yJcEcD0jpkfo6GS81i5y kH+gPTPYH30Wr9WocW6L91lXSvOaqKNE3BzcyPFgUPkKZdEFM+dMi8tZl2HxIwzJA1XqcwFfi XrfEV0cIYSe2KcZozeoabmYbdGj6q/22WC5AsKTZZgalFOuOBF8wVGKu/2wC6RLZ9COX/CFeu 6W+gTiE6JSfyRpDVXLFq+HnzULwdyNoAEb9aJf3iXX2AjYYvaqyB/lzs4IWSfLtkGFp9HDRzt AqgANzoPqYHUQkhSHCS2jpi3VNEU1z3mj98JfTwXmrM5v9LhzBIuTMdDAgqLXUSCEdq7RhW3T XvOf7th7/rXNolz9+AOIiILyM7J3arHbaIfZhe23PnMVjW1r8ySVflQqck+e0e0zycDo0T/Bx YtLQLGldhMoefh+6y6apc8rGbDJpRnerakstMgLD3Xg4C3JBpOoFEMmWSTc0KwSjScvTdVbFZ N2d5HtbEJry0CQNPtNudp2FRAzOMVvxY6G+Tz19wbIEno35Y6FxB+s2evGed0xWIVvhi7fdjc QFRA5cQBDSRwNMPrqLXlIjX5+A+SX8eaXTCT/FampsaxQeRsv7tSnCQm+OMw67CNp7QNJOZOs HS8WJIHYn7I0p4NzUPVc9S0+juW29sTv81JFrBTxLetf8xRiNA= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Using 'imply' does not work here, it still cause the same build failure: arm-linux-gnueabi-ld: drivers/gpu/drm/bridge/sil-sii8620.o: in function `sii8620_remove': sil-sii8620.c:(.text+0x1b8): undefined reference to `extcon_unregister_notifier' arm-linux-gnueabi-ld: drivers/gpu/drm/bridge/sil-sii8620.o: in function `sii8620_probe': sil-sii8620.c:(.text+0x27e8): undefined reference to `extcon_find_edev_by_node' arm-linux-gnueabi-ld: sil-sii8620.c:(.text+0x2870): undefined reference to `extcon_register_notifier' arm-linux-gnueabi-ld: drivers/gpu/drm/bridge/sil-sii8620.o: in function `sii8620_extcon_work': sil-sii8620.c:(.text+0x2908): undefined reference to `extcon_get_state' I tried the usual 'depends on EXTCON || !EXTCON' logic, but that caused a circular Kconfig dependency. Using IS_REACHABLE() is ugly but works. Fixes: 7a109673899b ("drm/bridge/sii8620: add Kconfig dependency on extcon") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/bridge/Kconfig | 1 - drivers/gpu/drm/bridge/sil-sii8620.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index aaed2347ace9..78e5ba06acff 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -90,7 +90,6 @@ config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF select DRM_KMS_HELPER - imply EXTCON depends on RC_CORE || !RC_CORE help Silicon Image SII8620 HDMI/MHL bridge chip driver. diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 92acd336aa89..94b6c38e6855 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -2330,7 +2330,8 @@ static int sii8620_probe(struct i2c_client *client, if (ret) return ret; - ret = sii8620_extcon_init(ctx); + if (IS_REACHABLE(CONFIG_EXTCON)) + ret = sii8620_extcon_init(ctx); if (ret < 0) { dev_err(ctx->dev, "failed to initialize EXTCON\n"); return ret; @@ -2352,7 +2353,7 @@ static int sii8620_remove(struct i2c_client *client) { struct sii8620 *ctx = i2c_get_clientdata(client); - if (ctx->extcon) { + if (IS_REACHABLE(CONFIG_EXTCON) && ctx->extcon) { extcon_unregister_notifier(ctx->extcon, EXTCON_DISP_MHL, &ctx->extcon_nb); flush_work(&ctx->extcon_wq); From patchwork Wed Apr 8 20:27:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480871 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4223E15AB for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A43D20753 for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728485AbgDHU2N (ORCPT ); Wed, 8 Apr 2020 16:28:13 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50203 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729431AbgDHU1s (ORCPT ); Wed, 8 Apr 2020 16:27:48 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1Ma1kC-1jpzv402E8-00VxbF; Wed, 08 Apr 2020 22:27:22 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 5/6] drm/rcar-du: fix selection of CMM driver Date: Wed, 8 Apr 2020 22:27:10 +0200 Message-Id: <20200408202711.1198966-6-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:BHGsIuVv5ZbKZcE4TjncqtpdBu8WjZS+2Q1lxqyGkiA2mhZOxWk P/dnbzJufBgPE0K1DKdoofKWfp0z22YhTz+VuyDG06en1W4KOhovhJrv6BugOwEFXqTaTj2 288ntMN6bhI9PumD50NA/n3txC43UpJhfmdGrdxosHRyNYVJgDBMQiwxTTn/uWVFTqjSdUU fDQQqODpLa+nnX9eremjg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:pp2T8S8fwiY=:YFTKAmm3THs3lkgTu/9cJO OlEtbaj4m1Q5rf7W3W0uZLdMofdnYljtx8FY5AetjTPsNapbUFYF/lEmeEIi2ZJ2XntmC8zYC EJ8vhWs3nd3PF4ZiisP0ZuphikEQmE6sMD/MqJ4fMBozRB7Y7Q9WYtgy9LYl4pofjT5ITkfj8 zn1K+ou3M5Zg8obfkcB7h2q53e3Xf0UwPgVqBhex3D/m3VsHxFczoP4Ke5g8FGmAhJCUxAlwL 2PFHFwGyb6KCkVHbnDkhoOeZxvn0QqXK8+45nCfJIvr2AbPnhixWzgQByM2NXOAZEd4teCAz/ qxorUPGpDH1S7dbIj3N3ooaHTS3oi4JQacv8a+RLyyJQ9pwxlazye1rH6RI0Z6gK3MiRFnhZ2 lq9fUUdQg/KctqBHG8a73RVU0VDaP0fy1BjwPBZaFhlWURfyNLxRG/qVhfmA0raUlGneT2iOW He+R/86cyk0/B1G6OZZxXsX5ZBaVdYxOT/CYk3yXRB40jdkw/v8ZTle5gBvZ6zySj1Ad0dcs/ 4iMaS5adZbjp1svnyH2qvzvuB4vAmca9l1RJLzwFCdzSwFMdwNpowt/525p3rQ5hPvavQkS8W 6eOsFHwpp9Kp7ZCoHvnhNwEEvUI7wiYSRg1BO7t3B5OgB19ndMAHUoTgc3lbOxgyhoTXPaX8o tI7K8mzkll+T9iyBn99wcIbTYTEiYhRM1BvmfTtCRyn9H7UWD3WTPba8PPrynVA50MrI7uLly BS8Jy4fz75apY/KbCLbbT54mmCW1x+HAOJaCCcrHcpdZkjz0fj3tWKOz+LDi0Kvmt0qRb5tKd rSVLD4Vzw4UcAzTHMoiBj6bSie1LlISiOrXQ/oOoxrZBCBLNp8= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org The 'imply' statement does not seem to have an effect, as it's still possible to turn the CMM code into a loadable module in a randconfig build, leading to a link error: arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_crtc.o: in function `rcar_du_crtc_atomic_enable': rcar_du_crtc.c:(.text+0xad4): undefined reference to `rcar_lvds_clk_enable' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_crtc.o: in function `rcar_du_crtc_atomic_disable': rcar_du_crtc.c:(.text+0xd7c): undefined reference to `rcar_lvds_clk_disable' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_drv.o: in function `rcar_du_init': rcar_du_drv.c:(.init.text+0x4): undefined reference to `rcar_du_of_init' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_encoder.o: in function `rcar_du_encoder_init': Remove the 'imply', and instead use a silent symbol that defaults to the correct setting. Fixes: e08e934d6c28 ("drm: rcar-du: Add support for CMM") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/rcar-du/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 0919f1f159a4..5e35f5934d62 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -4,7 +4,6 @@ config DRM_RCAR_DU depends on DRM && OF depends on ARM || ARM64 depends on ARCH_RENESAS || COMPILE_TEST - imply DRM_RCAR_CMM imply DRM_RCAR_LVDS select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER @@ -15,9 +14,8 @@ config DRM_RCAR_DU If M is selected the module will be called rcar-du-drm. config DRM_RCAR_CMM - tristate "R-Car DU Color Management Module (CMM) Support" + def_tristate DRM_RCAR_DU depends on DRM && OF - depends on DRM_RCAR_DU help Enable support for R-Car Color Management Module (CMM). From patchwork Wed Apr 8 20:27:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11480869 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23ED21805 for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BAAD20753 for ; Wed, 8 Apr 2020 20:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730565AbgDHU2N (ORCPT ); Wed, 8 Apr 2020 16:28:13 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:47637 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729429AbgDHU1s (ORCPT ); Wed, 8 Apr 2020 16:27:48 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MlwO3-1ivhhR25Ex-00j4la; Wed, 08 Apr 2020 22:27:22 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Pitre Cc: Arnd Bergmann , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kieran Bingham , "David S. Miller" , Saeed Mahameed , Leon Romanovsky , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [RFC 6/6] drm/rcar-du: fix lvds dependency Date: Wed, 8 Apr 2020 22:27:11 +0200 Message-Id: <20200408202711.1198966-7-arnd@arndb.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408202711.1198966-1-arnd@arndb.de> References: <20200408202711.1198966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:6joVxabJuDS2zN5PignIP9zyZK531/9BWLW8G6Y1kfoxuD26fpJ e9TjrS9eT9Ko/YwofV0uvqlzR39kV/5clC3e1cU1XtH9XiRMdS8pY8+PMidq93htFsYtGB+ 2rST/EfwV6XIEX89jrfzlrw1uiIeJ/U9vaNXBxNHd+ymwIvLks+L+zpkB/LFrnUO/RGvcku XhWxpOHWmXxopP4MjfpIw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:V6Hg3hzNJgA=:jAW5mLgmVYFGsGDyp6JaXk Dlvd8CjREs2fojxU42iMYR3PHdV6NrT/CljWmBlPWkxQycRnbtkItT3lT8Odd6ggW9Uhfur5+ 4p1NaqMhG5UaFssj7+7RXYybsDS76nscqwnfSbHXrkweinjBnCc1pDvPFCEbA1A1uZrVJQRAT 8IVxJk3frSPEODrMbDQ274Be//Ts5uVyiCNxRBAJzr35tO7HjuVN/YrOBhltazb5s/yD3+0Nu l+sY7m/m/GeCFgo4cwB3ibxhAzKW7WbXb4pAEITob4YbtEIxThVNhk4xlmhG5iFmH9qa0+9mk aWUDtLw+WN61FFGI5xT11PttDQHEFXL1momPLde43hFjHoC9XIObYaCjB9nGTEYpgsJwf2SPM RjdEuKC4Ld8pz/nJpsBluuGGkDVPzEiY91VDKxaN3l4uEiC4HHlaH29yh34+ANrRXwralZLmk 7VtvAFvWjBrJUVLLbOgvOIQLZL+viu0bdJV2Xww5hjkbgefEGsEW0CijQ2v3qfeRUyZELKGHi 3v8m3T83iUoZy8w4aKYoE8sPDzVhGOq/2FU6MVyyUMxAt1cbmMEhBJUl6SECbms/dR4kHOlhm jROLQPSHz52dxAsQHe9UKWPbn2PKDFiQ3gfcc7R0gXy22Ja46N0wWx0j6bGibiGYkbI9uLv6v F7KPxMoRJYjPHwTvdMOBc4qi1PLZwRUmXJ6eP0B1Yk4mTj9ORNrtvkxb2+y7GDHfvljYoufCk EiFB/wrLOG5bJPih2rNCsRbu4kYaFl8VnEW1ZuefobXZELHLEqUhKNzJyaktefLCrHSEd7bLY CPvoocEN7msNixrDQ9qyTSAYQnjNywPI+GL9PHTYP1XbKe0Ams= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_crtc.o: in function `rcar_du_crtc_atomic_enable': rcar_du_crtc.c:(.text+0xad4): undefined reference to `rcar_lvds_clk_enable' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_crtc.o: in function `rcar_du_crtc_atomic_disable': rcar_du_crtc.c:(.text+0xd7c): undefined reference to `rcar_lvds_clk_disable' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_drv.o: in function `rcar_du_init': rcar_du_drv.c:(.init.text+0x4): undefined reference to `rcar_du_of_init' arm-linux-gnueabi-ld: drivers/gpu/drm/rcar-du/rcar_du_encoder.o: in function `rcar_du_encoder_init': rcar_du_encoder.c:(.text+0x7a): undefined reference to `rcar_lvds_dual_link' Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/rcar-du/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 5e35f5934d62..4bb879f02633 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -4,7 +4,6 @@ config DRM_RCAR_DU depends on DRM && OF depends on ARM || ARM64 depends on ARCH_RENESAS || COMPILE_TEST - imply DRM_RCAR_LVDS select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_GEM_CMA_HELPER @@ -27,7 +26,7 @@ config DRM_RCAR_DW_HDMI Enable support for R-Car Gen3 internal HDMI encoder. config DRM_RCAR_LVDS - tristate "R-Car DU LVDS Encoder Support" + def_tristate DRM_RCAR_DU depends on DRM && DRM_BRIDGE && OF select DRM_PANEL select OF_FLATTREE