Received: by 2002:a05:7412:8598:b0:f9:33c2:5753 with SMTP id n24csp416215rdh; Tue, 19 Dec 2023 02:59:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsQcuG1xq26Cso31/dC0RdSP1EWZfRHXb9s/1XOE/THrXjJF2KP8UWN+RFRaPlfxdov+Bc X-Received: by 2002:a05:620a:260e:b0:77e:fba3:81e5 with SMTP id z14-20020a05620a260e00b0077efba381e5mr20171838qko.123.1702983594910; Tue, 19 Dec 2023 02:59:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702983594; cv=none; d=google.com; s=arc-20160816; b=ilTenJd6GuTdl5v5vAsOpUjwSD4h7xPOnjb0fGiGnyobHcIuvQMOLRJBLykt2+PE76 F3eNoDCVSQ2O7YHkJvjj1vI5AOAjO1MauPkN08OWjs7wq8dDixe875lr74mRp7NlrQIM ZXasbq/yNsRr0/1Oz+VaVNNJU/uK6ylzu7VEGDlZbrMPeW3ki4gFjxFNamplWDAzHSG1 oe9o5qp97h/MJuDo0CBVNF5E6G184YzVxlqakeu8qfxf9rpyQMRXdCrTOWgjXH+xGttu QQIqKhh8l4H2M/KVd4Hq5yuuzAEsjBLLgT935vi5clx1BgQmANMgY5WAk7Oh9Vg1PMtp QplA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=t4wMGkHBQZoaEQdq58R7Shq7J3YqYDi2ZX2rrSV1Pnw=; fh=atN1XXIEfyrYF91vXjukw10btm2OohYym78OPztZ9zU=; b=HjXI7zKFJQqbJDJjzqyFCygnM74dQrE3w1z7lcbfE26RYkSxYiDlGWHg806fm5w14c aAyWaP5sZ3dHR85RDIsXURC6WJoHl2SfZZcfqyW13hiiX6AVyRk/u1VcAoUahdIUcECs rspCqIfJxN1/4Di1Zh92ubYXe/E04YCSt+LSHSRW3esJHk7fz8nHYAFNtKdhR2c9z9Zq +fpBravH7Gsce2B/swQHj4riDxxqVkbaVIuJZZkkmPsBvzAI/VvLw1uvfHUbZz8BEcCN BizYlfXHpYenZg6+ReGkjepTuc9r6xUZl7kqzACgM1qZDwvHWVXSRJd/PyIfIsMB8Aev vaPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="oQ5WX/wy"; spf=pass (google.com: domain of linux-kernel+bounces-5045-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5045-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x10-20020a05620a258a00b0077dc65e33f9si26826218qko.27.2023.12.19.02.59.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 02:59:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5045-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="oQ5WX/wy"; spf=pass (google.com: domain of linux-kernel+bounces-5045-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5045-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A14051C235C3 for ; Tue, 19 Dec 2023 10:59:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0112A18640; Tue, 19 Dec 2023 10:58:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oQ5WX/wy" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 320C518634; Tue, 19 Dec 2023 10:58:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67DEDC433C7; Tue, 19 Dec 2023 10:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702983509; bh=QYRiQPYVRwGrkv8UjkvGdF/6/6gvHgU56X9jIaygDAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQ5WX/wyRoN5xFaBK+COqHCYXtLil29EEnfdcmhFEVyzS+669zCYfKs8Rbndwgoxs 8USiy0LJd49ir07sSOtbplqh/X7eJVaAfs0JiEJzT60uVhcGS8WsdAGvmwMlk99T3v BTZPU3nfOjETN+PwvDM0+sdjFWRdpUnsrpZEB6DZascWWwklVCCK6HFQHEWMTV2fHu uJqCeeoNCqG/34rceE71L2jERWbzXr5/tMQhRo/PJKBTA+g8yLjiwYv2QQ5zCdYbHs opnwOK0wzHQl9RaOzfJNDtAp76dQ2LAHFvnGiL5yoX4V+7OPUlhm042KZlXGqID0W+ qQw0fs0O9htMA== 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, linux-kselftest@vger.kernel.org, rogerq@kernel.org Subject: [PATCH net-next v11 04/10] net: ethernet: am65-cpsw: Rename TI_AM65_CPSW_TAS to TI_AM65_CPSW_QOS Date: Tue, 19 Dec 2023 12:57:59 +0200 Message-Id: <20231219105805.80617-5-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219105805.80617-1-rogerq@kernel.org> References: <20231219105805.80617-1-rogerq@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Vladimir Oltean --- 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: v11: no change v10: no code change. Added Reviewed-by tag. v9: no change 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