Commit 1e9614cd authored by Michael Chan's avatar Michael Chan Committed by Paolo Abeni
Browse files

bnxt_en: Refactor bnxt_ptp_init() 



Instead of passing the 2nd parameter phc_cfg to bnxt_ptp_init().
Store it in bp->ptp_cfg so that the caller doesn't need to know what
the value should be.

In the next patch, we'll need to call bnxt_ptp_init() in bnxt_resume()
and this will make it easier.

Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3051a77a

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

+3 −3
Original line number Diff line number Diff line
@@ -9296,7 +9296,6 @@ static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp) 
	struct hwrm_port_mac_ptp_qcfg_output *resp;

	struct hwrm_port_mac_ptp_qcfg_input *req;

	struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;

	bool phc_cfg;

	u8 flags;

	int rc;
@@ -9343,8 +9342,9 @@ static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp) 
		rc = -ENODEV;

		goto exit;

	}

	phc_cfg = (flags & PORT_MAC_PTP_QCFG_RESP_FLAGS_RTC_CONFIGURED) != 0;

	rc = bnxt_ptp_init(bp, phc_cfg);

	ptp->rtc_configured =

		(flags & PORT_MAC_PTP_QCFG_RESP_FLAGS_RTC_CONFIGURED) != 0;

	rc = bnxt_ptp_init(bp);

	if (rc)

		netdev_warn(bp->dev, "PTP initialization failed.\n");

exit:

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

+2 −2
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ static void bnxt_ptp_free(struct bnxt *bp) 
	}

}



int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg)

int bnxt_ptp_init(struct bnxt *bp)

{

	struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;

	int rc;
@@ -1061,7 +1061,7 @@ int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg) 


	if (BNXT_PTP_USE_RTC(bp)) {

		bnxt_ptp_timecounter_init(bp, false);

		rc = bnxt_ptp_init_rtc(bp, phc_cfg);

		rc = bnxt_ptp_init_rtc(bp, ptp->rtc_configured);

		if (rc)

			goto out;

	} else {

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

+2 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct bnxt_ptp_cfg { 
					 BNXT_PTP_MSG_PDELAY_REQ |	\

					 BNXT_PTP_MSG_PDELAY_RESP)

	u8			tx_tstamp_en:1;

	u8			rtc_configured:1;

	int			rx_filter;

	u32			tstamp_filters;
@@ -168,7 +169,7 @@ void bnxt_tx_ts_cmp(struct bnxt *bp, struct bnxt_napi *bnapi, 
		    struct tx_ts_cmp *tscmp);

void bnxt_ptp_rtc_timecounter_init(struct bnxt_ptp_cfg *ptp, u64 ns);

int bnxt_ptp_init_rtc(struct bnxt *bp, bool phc_cfg);

int bnxt_ptp_init(struct bnxt *bp, bool phc_cfg);

int bnxt_ptp_init(struct bnxt *bp);

void bnxt_ptp_clear(struct bnxt *bp);

static inline u64 bnxt_timecounter_cyc2time(struct bnxt_ptp_cfg *ptp, u64 ts)

{