Commit 3d4375c2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-thunderbolt-various-improvements' 

Mika Westerberg says:

====================
net: thunderbolt: Various improvements

This series improves the Thunderbolt networking driver so that it should
work with the bonding driver.

The discussion that started this patch series can be read below:

  https://lore.kernel.org/netdev/CAFJzfF9N4Hak23sc-zh0jMobbkjK7rg4odhic1DQ1cC+=MoQoA@mail.gmail.com/

v2: https://lore.kernel.org/20260109122606.3586895-1-mika.westerberg@linux.intel.com
v1: https://lore.kernel.org/20251127131521.2580237-1-mika.westerberg@linux.intel.com
====================

Link: https://patch.msgid.link/20260115115646.328898-1-mika.westerberg@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 456083e7 7a3d3279

drivers/net/bonding/bond_3ad.c

+9 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ enum ad_link_speed_type { 
	AD_LINK_SPEED_40000MBPS,

	AD_LINK_SPEED_50000MBPS,

	AD_LINK_SPEED_56000MBPS,

	AD_LINK_SPEED_80000MBPS,

	AD_LINK_SPEED_100000MBPS,

	AD_LINK_SPEED_200000MBPS,

	AD_LINK_SPEED_400000MBPS,
@@ -297,6 +298,7 @@ static inline int __check_agg_selection_timer(struct port *port) 
 *     %AD_LINK_SPEED_40000MBPS

 *     %AD_LINK_SPEED_50000MBPS

 *     %AD_LINK_SPEED_56000MBPS

 *     %AD_LINK_SPEED_80000MBPS

 *     %AD_LINK_SPEED_100000MBPS

 *     %AD_LINK_SPEED_200000MBPS

 *     %AD_LINK_SPEED_400000MBPS
@@ -365,6 +367,10 @@ static u16 __get_link_speed(struct port *port) 
			speed = AD_LINK_SPEED_56000MBPS;

			break;



		case SPEED_80000:

			speed = AD_LINK_SPEED_80000MBPS;

			break;



		case SPEED_100000:

			speed = AD_LINK_SPEED_100000MBPS;

			break;
@@ -816,6 +822,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) 
		case AD_LINK_SPEED_56000MBPS:

			bandwidth = nports * 56000;

			break;

		case AD_LINK_SPEED_80000MBPS:

			bandwidth = nports * 80000;

			break;

		case AD_LINK_SPEED_100000MBPS:

			bandwidth = nports * 100000;

			break;

drivers/net/phy/phy-caps.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum { 
	LINK_CAPA_40000FD,

	LINK_CAPA_50000FD,

	LINK_CAPA_56000FD,

	LINK_CAPA_80000FD,

	LINK_CAPA_100000FD,

	LINK_CAPA_200000FD,

	LINK_CAPA_400000FD,

drivers/net/phy/phy-core.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ const char *phy_speed_to_str(int speed) 
		return "50Gbps";

	case SPEED_56000:

		return "56Gbps";

	case SPEED_80000:

		return "80Gbps";

	case SPEED_100000:

		return "100Gbps";

	case SPEED_200000:

drivers/net/phy/phy_caps.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ static struct link_capabilities link_caps[__LINK_CAPA_MAX] __ro_after_init = { 
	{ SPEED_40000, DUPLEX_FULL, {0} }, /* LINK_CAPA_40000FD */

	{ SPEED_50000, DUPLEX_FULL, {0} }, /* LINK_CAPA_50000FD */

	{ SPEED_56000, DUPLEX_FULL, {0} }, /* LINK_CAPA_56000FD */

	{ SPEED_80000, DUPLEX_FULL, {0} }, /* LINK_CAPA_80000FD */

	{ SPEED_100000, DUPLEX_FULL, {0} }, /* LINK_CAPA_100000FD */

	{ SPEED_200000, DUPLEX_FULL, {0} }, /* LINK_CAPA_200000FD */

	{ SPEED_400000, DUPLEX_FULL, {0} }, /* LINK_CAPA_400000FD */
@@ -49,6 +50,7 @@ static int speed_duplex_to_capa(int speed, unsigned int duplex) 
	case SPEED_40000: return LINK_CAPA_40000FD;

	case SPEED_50000: return LINK_CAPA_50000FD;

	case SPEED_56000: return LINK_CAPA_56000FD;

	case SPEED_80000: return LINK_CAPA_80000FD;

	case SPEED_100000: return LINK_CAPA_100000FD;

	case SPEED_200000: return LINK_CAPA_200000FD;

	case SPEED_400000: return LINK_CAPA_400000FD;

drivers/net/phy/phylink.c

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static struct { 
	{ MAC_400000FD, SPEED_400000, DUPLEX_FULL, BIT(LINK_CAPA_400000FD) },

	{ MAC_200000FD, SPEED_200000, DUPLEX_FULL, BIT(LINK_CAPA_200000FD) },

	{ MAC_100000FD, SPEED_100000, DUPLEX_FULL, BIT(LINK_CAPA_100000FD) },

	{ MAC_80000FD,  SPEED_80000,  DUPLEX_FULL, BIT(LINK_CAPA_80000FD) },

	{ MAC_56000FD,  SPEED_56000,  DUPLEX_FULL, BIT(LINK_CAPA_56000FD) },

	{ MAC_50000FD,  SPEED_50000,  DUPLEX_FULL, BIT(LINK_CAPA_50000FD) },

	{ MAC_40000FD,  SPEED_40000,  DUPLEX_FULL, BIT(LINK_CAPA_40000FD) },