From patchwork Thu Feb 25 14:38:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 387219 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp365830jap; Thu, 25 Feb 2021 06:41:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPT3ta8e03zpTUmtK96rlJXswvqsWirxcooOB3uVfBM9aR/iOKGtLlaE/ynmp12ZCRmi/h X-Received: by 2002:a05:6402:22f3:: with SMTP id dn19mr3285142edb.238.1614264086297; Thu, 25 Feb 2021 06:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614264086; cv=none; d=google.com; s=arc-20160816; b=k27AhbM0oAb2BfzQkpR2+vRu4kKhOnEet3e8azrp6qW2CWZJWo/iTOsgKQpVcpTbBD u2wrev532CUlYsr5Np9cIXtvilPG/DHU22/DXlOoWOsmmXxVe2zuRXMLdWBUGddMog3V PG4VrDnWFJNsNRBi5/hAL3oEOnCH4U8tgwr1dy6DPcKF1aoYasFBP4brXd0f+vpYEqYu 5/OEdWw8KOBK+pHI3Xz/NqCMxoQsigN3xDL+MuUEm7GBqH1xDoQxAGfkDKDw+iGFMFE8 LJyy9JBlK3f58OuQcPdUG4Ga+CCVeus8+nIKHFLp99khXrcmISf4rtTDTE5q/WxQl4/T EiFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X14KsJdHBaJUQDUSRsb0GEbY90Osu80l0nPE5NyeIbw=; b=YkzWvcYKkmxUMtGIFLP4jV7lsvG18MqA6t1J7SI32L1fbxxw8K0c66HHo7C9vWq+j3 J9Qbv5K0JgM1dGVUKzySFgilIo2QeZ1da8WqXTx6uxFB1EiVqyKveUX3D6/D5E8KzLr0 r+OBZf1zpOu7A0FdS9Qb34Qh3ShcX/IupGn+zIbpdiAuyj69w1IKmf6GFF6REAFCpmmQ ncSwzaOXmYXLro+H+qJi0YVXMMzDFzQramYzbSjJOsXYHj7N7k7iD2Qpa1IzgAA3nE7q S/uOuXmkM6X8SqOs6Jjp0mrEQqvlF68XO3Jz0o69v/V9Jqn9QpRYFVXYLujH0bwlguXX 03uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dlkMMQoA; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id di21si3551551edb.597.2021.02.25.06.41.26; Thu, 25 Feb 2021 06:41:26 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dlkMMQoA; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232394AbhBYOkY (ORCPT + 9 others); Thu, 25 Feb 2021 09:40:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:57972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232557AbhBYOkS (ORCPT ); Thu, 25 Feb 2021 09:40:18 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2043064EB7; Thu, 25 Feb 2021 14:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614263977; bh=STZDJx0qp9i6/i1NooOs3H6OwuabG+VJzumPODCTw5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dlkMMQoA8p2tKnGs7/wS/B53kyT6XbPRjaeaJxDr0nBnAdIrFpGNQDzAZkDWnJvA8 lG/0uWNz9ucSJPKx7jKdRJwSlawk18v0IZ3f/TX1WebMYyFWQ+CSMxqzruPDPBKU24 Aw3MMbo3qKXMoReXDCwtshYnUxoN9ZRtLm460K/gVkp+Jn1iIJnq0m2N06V90FZzwJ nBIJ2ie/ap5TMzlCYeKPkwTuVmwRINYy0LJhzy3wMn4HM80/Ppn3BWsBj1AyImvatt E97OvQmuOUte7zPas3z1uFk1O02/KXubHcpByrnAf0Uag1uP4wmRpbiirD9F7Ar3s4 yI4TCAkxyELAg== From: Arnd Bergmann To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski Cc: Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] net: dsa: tag_ocelot_8021q: fix driver dependency Date: Thu, 25 Feb 2021 15:38:32 +0100 Message-Id: <20210225143910.3964364-2-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210225143910.3964364-1-arnd@kernel.org> References: <20210225143910.3964364-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann When the ocelot driver code is in a library, the dsa tag code cannot be built-in: ld.lld: error: undefined symbol: ocelot_can_inject >>> referenced by tag_ocelot_8021q.c >>> dsa/tag_ocelot_8021q.o:(ocelot_xmit) in archive net/built-in.a ld.lld: error: undefined symbol: ocelot_port_inject_frame >>> referenced by tag_ocelot_8021q.c >>> dsa/tag_ocelot_8021q.o:(ocelot_xmit) in archive net/built-in.a Building the tag support only really makes sense for compile-testing when the driver is available, so add a Kconfig dependency that prevents the broken configuration while allowing COMPILE_TEST alternative when MSCC_OCELOT_SWITCH_LIB is disabled entirely. This case is handled through the #ifdef check in include/soc/mscc/ocelot.h. Fixes: 0a6f17c6ae21 ("net: dsa: tag_ocelot_8021q: add support for PTP timestamping") Signed-off-by: Arnd Bergmann --- net/dsa/Kconfig | 2 ++ 1 file changed, 2 insertions(+) -- 2.29.2 Acked-by: Vladimir Oltean diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 3589224c8da9..58b8fc82cd3c 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -118,6 +118,8 @@ config NET_DSA_TAG_OCELOT config NET_DSA_TAG_OCELOT_8021Q tristate "Tag driver for Ocelot family of switches, using VLAN" + depends on MSCC_OCELOT_SWITCH_LIB || \ + (MSCC_OCELOT_SWITCH_LIB=n && COMPILE_TEST) select NET_DSA_TAG_8021Q help Say Y or M if you want to enable support for tagging frames with a