Commit 2b156fb5 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Initiallize bp->ptp_lock first before using it 



bnxt_ptp_init() calls bnxt_ptp_init_rtc() which will acquire the ptp_lock
spinlock.  The spinlock is not initialized until later.  Move the
bnxt_ptp_init_rtc() call after the spinlock is initialized.

Fixes: 24ac1ecd ("bnxt_en: Add driver support to use Real Time Counter for PTP")
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarSaravanan Vajravel <saravanan.vajravel@broadcom.com>
Reviewed-by: default avatarAndy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: default avatarDamodharam Ammepalli <damodharam.ammepalli@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 13ba7943

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)) {