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

Commit 1c90eabc authored by Rahul Verma's avatar Rahul Verma Committed by David S. Miller
Browse files

qed: Prevent link getting down in case of autoneg-off. 



	Newly added link modes are required to be added
	during setting link modes. If the new link mode
	is not available during qed_set_link, it may cause
	link getting down due to empty supported capability,
	being passed to MFW, after setting autoneg off/on
	with current/supported speed.

Signed-off-by: default avatarRahul Verma <Rahul.Verma@cavium.com>
Signed-off-by: default avatarAriel Elior <ariel.elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e6e2ded

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

+33 −7
Original line number Diff line number Diff line
@@ -1305,6 +1305,7 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params) 
	struct qed_hwfn *hwfn;

	struct qed_mcp_link_params *link_params;

	struct qed_ptt *ptt;

	u32 sup_caps;

	int rc;



	if (!cdev)
@@ -1331,25 +1332,50 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params) 
		link_params->speed.autoneg = params->autoneg;

	if (params->override_flags & QED_LINK_OVERRIDE_SPEED_ADV_SPEEDS) {

		link_params->speed.advertised_speeds = 0;

		if (params->adv_speeds & QED_LM_1000baseT_Full_BIT)

		sup_caps = QED_LM_1000baseT_Full_BIT |

			   QED_LM_1000baseKX_Full_BIT |

			   QED_LM_1000baseX_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

			    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G;

		if (params->adv_speeds & QED_LM_10000baseKR_Full_BIT)

		sup_caps = QED_LM_10000baseT_Full_BIT |

			   QED_LM_10000baseKR_Full_BIT |

			   QED_LM_10000baseKX4_Full_BIT |

			   QED_LM_10000baseR_FEC_BIT |

			   QED_LM_10000baseCR_Full_BIT |

			   QED_LM_10000baseSR_Full_BIT |

			   QED_LM_10000baseLR_Full_BIT |

			   QED_LM_10000baseLRM_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

			    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G;

		if (params->adv_speeds & QED_LM_20000baseKR2_Full_BIT)

			link_params->speed.advertised_speeds |=

				NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G;

		if (params->adv_speeds & QED_LM_25000baseKR_Full_BIT)

		sup_caps = QED_LM_25000baseKR_Full_BIT |

			   QED_LM_25000baseCR_Full_BIT |

			   QED_LM_25000baseSR_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

			    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G;

		if (params->adv_speeds & QED_LM_40000baseLR4_Full_BIT)

		sup_caps = QED_LM_40000baseLR4_Full_BIT |

			   QED_LM_40000baseKR4_Full_BIT |

			   QED_LM_40000baseCR4_Full_BIT |

			   QED_LM_40000baseSR4_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

				NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G;

		if (params->adv_speeds & QED_LM_50000baseKR2_Full_BIT)

		sup_caps = QED_LM_50000baseKR2_Full_BIT |

			   QED_LM_50000baseCR2_Full_BIT |

			   QED_LM_50000baseSR2_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

			    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G;

		if (params->adv_speeds & QED_LM_100000baseKR4_Full_BIT)

		sup_caps = QED_LM_100000baseKR4_Full_BIT |

			   QED_LM_100000baseSR4_Full_BIT |

			   QED_LM_100000baseCR4_Full_BIT |

			   QED_LM_100000baseLR4_ER4_Full_BIT;

		if (params->adv_speeds & sup_caps)

			link_params->speed.advertised_speeds |=

			    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G;

	}