Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d5e77aa authored by Dimitris Michailidis's avatar Dimitris Michailidis Committed by David S. Miller
Browse files

cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports 



And fix the supported flags ethtool reports for the two cases.

Signed-off-by: default avatarDimitris Michailidis <dm@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a57cabe0

drivers/net/cxgb4/cxgb4_main.c

+7 −2
Original line number Diff line number Diff line
@@ -1375,7 +1375,12 @@ static unsigned int from_fw_linkcaps(unsigned int type, unsigned int caps) 
	} else if (type == FW_PORT_TYPE_KR)

		v |= SUPPORTED_Backplane | SUPPORTED_10000baseKR_Full;

	else if (type == FW_PORT_TYPE_BP_AP)

		v |= SUPPORTED_Backplane | SUPPORTED_10000baseR_FEC;

		v |= SUPPORTED_Backplane | SUPPORTED_10000baseR_FEC |

		     SUPPORTED_10000baseKR_Full | SUPPORTED_1000baseKX_Full;

	else if (type == FW_PORT_TYPE_BP4_AP)

		v |= SUPPORTED_Backplane | SUPPORTED_10000baseR_FEC |

		     SUPPORTED_10000baseKR_Full | SUPPORTED_1000baseKX_Full |

		     SUPPORTED_10000baseKX4_Full;

	else if (type == FW_PORT_TYPE_FIBER_XFI ||

		 type == FW_PORT_TYPE_FIBER_XAUI || type == FW_PORT_TYPE_SFP)

		v |= SUPPORTED_FIBRE;
@@ -3489,7 +3494,7 @@ static void __devinit print_port_info(struct adapter *adap) 
{

	static const char *base[] = {

		"R XFI", "R XAUI", "T SGMII", "T XFI", "T XAUI", "KX4", "CX4",

		"KX", "KR", "KR SFP+", "KR FEC"

		"KX", "KR", "R SFP+", "KR/KX", "KR/KX/KX4"

	};



	int i;

drivers/net/cxgb4/t4fw_api.h

+1 −0
Original line number Diff line number Diff line
@@ -1239,6 +1239,7 @@ enum fw_port_type { 
	FW_PORT_TYPE_KR,

	FW_PORT_TYPE_SFP,

	FW_PORT_TYPE_BP_AP,

	FW_PORT_TYPE_BP4_AP,



	FW_PORT_TYPE_NONE = FW_PORT_CMD_PTYPE_MASK

};