From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165713AbdD1PDg (ORCPT ); Fri, 28 Apr 2017 11:03:36 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62563 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162863AbdD1PDc (ORCPT ); Fri, 28 Apr 2017 11:03:32 -0400 From: Arnd Bergmann To: "David S . Miller" Cc: Arnd Bergmann , Grygorii Strashko , Nicolas Pitre , WingMan Kwok , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH] [4.11 regression] cpsw/netcp: refine cpts dependency Date: Fri, 28 Apr 2017 17:03:58 +0200 Message-Id: <20170428150358.1537030-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:OIogzhQ8XSfAaDOHo+Q4pBlO4Bz2ZfmNI3wOUHHJVnYC2afGhSf 0Pis12nAiBOdXE1VbJAVGmrD6MiZ5vPlNe2HoRRo7het6DzKk9ON/Bed7BNLjKDEMDky6ws +2hpJr36ySXVh7Nzxi1NiG4Vc1iB2+rWcnWdzceN19Pq84pzHRfprwWp6rE6K90aInxjwEa FmCZhnzeIOtdGAwMJ9kgw== X-UI-Out-Filterresults: notjunk:1;V01:K0:4I+nb3nSnqc=:2OViAMaZIJ0kMldkMqQ4bQ nXSsxRqGuBIHDZ9P9yvohoURZpRmekg2V6DIwxr/Ly90inlss/Cv1HTZzWvIsvzH1QPTTnPkG S1Lo+2i1LXpizvzCYHJpFTbVOGvzVaC5r7R0xyPGYoBw7y+dWhNShDfQGpWdZJRoWMO3ZCiEU D41m1oL+doM7OIMLG0Ejo72rmno3tIIRY1JY0u6Bo8X7Md4GueEtCyA6xwtNCwiTe1tVyBvBs zb25V4LqFalqvWb5oFtDEFcCHf5WY9/QW04509zRyjy065n67kT8QdvpBAMDYfeLy511Hgpzp +dHBK+pexY3xkKgcMQr28Usas01PWh1znXCOa8VJnXEWY6EofXuzH2HzhxGRsmxMf0mbrwQxq rL3031ZmwHFTiwH8JunIo1xNuPGW1XCkuu++SK5/0nrDfXcWxx2vYx/fl+8Qu0ocqJc5rARsK x4VPchQRgJWs+noZn+OlX413Mp8wbx39do2gKMongPGRHu24CN17BMG1HlRcpZ0g0zi3FVM6d qwZZcI5lKeHs82vVxHjlLVEvuwipwVx09E89yIWggIRRkDQ6sxtkCCcTlY/3Os+HM6j93PPk3 +7Xx87HQhj5xTPr5NR0L7ZfG1bupuoij2zfndqBpYTXtMCwWRhMyJ1B4qeTjdM0yONI/5kffo EoP3gdSmtosDkInllipBadQQMjbIfFm9phGsyjVzp8/NTpe1kq0eLt0TIOPWOpKnU7WU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tony Lindgren reports a kernel oops that resulted from my compile-time fix on the default config. This shows two problems: a) configurations that did not already enable PTP_1588_CLOCK will now miss the cpts driver b) when cpts support is disabled, the driver crashes. This is a preexisting problem that we did not notice before my patch. While the second problem is still being investigated, this modifies the dependencies again, getting us back to the original state, with another 'select NET_PTP_CLASSIFY' added in to avoid the original link error we got, and the 'depends on POSIX_TIMERS' to hide the CPTS support when turning it on would be useless. Cc: stable@vger.kernel.org # 4.11 needs this Fixes: 07fef3623407 ("cpsw/netcp: cpts depends on posix_timers") Signed-off-by: Arnd Bergmann --- Adding the Cc: stable in case this doesn't make it into 4.11 any more. --- drivers/net/ethernet/ti/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index 9e631952b86f..48a541eb0af2 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -76,7 +76,7 @@ config TI_CPSW config TI_CPTS bool "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP - depends on PTP_1588_CLOCK + depends on POSIX_TIMERS ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. @@ -87,6 +87,8 @@ config TI_CPTS_MOD tristate depends on TI_CPTS default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y + select NET_PTP_CLASSIFY + imply PTP_1588_CLOCK default m config TI_KEYSTONE_NETCP -- 2.9.0