Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3083411rwb; Mon, 15 Aug 2022 17:43:24 -0700 (PDT) X-Google-Smtp-Source: AA6agR4RPZ+08/NNmDxPCzaILQlWgRILepZe3VhgAsi8/PzFngLHc6CdIpMVMorpPTxGxW0oupKv X-Received: by 2002:a17:903:40c4:b0:16d:d2a9:43ae with SMTP id t4-20020a17090340c400b0016dd2a943aemr19374300pld.57.1660610604220; Mon, 15 Aug 2022 17:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660610604; cv=none; d=google.com; s=arc-20160816; b=FVsCv9xm/pQH2M9KVUyWLEYFl6MXyN9IFfAqqXxcbDuyFjWLTSz+20v8LpI4Ju5IW0 Ow3xsvKmtLz2E9wX6Fm5tU9TFoHhhQamQEHaifWsFfh29jUx6uNv8M24k6Nt8wPWiC5p wqO1T5XfiORgfohdaEdxlN/JgojUBeJJE/Np3wYMjx8iuap95QaUXA6NpJwe4nYnFPi+ /54u8Xik3krJuqun1X/9wb0gm+PFXp7EVhrvPm06JQnvvbCX1DyzC69A8uz1BX7w9gea 7iIh5izNfdwroUExTeTsBo/4TcnqiER3a30W1hL4cFlIaowlZH5zp2X90fKlJSWy7SXJ YY5g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IR8WLhk7AwPBGpg/uXWZHc2JumuzrSmBfh5mBdJsIH0=; b=PcxCRUNv728utabBAJD+CtzD6tjobvipTbAmk05wwl27+Xs6zteEieQ57lr16jnpS7 1DVkLvKeTDQMu9BMaKxyJGJQFAVzkoIa1fgw5hikA0rwo2qq4phIDKIQxqIMSwoU5agT hgS/GiTCk4pNyL6RTx4EqSgKnRCGV+Y2YKf1oXpQDfXHBj+RVKvVDrtg+xgdOIKJ3c3p W/dDgC1LtHm+zoqIw8jMNOyVTdEbP6+Elz58MWZ18K4UXdD0afsmHgaRblq1P2E0SMSq 6mOHZN2kBu+O6Vj6P2R4HuKWpqAcHlsxYiwL5QVmiOZBv7gtPusYd2zI01OGkUynQPmB UYEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=x+yLosW7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c4-20020a170902d48400b0016ee6e782a4si13132955plg.560.2022.08.15.17.43.13; Mon, 15 Aug 2022 17:43:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=x+yLosW7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243686AbiHOXyr (ORCPT + 99 others); Mon, 15 Aug 2022 19:54:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343949AbiHOXr3 (ORCPT ); Mon, 15 Aug 2022 19:47:29 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBC51C2F9E; Mon, 15 Aug 2022 13:15:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id AF323B81135; Mon, 15 Aug 2022 20:15:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E500C433C1; Mon, 15 Aug 2022 20:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660594533; bh=nCWO8YIu1PEBiyHOTBnU4ZCYz8V+EBt7GoQJfXewjfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x+yLosW7x/nElLZnUB6Y6FAe/3nalnZJavyMPs3f0ziTPZ7iE5hcRq5EH8nMUeDhP CZzbYd41n1ZNIAUijbe+gnMFi4WhgdBRvvGjyiQzKeXHx3v2qrz3qOtzlAiMBTSRDu M3LHiucg1GEW7n0eMDktwcx2NhLMxo9mN+J8513Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Oltean , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.19 0443/1157] net: dsa: felix: build as module when tc-taprio is module Date: Mon, 15 Aug 2022 19:56:39 +0200 Message-Id: <20220815180457.322844187@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ Upstream commit 10ed11ab6399813eb652137db9c378433c28a95c ] felix_vsc9959.c calls taprio_offload_get() and taprio_offload_free(), symbols exported by net/sched/sch_taprio.c. As such, we must disallow building the Felix driver as built-in when the symbol exported by tc-taprio isn't present in the kernel image. Fixes: 1c9017e44af2 ("net: dsa: felix: keep reference on entire tc-taprio config") Signed-off-by: Vladimir Oltean Link: https://lore.kernel.org/r/20220704190241.1288847-2-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/dsa/ocelot/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig index 220b0b027b55..08db9cf76818 100644 --- a/drivers/net/dsa/ocelot/Kconfig +++ b/drivers/net/dsa/ocelot/Kconfig @@ -6,6 +6,7 @@ config NET_DSA_MSCC_FELIX depends on NET_VENDOR_FREESCALE depends on HAS_IOMEM depends on PTP_1588_CLOCK_OPTIONAL + depends on NET_SCH_TAPRIO || NET_SCH_TAPRIO=n select MSCC_OCELOT_SWITCH_LIB select NET_DSA_TAG_OCELOT_8021Q select NET_DSA_TAG_OCELOT -- 2.35.1