|
@@ -6546,6 +6546,75 @@ int i40e_up(struct i40e_vsi *vsi)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * i40e_force_link_state - Force the link status
|
|
|
+ * @pf: board private structure
|
|
|
+ * @is_up: whether the link state should be forced up or down
|
|
|
+ **/
|
|
|
+static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up)
|
|
|
+{
|
|
|
+ struct i40e_aq_get_phy_abilities_resp abilities;
|
|
|
+ struct i40e_aq_set_phy_config config = {0};
|
|
|
+ struct i40e_hw *hw = &pf->hw;
|
|
|
+ i40e_status err;
|
|
|
+ u64 mask;
|
|
|
+
|
|
|
+ /* Get the current phy config */
|
|
|
+ err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,
|
|
|
+ NULL);
|
|
|
+ if (err) {
|
|
|
+ dev_err(&pf->pdev->dev,
|
|
|
+ "failed to get phy cap., ret = %s last_status = %s\n",
|
|
|
+ i40e_stat_str(hw, err),
|
|
|
+ i40e_aq_str(hw, hw->aq.asq_last_status));
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* If link needs to go up, but was not forced to go down,
|
|
|
+ * no need for a flap
|
|
|
+ */
|
|
|
+ if (is_up && abilities.phy_type != 0)
|
|
|
+ return I40E_SUCCESS;
|
|
|
+
|
|
|
+ /* To force link we need to set bits for all supported PHY types,
|
|
|
+ * but there are now more than 32, so we need to split the bitmap
|
|
|
+ * across two fields.
|
|
|
+ */
|
|
|
+ mask = I40E_PHY_TYPES_BITMASK;
|
|
|
+ config.phy_type = is_up ? cpu_to_le32((u32)(mask & 0xffffffff)) : 0;
|
|
|
+ config.phy_type_ext = is_up ? (u8)((mask >> 32) & 0xff) : 0;
|
|
|
+ /* Copy the old settings, except of phy_type */
|
|
|
+ config.abilities = abilities.abilities;
|
|
|
+ config.link_speed = abilities.link_speed;
|
|
|
+ config.eee_capability = abilities.eee_capability;
|
|
|
+ config.eeer = abilities.eeer_val;
|
|
|
+ config.low_power_ctrl = abilities.d3_lpan;
|
|
|
+ err = i40e_aq_set_phy_config(hw, &config, NULL);
|
|
|
+
|
|
|
+ if (err) {
|
|
|
+ dev_err(&pf->pdev->dev,
|
|
|
+ "set phy config ret = %s last_status = %s\n",
|
|
|
+ i40e_stat_str(&pf->hw, err),
|
|
|
+ i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Update the link info */
|
|
|
+ err = i40e_update_link_info(hw);
|
|
|
+ if (err) {
|
|
|
+ /* Wait a little bit (on 40G cards it sometimes takes a really
|
|
|
+ * long time for link to come back from the atomic reset)
|
|
|
+ * and try once more
|
|
|
+ */
|
|
|
+ msleep(1000);
|
|
|
+ i40e_update_link_info(hw);
|
|
|
+ }
|
|
|
+
|
|
|
+ i40e_aq_set_link_restart_an(hw, true, NULL);
|
|
|
+
|
|
|
+ return I40E_SUCCESS;
|
|
|
+}
|
|
|
+
|
|
|
/**
|
|
|
* i40e_down - Shutdown the connection processing
|
|
|
* @vsi: the VSI being stopped
|
|
@@ -6563,6 +6632,9 @@ void i40e_down(struct i40e_vsi *vsi)
|
|
|
}
|
|
|
i40e_vsi_disable_irq(vsi);
|
|
|
i40e_vsi_stop_rings(vsi);
|
|
|
+ if (vsi->type == I40E_VSI_MAIN &&
|
|
|
+ vsi->back->flags & I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED)
|
|
|
+ i40e_force_link_state(vsi->back, false);
|
|
|
i40e_napi_disable_all(vsi);
|
|
|
|
|
|
for (i = 0; i < vsi->num_queue_pairs; i++) {
|
|
@@ -7524,6 +7596,9 @@ int i40e_open(struct net_device *netdev)
|
|
|
|
|
|
netif_carrier_off(netdev);
|
|
|
|
|
|
+ if (i40e_force_link_state(pf, true))
|
|
|
+ return -EAGAIN;
|
|
|
+
|
|
|
err = i40e_vsi_open(vsi);
|
|
|
if (err)
|
|
|
return err;
|