Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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 v6 2/2] ptp: ptp_clockmatrix: return -EBUSY if phase pull-in is in progress
Date:   Mon, 16 May 2022 10:47:07 -0400
Message-Id: <1652712427-14703-2-git-send-email-min.li.xe@renesas.com>
In-Reply-To: <1652712427-14703-1-git-send-email-min.li.xe@renesas.com>
References: <1652712427-14703-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?fUiEJpeWsJyaaCHe5N4LjtE0qBHVJ9SQhJo9BIiDNJHct0USo0vHU7e8j6+r?=
 =?us-ascii?Q?kGbshHTHG3T79/1V6/ZTS/N2Yj8eARbubI47gtEsQ9uPajVwOnJ1FCqAKl7M?=
 =?us-ascii?Q?Qej9AwQb3VWxASYTXJjhbl3yWKMEhMpkCQ7HqnLovm4mYSxxk4CzLDkKqfdm?=
 =?us-ascii?Q?J6Q7V1LoJCPUz2KwXPdhe3H5kXQ8TbfxM9ADoP2zaUrmMSeAdMav54surJkT?=
 =?us-ascii?Q?gJ8uHXP9xRU+3+3cxIkUfbd6SzUT4k7hpKlYWrhs9/d4AaRmr3BwmIEU3IuI?=
 =?us-ascii?Q?OVbuZ7maz++hyAC6lcchUObtieRQrBL0jDL7w8UrWKqvB7+47IF9xowhtkiT?=
 =?us-ascii?Q?HiCJBjr7wXTzSzRlFflXzXy6GJ0H6MT3OwgtCxjO2fVkbU83EMiC+rP02xHB?=
 =?us-ascii?Q?5fhNIk9WAhtxBxhuhGv55mJzW3oLvugA/OPRWwcuxWpvIvZaqleZPgSIwZeQ?=
 =?us-ascii?Q?/Eud+1Zkye90dyxsL/LKsCrHslA3FbHZJyznEowsjlJfbtUmNLXwO1VpDWzA?=
 =?us-ascii?Q?iITahoIADr/fYKP7ukIOTcKthBsFR2/LL1U3hnckISzBZ1wfor17pZKGBVBy?=
 =?us-ascii?Q?9J2Abo4pa/MzrBAi2vb7wX3IOJK7Aa7oVl4SEYhdBDonHy4EvPc/au4XwRy9?=
 =?us-ascii?Q?5BRTUYimIcBxxnh3k8a1LOn1BMZcvRB2yKxVqrh/x88Y+q/pNivgPwk4O/6F?=
 =?us-ascii?Q?xIcxlzH8ul6x3Fpunxg4gDoX5lR8CMxUWWdYZ8X506vD9RFvDPxfC1t8f7Ar?=
 =?us-ascii?Q?3kf8JMuqIpSM2Vk3f88bxWpPoAEQ3DcCGM4s9hT0dhpEJxaJyrQrly6HnWI+?=
 =?us-ascii?Q?M81BmlUF1Jq+g1fFWjSQehYJCVJOGMeMQT08RAfxNc3WTbscLjaIZ0xUiWnN?=
 =?us-ascii?Q?NM9pebNoYdAgacbPhrMY1y41gXmq60UAROdc0hKRhnzcFyAXZgrPdv4YOFo9?=
 =?us-ascii?Q?jNE8GII86sZUv87riMYK2/pv19MBhTbs2BQ89coMSQ+E8OQxClflHYlLR/Gh?=
 =?us-ascii?Q?6+a2mC7G4xV17UfSFcFVouoC8CVYRR0CITiNvLXHyldkHorjl+B+XUOfKg0W?=
 =?us-ascii?Q?LLJJvmOxMvMlhoRALjKyZDcMnkuY2Vu/m5w8ss1R5EUPGLKH4b+rSiJnDxlE?=
 =?us-ascii?Q?BBxFzgDvLYcX7B/DcJHmaFI13nRUIbFdFH1dJI1dGXL7PjD/7zuPlwMcwjJk?=
 =?us-ascii?Q?NGDO8MFubVLzKE3GIaUToLt3XspGTPdwsPDFZCG9HsFU2LK0BVNf92OhIM0x?=
 =?us-ascii?Q?JQZCrGjoKU3QuJZkYI176pIsFdqraSdob41ok0kG101NTRKAO5ZQzxLjlceD?=
 =?us-ascii?Q?o+8+ruPP7d/QHa50yHCJCBMWXZaY/IglMuSa8O8fhpHnT7gyPn6C1/irfY+h?=
 =?us-ascii?Q?wmk0r8ET0/eHCfjF48Lq/FlMshXhxRmaPSZozDLg3AiSvbvAHfLE4HGquU1N?=
 =?us-ascii?Q?vU3HWcwTtNUuX7ZpP1rq3FE22c0uFzYAHsY6dk8+XmT2DwiptI3KZm0arm43?=
 =?us-ascii?Q?PMrh923/bQrmfepgfiNs6yYveR5IY08g2Kpn2wLHwojsgHaMuu0LwD5SIkno?=
 =?us-ascii?Q?LIQxscp7SXaGvrOUkG33+j+n4SB1fIe6BRFHGosWbJHxcK5S+EeK+Y6XjxtK?=
 =?us-ascii?Q?u9eXseNsXLJcNRuMwNgwTP1hmvnQ37/04ff1CEVMmgsXn8VkieywgSeC3xgF?=
 =?us-ascii?Q?cZgiYazqi1StyxXO9uJjg09NUGvpr+KfnH4XpIamJLw2L3YOG1g4RZgSDgMz?=
 =?us-ascii?Q?cILzUpYr1WWjyznMxHoYkPQevxpo2F8=3D?=
X-OriginatorOrg: renesas.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 87c1834a-8004-4d93-ea94-08da374b0177
X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB6593.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 14:47:31.5400
 (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: LWEg8e1e5qmqbUwd4hJgH0w2CZMyy0XM270RxV5noQCqypkpI4JgT+Ad2vsDYmYPMmXCroooAwWeSbZUgIxsfA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8588
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham 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 2507576..cb258e1 100644
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -1352,43 +1352,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");
@@ -1892,7 +1864,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