Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5237775rdb; Wed, 13 Dec 2023 03:08:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1+WNvG9YA3tqAv5+ItRXauWWH8BhkBk2lPGO1ccEqqDRb9uXPnlICTACeBOlemC3kS197 X-Received: by 2002:a17:902:ea03:b0:1d0:737c:dcd9 with SMTP id s3-20020a170902ea0300b001d0737cdcd9mr11558040plg.57.1702465684774; Wed, 13 Dec 2023 03:08:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702465684; cv=none; d=google.com; s=arc-20160816; b=R7dw9Mp0MAGx+ayhgEOtpwpK12nTagE4KietL/fu0DPyyItqhuJb3Q0eo3Q0Lxzapc x/i3J043GJqU2GqtAEBKFBzsulaAdA5ZLMtSlqSEHL3Sn3CAqalnd4xT61c2Q+dBbK38 JMTDulFJfgo++WzG/juXtj0UeztDpYZsSe/XhLZiSrCzWAwj9wptnAkLu3vy1TTZpBFI V5cyrgn6bdF+Y1jF3Q7DCFDb09nBTEEALt+tQi5jnMjZXTmzeAzqtyxgz06ejXPkKabq nODfb733u4Z1XYEMYI3iHwM4vTKrG5TjDUEeeohUQoQuOEjdv1qc17fXEzV6YFfhIlnN bOGw== 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=HD/r3SHH2SLGpfeGRRURwfjrfTyiMavphJcBg8eFcYU=; fh=asmpGj2YxYe8/ji4bMUZUZytUYtbGpU9WbAkliy8rO0=; b=nr8e01vovOfYQCSOIzqdspjJGfZTlwJAT/cCFzucC3HP6mGZyP7FDHaBJHyDvEB6ex ErO5jmPRVah1C0X55v/tBD5WiezFXjr1Hv+j9wJAIdyluBjQg0saFE2i4EmlSEmm2KTe GUXoMQraUGjLP3oUqCQpISHC8uobbNkj9HdGfQ2R+OtFkHg7lV7Xxr1pVwQPKDsrZzv9 zVqaJSU1VXkSztPUIeUvirPb4rxVrTo5ATAg2OS4LXgMijutNybXyhsBBVC2QeRm37RA cqalq+bF9BPjEt0s4Zo+m61t32hA8EiJwdrl5iTqEWr7ymsdGj2aFkOG4tvTgWQenzDK xCfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WQ3TriLk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id q17-20020a170902dad100b001d351a5d2easi775106plx.376.2023.12.13.03.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:08:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WQ3TriLk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id BB8638053943; Wed, 13 Dec 2023 03:08:01 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378718AbjLMLHn (ORCPT + 99 others); Wed, 13 Dec 2023 06:07:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378716AbjLMLHj (ORCPT ); Wed, 13 Dec 2023 06:07:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAC479C for ; Wed, 13 Dec 2023 03:07:44 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3A18C433C8; Wed, 13 Dec 2023 11:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702465664; bh=UGvQIiReFkG1frMVyMqxPjsjO3iZbLcTAW7fpnClpK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WQ3TriLkBKtLNyg/oyYevIJ5UsmVvUI/fCLDxt1BeTirg/OsN/XiJJ//xUZ6Hvz22 7x2qNsaak4xRiMq/O/Zq2VIO3yOK4LHiMPmgzbvsNxUI+wee3v7UjdARqGnz5EVgy5 opOqBAuVyFYApcHKR4YhDGVfk23jrDaoeX5evYIevX5cuJt43II7acmX1Mh1tQ3XRM RcLxLy9BvHnRclURzCwLAKMse3oHyZ0MTXXmItjpAYTJFp+63oPxZGXRnO+/vEZM7D geIp74kQrZKsfLF6f9Py+GTjfhjD87yTGP7JYirPymLSyt59ntoaJOKilXcGy1VJgP WAYLCETMYXZRQ== From: Roger Quadros To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, shuah@kernel.org, vladimir.oltean@nxp.com Cc: s-vadapalli@ti.com, r-gunasekaran@ti.com, vigneshr@ti.com, srk@ti.com, horms@kernel.org, p-varis@ti.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, rogerq@kernel.org Subject: [PATCH v8 net-next 04/11] net: ethernet: am65-cpsw: Rename TI_AM65_CPSW_TAS to TI_AM65_CPSW_QOS Date: Wed, 13 Dec 2023 13:07:14 +0200 Message-Id: <20231213110721.69154-5-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213110721.69154-1-rogerq@kernel.org> References: <20231213110721.69154-1-rogerq@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Dec 2023 03:08:01 -0800 (PST) We will use this Kconfig option to not only enable TAS/EST offload but also other QoS features like Multiqueue priority descriptors and MAC-Merge/Frame Preemption. TI_AM65_CPSW_QOS seems a more appropriate Kconfig option name than TI_AM65_CPSW_TAS. Signed-off-by: Roger Quadros --- drivers/net/ethernet/ti/Kconfig | 12 ++++++------ drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/am65-cpsw-qos.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) Changelog: v8: initial commit diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index e60b557d59b9..49cd96c4f532 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -134,14 +134,14 @@ config TI_K3_AM65_CPTS protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time Measurement (PTM). -config TI_AM65_CPSW_TAS - bool "Enable TAS offload in AM65 CPSW" +config TI_AM65_CPSW_QOS + bool "Enable QoS offload features in AM65 CPSW" depends on TI_K3_AM65_CPSW_NUSS && NET_SCH_TAPRIO && TI_K3_AM65_CPTS help - Say y here to support Time Aware Shaper(TAS) offload in AM65 CPSW. - AM65 CPSW hardware supports Enhanced Scheduled Traffic (EST) - defined in IEEE 802.1Q 2018. The EST scheduler runs on CPTS and the - TAS/EST schedule is updated in the Fetch RAM memory of the CPSW. + This option enables QoS offload features in AM65 CPSW like + Time Aware Shaper (TAS) / Enhanced Scheduled Traffic (EST). + The EST scheduler runs on CPTS and the TAS/EST schedule is + updated in the Fetch RAM memory of the CPSW. config TI_KEYSTONE_NETCP tristate "TI Keystone NETCP Core Support" diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile index 9d7cd84d1e2d..d8590304f3df 100644 --- a/drivers/net/ethernet/ti/Makefile +++ b/drivers/net/ethernet/ti/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_TI_K3_CPPI_DESC_POOL) += k3-cppi-desc-pool.o obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o -ti-am65-cpsw-nuss-$(CONFIG_TI_AM65_CPSW_TAS) += am65-cpsw-qos.o +ti-am65-cpsw-nuss-$(CONFIG_TI_AM65_CPSW_QOS) += am65-cpsw-qos.o ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.h b/drivers/net/ethernet/ti/am65-cpsw-qos.h index 898f13a4a112..be4987eb8c51 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-qos.h +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.h @@ -31,7 +31,7 @@ struct am65_cpsw_qos { struct am65_cpsw_ale_ratelimit ale_mc_ratelimit; }; -#if IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS) +#if IS_ENABLED(CONFIG_TI_AM65_CPSW_QOS) int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type, void *type_data); void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed); -- 2.34.1