RE: [PATCH V2 4/4] rtc: imx-sc: add rtc alarm support

From: Anson Huang
Date: Mon Feb 18 2019 - 22:12:07 EST

Next message: Baolin Wang: "Re: [PATCH 1/3] dt-bindings: dmaengine: Add one new cell to present hardware slave id"
Previous message: Anson Huang: "[PATCH V3 4/4] rtc: imx-sc: add rtc alarm support"
In reply to: Alexandre Belloni: "Re: [PATCH V2 4/4] rtc: imx-sc: add rtc alarm support"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi, Alexandre

Best Regards!
Anson Huang

> -----Original Message-----
> From: Alexandre Belloni [mailto:alexandre.belloni@xxxxxxxxxxx]
> Sent: 2019年2月19日 5:58
> To: Anson Huang <anson.huang@xxxxxxx>
> Cc: robh+dt@xxxxxxxxxx; mark.rutland@xxxxxxx; shawnguo@xxxxxxxxxx;
> s.hauer@xxxxxxxxxxxxxx; kernel@xxxxxxxxxxxxxx; festevam@xxxxxxxxx;
> a.zummo@xxxxxxxxxxxx; Aisheng Dong <aisheng.dong@xxxxxxx>;
> ulf.hansson@xxxxxxxxxx; sboyd@xxxxxxxxxx; Daniel Baluta
> <daniel.baluta@xxxxxxx>; devicetree@xxxxxxxxxxxxxxx; linux-
> kernel@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-
> rtc@xxxxxxxxxxxxxxx; dl-linux-imx <linux-imx@xxxxxxx>
> Subject: Re: [PATCH V2 4/4] rtc: imx-sc: add rtc alarm support
>
> Hi,
>
> On 14/02/2019 03:44:48+0000, Anson Huang wrote:
> > Add i.MX system controller RTC alarm support, the RTC alarm is
> > implemented via SIP(silicon provider) runtime service call and
> > ARM-Trusted-Firmware will communicate with system controller via
> > MU(message unit) IPC to set RTC alarm. When RTC alarm fires, system
> > controller will generate a common MU irq event and notify system
> > controller RTC driver to handle the irq event.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@xxxxxxx>
> > ---
> > No V1 patch, just add it into the i.MX SC general irq support patch
> > series, to support system controller RTC's alarm function and also to
> > provide an example of how to use general MU irq, this patch depends on
> > the i.MX SC general irq support patch set, so add it into same patch series.
>
> Through which tree do you expect this patch to be merged?

Since this patch depends on the general MU irq support, to avoid build break,
I think may be after the general MU irq support patches are merged, then I will
notify you to pick up this patch to your tree?

>
> > --
> > drivers/rtc/rtc-imx-sc.c | 100
> > +++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 100 insertions(+)
> >
> > diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c index
> > 60570a2..147545e 100644
> > --- a/drivers/rtc/rtc-imx-sc.c
> > +++ b/drivers/rtc/rtc-imx-sc.c
> > @@ -3,6 +3,7 @@
> > * Copyright 2018 NXP.
> > */
> >
> > +#include <dt-bindings/firmware/imx/rsrc.h>
> > #include <linux/arm-smccc.h>
> > #include <linux/firmware/imx/sci.h>
> > #include <linux/module.h>
> > @@ -11,11 +12,17 @@
> > #include <linux/rtc.h>
> >
> > #define IMX_SC_TIMER_FUNC_GET_RTC_SEC1970 9
> > +#define IMX_SC_TIMER_FUNC_SET_RTC_ALARM 8
> > #define IMX_SC_TIMER_FUNC_SET_RTC_TIME 6
> >
> > +#define IMX_SC_IRQ_FUNC_ENABLE 1
> > +
> > #define IMX_SIP_SRTC 0xC2000002
> > #define IMX_SIP_SRTC_SET_TIME 0x0
> >
> > +#define SC_IRQ_GROUP_RTC 2
> > +#define SC_IRQ_RTC 1
> > +
> > static struct imx_sc_ipc *rtc_ipc_handle; static struct rtc_device
> > *imx_sc_rtc;
> >
> > @@ -24,6 +31,24 @@ struct imx_sc_msg_timer_get_rtc_time {
> > u32 time;
> > } __packed;
> >
> > +struct imx_sc_msg_timer_enable_irq {
> > + struct imx_sc_rpc_msg hdr;
> > + u32 mask;
> > + u16 resource;
> > + u8 group;
> > + u8 enable;
> > +} __packed;
> > +
> > +struct imx_sc_msg_timer_rtc_set_alarm {
> > + struct imx_sc_rpc_msg hdr;
> > + u16 year;
> > + u8 mon;
> > + u8 day;
> > + u8 hour;
> > + u8 min;
> > + u8 sec;
> > +} __packed;
> > +
> > static int imx_sc_rtc_read_time(struct device *dev, struct rtc_time
> > *tm) {
> > struct imx_sc_msg_timer_get_rtc_time msg; @@ -60,9 +85,80 @@
> static
> > int imx_sc_rtc_set_time(struct device *dev, struct rtc_time *tm)
> > return res.a0;
> > }
> >
> > +static int imx_sc_rtc_alarm_irq_enable(struct device *dev, unsigned
> > +int enable) {
> > + struct imx_sc_msg_timer_enable_irq msg;
> > + struct imx_sc_rpc_msg *hdr = &msg.hdr;
> > + int ret;
> > +
> > + hdr->ver = IMX_SC_RPC_VERSION;
> > + hdr->svc = IMX_SC_RPC_SVC_IRQ;
> > + hdr->func = IMX_SC_IRQ_FUNC_ENABLE;
> > + hdr->size = 3;
> > +
> > + msg.resource = IMX_SC_R_MU_1A;
> > + msg.group = SC_IRQ_GROUP_RTC;
> > + msg.mask = SC_IRQ_RTC;
> > + msg.enable = enable;
> > +
> > + ret = imx_scu_call_rpc(rtc_ipc_handle, &msg, true);
> > + if (ret) {
> > + dev_err(dev, "enable rtc irq failed, ret %d\n", ret);
> > + return ret;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int imx_sc_rtc_set_alarm(struct device *dev, struct rtc_wkalrm
> > +*alrm) {
> > + struct imx_sc_msg_timer_rtc_set_alarm msg;
> > + struct imx_sc_rpc_msg *hdr = &msg.hdr;
> > + int ret;
> > + struct rtc_time *alrm_tm = &alrm->time;
> > +
> > + hdr->ver = IMX_SC_RPC_VERSION;
> > + hdr->svc = IMX_SC_RPC_SVC_TIMER;
> > + hdr->func = IMX_SC_TIMER_FUNC_SET_RTC_ALARM;
> > + hdr->size = 3;
> > +
> > + msg.year = alrm_tm->tm_year + 1900;
> > + msg.mon = alrm_tm->tm_mon + 1;
> > + msg.day = alrm_tm->tm_mday;
> > + msg.hour = alrm_tm->tm_hour;
> > + msg.min = alrm_tm->tm_min;
> > + msg.sec = alrm_tm->tm_sec;
> > +
> > + ret = imx_scu_call_rpc(rtc_ipc_handle, &msg, true);
> > + if (ret) {
> > + dev_err(dev, "set rtc alarm failed, ret %d\n", ret);
> > + return ret;
> > + }
> > +
>
> You must check whether the alarm needs to be enabled here and enable the
> alarm else the userspace application that are using RTC_WKALM_SET will not
> work properly.

Oops, missed the alarm irq enable, and also need to add read_alarm callback
to make RTC alarm work properly, made mistake in V2, now fix it in V3, please review.

Thanks,
Anson.

>
> > + return 0;
> > +}
> > +
> > static const struct rtc_class_ops imx_sc_rtc_ops = {
> > .read_time = imx_sc_rtc_read_time,
> > .set_time = imx_sc_rtc_set_time,
> > + .set_alarm = imx_sc_rtc_set_alarm,
> > + .alarm_irq_enable = imx_sc_rtc_alarm_irq_enable, };
> > +
> > +static int imx_sc_rtc_alarm_sc_notify(struct notifier_block *nb,
> > + unsigned long event, void *group) {
> > + /* ignore non-rtc irq */
> > + if (!((event & SC_IRQ_RTC) && (*(u8 *)group ==
> SC_IRQ_GROUP_RTC)))
> > + return 0;
> > +
> > + rtc_update_irq(imx_sc_rtc, 1, RTC_IRQF | RTC_AF);
> > +
> > + return 0;
> > +}
> > +
> > +static struct notifier_block imx_sc_rtc_alarm_sc_notifier = {
> > + .notifier_call = imx_sc_rtc_alarm_sc_notify,
> > };
> >
> > static int imx_sc_rtc_probe(struct platform_device *pdev) @@ -73,6
> > +169,8 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
> > if (ret)
> > return ret;
> >
> > + device_init_wakeup(&pdev->dev, true);
> > +
> > imx_sc_rtc = devm_rtc_allocate_device(&pdev->dev);
> > if (IS_ERR(imx_sc_rtc))
> > return PTR_ERR(imx_sc_rtc);
> > @@ -87,6 +185,8 @@ static int imx_sc_rtc_probe(struct platform_device
> *pdev)
> > return ret;
> > }
> >
> > + imx_scu_register_notifier(&imx_sc_rtc_alarm_sc_notifier);
> > +
> > return 0;
> > }
> >
> > --
> > 2.7.4
> >
>
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fboo
> tlin.com&data=02%7C01%7Canson.huang%40nxp.com%7C42f5ff583e1
> d4291e96f08d695ec21a0%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C
> 0%7C636861238739290396&sdata=m6zYiMboulNT%2FbcB7mUk509FqR
> PJutjMUE7kPtZCctI%3D&reserved=0

Next message: Baolin Wang: "Re: [PATCH 1/3] dt-bindings: dmaengine: Add one new cell to present hardware slave id"
Previous message: Anson Huang: "[PATCH V3 4/4] rtc: imx-sc: add rtc alarm support"
In reply to: Alexandre Belloni: "Re: [PATCH V2 4/4] rtc: imx-sc: add rtc alarm support"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]