Commit 4971394d authored by Jian Shen's avatar Jian Shen Committed by Jakub Kicinski
Browse files

net: hns3: defer calling ptp_clock_register() 



Currently the ptp_clock_register() is called before relative
ptp resource ready. It may cause unexpected result when upper
layer called the ptp API during the timewindow. Fix it by
moving the ptp_clock_register() to the function end.

Fixes: 0bf5eb78 ("net: hns3: add support for PTP")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20250430093052.2400464-5-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e317aebe

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c

+7 −6
Original line number Diff line number Diff line
@@ -440,6 +440,13 @@ static int hclge_ptp_create_clock(struct hclge_dev *hdev) 
	ptp->info.settime64 = hclge_ptp_settime;



	ptp->info.n_alarm = 0;



	spin_lock_init(&ptp->lock);

	ptp->io_base = hdev->hw.hw.io_base + HCLGE_PTP_REG_OFFSET;

	ptp->ts_cfg.rx_filter = HWTSTAMP_FILTER_NONE;

	ptp->ts_cfg.tx_type = HWTSTAMP_TX_OFF;

	hdev->ptp = ptp;



	ptp->clock = ptp_clock_register(&ptp->info, &hdev->pdev->dev);

	if (IS_ERR(ptp->clock)) {

		dev_err(&hdev->pdev->dev,
@@ -451,12 +458,6 @@ static int hclge_ptp_create_clock(struct hclge_dev *hdev) 
		return -ENODEV;

	}



	spin_lock_init(&ptp->lock);

	ptp->io_base = hdev->hw.hw.io_base + HCLGE_PTP_REG_OFFSET;

	ptp->ts_cfg.rx_filter = HWTSTAMP_FILTER_NONE;

	ptp->ts_cfg.tx_type = HWTSTAMP_TX_OFF;

	hdev->ptp = ptp;



	return 0;

}