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:   Kane Jiang <jian.jiang@nxp.com>
To:     Daniel Lezcano <daniel.lezcano@linaro.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        Steve Longerbeam <slongerbeam@gmail.com>,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc:     Kane Jiang <jian.jiang@nxp.com>
Subject: [PATCH V2 2/2] clocksource/drivers/timer-imx-gpt: Change to cyclecounter for GPT input capture.
Date:   Fri,  4 Mar 2022 09:56:23 +0800
Message-Id: <20220304015623.338645-3-jian.jiang@nxp.com>
In-Reply-To: <20220304015623.338645-1-jian.jiang@nxp.com>
References: <20220304015623.338645-1-jian.jiang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/H3kyZw+wZZwTvxyJJVogK0c4U6RcCZuBvAJlP0YM/vLXU8aV+w8a+acCYWF?=
 =?us-ascii?Q?yb7b2Wkz+nLFjgpgmk0REcIKAGih4pgGAOGnX1cvRBLgc/U+Ch82WX9o/+AS?=
 =?us-ascii?Q?8x03vBLGd1JgJ3eAvgeTY4TmXzlZsxZALYVJgF+dmPhl8ExVN2JJF50dQEtC?=
 =?us-ascii?Q?6+j3+3NSi6a+NM5Izd862bZp++5mq8hXpqZz3lprZRugf9t/Hf3odtadyPiL?=
 =?us-ascii?Q?1vpA9naF4Vjy3zFK4FFoGV4RuxHHgFXGyI19l6MPbL+mMAe8yUPRKZVMbI68?=
 =?us-ascii?Q?c6SjilDc2WN/Hac6gziMNpKvAOfLrgCLRzVPT2X2bNEiKNlonlMn20/DPaJU?=
 =?us-ascii?Q?MtzLA3zkZPQQKKY6QbJpaYf8bX7S1BZ0biR7BAKIqEfBV9B1NVTCXdT+K/zY?=
 =?us-ascii?Q?21jylaxmL1ZBjsxysFvvFwNSC1NGcDmDzKW/yMxRTOVtgr8cj460EWA6Sm/4?=
 =?us-ascii?Q?orAte0Y1Fx0FrcTnfX9/862WGACXgrxsjb7A4QTzN/SOmlWJQlBKy4m1dt+7?=
 =?us-ascii?Q?WnoTPzYWVRKsNtEHoCWBV9N7WIaaaC3kh/xMzwVQYwwWNd30H1rkAcEAsI7L?=
 =?us-ascii?Q?dcNupAZOzEv/C7/qBULsiEg3FiWrRedhSvzjPYj6fz5CWma0YFZQrtsaHdEa?=
 =?us-ascii?Q?hb04BHCOmolKXFbZL8l9BQ+vjarvKwaHdSDqzGaM4suA1lmyj5OhdkxLrrWz?=
 =?us-ascii?Q?Dwb/Djk7R0hRnAIDqZY+vnf14oYDnlRoAP7dVfWKdrE4r75dQ1f+cjBJbIGe?=
 =?us-ascii?Q?ELMMyR4/7fNMj53zDoS1m5kqhdg74tkbwGIw0N6kO8mqaGoVNs25UaaS/oIm?=
 =?us-ascii?Q?YNKkQ6mWhzcqqM2rCpYDf4usyzf3OImT7JFgsgd1Nb1SoyxrNT+AR9lO+Xlq?=
 =?us-ascii?Q?FWwmUiLHh/mRhD3RMgqXv95rT+iJNbrdEEduCGubLYmGvceW7EWzrm5weAYI?=
 =?us-ascii?Q?Gj9typnDETEVnRMYtTNqr3CxlWlKLLKr0WyCOmevoMIw7nk24hvKoMAl6nLp?=
 =?us-ascii?Q?li+SXQXAYqWPnC+IGs6WnW4igyQfM/cZ1JfLwgmGZXTMhgHP9HjZkh0QykV5?=
 =?us-ascii?Q?yy3vZ2dcNjSIWYctGwPr94ehkCfDiP0zSZ7NStDXP7VHFBdw7aLd/lK67ujz?=
 =?us-ascii?Q?d2LXc9ub219nHm4pOvRW06TMw6y9s3MwyUEQvqF30egvanwmHdfLd5mibBrs?=
 =?us-ascii?Q?Wrrz6cdU0ZPbixgOyRMcM+tz8Nz+ao6SityM/GuioffjR6AuwWMEo8pgeFII?=
 =?us-ascii?Q?PrH5qV8/tiii0iyXrRME92K30ttW00syX/0WRGVJsbJk/0UNc39BN4yKrO1x?=
 =?us-ascii?Q?hum2/XRU7hXrZusBUMYpNYqW8s4pfT1PrbHoh9zPO0YWQWgFFXnEhKO0akVN?=
 =?us-ascii?Q?bBYSfzxxQCWVnDHaFAjxiN05p4MLGDyNPrDGE6Kncef7d7dBoJ3SMh2rE8E/?=
 =?us-ascii?Q?yXTYpJnqI/ZAO/ysSm+eqjnp8vHvI+WlroU9lzAKpTGJrQ2nRI2keGeqWems?=
 =?us-ascii?Q?luEGv+IQVrtuQO3oHQZlXrKZFINIs31qsEkOEApA2UYNskqAv4BV3Cv/4BkS?=
 =?us-ascii?Q?aBxUPaSpUniQ7LFWsYESFwdWUCUFgMouiSDR3OSDQz1hB16GS6hr26Jpbufa?=
 =?us-ascii?Q?zm0I8oynRKeG3Wk933pm/9E=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f957d716-5c2c-4df3-1b60-08d9fd824280
X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB5771.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 01:56:55.4622
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pMhwAtu6L3x2+DD+KFsDDLu44s7H+oG93kFXTZM0TQvCvWyxFv/RVZJ/HVtt9gWDzjciRFuW/Xw4Dn4L9Mm9yw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4920
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

Modify the timestamp to cyclecounter in i.MX GPT driver for input
capture function.

Signed-off-by: Kane Jiang <jian.jiang@nxp.com>
---
V2:
 - remove compatible support for NXP i.MX8MM
---
 drivers/clocksource/timer-imx-gpt.c | 9 +++++----
 include/linux/mxc_icap.h            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index c6aa1462e441..01f4d78d0b6e 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -417,22 +417,23 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id)
 
 	for (i = 0; i < 2; i++) {
 		struct icap_channel *ic = &icap_channel[i];
-		ktime_t timestamp;
+		u64 cyclecounter;
 
 		if (!imxtm->gpt->gpt_is_ic_irq(ic, tstat))
 			continue;
 
 		imxtm->gpt->gpt_ic_irq_acknowledge(ic);
 
-		timestamp = ns_to_ktime(timecounter_read(&ic->tc));
+		cyclecounter = ic->cc.read(&ic->cc);
 
 		if (ic->handler)
-			ic->handler(ic->chan, ic->dev_id, timestamp);
+			ic->handler(ic->chan, ic->dev_id, cyclecounter);
 	}
 
 	if (imxtm->gpt->gpt_is_oc_irq(imxtm, tstat)) {
 		imxtm->gpt->gpt_oc_irq_acknowledge(imxtm);
-		ced->event_handler(ced);
+		if (ced->event_handler)
+			ced->event_handler(ced);
 	}
 
 	return IRQ_HANDLED;
diff --git a/include/linux/mxc_icap.h b/include/linux/mxc_icap.h
index fa5ffdf3b589..292c15b6b028 100644
--- a/include/linux/mxc_icap.h
+++ b/include/linux/mxc_icap.h
@@ -7,7 +7,7 @@
 #ifndef __MXC_ICAP_H__
 #define __MXC_ICAP_H__
 
-typedef void (*mxc_icap_handler_t)(int, void *, ktime_t);
+typedef void (*mxc_icap_handler_t)(int, void *, u64);
 
 int mxc_request_input_capture(unsigned int chan, mxc_icap_handler_t handler,
 			      unsigned long capflags, void *dev_id);
-- 
2.25.1