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

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

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: Misc. bug fixes.

4 small bug fixes related to setting firmware message enables bits, possible
memory leak when probe fails, and ring accouting when RDMA driver is loaded.

Please queue these for -stable as well.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 471b83bd c78fe058

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

+8 −6
Original line number Diff line number Diff line
@@ -3017,11 +3017,12 @@ static void bnxt_free_hwrm_resources(struct bnxt *bp) 
{

	struct pci_dev *pdev = bp->pdev;



	if (bp->hwrm_cmd_resp_addr) {

		dma_free_coherent(&pdev->dev, PAGE_SIZE, bp->hwrm_cmd_resp_addr,

				  bp->hwrm_cmd_resp_dma_addr);



		bp->hwrm_cmd_resp_addr = NULL;

	}

}



static int bnxt_alloc_hwrm_resources(struct bnxt *bp)

{
@@ -4650,7 +4651,7 @@ __bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct hwrm_func_cfg_input *req, 
				      FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;

		enables |= ring_grps ?

			   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS : 0;

		enables |= vnics ? FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS : 0;

		enables |= vnics ? FUNC_CFG_REQ_ENABLES_NUM_VNICS : 0;



		req->num_rx_rings = cpu_to_le16(rx_rings);

		req->num_hw_ring_grps = cpu_to_le16(ring_grps);
@@ -8621,7 +8622,7 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, 
	*max_tx = hw_resc->max_tx_rings;

	*max_rx = hw_resc->max_rx_rings;

	*max_cp = min_t(int, bnxt_get_max_func_cp_rings_for_en(bp),

			hw_resc->max_irqs);

			hw_resc->max_irqs - bnxt_get_ulp_msix_num(bp));

	*max_cp = min_t(int, *max_cp, hw_resc->max_stat_ctxs);

	max_ring_grps = hw_resc->max_hw_ring_grps;

	if (BNXT_CHIP_TYPE_NITRO_A0(bp) && BNXT_PF(bp)) {
@@ -9057,6 +9058,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bnxt_clear_int_mode(bp);



init_err_pci_clean:

	bnxt_free_hwrm_resources(bp);

	bnxt_cleanup_pci(bp);



init_err_free:

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

+3 −3
Original line number Diff line number Diff line
@@ -98,13 +98,13 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, 


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

	for (i = 0; i < max_tc; i++) {

		u8 qidx;

		u8 qidx = bp->tc_to_qidx[i];



		req.enables |= cpu_to_le32(

			QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID << i);

			QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID <<

			qidx);



		memset(&cos2bw, 0, sizeof(cos2bw));

		qidx = bp->tc_to_qidx[i];

		cos2bw.queue_id = bp->q_info[qidx].queue_id;

		if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_STRICT) {

			cos2bw.tsa =