Commit d0f9535b authored by Roger Quadros's avatar Roger Quadros Committed by David S. Miller
Browse files

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: default avatarRoger Quadros <rogerq@kernel.org>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c92b1321

drivers/net/ethernet/ti/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -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"

drivers/net/ethernet/ti/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);