From patchwork Thu Sep 27 10:02:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 147697 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1792277lji; Thu, 27 Sep 2018 03:03:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV63EdgqxYbVEgYeg7GTIPDMAK1wNjJXUfoM6XH8CuLWhUPxKZV6KgW+eD4J8i6GdiIvSyOKm X-Received: by 2002:a17:902:f209:: with SMTP id gn9mr10121527plb.173.1538042616384; Thu, 27 Sep 2018 03:03:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538042616; cv=none; d=google.com; s=arc-20160816; b=fxMVxfMEffFiV60BgsQYnDEXJYbOqfKxwaixpoI6Ugs8/+Q7VkJF1xGEXXhultV/Th GPxlPp48siNNi2noeIcTJChykinTe+G2w0E58oHidzQQz2R+kG7juAJev6O98bPGttL5 FMITPMtQAZAmSnZIymUYH0oK7eFz8rKeNDmH2klKoDfEuXPEp83dMBiVuAfjd+SuF64b NvQS+yntJz7wa20hAqne131z8R3EEMJqmo7jKvJDYA2D9/oySjMv0vVLMLk+IO/CK7ty AJPDUDeKiWA9l9EZRJlWuLs0q0F7WjNsK0vdgNkLRy4KfuuiYYaMrTEjKALjjux2tpBD 4CxQ== 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; bh=TMn4GKuvKlRJXnKL+JcBM5H90xyptCcTVIPO+v8k+Gw=; b=aThnPjTgQmslqk9x/1XUyeGpIivcrfBOV3pUpvDjXas990v3/eHP1NVU5aVubf4Ybg 77kPZoWaC+lOZaHIFzdHwXlLr5ZX04JOHbvvBA2H7NP1JDNkeH1JQU4g6EPcSPQsyTAN NfuMQecMu60Vnt/JZS/dFwuADVw2UQ7BkXIgQNwNT6zyY6GnT5iTsJW4NZVPXReQjwnL wmeIOoRmMBIkLBz8QzQEJP1GOsKC8VbVNHT56qX/o/Q8PDnkXwaX6nIFvWcGCsm+zToA Gaqgr6PK6MLwFTItvmZDd/uFR4HZj57Z8wrIV5sGyScDB8qaL/kBOPRcrmvuBqO6feDE m7Sw== 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 k25-v6si1682449pgn.375.2018.09.27.03.03.36; Thu, 27 Sep 2018 03:03:36 -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 S1727388AbeI0QVD (ORCPT + 32 others); Thu, 27 Sep 2018 12:21:03 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:53569 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726790AbeI0QVD (ORCPT ); Thu, 27 Sep 2018 12:21:03 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MCJzI-1fxBPO3AGo-009OVO; Thu, 27 Sep 2018 12:02:48 +0200 From: Arnd Bergmann To: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: dsa: b53: Fix build with B53_SRAB enabled and B53_SERDES=m Date: Thu, 27 Sep 2018 12:02:38 +0200 Message-Id: <20180927100244.692546-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:UYHFbW7zQ7Is2ixgHOUkbqFpu2QSseoUsKjoB69Pm7Zb8FWvuWY c1Gi2aiHZxncIvUbh/je6HdnSou2AAVMHgT6QuDTnMnatWTj+UEmKUnplouXaJ89ikYIdw0 1Je+e8XDlHI4Suhz+j68/gd0zxJw56qoN5U2VoVE4sxNiKVnlqmLiELtkrRjvhUhAekiL/6 r9q+agZEDgwp13YvcGiFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:gyEh4GGfObw=:95/gavPNslR+zQ5CS/jG5R ZLc2+MxplGzG4rzSuzjYl2QtTbKM+Qree4WLpGBbeV8lYi5cVEWwmgTy/StzGDtuqMacuYO9R XgtTihTw6JVheTjWMHzztv0oq+Xaf/kIMHbdhRQMzZWTjAp0D5vHJwrTW5stG4WGwCON2+TBn gKFi3Ssex4mUKU9Y+mksvBM2DZ0yzuz3WNYUl0Fe0rjpHpAqfJTjq2WPNARJa9VvLjrRl+Hau rKmpqq+TK//t36bLvqYiMRrtBGnILRYM+8u/dY1dZCWOhhpyL/q2TIpBonmW+YNjH1aUXYJGR AHf78F/T3uDSjNUtWXPBteU29eyi2yyOZQm5BibKEsvGWDPTLuKYBjriwYZE5ti9v58T/2zQb l3iqEeML026pskdclP0tx78XUOE+J49l9SqLQmlXFe38Ak3F5ylX8iCFSUq+YG/9ksXu46eFa aRKLHaSy54mFhkMPAb4wQAVTbmgWZGFqpiNldCxTAIsppYLOFtHZf0Vu6sqRzpoJjmcWnO1Sv 0l2VIdmlBAHfDxx138BFLU/1CVdQTDqymjr86y9vnkcG3g2kADsZMyVB4Syxz1pZJpH2TfvVD B+onqPu5KekMMCz7yheRCIodZhSu+qojt3U39s80Mc0ADP4LEWTLI2BDZNkHe/ssILV1/nBIq B8MKTuCqLtt5i5nFrs1mgx5reLJaHxYcCAaLKK+Qgpek/7XjpvPhZXtMAuWwvksaEIPk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When B53_SERDES is a loadable module, a built-in srab driver still cannot reach it, so the previous fix is incomplete: b53_srab.c:(.text+0x3f4): undefined reference to `b53_serdes_init' drivers/net/dsa/b53/b53_srab.o:(.rodata+0xe64): undefined reference to `b53_serdes_link_state' drivers/net/dsa/b53/b53_srab.o:(.rodata+0xe74): undefined reference to `b53_serdes_link_set' drivers/net/dsa/b53/b53_srab.o:(.rodata+0xe88): undefined reference to `b53_serdes_an_restart' drivers/net/dsa/b53/b53_srab.o:(.rodata+0xea0): undefined reference to `b53_serdes_phylink_validate' drivers/net/dsa/b53/b53_srab.o:(.rodata+0xea4): undefined reference to `b53_serdes_config' Add a Kconfig dependency that forces srab to also be a module in this case, but allow it to be built-in when serdes is disabled or built-in. Fixes: 7a8c7f5c30f9 ("net: dsa: b53: Fix build with B53_SRAB enabled and not B53_SERDES") Signed-off-by: Arnd Bergmann --- drivers/net/dsa/b53/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.18.0 Acked-by: Florian Fainelli diff --git a/drivers/net/dsa/b53/Kconfig b/drivers/net/dsa/b53/Kconfig index e83ebfafd881..d32469283f97 100644 --- a/drivers/net/dsa/b53/Kconfig +++ b/drivers/net/dsa/b53/Kconfig @@ -31,6 +31,7 @@ config B53_MMAP_DRIVER config B53_SRAB_DRIVER tristate "B53 SRAB connected switch driver" depends on B53 && HAS_IOMEM + depends on B53_SERDES || !B53_SERDES default ARCH_BCM_IPROC help Select to enable support for memory-mapped Switch Register Access