Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Min Li <min.li.xe@renesas.com>
To:     richardcochran@gmail.com, lee.jones@linaro.org
Cc:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        Min Li <min.li.xe@renesas.com>
Subject: [PATCH net v5 2/3] ptp: ptp_clockmatrix: return -EBUSY if phase pull-in is in progress
Date:   Wed, 11 May 2022 10:25:13 -0400
Message-Id: <1652279114-25939-2-git-send-email-min.li.xe@renesas.com>
In-Reply-To: <1652279114-25939-1-git-send-email-min.li.xe@renesas.com>
References: <1652279114-25939-1-git-send-email-min.li.xe@renesas.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8Xu9/u4vOOPUiggt18SkO1XHXVvL3HNPXLmWKOC+Xf+entBQh5mnwLFxDCh3?=
 =?us-ascii?Q?B9O5T5VdlYmoy1rz6WUvPW7eXlnKvQJupD8NIcZaLgnT0kU1k0xqSh1o8nMM?=
 =?us-ascii?Q?uln93glC13AJReIerHVulI6qwjqUFWH4+09ZSIoqYvW0oy+thJRDAnZOoX3j?=
 =?us-ascii?Q?fCc8W1a4EBSJtKQo1ykE2FsqnRX/4txRcXHTmjXNra5UwF0+f5J8WnwR1xRi?=
 =?us-ascii?Q?6lizPnTqssIL2xhzGqUOd/bIL0y7/nBSZl8wMtSrZuE+XTHgMIaZn4EzoaIU?=
 =?us-ascii?Q?IDP/R2pHIXR8RDdAAww7/On1wxTIYiS51IWSjBxQF8KkGyXJkh0rYyOqv067?=
 =?us-ascii?Q?JH/3Ziu1I1Dk8Kpg0LrgtRvoQB4tzUDR7KhDgPpzzDdg2b+RUOZFFMpAzV2R?=
 =?us-ascii?Q?ov1SdlhvX6gpwXomBXvIyo3ijYCgNb4EjkbRQZrXhTEScbzgnkhYr8DMo3CJ?=
 =?us-ascii?Q?NQWOvWgGQ155en7Q55t7TzMyshnwDA0Mw4mCwKI81iYgF0IApoJeJCQxizww?=
 =?us-ascii?Q?pPWRhmjcPSBp4bpN/8j0t36tm1JxVIqSzYug0gFN08Yr1OXSegHVTf7WDW63?=
 =?us-ascii?Q?f8/Vmnj3P7cAenY2DUKZ3ZsYRSrbI4mDnEarVNj7Muopq7K1b6vrhL6eoAaV?=
 =?us-ascii?Q?qsuKTCCX55sBkMP206XrdT6g/FGHku2KbhzS/S2Hbpqz3xGnvTQVflrgErHh?=
 =?us-ascii?Q?mSUovOsm64HxcnlvTFPuMaJceNVGw1jBNjD/ANmmP4KPilZr71dVbSFZdyQI?=
 =?us-ascii?Q?TMw0gln4kDubg/vnlTZ+C1fS4RxbEOcc5lm3P5LIPKGEjjKbFLzqyOFSYSe0?=
 =?us-ascii?Q?fwmrUag2Pc3UJyI1HVZCzpS2Pv2EyxLtHRp36Lnp3ntlVBCUcNiwDrvJ/8Hm?=
 =?us-ascii?Q?R4iqRJD8slQf6im/5Lt8Fl09ElBka6ppjJMMiofS4whQz75gs49ATTrH7yoN?=
 =?us-ascii?Q?f26grvwYvgyBafDxvhjCCUF2YIIZgNaBn+gd6BR5P+e4dQRCnbCrkk4oRRb+?=
 =?us-ascii?Q?E7ey1e0UKIwMKYGnQDwSnqvlFMMUS9DKrSTNjDhhcwZU841IV8WRI4nbQYaQ?=
 =?us-ascii?Q?04JVslfi5JwdENLfKmGBEPX/VnLTua5FN/6CapvBO3Enud6SR0D9u+C0XTy6?=
 =?us-ascii?Q?vL3iRjucLnKHvYFxQ1DDQY3u+lPK6jNZdlRoVlnnKCA4tCMEJtpSPNkM5cOY?=
 =?us-ascii?Q?ZQx5yFqoz09ivZsVXd1ePpiq2RKCCQmwga8/rfGkFBqEO9GIemCCdkPoGzdW?=
 =?us-ascii?Q?rwP2tsBmebik/9/w5FHBp/c605CZpxjP02qqvqEm9lTIT6Ldn+HnXgxGRMzY?=
 =?us-ascii?Q?3z/YSYZfkPAmaxWWFkuOysGudfocOzmwclYcuwDEPwvYZiIc7Tg6C3oZ8vSX?=
 =?us-ascii?Q?AbEgmD/Uzn0EeKsOEk90/gqzy3DODEaJJaJmbpI/H9MVFz5yOl7Ob78/FYfp?=
 =?us-ascii?Q?QFVwSu/yzbiY9OUUxYC+GUFd/fXL2DCUIWjyYAnOVPnukY44U+Cs6AoQ800o?=
 =?us-ascii?Q?F4snvgXhcpMzvSfdf8KioPlJQie19gTBpEMkFYtFFQniwluPkqqn4ZFSEuIY?=
 =?us-ascii?Q?Y2R+VskzTlUVM/UPplyDwfwfgiIo+Qi+4iSqrU4AArshY75uRpFrJd9tV9u3?=
 =?us-ascii?Q?JgLRr+cjhuUPosQCNr2iL9krUtLlfexdWkJ4DSnYf1RoQZmCeW3sGBwZiCRI?=
 =?us-ascii?Q?9GEXxkWhNdkIdfTrpo4wsucewzzFVDXGnSmaf0FtHxrOMES38ePuBDS0CPmJ?=
 =?us-ascii?Q?KI9D5IUSlZpfDPOjX3mPdFL3buOVXVU=3D?=
X-OriginatorOrg: renesas.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a2a24860-0a8f-4e6c-d74e-08da335a1cb6
X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB6593.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 14:25:35.0351
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: x9dRXfFFMx0eY5+5Xr/zdfgSEJPHB9JEhANGfCFZG9gMVvtClanljtzS/QKiidaDN1pXpyJSdcoISLc1MycVig==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB4850
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Also removes PEROUT_ENABLE_OUTPUT_MASK

Signed-off-by: Min Li <min.li.xe@renesas.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/ptp/ptp_clockmatrix.c | 32 ++------------------------------
 drivers/ptp/ptp_clockmatrix.h |  2 --
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
index aaff5cd..ea87487 100644
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -1363,43 +1363,15 @@ static int idtcm_output_enable(struct idtcm_channel *channel,
 	return idtcm_write(idtcm, (u16)base, OUT_CTRL_1, &val, sizeof(val));
 }
 
-static int idtcm_output_mask_enable(struct idtcm_channel *channel,
-				    bool enable)
-{
-	u16 mask;
-	int err;
-	u8 outn;
-
-	mask = channel->output_mask;
-	outn = 0;
-
-	while (mask) {
-		if (mask & 0x1) {
-			err = idtcm_output_enable(channel, enable, outn);
-			if (err)
-				return err;
-		}
-
-		mask >>= 0x1;
-		outn++;
-	}
-
-	return 0;
-}
-
 static int idtcm_perout_enable(struct idtcm_channel *channel,
 			       struct ptp_perout_request *perout,
 			       bool enable)
 {
 	struct idtcm *idtcm = channel->idtcm;
-	unsigned int flags = perout->flags;
 	struct timespec64 ts = {0, 0};
 	int err;
 
-	if (flags == PEROUT_ENABLE_OUTPUT_MASK)
-		err = idtcm_output_mask_enable(channel, enable);
-	else
-		err = idtcm_output_enable(channel, enable, perout->index);
+	err = idtcm_output_enable(channel, enable, perout->index);
 
 	if (err) {
 		dev_err(idtcm->dev, "Unable to set output enable");
@@ -1903,7 +1875,7 @@ static int idtcm_adjtime(struct ptp_clock_info *ptp, s64 delta)
 	int err;
 
 	if (channel->phase_pull_in == true)
-		return 0;
+		return -EBUSY;
 
 	mutex_lock(idtcm->lock);
 
diff --git a/drivers/ptp/ptp_clockmatrix.h b/drivers/ptp/ptp_clockmatrix.h
index 4379650..bf1e49409 100644
--- a/drivers/ptp/ptp_clockmatrix.h
+++ b/drivers/ptp/ptp_clockmatrix.h
@@ -54,8 +54,6 @@
 #define LOCK_TIMEOUT_MS			(2000)
 #define LOCK_POLL_INTERVAL_MS		(10)
 
-#define PEROUT_ENABLE_OUTPUT_MASK	(0xdeadbeef)
-
 #define IDTCM_MAX_WRITE_COUNT		(512)
 
 #define PHASE_PULL_IN_MAX_PPB		(144000)
-- 
2.7.4