From patchwork Mon Aug 13 21:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 144040 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3540383ljj; Mon, 13 Aug 2018 14:19:57 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyZmx3+8ZCdu6N2qyDImxyitjGmBFBEBAjfaQHI2pW+5chcAFbSXh0zMsOc+A84n1OnsR+O X-Received: by 2002:a62:e18:: with SMTP id w24-v6mr20619220pfi.145.1534195197828; Mon, 13 Aug 2018 14:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534195197; cv=none; d=google.com; s=arc-20160816; b=OlV953YtKCFQObuVNtp5xd2hKonHn1m4cgRYUABz1Fekj5/E+4kGHid3P5chRTiSw1 LE0sngbQtXg4ovdvaNztaS4+ElTJ/vhNCXxsZxnfgvOn/hqDIhtvvDZyyAnObAtgpFxd UdePwrk+nx7k4iyJXqGVVmAZoDCZ/OoT69Ywmj52NAlVFUbPSxFouBsz+c7565rVEwZR gNnDIEkDPM6l51vqchsm2njSFGx3dmUXM5/jHpUhO/txnwYqkOp8UjM84RO3tnjUcOtP ZheD5gLGXtK7YL12hzxxqD6Oyax4/VhQyuMcBcGjrL8iuzhnClUJkQHjzMJfjAtdDIcD /2Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=WpEld5jld0l0ppuSj3k5sWrfMG7k8J28jkSsX+C8nJs=; b=npFP6rxJNFkKJIcW8LLYqUx6+LKXQKNH+llm7nOKrZFJg6CBBF+t9+3kb8FCoXoWNH 0+bOFMNI0euTAmQWj3KjZrsa/FynKdS2K/4debJIPxeAUX6AQCz3Ps52CItrx+zMXDjs R02OQxOrbcMJvXvlJVzxsr1NorwWxuPZHcGywKow2KtHA0MO0peKiifFjMurWs3H87sY 8aqKgROYlQyp7SJtKgYJLN/4ojhqqevYs6PCB8vwk3OJtvsb0sI/9PEQRvhNQukO6D+D 5d2bXhhQozn6UechYqgtN05FtQ5DFAKkZWrWAYkl2IW+SE7pWS8C4y6lorUKSeNtNAEV 1rCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y187-v6si19673683pfy.151.2018.08.13.14.19.57; Mon, 13 Aug 2018 14:19:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730417AbeHNADw (ORCPT + 31 others); Mon, 13 Aug 2018 20:03:52 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:36047 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbeHNADw (ORCPT ); Mon, 13 Aug 2018 20:03:52 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MHaGK-1fsd6G3pxE-003QeE; Mon, 13 Aug 2018 23:19:41 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Bryan Whitehead , Andrew Lunn , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: lan743x: select CRC16 Date: Mon, 13 Aug 2018 23:19:21 +0200 Message-Id: <20180813211938.2375199-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:aerfOqeGt7V2aMaBJ6hEkWk0PoIwAGxI3/K1N9nDEgRmZx7K0OO 6YuL8P27a+Ujquv+Y7kUKcmlfDtH/7uWZtxiomhn6I7LIiFji9gohoDaCn2j3HHORKZCi2P CVfdiuugMdWnp4pHQtKN2oQGbuRHNb2YH/ysEzfM1fBWakUXjVmbjTbwLCUim+Vsub3Wn8R ojKXzwuA9p1mnDFbcKxFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:WoNWIU4j55k=:Qi+ky8Dm8WJLaMTkcdzfQS ViQyStUnvq5OjpTekqDlkrVdL5YaYYSUQu2WxGKSabjMUZjKipGCLDPe0wFvJMv4DXmOElM6d +oB/Er/4WorOhUKZL066WLRAf1Gll81osgp5LI+SOUr5aIQ9ZeIGttnC1BEDJTNh3/Lw/+4dz eHs4FcA/qxYwLPNjWqkbNC1X90ISIJGzxcIrLEl5xPkcoQiiM/9Dfg/NJdnlbroff7LMKpau9 Ai6WO1Vloo6cljZ3Ia4sxIM/+8vNu9qn9jAizXnOUang7j5FOwte6JwSeI6v+ysZhIn9KxYp0 0yXYXVBFQVKO1Zi1CBeho8UbLhrHa5Nb01BoEhthb+w8Nmufn6UwgU9MVUoeJSfxyMNQUa0V8 3gyNGH3lYUOhAGoLzRGtdCbuwbymZLjPehMz+TWwm+RHgbFTxNd/NDBoPOjpUxvP2xPV6Amxq CmD4bbpjU/IS8hCuDGvKhYuSCiWSVNlq+tfYpw+EHFAut5JvKVbz4aBSF6bYiLc5ereGEctHr NfAXh/wTMtCakdaJfj6o7jXqBCrcc+Esyzab3aB38TuIBBF4unADLXjMf1miz4gVQkIGFzInu evMrUBqQUdCHfxvIaXfiQFdEuDrplVXxMpTfVgIdJCAQ7toGdUvfveN1P+oOyStmPYum+Pksi LzWuMZ2INpVFPhq58QMOvz5o49R2nVk+7cRtKYFWbkobwjVi5f0izBBNJLuRqG6aM5nk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org lan743x now fails to build when CONFIG_CRC16 is disabled: drivers/net/ethernet/microchip/lan743x_main.o: In function crc16' Force it on like all other users do. Fixes: 4d94282afd95 ("lan743x: Add power management support") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/microchip/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.18.0 diff --git a/drivers/net/ethernet/microchip/Kconfig b/drivers/net/ethernet/microchip/Kconfig index 71dca8bd51ac..16bd3f44dbe8 100644 --- a/drivers/net/ethernet/microchip/Kconfig +++ b/drivers/net/ethernet/microchip/Kconfig @@ -46,6 +46,7 @@ config LAN743X tristate "LAN743x support" depends on PCI select PHYLIB + select CRC16 ---help--- Support for the Microchip LAN743x PCI Express Gigabit Ethernet chip From patchwork Mon Aug 13 21:19:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 144041 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3540575ljj; Mon, 13 Aug 2018 14:20:11 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwK0kth4IvEqTobsLWdHlTTxf9mn1fMKAaEeawT837DviGYC41cdORcNW0ZLlQHSJTJToRl X-Received: by 2002:a17:902:2f84:: with SMTP id t4-v6mr17886019plb.87.1534195211645; Mon, 13 Aug 2018 14:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534195211; cv=none; d=google.com; s=arc-20160816; b=VmVDPPCBdCwhmkXjhUo73xwluKaT1oHisXtXEfTDtUF5xB+gZvcwlJ6+WRIlKwKyEt rVBpTpDFMY05x6RXEgubf/8agySoU94PwXD1npnnXHWiVNPiqVnYAqJ9MAfg7mVMMttN EXdbLq/JbUBcHDcGQmRIUAGOJT82YspoYqrqVHCIkLXFsTPuH3ET60/zGJIEmZFd8SzW 0gZL39pn2C066oaIQaTH0H58tvsBuKS4JXvxa/ED4pN4/QsJMnKHxipLe/kYhP8w2LOf rdf/po26e15xMP1pSqqKDrFz7lGAPWtwVA1MAWc/NXwJKyMelOpsLayXxZ0iG3N5dgvc 9UqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=UJsgCKq9Ct07PK1ZV7coO7wdpk+t8hM3kHPwWLp707Q=; b=YO5hkQwp3S4MObtFDm1LVsum2ICDG6wCRYec3+JgNCF36UUJ8+/BCNkSm8w+z+H1xm Bt5M7U67tqzYCKm2gpmUASjaD+z8pjQC28B2t/UAlY/4/iomvzR0PnnB0HVJi1m2C3ol q+BdVlMhrVi6Gtcsu8h7QK7y1cj51UF+iBDjns5a9xc5KpG0Q6DDxLvUAvxEZeEUhY4I /yPdPKEqxk/16s6GtI8xHqtNZDG3ctfRA9z7gmNHl1WYm7D/jwwx+zHdTl1zNunOMplj kuQPHNAQRDrhClgOX/K24tO5FheIDBUA+UVRcvlERUB9IliLnwVumcuAbOndS5tz3z74 H3WQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g80-v6si20413766pfk.53.2018.08.13.14.20.11; Mon, 13 Aug 2018 14:20:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730543AbeHNAEG (ORCPT + 31 others); Mon, 13 Aug 2018 20:04:06 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:45385 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbeHNAEF (ORCPT ); Mon, 13 Aug 2018 20:04:05 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0LqWMz-1gJhCL24ZN-00e7JT; Mon, 13 Aug 2018 23:20:00 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Bryan Whitehead , Microchip Linux Driver Support , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: lan743x: fix building without CONFIG_PTP_1588_CLOCK Date: Mon, 13 Aug 2018 23:19:22 +0200 Message-Id: <20180813211938.2375199-2-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180813211938.2375199-1-arnd@arndb.de> References: <20180813211938.2375199-1-arnd@arndb.de> X-Provags-ID: V03:K1:moEVRf07NMLFxf+iDqWR6M0Hs21tiTq49UasZD4a0HDGzIIP8TC kOLzqd7Z7y5C74spOjG8IhGVHZy73rqrm+IoXOflR6EvPv7ILobJSO3Pzt3g6pC2Ks2Gpmn zijj5b9dhPlNN4C8P9rTl2qlnEVjE2JTaxOEzbRK2d/g7UvugyyHNVH6/+6zygnwyuGo43N tljhqK3kPymBEby7MVluQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:lh8ARA3Pq7w=:gH8RVdv8ndlPsph2F8UkIk 20RLrJnnbYmruKA80QjNXO2hGphqhdrcsSbeuQkeY6cVbhOrolzkPWgwjfb4i59XcDPiRSP3r bY3M+S9HneNULddbJTpb6CHvyj3gbebzcH6P/jqk+AZpZu94SjuXRQz36UHHUiTVqshliyTP1 WS5bjYziB1teFvpO7B+SuF9+da+pQUTnv/KoDrOwuxVa0m96Ge4FFDzDLE7m5ymLXDmESpfjG QjFWcJTVJ8Je+XPLYm6aGVVKPLAFd9QMBipXLr5rXAro/vZPC6PajMAySWTS+iH+J5waUAgJw +waWpL8zr9/WZH1jkuTTtjytiiniRvhfSRAFJ/ZPuTeIUEgxw/khbTkcqORv+d132L4sUNYTT /6f63knPiqJSIBK8UfECyk7/NkdaqnoI2dtBOoJ3ZoMbuPGmvtjTo2pmQ2lqEroTjDyDGsM3k xpAhJFeBozWdvLwiLAhIrvYyPhZlvEEkIC23YmIoIDjTNJdrJWJ2LUsdcDrh9LmWEht7I6sVX E8vaZinmUDkMqy9vZqipWBJYb4YykFI9D5XFMrjWFnmhgBMAogcPgv4e5esGLeFxQCZ5vwM/2 Spj/XfE6xm76/kHmsAPYpBvyELtAWCqz0Kq+VXVUmPHRJwsoIWOgBzEGIwLUzS0u8ya5OAJWW 4YrIg0G6jNmbDUc82havqzriaQkN9HJQdo3qwl/zjFVmfneTbW7Se+Xw//QGu7HFbGnc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building without CONFIG_PTP_1588_CLOCK results in multiple failures, this was obviously not well tested: drivers/net/ethernet/microchip/lan743x_ptp.c: In function 'lan743x_ptp_isr': drivers/net/ethernet/microchip/lan743x_ptp.c:781:28: error: 'struct lan743x_ptp' has no member named 'ptp_clock'; did you mean 'tx_ts_lock'? ptp_schedule_worker(ptp->ptp_clock, 0); ^~~~~~~~~ tx_ts_lock drivers/net/ethernet/microchip/lan743x_ptp.c: In function 'lan743x_ptp_open': drivers/net/ethernet/microchip/lan743x_ptp.c:879:6: error: unused variable 'ret' [-Werror=unused-variable] int ret = -ENODEV; ^~~ At top level: drivers/net/ethernet/microchip/lan743x_ptp.c:63:13: error: 'lan743x_ptp_tx_ts_enqueue_ts' defined but not used [-Werror=unused-function] static void lan743x_ptp_tx_ts_enqueue_ts(struct lan743x_adapter *adapter, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors drivers/net/ethernet/microchip/lan743x_ethtool.c: In function 'lan743x_ethtool_get_ts_info': drivers/net/ethernet/microchip/lan743x_ethtool.c:558:19: error: 'struct lan743x_ptp' has no member named 'ptp_clock'; did you mean 'tx_ts_lock'? Those #ifdef checks are hard to get right, replace them all with IS_ENABLED() checks that leave the same code visible to the compiler but let it optimize out the unused bits based on the configuration. Fixes: 07624df1c9ef ("lan743x: lan743x: Add PTP support") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/microchip/lan743x_ptp.c | 15 ++++++--------- drivers/net/ethernet/microchip/lan743x_ptp.h | 2 -- 2 files changed, 6 insertions(+), 11 deletions(-) -- 2.18.0 diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c index 42064fd2beb5..66e7568a0e7c 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.c +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c @@ -4,6 +4,7 @@ #include #include "lan743x_main.h" +#include #include #include #include @@ -139,7 +140,6 @@ static void lan743x_ptp_tx_ts_complete(struct lan743x_adapter *adapter) spin_unlock_bh(&ptp->tx_ts_lock); } -#ifdef CONFIG_PTP_1588_CLOCK static int lan743x_ptp_reserve_event_ch(struct lan743x_adapter *adapter) { struct lan743x_ptp *ptp = &adapter->ptp; @@ -761,7 +761,6 @@ static void lan743x_ptp_clock_step(struct lan743x_adapter *adapter, mutex_unlock(&ptp->command_lock); } } -#endif /* CONFIG_PTP_1588_CLOCK */ void lan743x_ptp_isr(void *context) { @@ -890,7 +889,9 @@ int lan743x_ptp_open(struct lan743x_adapter *adapter) PTP_INT_BIT_TX_SWTS_ERR_ | PTP_INT_BIT_TX_TS_); ptp->flags |= PTP_FLAG_ISR_ENABLED; -#ifdef CONFIG_PTP_1588_CLOCK + if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK)) + return 0; + snprintf(ptp->pin_config[0].name, 32, "lan743x_ptp_pin_0"); ptp->pin_config[0].index = 0; ptp->pin_config[0].func = PTP_PF_PEROUT; @@ -932,9 +933,6 @@ int lan743x_ptp_open(struct lan743x_adapter *adapter) done: lan743x_ptp_close(adapter); return ret; -#else - return 0; -#endif } void lan743x_ptp_close(struct lan743x_adapter *adapter) @@ -942,15 +940,14 @@ void lan743x_ptp_close(struct lan743x_adapter *adapter) struct lan743x_ptp *ptp = &adapter->ptp; int index; -#ifdef CONFIG_PTP_1588_CLOCK - if (ptp->flags & PTP_FLAG_PTP_CLOCK_REGISTERED) { + if (IS_ENABLED(CONFIG_PTP_1588_CLOCK) && + ptp->flags & PTP_FLAG_PTP_CLOCK_REGISTERED) { ptp_clock_unregister(ptp->ptp_clock); ptp->ptp_clock = NULL; ptp->flags &= ~PTP_FLAG_PTP_CLOCK_REGISTERED; netif_info(adapter, drv, adapter->netdev, "ptp clock unregister\n"); } -#endif if (ptp->flags & PTP_FLAG_ISR_ENABLED) { lan743x_csr_write(adapter, PTP_INT_EN_CLR, diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.h b/drivers/net/ethernet/microchip/lan743x_ptp.h index 20f2223024dc..5fc1b3cd5e33 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.h +++ b/drivers/net/ethernet/microchip/lan743x_ptp.h @@ -49,11 +49,9 @@ struct lan743x_ptp { /* command_lock: used to prevent concurrent ptp commands */ struct mutex command_lock; -#ifdef CONFIG_PTP_1588_CLOCK struct ptp_clock *ptp_clock; struct ptp_clock_info ptp_clock_info; struct ptp_pin_desc pin_config[1]; -#endif /* CONFIG_PTP_1588_CLOCK */ #define LAN743X_PTP_NUMBER_OF_EVENT_CHANNELS (2) unsigned long used_event_ch;