From patchwork Fri May 5 19:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98690 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292818qge; Fri, 5 May 2017 12:48:38 -0700 (PDT) X-Received: by 10.84.178.129 with SMTP id z1mr1957159plb.44.1494013718156; Fri, 05 May 2017 12:48:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.37; Fri, 05 May 2017 12:48:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755645AbdEETsf (ORCPT + 6 others); Fri, 5 May 2017 15:48:35 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:65031 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsa (ORCPT ); Fri, 5 May 2017 15:48:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mhqzr-1dTSlW3CTr-00MpXa; Fri, 05 May 2017 21:48:25 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 52/87] net: tulip: turn compile-time warning into dev_warn() Date: Fri, 5 May 2017 21:47:10 +0200 Message-Id: <20170505194745.3627137-53-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:lvSX31jUuUFK8I2rppuRECbjFElgLjEQtOz5+khYrW45lqgMrwO MaHYJv3KMuozdrch7BhpkJDrbZSqNgdnKeYwq6Y3aX/653oriLTzMwDbZMw0I8gevvcEKE7 DuB9qgw7GjtosIPBmCVvw5ThXobY0akfp4gWQsuSuuBVMZNFQLHgzTvMgI+aBFnK6oLd05E Jw78KyQe9n3yMAT+QmT4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:QFAJLiXPf30=:/WmBRd5vAHgTLfIZcbasYF D0eWjgkYsACNGk6ipcZrKqnae4JhKvMcMr+To8On/ksWdx8ZUkkxqcX3vNVju2NhPc8coOe6O Mxa0xyTyQbXzNllK4oogZdIdv2KStUGGYhvaCPupdfuTBXPA61GpoUObxvnE9Nr8v3ed3+1d/ GanU6eE3iHX0wuivkcxrQoO0Nf5aM92hc6KZLzy9nFKEZjDBcSP+Ln291EX2PgirSSPWCOGhQ GOfbSK5dxLYklt5X5mU9ILvwjWnA5tz6M13esq3s17q3ujh0Nhmjx4cZ48gQpvBBSoKI1gq5Q GG/LCBAZsslOusGthhh1Y5+mWl9uZiPYn2CM0AXB/xy9Tpy1KDUsNOfKN2S0vqqezk33dt+S8 FJ2GiRKxfJzgXpM75tC++oiGxnq569zS1WqTp+3ELewKeHXsefVckz/9a6rh6twZ4OYJsQjKX K3SmG8c1Yi/jqeFE4fiLLwBdOCc+2e1tcIB+2BE6cPBWpzpdUePWiEMYyeSitfS9p/cFLrntZ cRFSUQn8F5XWEyY0PhQf8oTY/tyLBdBON788NhJYEai4IZq2WhWsvR4EzE18xK2BeA7E6hrn7 +459VP2CM5j8UP8pXqZKaVPddcU6m2M9khtTdgT9uOkcuMTaGo/NMZ87aUwfW27zGdW5ZvVGK GeO0XZHpJ0IVj6K873fQM35xs3q/gSWGW4og+GBMaQBZp1DkjtwknWQ/03oh++wTPfMI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 738cc2bfd9b0858122a60c07f228ec8807592602 upstream. The tulip driver causes annoying build-time warnings for allmodconfig builds for all recent architectures: dec/tulip/winbond-840.c:910:2: warning: #warning Processor architecture undefined dec/tulip/tulip_core.c:101:2: warning: #warning Processor architecture undefined! This is the last remaining warning for arm64, and I'd like to get rid of it. We don't really know the cache line size, architecturally it would be at least 16 bytes, but all implementations I found have 64 or 128 bytes. Configuring tulip for 32-byte lines as we do on ARM32 seems to be the safe but slow default, and nobody who cares about performance these days would use a tulip chip anyway, so we can just use that. To save the next person the job of trying to find out what this is for and picking a default for their architecture just to kill off the warning, I'm now removing the preprocessor #warning and turning it into a pr_warn or dev_warn that prints the equivalent information when the driver gets loaded. Signed-off-by: Arnd Bergmann Acked-by: Grant Grundler Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +++++++-- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 861660841ce2..eab3142bd795 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -98,8 +98,7 @@ static int csr0 = 0x01A00000 | 0x4800; #elif defined(__mips__) static int csr0 = 0x00200000 | 0x4000; #else -#warning Processor architecture undefined! -static int csr0 = 0x00A00000 | 0x4800; +static int csr0; #endif /* Operational parameters that usually are not changed. */ @@ -1982,6 +1981,12 @@ static int __init tulip_init (void) pr_info("%s", version); #endif + if (!csr0) { + pr_warn("tulip: unknown CPU architecture, using default csr0\n"); + /* default to 8 longword cache line alignment */ + csr0 = 0x00A00000 | 0x4800; + } + /* copy module parms into globals */ tulip_rx_copybreak = rx_copybreak; tulip_max_interrupt_work = max_interrupt_work; diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 62fe512bb216..345f2fe8755c 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -907,7 +907,7 @@ static void init_registers(struct net_device *dev) #elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) i |= 0x4800; #else -#warning Processor architecture undefined + dev_warn(&dev->dev, "unknown CPU architecture, using default csr0 setting\n"); i |= 0x4800; #endif iowrite32(i, ioaddr + PCIBusCfg);