Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f490e70f authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Sasha Levin
Browse files

net: qede: fix PTP initialization on recovery 



[ Upstream commit 1c85f394c2206ea3835f43534d5675f0574e1b70 ]

Currently PTP cyclecounter and timecounter are initialized only on
the first probing and are cleaned up during removal. This means that
PTP becomes non-functional after device recovery.
Fix this by unconditional PTP initialization on probing and clearing
Tx pending bit on exiting.

Fixes: ccc67ef5 ("qede: Error recovery process")
Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarMichal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7180c8fc

drivers/net/ethernet/qlogic/qede/qede_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level, 


	/* PTP not supported on VFs */

	if (!is_vf)

		qede_ptp_enable(edev, (mode == QEDE_PROBE_NORMAL));

		qede_ptp_enable(edev);



	edev->ops->register_ops(cdev, &qede_ll_ops, edev);

drivers/net/ethernet/qlogic/qede/qede_ptp.c

+13 −18
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ void qede_ptp_disable(struct qede_dev *edev) 
	if (ptp->tx_skb) {

		dev_kfree_skb_any(ptp->tx_skb);

		ptp->tx_skb = NULL;

		clear_bit_unlock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, &edev->flags);

	}



	/* Disable PTP in HW */
@@ -422,7 +423,7 @@ void qede_ptp_disable(struct qede_dev *edev) 
	edev->ptp = NULL;

}



static int qede_ptp_init(struct qede_dev *edev, bool init_tc)

static int qede_ptp_init(struct qede_dev *edev)

{

	struct qede_ptp *ptp;

	int rc;
@@ -443,25 +444,19 @@ static int qede_ptp_init(struct qede_dev *edev, bool init_tc) 
	/* Init work queue for Tx timestamping */

	INIT_WORK(&ptp->work, qede_ptp_task);



	/* Init cyclecounter and timecounter. This is done only in the first

	 * load. If done in every load, PTP application will fail when doing

	 * unload / load (e.g. MTU change) while it is running.

	 */

	if (init_tc) {

	/* Init cyclecounter and timecounter */

	memset(&ptp->cc, 0, sizeof(ptp->cc));

	ptp->cc.read = qede_ptp_read_cc;

	ptp->cc.mask = CYCLECOUNTER_MASK(64);

	ptp->cc.shift = 0;

	ptp->cc.mult = 1;



		timecounter_init(&ptp->tc, &ptp->cc,

				 ktime_to_ns(ktime_get_real()));

	}

	timecounter_init(&ptp->tc, &ptp->cc, ktime_to_ns(ktime_get_real()));



	return rc;

	return 0;

}



int qede_ptp_enable(struct qede_dev *edev, bool init_tc)

int qede_ptp_enable(struct qede_dev *edev)

{

	struct qede_ptp *ptp;

	int rc;
@@ -482,7 +477,7 @@ int qede_ptp_enable(struct qede_dev *edev, bool init_tc) 


	edev->ptp = ptp;



	rc = qede_ptp_init(edev, init_tc);

	rc = qede_ptp_init(edev);

	if (rc)

		goto err1;

drivers/net/ethernet/qlogic/qede/qede_ptp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void qede_ptp_rx_ts(struct qede_dev *edev, struct sk_buff *skb); 
void qede_ptp_tx_ts(struct qede_dev *edev, struct sk_buff *skb);

int qede_ptp_hw_ts(struct qede_dev *edev, struct ifreq *req);

void qede_ptp_disable(struct qede_dev *edev);

int qede_ptp_enable(struct qede_dev *edev, bool init_tc);

int qede_ptp_enable(struct qede_dev *edev);

int qede_ptp_get_ts_info(struct qede_dev *edev, struct ethtool_ts_info *ts);



static inline void qede_ptp_record_rx_ts(struct qede_dev *edev,