Commit edc52873 authored by Pavan Chebbi's avatar Pavan Chebbi Committed by Jakub Kicinski
Browse files

bnxt: Defer PTP initialization to after querying function caps 



Driver uses the flag BNXT_FLAG_MULTI_HOST to determine whether
to use non-realtime mode PHC when running on a multi host NIC.
However when ptp initializes on a NIC with shared PHC, we still
don't have this flag set yet because HWRM_FUNC_QCFG is issued
much later.

Move the ptp initialization code after we have issued func_qcfg.
The next patch will use the BNXT_FLAG_MULTI_HOST flag during PTP
initialization.

Signed-off-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
Acked-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a3a4e300

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

+3 −1
Original line number Diff line number Diff line
@@ -7769,7 +7769,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) 
		if (flags & FUNC_QCAPS_RESP_FLAGS_WOL_MAGICPKT_SUPPORTED)

			bp->flags |= BNXT_FLAG_WOL_CAP;

		if (flags & FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED) {

			__bnxt_hwrm_ptp_qcfg(bp);

			bp->fw_cap |= BNXT_FW_CAP_PTP;

		} else {

			bnxt_ptp_clear(bp);

			kfree(bp->ptp_cfg);
@@ -12298,6 +12298,8 @@ static int bnxt_fw_init_one_p2(struct bnxt *bp) 
	bnxt_hwrm_vnic_qcaps(bp);

	bnxt_hwrm_port_led_qcaps(bp);

	bnxt_ethtool_init(bp);

	if (bp->fw_cap & BNXT_FW_CAP_PTP)

		__bnxt_hwrm_ptp_qcfg(bp);

	bnxt_dcb_init(bp);

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -1996,6 +1996,7 @@ struct bnxt { 
	#define BNXT_FW_CAP_HOT_RESET_IF		BIT_ULL(29)

	#define BNXT_FW_CAP_RING_MONITOR		BIT_ULL(30)

	#define BNXT_FW_CAP_DBG_QCAPS			BIT_ULL(31)

	#define BNXT_FW_CAP_PTP				BIT_ULL(32)



	u32			fw_dbg_cap;