|
@@ -4488,12 +4488,49 @@ static void bnxt_report_link(struct bnxt *bp)
|
|
|
speed = bnxt_fw_to_ethtool_speed(bp->link_info.link_speed);
|
|
|
netdev_info(bp->dev, "NIC Link is Up, %d Mbps %s duplex, Flow control: %s\n",
|
|
|
speed, duplex, flow_ctrl);
|
|
|
+ if (bp->flags & BNXT_FLAG_EEE_CAP)
|
|
|
+ netdev_info(bp->dev, "EEE is %s\n",
|
|
|
+ bp->eee.eee_active ? "active" :
|
|
|
+ "not active");
|
|
|
} else {
|
|
|
netif_carrier_off(bp->dev);
|
|
|
netdev_err(bp->dev, "NIC Link is Down\n");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
|
|
|
+{
|
|
|
+ int rc = 0;
|
|
|
+ struct hwrm_port_phy_qcaps_input req = {0};
|
|
|
+ struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
|
|
|
+
|
|
|
+ if (bp->hwrm_spec_code < 0x10201)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_QCAPS, -1, -1);
|
|
|
+
|
|
|
+ mutex_lock(&bp->hwrm_cmd_lock);
|
|
|
+ rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
|
|
|
+ if (rc)
|
|
|
+ goto hwrm_phy_qcaps_exit;
|
|
|
+
|
|
|
+ if (resp->eee_supported & PORT_PHY_QCAPS_RESP_EEE_SUPPORTED) {
|
|
|
+ struct ethtool_eee *eee = &bp->eee;
|
|
|
+ u16 fw_speeds = le16_to_cpu(resp->supported_speeds_eee_mode);
|
|
|
+
|
|
|
+ bp->flags |= BNXT_FLAG_EEE_CAP;
|
|
|
+ eee->supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
|
|
|
+ bp->lpi_tmr_lo = le32_to_cpu(resp->tx_lpi_timer_low) &
|
|
|
+ PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK;
|
|
|
+ bp->lpi_tmr_hi = le32_to_cpu(resp->valid_tx_lpi_timer_high) &
|
|
|
+ PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK;
|
|
|
+ }
|
|
|
+
|
|
|
+hwrm_phy_qcaps_exit:
|
|
|
+ mutex_unlock(&bp->hwrm_cmd_lock);
|
|
|
+ return rc;
|
|
|
+}
|
|
|
+
|
|
|
static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
|
|
|
{
|
|
|
int rc = 0;
|
|
@@ -4535,8 +4572,44 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
|
|
|
link_info->phy_ver[2] = resp->phy_bld;
|
|
|
link_info->media_type = resp->media_type;
|
|
|
link_info->transceiver = resp->xcvr_pkg_type;
|
|
|
- link_info->phy_addr = resp->eee_config_phy_addr;
|
|
|
+ link_info->phy_addr = resp->eee_config_phy_addr &
|
|
|
+ PORT_PHY_QCFG_RESP_PHY_ADDR_MASK;
|
|
|
+
|
|
|
+ if (bp->flags & BNXT_FLAG_EEE_CAP) {
|
|
|
+ struct ethtool_eee *eee = &bp->eee;
|
|
|
+ u16 fw_speeds;
|
|
|
+
|
|
|
+ eee->eee_active = 0;
|
|
|
+ if (resp->eee_config_phy_addr &
|
|
|
+ PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ACTIVE) {
|
|
|
+ eee->eee_active = 1;
|
|
|
+ fw_speeds = le16_to_cpu(
|
|
|
+ resp->link_partner_adv_eee_link_speed_mask);
|
|
|
+ eee->lp_advertised =
|
|
|
+ _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Pull initial EEE config */
|
|
|
+ if (!chng_link_state) {
|
|
|
+ if (resp->eee_config_phy_addr &
|
|
|
+ PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ENABLED)
|
|
|
+ eee->eee_enabled = 1;
|
|
|
|
|
|
+ fw_speeds = le16_to_cpu(resp->adv_eee_link_speed_mask);
|
|
|
+ eee->advertised =
|
|
|
+ _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
|
|
|
+
|
|
|
+ if (resp->eee_config_phy_addr &
|
|
|
+ PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_TX_LPI) {
|
|
|
+ __le32 tmr;
|
|
|
+
|
|
|
+ eee->tx_lpi_enabled = 1;
|
|
|
+ tmr = resp->xcvr_identifier_type_tx_lpi_timer;
|
|
|
+ eee->tx_lpi_timer = le32_to_cpu(tmr) &
|
|
|
+ PORT_PHY_QCFG_RESP_TX_LPI_TIMER_MASK;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
/* TODO: need to add more logic to report VF link */
|
|
|
if (chng_link_state) {
|
|
|
if (link_info->phy_link_status == BNXT_LINK_LINK)
|
|
@@ -5825,6 +5898,13 @@ static int bnxt_probe_phy(struct bnxt *bp)
|
|
|
int rc = 0;
|
|
|
struct bnxt_link_info *link_info = &bp->link_info;
|
|
|
|
|
|
+ rc = bnxt_hwrm_phy_qcaps(bp);
|
|
|
+ if (rc) {
|
|
|
+ netdev_err(bp->dev, "Probe phy can't get phy capabilities (rc: %x)\n",
|
|
|
+ rc);
|
|
|
+ return rc;
|
|
|
+ }
|
|
|
+
|
|
|
rc = bnxt_update_link(bp, false);
|
|
|
if (rc) {
|
|
|
netdev_err(bp->dev, "Probe phy can't update link (rc: %x)\n",
|