Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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 2/2] ptp: ptp_clockmatrix: return -EBUSY if phase pull-in is in progress
Date:   Tue, 26 Apr 2022 15:32:54 -0400
Message-Id: <1651001574-32457-2-git-send-email-min.li.xe@renesas.com>
In-Reply-To: <1651001574-32457-1-git-send-email-min.li.xe@renesas.com>
References: <1651001574-32457-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?vi14cMr3BzCoyndOahln+9w9Gq9NDiLzLaR+JlVkEH4vSmEXyYE99KHjvlqm?=
 =?us-ascii?Q?2N6vZtMh2rxgZzGQlK9yDx29re5z4KabLMk4ESEiyvsfPkv2XObTUnTQAAXJ?=
 =?us-ascii?Q?wzfWcOBTy3zqVDcw4bymobi60+y7l6LTzSlcEK+j19zD7k/p9jVcVfh1KIJI?=
 =?us-ascii?Q?5YfsBHjhf6aEZmRa3L5KNi2wNb4P8+XHih1lyvjqVHVWMg+Y5bHPSPgoq1OI?=
 =?us-ascii?Q?XZ5AZg3hggySX2XNDo23iTWny5qNNCT0iR+SP+axjQDc+P/EAkdMLUeQOhrK?=
 =?us-ascii?Q?C9SsPJOfShOyNbObhuV1dWMktKAuhdxb9q2Sul9DAt84bJu3hzGPUCMRCRG8?=
 =?us-ascii?Q?3ABb7uZCIvnWiQHPU4OPGtBzGhwGz3tywa5DZr/D9y/6FHk83vDPrWjRDyFq?=
 =?us-ascii?Q?iWY7w7XFjBmGgryU9uvSwbL0MU0Tk/p8O1AKqfPfgtjc9jig+/MFjm2DKcQ7?=
 =?us-ascii?Q?6wl+f5KjTFgCxVY6QqVpk922GpqcYp1id+PsHFBpxG654YBXA5RUsqJqsDiu?=
 =?us-ascii?Q?/GjRZ8lv66RDBOQ2FlYKfXE6mQQxOyZVv2x7Dt+dMCthmPqsEpQt9gusJ1a+?=
 =?us-ascii?Q?xEHjIt1AtPgTiMbxVK4WLY89s7IVLn4PL5b2xV4PXJm3wx1Y3xMlTZEcNNnV?=
 =?us-ascii?Q?YCePCG05/eGQn6SsTjeEmsfTW3evntIOK+KRcuCn3Qq7UOroIkImS7uTbwmi?=
 =?us-ascii?Q?XXLacDp5Sak/5eDLs5PZ1RsEoHJ7LJG2Vbzpy4yquZxaAO7GmTABqLQidY4Z?=
 =?us-ascii?Q?Swe3KScVPdDnm14XmHnlUFll3naao4WrhVdCht4jkB3myW4yKA4yBJuUCZaT?=
 =?us-ascii?Q?bn9hXdumOmQhCUIsvIapLBppijTvUT5SuLQbGJMwSA3kb0MV6M49IBPsDld1?=
 =?us-ascii?Q?44MesMsw5kv2mPPi/UbVi1PPkp199aDQc2jal+O6GS/ATjMAoWm+llx7gtXv?=
 =?us-ascii?Q?5bQXE1qoB2WWNdMPoa4jXr/BcVVi+Jsr98tsxJp2UDN0eKdjTTPb23R7b+b+?=
 =?us-ascii?Q?XDjEvtG2/TAVcEDhghBU7xoJfYhlvwzOq0I0F/UV0UhGWZTMxbpE7VSxayvV?=
 =?us-ascii?Q?cgWV+JGpzWMu7wMkA0MG7RAf7vo9ZpbpchG37AQlaAJCQkaUAz3AxxEUn8VE?=
 =?us-ascii?Q?o5IAFvDpGr8zyTdq+o3UqKyV1yaSVLSCwZqyKv3YkT6xXHOvg/9u2nMTIr6Y?=
 =?us-ascii?Q?SiN+qMR0DRBZRBLrO9gazyr3Dx4u+Ce5XnBUvIIan05IRfwfvdoR2BT7W3XY?=
 =?us-ascii?Q?RmclORAvU+E9vjWCBvg7WwIxnoghiW2lxsbP7R4Rmwo4H2WjakLk8vrfjuzT?=
 =?us-ascii?Q?Y57EQaDkDx47yuw1GBed3csTUlk0O21BeAGUjN2jtBJR9ZQHEyRAIglNAXCk?=
 =?us-ascii?Q?F+2rJ5x2GcQr9NaxsMHoCQSZU1bTnQ089UhTQUB2OMQNnAXH2YIOisFkx2o1?=
 =?us-ascii?Q?2asQsgWbem2FDPPqhrVVnc73/y1YyGX5n3fdM8Qzncu7uvBIp8K2X/eWsW5j?=
 =?us-ascii?Q?q3KbowZqfztCC2/s/cU8S/UgI3j8D79VOekNyx2qKJXbytDa98jYXSF7Jsjg?=
 =?us-ascii?Q?zUhBnC0oIqz27A9WcVInlK2C36k5l7EM5IPeWNje1J5NMGvEKyDZkKPw/ebL?=
 =?us-ascii?Q?GJ8QRpG7WZ1i3kQcw5nyNf+gIpDNt9jF/1ryQptn0RWksxySSoQXdBQnzC7L?=
 =?us-ascii?Q?vTkDlhwR3Lp1ghNXNms/vl68gxE6V506wrYYg0UpkU6S4YIHFWtuJuwy5Nag?=
 =?us-ascii?Q?UtZjcOxMVx1LHAfhLY8KIfcTvljlPbk=3D?=
X-OriginatorOrg: renesas.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bf6d953c-3a44-49d7-043c-08da27bb9cb0
X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB6593.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2022 19:33:16.9995
 (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: Vtlu/xuETKlNImON371VpXEtK04JRF0Z/jxbOztzh/oqZpjV5umAiOWzQVtXrUnVCzogm+JRnDcBOlmf1DjNhw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB6475
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 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>
---
 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 0e8e698..7f324fd 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