Commit 22506f48 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.

Miscellaneous bug fix patches, including two resource handling fixes for
the RDMA driver, a PCI shutdown patch to add pci_disable_device(), a patch
to fix ethtool selftest crash, and the last one suppresses an unnecessry
error message.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7b75e49d 4ca5fa39

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

+13 −7
Original line number Diff line number Diff line
@@ -5508,7 +5508,16 @@ static int bnxt_cp_rings_in_use(struct bnxt *bp) 


static int bnxt_get_func_stat_ctxs(struct bnxt *bp)

{

	return bp->cp_nr_rings + bnxt_get_ulp_stat_ctxs(bp);

	int ulp_stat = bnxt_get_ulp_stat_ctxs(bp);

	int cp = bp->cp_nr_rings;



	if (!ulp_stat)

		return cp;



	if (bnxt_nq_rings_in_use(bp) > cp + bnxt_get_ulp_msix_num(bp))

		return bnxt_get_ulp_msix_base(bp) + ulp_stat;



	return cp + ulp_stat;

}



static bool bnxt_need_reserve_rings(struct bnxt *bp)
@@ -7477,11 +7486,7 @@ unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp) 


unsigned int bnxt_get_avail_stat_ctxs_for_en(struct bnxt *bp)

{

	unsigned int stat;



	stat = bnxt_get_max_func_stat_ctxs(bp) - bnxt_get_ulp_stat_ctxs(bp);

	stat -= bp->cp_nr_rings;

	return stat;

	return bnxt_get_max_func_stat_ctxs(bp) - bnxt_get_func_stat_ctxs(bp);

}



int bnxt_get_avail_msix(struct bnxt *bp, int num)
@@ -10262,10 +10267,10 @@ static void bnxt_remove_one(struct pci_dev *pdev) 
	bnxt_dcb_free(bp);

	kfree(bp->edev);

	bp->edev = NULL;

	bnxt_cleanup_pci(bp);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

	bnxt_cleanup_pci(bp);

	bnxt_free_port_stats(bp);

	free_netdev(dev);

}
@@ -10859,6 +10864,7 @@ static void bnxt_shutdown(struct pci_dev *pdev) 


	if (system_state == SYSTEM_POWER_OFF) {

		bnxt_clear_int_mode(bp);

		pci_disable_device(pdev);

		pci_wake_from_d3(pdev, bp->wol);

		pci_set_power_state(pdev, PCI_D3hot);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int bnxt_hwrm_queue_dscp_qcaps(struct bnxt *bp) 


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

	mutex_lock(&bp->hwrm_cmd_lock);

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

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

	if (!rc) {

		bp->max_dscp_value = (1 << resp->num_dscp_bits) - 1;

		if (bp->max_dscp_value < 0x3f)

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

+3 −3
Original line number Diff line number Diff line
@@ -2842,7 +2842,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
	bool offline = false;

	u8 test_results = 0;

	u8 test_mask = 0;

	int rc, i;

	int rc = 0, i;



	if (!bp->num_tests || !BNXT_SINGLE_PF(bp))

		return;
@@ -2913,9 +2913,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
		}

		bnxt_hwrm_phy_loopback(bp, false, false);

		bnxt_half_close_nic(bp);

		bnxt_open_nic(bp, false, true);

		rc = bnxt_open_nic(bp, false, true);

	}

	if (bnxt_test_irq(bp)) {

	if (rc || bnxt_test_irq(bp)) {

		buf[BNXT_IRQ_TEST_IDX] = 1;

		etest->flags |= ETH_TEST_FL_FAILED;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -157,8 +157,10 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id, 


	if (BNXT_NEW_RM(bp)) {

		struct bnxt_hw_resc *hw_resc = &bp->hw_resc;

		int resv_msix;



		avail_msix = hw_resc->resv_irqs - bp->cp_nr_rings;

		resv_msix = hw_resc->resv_irqs - bp->cp_nr_rings;

		avail_msix = min_t(int, resv_msix, avail_msix);

		edev->ulp_tbl[ulp_id].msix_requested = avail_msix;

	}

	bnxt_fill_msix_vecs(bp, ent);

CRA Git | Maintained and supported by SUSTech CRA and CCSE