From patchwork Tue Nov 12 17:06:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 13872649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 956A6D42BB3 for ; Tue, 12 Nov 2024 17:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nVtphm0cd92uCNrWWJUGo3RJLZx12bWCtkJrrYfGlSo=; b=dV6owWU2Ozbxg88KcwN4AOnVb5 pRCoBhJ9xudeybJoLdasDwOQPsOuByWrQbIKx5rKSkyeeznSA68V2jA8XyN3wkajxbuuCMlZN55ch 57tsifw2g2+2LknxsmxpDaDjJFz1c2Hg6RIYXBUwdkYKz3votUXH8nD5RR/4TLngpiqi8qhsmBOXZ /m3kcViVaJmB+V97Q+8mX6v77VZOO//xlj6Ckb6YTl8MQ8z2hvXidyP/aOLyOPyl/7c8aIrz2lGlI P5fhtqrO+GrEWvdMqGbtvfo6iXywl5ahi0CeTfVT/5BwT6mnXqUu2pzC6AJ/jAJ8e2fBOzVgDQcqp KLMTVUtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tAubd-00000004Lkh-1IGD; Tue, 12 Nov 2024 17:23:09 +0000 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tAuM6-00000004I8b-1dt5 for linux-arm-kernel@lists.infradead.org; Tue, 12 Nov 2024 17:07:08 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 11CE5E0003; Tue, 12 Nov 2024 17:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1731431224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nVtphm0cd92uCNrWWJUGo3RJLZx12bWCtkJrrYfGlSo=; b=VUs0vHrqRT6gmNV+qM2o7SK4Ufz4FuiWZfazvKngkJCFOIrp8DAR467nZvLpRLUDTMgxF1 9NYrLw4ZBXUQL0Z2jBDyyosH1V9svrfMsrK7vwagKF3md+65xJCHEEjUDyL2x4mAvnglqJ zQRmMUG2Wh2CaRPJrG/VL85p0REl0tg17l3xvH+6Yv/bpSXvQPLWqyVxRtxviazfGEk0Zb v9NTzIN5S+RYa5frnahoNQg4gewc/k3RGIDhhKLiW0ZE1l5xOpZZgH31tLzns3bIho03ov vLFtKABvz4Od8wvpUoW25wH7B6akGQJXHhUFJ3Dz8VXSN9BaQ11BOHZIVhyLeA== From: Maxime Chevallier To: Alexandre Torgue , Jose Abreu , Andrew Lunn , davem@davemloft.net, Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Richard Cochran Cc: Maxime Chevallier , =?utf-8?q?Alexis_Loth?= =?utf-8?q?or=C3=A9?= , Thomas Petazzoni , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Daniel Machon , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 3/9] net: stmmac: Only update the auto-discovered PTP clock features Date: Tue, 12 Nov 2024 18:06:51 +0100 Message-ID: <20241112170658.2388529-4-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112170658.2388529-1-maxime.chevallier@bootlin.com> References: <20241112170658.2388529-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241112_090706_692650_FAFB34A2 X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some DWMAC variants such as dwmac1000 don't support discovering the number of output pps and auxiliary snapshots. Allow these parameters to be defined in default ptp_clock_info, and let them be updated only when the feature discovery yielded a result. Reviewed-by: Daniel Machon Signed-off-by: Maxime Chevallier --- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 41581f516ea9..8ea2b4226234 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -303,8 +303,14 @@ void stmmac_ptp_register(struct stmmac_priv *priv) if (priv->plat->has_gmac4 && priv->plat->clk_ptp_rate) priv->plat->cdc_error_adj = (2 * NSEC_PER_SEC) / priv->plat->clk_ptp_rate; - priv->ptp_clock_ops.n_per_out = priv->dma_cap.pps_out_num; - priv->ptp_clock_ops.n_ext_ts = priv->dma_cap.aux_snapshot_n; + /* Update the ptp clock parameters based on feature discovery, when + * available + */ + if (priv->dma_cap.pps_out_num) + priv->ptp_clock_ops.n_per_out = priv->dma_cap.pps_out_num; + + if (priv->dma_cap.aux_snapshot_n) + priv->ptp_clock_ops.n_ext_ts = priv->dma_cap.aux_snapshot_n; if (priv->plat->ptp_max_adj) priv->ptp_clock_ops.max_adj = priv->plat->ptp_max_adj;