Commit e1b81391 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-Bug-fixes' 



Michael Chan says:

====================
bnxt_en: Bug fixes.

A series of small driver fixes covering VPD length logic,
ethtool_get_regs on VF, hwmon temperature error handling,
mutex locking for EEE and pause ethtool settings, and
parameters for statistics related firmware calls.

Please queue patches 1, 2, and 3 for -stable.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fe81d9f6 c07fa08f

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+20 −10
Original line number Diff line number Diff line
@@ -3782,6 +3782,7 @@ static int bnxt_hwrm_func_qstat_ext(struct bnxt *bp, 
		return -EOPNOTSUPP;



	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_QSTATS_EXT, -1, -1);

	req.fid = cpu_to_le16(0xffff);

	req.flags = FUNC_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK;

	mutex_lock(&bp->hwrm_cmd_lock);

	rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
@@ -3852,7 +3853,7 @@ static void bnxt_init_stats(struct bnxt *bp) 
		tx_masks = stats->hw_masks;

		tx_count = sizeof(struct tx_port_stats_ext) / 8;



		flags = FUNC_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK;

		flags = PORT_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK;

		rc = bnxt_hwrm_port_qstats_ext(bp, flags);

		if (rc) {

			mask = (1ULL << 40) - 1;
@@ -9311,18 +9312,16 @@ static ssize_t bnxt_show_temp(struct device *dev, 
	struct hwrm_temp_monitor_query_output *resp;

	struct bnxt *bp = dev_get_drvdata(dev);

	u32 len = 0;

	int rc;



	resp = bp->hwrm_cmd_resp_addr;

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_TEMP_MONITOR_QUERY, -1, -1);

	mutex_lock(&bp->hwrm_cmd_lock);

	if (!_hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT))

	rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

	if (!rc)

		len = sprintf(buf, "%u\n", resp->temp * 1000); /* display millidegree */

	mutex_unlock(&bp->hwrm_cmd_lock);



	if (len)

		return len;



	return sprintf(buf, "unknown\n");

	return rc ?: len;

}

static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);
@@ -9342,7 +9341,16 @@ static void bnxt_hwmon_close(struct bnxt *bp) 


static void bnxt_hwmon_open(struct bnxt *bp)

{

	struct hwrm_temp_monitor_query_input req = {0};

	struct pci_dev *pdev = bp->pdev;

	int rc;



	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_TEMP_MONITOR_QUERY, -1, -1);

	rc = hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

	if (rc == -EACCES || rc == -EOPNOTSUPP) {

		bnxt_hwmon_close(bp);

		return;

	}



	if (bp->hwmon_dev)

		return;
@@ -12090,7 +12098,7 @@ static int bnxt_init_mac_addr(struct bnxt *bp) 
static void bnxt_vpd_read_info(struct bnxt *bp)

{

	struct pci_dev *pdev = bp->pdev;

	int i, len, pos, ro_size;

	int i, len, pos, ro_size, size;

	ssize_t vpd_size;

	u8 *vpd_data;
@@ -12125,7 +12133,8 @@ static void bnxt_vpd_read_info(struct bnxt *bp) 
	if (len + pos > vpd_size)

		goto read_sn;



	strlcpy(bp->board_partno, &vpd_data[pos], min(len, BNXT_VPD_FLD_LEN));

	size = min(len, BNXT_VPD_FLD_LEN - 1);

	memcpy(bp->board_partno, &vpd_data[pos], size);



read_sn:

	pos = pci_vpd_find_info_keyword(vpd_data, i, ro_size,
@@ -12138,7 +12147,8 @@ read_sn: 
	if (len + pos > vpd_size)

		goto exit;



	strlcpy(bp->board_serialno, &vpd_data[pos], min(len, BNXT_VPD_FLD_LEN));

	size = min(len, BNXT_VPD_FLD_LEN - 1);

	memcpy(bp->board_serialno, &vpd_data[pos], size);

exit:

	kfree(vpd_data);

}

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+23 −11
Original line number Diff line number Diff line
@@ -1322,6 +1322,9 @@ static int bnxt_get_regs_len(struct net_device *dev) 
	struct bnxt *bp = netdev_priv(dev);

	int reg_len;



	if (!BNXT_PF(bp))

		return -EOPNOTSUPP;



	reg_len = BNXT_PXP_REG_LEN;



	if (bp->fw_cap & BNXT_FW_CAP_PCIE_STATS_SUPPORTED)
@@ -1788,9 +1791,12 @@ static int bnxt_set_pauseparam(struct net_device *dev, 
	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	mutex_lock(&bp->link_lock);

	if (epause->autoneg) {

		if (!(link_info->autoneg & BNXT_AUTONEG_SPEED))

			return -EINVAL;

		if (!(link_info->autoneg & BNXT_AUTONEG_SPEED)) {

			rc = -EINVAL;

			goto pause_exit;

		}



		link_info->autoneg |= BNXT_AUTONEG_FLOW_CTRL;

		if (bp->hwrm_spec_code >= 0x10201)
@@ -1811,11 +1817,11 @@ static int bnxt_set_pauseparam(struct net_device *dev, 
	if (epause->tx_pause)

		link_info->req_flow_ctrl |= BNXT_LINK_PAUSE_TX;



	if (netif_running(dev)) {

		mutex_lock(&bp->link_lock);

	if (netif_running(dev))

		rc = bnxt_hwrm_set_pause(bp);



pause_exit:

	mutex_unlock(&bp->link_lock);

	}

	return rc;

}
@@ -2552,8 +2558,7 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	struct bnxt *bp = netdev_priv(dev);

	struct ethtool_eee *eee = &bp->eee;

	struct bnxt_link_info *link_info = &bp->link_info;

	u32 advertising =

		 _bnxt_fw_to_ethtool_adv_spds(link_info->advertising, 0);

	u32 advertising;

	int rc = 0;



	if (!BNXT_PHY_CFG_ABLE(bp))
@@ -2562,19 +2567,23 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	if (!(bp->flags & BNXT_FLAG_EEE_CAP))

		return -EOPNOTSUPP;



	mutex_lock(&bp->link_lock);

	advertising = _bnxt_fw_to_ethtool_adv_spds(link_info->advertising, 0);

	if (!edata->eee_enabled)

		goto eee_ok;



	if (!(link_info->autoneg & BNXT_AUTONEG_SPEED)) {

		netdev_warn(dev, "EEE requires autoneg\n");

		return -EINVAL;

		rc = -EINVAL;

		goto eee_exit;

	}

	if (edata->tx_lpi_enabled) {

		if (bp->lpi_tmr_hi && (edata->tx_lpi_timer > bp->lpi_tmr_hi ||

				       edata->tx_lpi_timer < bp->lpi_tmr_lo)) {

			netdev_warn(dev, "Valid LPI timer range is %d and %d microsecs\n",

				    bp->lpi_tmr_lo, bp->lpi_tmr_hi);

			return -EINVAL;

			rc = -EINVAL;

			goto eee_exit;

		} else if (!bp->lpi_tmr_hi) {

			edata->tx_lpi_timer = eee->tx_lpi_timer;

		}
@@ -2584,7 +2593,8 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	} else if (edata->advertised & ~advertising) {

		netdev_warn(dev, "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",

			    edata->advertised, advertising);

		return -EINVAL;

		rc = -EINVAL;

		goto eee_exit;

	}



	eee->advertised = edata->advertised;
@@ -2596,6 +2606,8 @@ eee_ok: 
	if (netif_running(dev))

		rc = bnxt_hwrm_set_link_setting(bp, false, true);



eee_exit:

	mutex_unlock(&bp->link_lock);

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE