From patchwork Fri Dec 16 09:19:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101404 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp148086obb; Fri, 16 Dec 2016 01:21:45 -0800 (PST) X-Received: by 10.99.245.21 with SMTP id w21mr3905535pgh.5.1481880105050; Fri, 16 Dec 2016 01:21:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k21si6913647pgg.84.2016.12.16.01.21.44; Fri, 16 Dec 2016 01:21:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760204AbcLPJVi (ORCPT + 5 others); Fri, 16 Dec 2016 04:21:38 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51446 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760190AbcLPJVc (ORCPT ); Fri, 16 Dec 2016 04:21:32 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MYekE-1c45DR1jaE-00VSQy; Fri, 16 Dec 2016 10:21:11 +0100 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Grygorii Strashko , Thomas Gleixner , Nicolas Pitre , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , WingMan Kwok , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 3/3] cpsw/netcp: work around reverse cpts dependency Date: Fri, 16 Dec 2016 10:19:59 +0100 Message-Id: <20161216092017.2560717-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161216092017.2560717-1-arnd@arndb.de> References: <20161216092017.2560717-1-arnd@arndb.de> X-Provags-ID: V03:K0:T+XphN2sMgYktxaCQFrW4MwWN3v9OHS4IOcoZyzufRfvjT5UeBy naMvMuJ0/ZQohrRFkLF4lFfukR0GokUs8vutfbf5VKlwmDP+1iWLHggP7Axy06rs8ANnUDR IiTD80noj4sncyi+KIpxey19K/1bA5ynTT4Ib3X8WqEnv8h01LgamZYSUfr/TKTQoNny3ye tiaA15vHtprjGNcRZQoCA== X-UI-Out-Filterresults: notjunk:1; V01:K0:S9L8IvZM4qU=:8b7u5p8CmOCxAp4ZC0bcF+ hjPpSL/3KoZJQQEFrnCiFgtAMzCoCdPhyhz5dTSJTLd6dwKwe13IzUsnkc2YbLnO6Q3mqBupK bZ+H0h7as+ilaxC2TR8dpfFz+r3qRWZkx+GP5/CEemcJQO62nT15EzxcT1E6KTxdPRbV9B6KJ z7HQv33vgQN3gppXWq5EErNasUVm/IJmC8cKknRinv4aht++vn2C6KlXsWxyqbTSYeA9MJcOi bXNbHMM5FWY/yUrCRZ2Eby6hTDe1AmHeEFn8DBuleREzAdWFl7ya/Nlh2Vy1QwAqkbmG+mbkF mMcpz+V+rIVKz23rbJpkDAWVzny0USMZz3Av3BQmiWzXTJ/qw/toYOF4ETwBUu7tHNgbh2mjQ RD2y+Wq4/F/sMHZEi7k5dGBBSj4S+8FeeNo7ChY1BxwMnasZAkN5KjBKd+hnZ1Y5HQWogtFOh uUkNI1NKTf10SEOay8uCE32PgutnCfGLUL6dmPt2ihFfn3MNiUiX6exVR2dM9ty5XmBqCmSTk PPOPDuF8GUqMn6TkGA9k/igVBDcnvuYz19P0yViuidf0HBLn3s4p+H5WRTyH9V/LX0DDz8/pl aetCFr2RJIYsP8nmrNf22oABSxqvaO+cNqYr8a2WGsKhxBRTV+eBfPVxnokIIPwn5oc+lqxuP Ajaz/1MlCz7/aAaI0GYmKjhBQ9MeNXKe1G57AWs/7WMnCTrPFeOwWp91H0h4O0vsCJhw= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The dependency is reversed: cpsw and netcp call into cpts, but cpts depends on the other two in Kconfig. This can lead to cpts being a loadable module and its callers built-in: drivers/net/ethernet/ti/cpsw.o: In function `cpsw_remove': cpsw.c:(.text.cpsw_remove+0xd0): undefined reference to `cpts_release' drivers/net/ethernet/ti/cpsw.o: In function `cpsw_rx_handler': cpsw.c:(.text.cpsw_rx_handler+0x2dc): undefined reference to `cpts_rx_timestamp' drivers/net/ethernet/ti/cpsw.o: In function `cpsw_tx_handler': cpsw.c:(.text.cpsw_tx_handler+0x7c): undefined reference to `cpts_tx_timestamp' drivers/net/ethernet/ti/cpsw.o: In function `cpsw_ndo_stop': As a workaround, I'm introducing another Kconfig symbol to control the compilation of cpts, while making the actual module controlled by a silent symbol that is =y when necessary. Fixes: 6246168b4a38 ("net: ethernet: ti: netcp: add support of cpts") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/ti/Kconfig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index 366e29ff8605..c114efcd1575 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -73,8 +73,8 @@ config TI_CPSW To compile this driver as a module, choose M here: the module will be called cpsw. -config TI_CPTS - tristate "TI Common Platform Time Sync (CPTS) Support" +config TI_CPTS_ENABLE + bool "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP depends on POSIX_TIMERS select PTP_1588_CLOCK @@ -84,6 +84,12 @@ config TI_CPTS The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the driver offers a PTP Hardware Clock. +config TI_CPTS + tristate + depends on TI_CPTS_ENABLE + default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y + default m + config TI_KEYSTONE_NETCP tristate "TI Keystone NETCP Core Support" select TI_CPSW_ALE