Received-SPF: pass (google.com: domain of linux-kernel+bounces-165530-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Min Li <lnimi@hotmail.com>
To: richardcochran@gmail.com,
	lee@kernel.org
Cc: linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org,
	Min Li <min.li.xe@renesas.com>
Subject: [PATCH net-next v7 2/5] ptp: clockmatrix: set write phase timer to 0 when not in PCW mode
Date: Wed,  1 May 2024 12:03:21 -0400
Message-ID:
 <LV3P220MB1202A510FE5EE4548DB06F2BA0192@LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM>
In-Reply-To: <20240501160324.27514-1-lnimi@hotmail.com>
References: <20240501160324.27514-1-lnimi@hotmail.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: LV3P220MB1202:EE_|EA2P220MB1331:EE_
X-MS-Office365-Filtering-Correlation-Id: 77b13769-f676-4591-5506-08dc69f84914
X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016;
X-Microsoft-Antispam-Message-Info:
	qt22vGvJT3fF8OVfjTgG4JpGFmbcey0rr8sPumDbCFeeU2t+/Y0qXp5Vw6J8I3EW+rAEgcfLyw0lLWkPE6ll9IM7dUrbm91U3j7XMGhddsltU9END+fdmWLGr+86UIY8F8TVzVY8o+0soxMIms0BFeIggLz+PI2sKENFmaqrtUcUZzpqmzxnU/OdE49flO3YTI3NxJV9UZI2KGoTPkPJQir6PCTbgnbsQHyxCM6DVeVFba/yKSQAGH2IDAY0DQXKU5ywzv5ybEUQTbOsUoO+1HsGBm6QqOT2U4EQFkCDIbZdQEgPtQjMc4Q00Px/qhkY0PtFPen2b7CRvnlc1JYpw+CPey+rdLapirijO2Xiix1G9Cdxm0uIDMRfmt0oVEDKC02qHWtv2xOkJIokTH6rC+ocYauYi1YGF3cn+7aWg9a0i3n/PpmyCyJ3pkDRrbHmpof+W4nb1aarVv83RZGISbhvCPuVQ5Vg9L0KwtXPtvjK/ujqgxEZCuZgtXLhhfhkQ16PHlLSq8/lwPACvvpLNVMhPdQ0nXvAOyRlvck2pxbaFkn8pXmu2cAMgdan0k9v
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?jCCmjQGv/wDQ2i8YtiWMpvNJZ2ihF1IwyeIdPCzqRO8t+uplESUda21EYncP?=
 =?us-ascii?Q?am/frarhCd9CypxQMtlYrrpBlHFUjatPvTearo9747fvzF+o1gmnz87AXs/m?=
 =?us-ascii?Q?j294lWGWqBRDTpFBPmQFSEgdmBBl5EZHpkunqMIHKPBxRXOM39LbTKnEYu4I?=
 =?us-ascii?Q?/g+CsCNY9ISuJt0BJcTN9e9Q5queW9WfMalzTXi73k2dOKsWHuZGVrbWJhmd?=
 =?us-ascii?Q?F/6P9YmUTb7Pb+kZQLFwnD2grc9ut/Ymcwg34wD+2d63ssDlKBDynzyPu4Z7?=
 =?us-ascii?Q?VOVCLWuMluPYp6m0vJQa/Kgwy4U4KV3KwVAJ6QCgh6lNTZBLFD0swPLSk6yp?=
 =?us-ascii?Q?1GDIiKa7mf6gVa+cpUPXO7yFWB8sAUF+iOoxTTY3VCjpbf/Lt1zrQ4zcyc9C?=
 =?us-ascii?Q?xc7uBDQJAEwfKsvvUU6xOlbQJwh1nJ90I6w9mbZyvgUFC7vDxKgcmOCHxaQE?=
 =?us-ascii?Q?MWbxtT6g/htGY5YNeVH4lttwxzveDgpJaCZEXWLYPqSfIZj6NWgLqIfhJiX6?=
 =?us-ascii?Q?7AfgDFhnGo0BXN+st/4JdURkI0o1C55K/8zhZ73/CuK8bKten26zRTD5li96?=
 =?us-ascii?Q?ACJUo5nHXHFXdp5CPzCFjHwxbDwI6EkxjbZxR+O+mYNkFeUlSWtg5VufIBgY?=
 =?us-ascii?Q?pxLdL0XMxnbwAWLHFLaT7M9yMSkkWTxfr16yWfHs455DcxWMjbe6iz4AvBOP?=
 =?us-ascii?Q?oOGx8kcUrL4epg6jkEOfQfQ6YXG9r+Pn/iLy2k34N72MgmbxX0WMHIuS9Gw+?=
 =?us-ascii?Q?wdjT3SZI5b59uC76NYNaz/QzwmwmPA1i7YTmHmOZOO2cSf7t49Af3Yzed+N3?=
 =?us-ascii?Q?iItlnoGPnHX3EEzUV3scDwZWNeP480TRmdinBlhChg1hY4EW4OThbw0bFdc4?=
 =?us-ascii?Q?XKq4sscN99+U2fgb5QmXtWxXZYbBcD3V6pZauaL6U1a0HYeTPiW6SB8hWXR8?=
 =?us-ascii?Q?BTHmx4Z+rB5UtxIaoejsCDB529Vk9cFrTbpTqv9N4ZR27BGd8kMAs/n5uDaM?=
 =?us-ascii?Q?Ov8bE6rnDSE0niMjMT9zW5+QI9UgQeOBUKoGQH7u2/IXUwPDvSipTnL0XTSE?=
 =?us-ascii?Q?kzraFeJti8p6dI5i4POujltblyFvN4nBKB2iiMAXAMl+5iRs3B0Tq96PP7Sn?=
 =?us-ascii?Q?qkJGfDpCpWkEqMBy6MGcLQeE6Z275j3qCz4CQ3t6rlMRQle7hOwnJa12RCbi?=
 =?us-ascii?Q?uNSSvJLQyoMfEMLjYmKTSU+sZPhJqN4+3FjnELbRIzm/VbySUiniQRzKsMI?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 77b13769-f676-4591-5506-08dc69f84914
X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 16:03:48.0829
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: EA2P220MB1331

From: Min Li <min.li.xe@renesas.com>

In order for phase pull-in to work, write phase timer shall be 0
when not in write phase mode. Also Fix u8 -> u16, DPLL_WF_TIMER
and DPLL_WP_TIMER are 2-byte registers

Signed-off-by: Min Li <min.li.xe@renesas.com>
---
 drivers/ptp/ptp_clockmatrix.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
index f8556627befa..d069b6e451ef 100644
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -1396,6 +1396,20 @@ static int idtcm_set_pll_mode(struct idtcm_channel *channel,
 	struct idtcm *idtcm = channel->idtcm;
 	int err;
 	u8 dpll_mode;
+	u8 buf[2] = {0};
+
+	/* Setup WF/WP timer for phase pull-in to work correctly */
+	err = idtcm_write(idtcm, channel->dpll_n, DPLL_WF_TIMER,
+			  buf, sizeof(buf));
+	if (err)
+		return err;
+
+	if (mode == PLL_MODE_WRITE_PHASE)
+		buf[0] = 160;
+	err = idtcm_write(idtcm, channel->dpll_n, DPLL_WP_TIMER,
+			  buf, sizeof(buf));
+	if (err)
+		return err;
 
 	err = idtcm_read(idtcm, channel->dpll_n,
 			 IDTCM_FW_REG(idtcm->fw_ver, V520, DPLL_MODE),
-- 
2.39.2