Commit a396818c authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller
Browse files

qed: add support for new port modes 



These ports ship on new boards revisions and are supported by newer
firmware versions.

Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9a5eb85

drivers/net/ethernet/qlogic/qed/qed_dev.c

+5 −0
Original line number Diff line number Diff line
@@ -4004,6 +4004,11 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2:

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4:

		break;

	default:

		DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg);

drivers/net/ethernet/qlogic/qed/qed_hsi.h

+5 −0
Original line number Diff line number Diff line
@@ -13015,6 +13015,11 @@ struct nvm_cfg1_glob { 
#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G			0xd

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G			0xe

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G			0xf

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1		0x11

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1		0x12

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2		0x13

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2		0x14

#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4		0x15



	u32							e_lane_cfg1;

	u32							e_lane_cfg2;