Skip to content

Commit d0f9535

Browse files
rogerqdavem330
authored andcommitted
net: ethernet: am65-cpsw: Rename TI_AM65_CPSW_TAS to TI_AM65_CPSW_QOS
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 <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c92b132 commit d0f9535

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

drivers/net/ethernet/ti/Kconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ config TI_K3_AM65_CPTS
134134
protocol, Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn)
135135
and PCIe Subsystem Precision Time Measurement (PTM).
136136

137-
config TI_AM65_CPSW_TAS
138-
bool "Enable TAS offload in AM65 CPSW"
137+
config TI_AM65_CPSW_QOS
138+
bool "Enable QoS offload features in AM65 CPSW"
139139
depends on TI_K3_AM65_CPSW_NUSS && NET_SCH_TAPRIO && TI_K3_AM65_CPTS
140140
help
141-
Say y here to support Time Aware Shaper(TAS) offload in AM65 CPSW.
142-
AM65 CPSW hardware supports Enhanced Scheduled Traffic (EST)
143-
defined in IEEE 802.1Q 2018. The EST scheduler runs on CPTS and the
144-
TAS/EST schedule is updated in the Fetch RAM memory of the CPSW.
141+
This option enables QoS offload features in AM65 CPSW like
142+
Time Aware Shaper (TAS) / Enhanced Scheduled Traffic (EST).
143+
The EST scheduler runs on CPTS and the TAS/EST schedule is
144+
updated in the Fetch RAM memory of the CPSW.
145145

146146
config TI_KEYSTONE_NETCP
147147
tristate "TI Keystone NETCP Core Support"

drivers/net/ethernet/ti/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ obj-$(CONFIG_TI_K3_CPPI_DESC_POOL) += k3-cppi-desc-pool.o
2727

2828
obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o
2929
ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o
30-
ti-am65-cpsw-nuss-$(CONFIG_TI_AM65_CPSW_TAS) += am65-cpsw-qos.o
30+
ti-am65-cpsw-nuss-$(CONFIG_TI_AM65_CPSW_QOS) += am65-cpsw-qos.o
3131
ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o
3232
obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o
3333

drivers/net/ethernet/ti/am65-cpsw-qos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct am65_cpsw_qos {
3131
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
3232
};
3333

34-
#if IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS)
34+
#if IS_ENABLED(CONFIG_TI_AM65_CPSW_QOS)
3535
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
3636
void *type_data);
3737
void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed);

0 commit comments

Comments
 (0)