Commit 22b9c41a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-5-bug-fixes' 

Michael Chan says:

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

This patchset fixes various issues, including SRIOV error unwinding,
one error recovery path, live patch reporting, XDP transmit path,
and PHC clock reading.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f946964a ddde5412

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

+3 −2
Original line number Diff line number Diff line
@@ -7790,7 +7790,7 @@ static void bnxt_hwrm_dbg_qcaps(struct bnxt *bp) 


static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);



static int bnxt_hwrm_func_qcaps(struct bnxt *bp)

int bnxt_hwrm_func_qcaps(struct bnxt *bp)

{

	int rc;
@@ -10065,7 +10065,8 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 


	if (flags & FUNC_DRV_IF_CHANGE_RESP_FLAGS_RESC_CHANGE)

		resc_reinit = true;

	if (flags & FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE)

	if (flags & FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE ||

	    test_bit(BNXT_STATE_FW_RESET_DET, &bp->state))

		fw_reset = true;

	else

		bnxt_remap_fw_health_regs(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,7 @@ int bnxt_cancel_reservations(struct bnxt *bp, bool fw_reset); 
int bnxt_hwrm_alloc_wol_fltr(struct bnxt *bp);

int bnxt_hwrm_free_wol_fltr(struct bnxt *bp);

int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all);

int bnxt_hwrm_func_qcaps(struct bnxt *bp);

int bnxt_hwrm_fw_set_time(struct bnxt *);

int bnxt_open_nic(struct bnxt *, bool, bool);

int bnxt_half_open_nic(struct bnxt *bp);

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

+5 −3
Original line number Diff line number Diff line
@@ -979,9 +979,11 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (rc)

		return rc;



	if (BNXT_CHIP_P5(bp)) {

		rc = bnxt_dl_livepatch_info_put(bp, req, BNXT_FW_SRT_PATCH);

		if (rc)

			return rc;

	}

	return bnxt_dl_livepatch_info_put(bp, req, BNXT_FW_CRT_PATCH);



}

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

+11 −2
Original line number Diff line number Diff line
@@ -76,14 +76,23 @@ static int bnxt_refclk_read(struct bnxt *bp, struct ptp_system_timestamp *sts, 
			    u64 *ns)

{

	struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;

	u32 high_before, high_now, low;



	if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))

		return -EIO;



	high_before = readl(bp->bar0 + ptp->refclk_mapped_regs[1]);

	ptp_read_system_prets(sts);

	*ns = readl(bp->bar0 + ptp->refclk_mapped_regs[0]);

	low = readl(bp->bar0 + ptp->refclk_mapped_regs[0]);

	ptp_read_system_postts(sts);

	*ns |= (u64)readl(bp->bar0 + ptp->refclk_mapped_regs[1]) << 32;

	high_now = readl(bp->bar0 + ptp->refclk_mapped_regs[1]);

	if (high_now != high_before) {

		ptp_read_system_prets(sts);

		low = readl(bp->bar0 + ptp->refclk_mapped_regs[0]);

		ptp_read_system_postts(sts);

	}

	*ns = ((u64)high_now << 32) | low;



	return 0;

}

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

+6 −1
Original line number Diff line number Diff line
@@ -823,8 +823,10 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs) 
		goto err_out2;



	rc = pci_enable_sriov(bp->pdev, *num_vfs);

	if (rc)

	if (rc) {

		bnxt_ulp_sriov_cfg(bp, 0);

		goto err_out2;

	}



	return 0;
@@ -832,6 +834,9 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs) 
	/* Free the resources reserved for various VF's */

	bnxt_hwrm_func_vf_resource_free(bp, *num_vfs);



	/* Restore the max resources */

	bnxt_hwrm_func_qcaps(bp);



err_out1:

	bnxt_free_vf_resources(bp);