Commit 0a806ecc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-bug-fixes' 

Michael Chan says:

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

This patch series includes 3 fixes:
 - Fix an occasional VF open failure.
 - Fix a PTP spinlock usage before initialization
 - Fix unnecesary RX packet drops under high TX traffic load.
====================

Link: https://lore.kernel.org/r/1651540392-2260-1-git-send-email-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5ef9b803 195af579

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

+8 −5
Original line number Diff line number Diff line
@@ -2707,6 +2707,10 @@ static int bnxt_poll_p5(struct napi_struct *napi, int budget) 
			u32 idx = le32_to_cpu(nqcmp->cq_handle_low);

			struct bnxt_cp_ring_info *cpr2;



			/* No more budget for RX work */

			if (budget && work_done >= budget && idx == BNXT_RX_HDL)

				break;



			cpr2 = cpr->cp_ring_arr[idx];

			work_done += __bnxt_poll_work(bp, cpr2,

						      budget - work_done);
@@ -10983,7 +10987,7 @@ static bool bnxt_rfs_capable(struct bnxt *bp) 


	if (bp->flags & BNXT_FLAG_CHIP_P5)

		return bnxt_rfs_supported(bp);

	if (!(bp->flags & BNXT_FLAG_MSIX_CAP) || !bnxt_can_reserve_rings(bp))

	if (!(bp->flags & BNXT_FLAG_MSIX_CAP) || !bnxt_can_reserve_rings(bp) || !bp->rx_nr_rings)

		return false;



	vnics = 1 + bp->rx_nr_rings;
@@ -13234,10 +13238,9 @@ static int bnxt_init_dflt_ring_mode(struct bnxt *bp) 
		goto init_dflt_ring_err;



	bp->tx_nr_rings_per_tc = bp->tx_nr_rings;

	if (bnxt_rfs_supported(bp) && bnxt_rfs_capable(bp)) {

		bp->flags |= BNXT_FLAG_RFS;

		bp->dev->features |= NETIF_F_NTUPLE;

	}



	bnxt_set_dflt_rfs(bp);



init_dflt_ring_err:

	bnxt_ulp_irq_restart(bp, rc);

	return rc;

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

+7 −8
Original line number Diff line number Diff line
@@ -846,13 +846,6 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg) 
	if (rc)

		return rc;



	if (bp->fw_cap & BNXT_FW_CAP_PTP_RTC) {

		bnxt_ptp_timecounter_init(bp, false);

		rc = bnxt_ptp_init_rtc(bp, phc_cfg);

		if (rc)

			goto out;

	}



	if (ptp->ptp_clock && bnxt_pps_config_ok(bp))

		return 0;
@@ -861,8 +854,14 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg) 
	atomic_set(&ptp->tx_avail, BNXT_MAX_TX_TS);

	spin_lock_init(&ptp->ptp_lock);



	if (!(bp->fw_cap & BNXT_FW_CAP_PTP_RTC))

	if (bp->fw_cap & BNXT_FW_CAP_PTP_RTC) {

		bnxt_ptp_timecounter_init(bp, false);

		rc = bnxt_ptp_init_rtc(bp, phc_cfg);

		if (rc)

			goto out;

	} else {

		bnxt_ptp_timecounter_init(bp, true);

	}



	ptp->ptp_info = bnxt_ptp_caps;

	if ((bp->fw_cap & BNXT_FW_CAP_PTP_PPS)) {