On Thu, 16 Jul 2020 14:54:43 +0300 Alexander Lobakin wrote:
> These ports ship on new boards revisions and are supported by newer
> firmware versions.
>
> Signed-off-by: Alexander Lobakin <aloba...@marvell.com>
> Signed-off-by: Igor Russkikh <irussk...@marvell.com>
What is the driver actually doing with them, tho?
Looks like you translate some firmware specific field to a driver
specific field, but I can't figure out what part of the code cares
about hw_info.port_mode
> diff --git a/drivers/net/ethernet/qlogic/qed/qed.h
> b/drivers/net/ethernet/qlogic/qed/qed.h
> index 6a1d12da7910..63fcbd5a295a 100644
> --- a/drivers/net/ethernet/qlogic/qed/qed.h
> +++ b/drivers/net/ethernet/qlogic/qed/qed.h
> @@ -257,6 +257,11 @@ enum QED_PORT_MODE {
> QED_PORT_MODE_DE_1X25G,
> QED_PORT_MODE_DE_4X25G,
> QED_PORT_MODE_DE_2X10G,
> + QED_PORT_MODE_DE_2X50G_R1,
> + QED_PORT_MODE_DE_4X50G_R1,
> + QED_PORT_MODE_DE_1X100G_R2,
> + QED_PORT_MODE_DE_2X100G_R2,
> + QED_PORT_MODE_DE_1X100G_R4,
> };
>
> enum qed_dev_cap {
> diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c
> b/drivers/net/ethernet/qlogic/qed/qed_dev.c
> index d929556247a5..4bad836d0f74 100644
> --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
> +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
> @@ -4026,6 +4026,21 @@ static int qed_hw_get_nvm_info(struct qed_hwfn
> *p_hwfn, struct qed_ptt *p_ptt)
> case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G:
> p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X25G;
> break;
> + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1:
> + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X50G_R1;
> + break;
> + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1:
> + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X50G_R1;
> + break;
> + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2:
> + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G_R2;
> + break;
> + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2:
> + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X100G_R2;
> + break;
> + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4:
> + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G_R4;
> + break;
> default:
> DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg);
> break;
> diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
> b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
> index a4a845579fd2..debc55923251 100644
> --- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
> +++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
> @@ -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;
