* [PATCH V3 2/4] firmware: imx: enable imx scu general irq function
2019-02-19 3:10 [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Anson Huang
@ 2019-02-19 3:10 ` Anson Huang
2019-02-20 5:46 ` Aisheng Dong
2019-02-19 3:10 ` [PATCH V3 3/4] arm64: dts: freescale: imx8qxp: enable scu general irq channel Anson Huang
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Anson Huang @ 2019-02-19 3:10 UTC (permalink / raw)
To: robh+dt, mark.rutland, shawnguo, s.hauer, kernel, festevam,
a.zummo, alexandre.belloni, Aisheng Dong, ulf.hansson,
Daniel Baluta, devicetree, linux-kernel, linux-arm-kernel,
linux-rtc
Cc: dl-linux-imx
The System Controller Firmware (SCFW) controls RTC, thermal
and WDOG etc., these resources' interrupt function are managed
by SCU. When any IRQ pending, SCU will notify Linux via MU general
interrupt channel #3, and Linux kernel needs to call SCU APIs
to get IRQ status and notify each module to handle the interrupt.
Since there is no data transmission for SCU IRQ notification, so
doorbell mode is used for this MU channel, and SCU driver will
use notifier mechanism to broadcast to every module which registers
the SCU block notifier.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
No change since V2.
---
drivers/firmware/imx/imx-scu.c | 101 +++++++++++++++++++++++++++++++++++++++
include/linux/firmware/imx/sci.h | 3 ++
2 files changed, 104 insertions(+)
diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c
index 2bb1a19..e93bea5 100644
--- a/drivers/firmware/imx/imx-scu.c
+++ b/drivers/firmware/imx/imx-scu.c
@@ -7,6 +7,7 @@
*
*/
+#include <dt-bindings/firmware/imx/rsrc.h>
#include <linux/err.h>
#include <linux/firmware/imx/types.h>
#include <linux/firmware/imx/ipc.h>
@@ -21,6 +22,8 @@
#define SCU_MU_CHAN_NUM 8
#define MAX_RX_TIMEOUT (msecs_to_jiffies(30))
+#define IMX_SC_IRQ_FUNC_STATUS 2
+#define IMX_SC_IRQ_NUM_GROUP 6
struct imx_sc_chan {
struct imx_sc_ipc *sc_ipc;
@@ -77,7 +80,23 @@ static int imx_sc_linux_errmap[IMX_SC_ERR_LAST] = {
-EIO, /* IMX_SC_ERR_FAIL */
};
+struct imx_sc_msg_irq_get_status {
+ struct imx_sc_rpc_msg hdr;
+ union {
+ struct {
+ u16 resource;
+ u8 group;
+ u8 reserved;
+ } send;
+ struct {
+ u32 status;
+ } receive;
+ } data;
+} __packed;
+
static struct imx_sc_ipc *imx_sc_ipc_handle;
+static struct work_struct imx_sc_general_irq_work;
+static BLOCKING_NOTIFIER_HEAD(imx_scu_notifier_chain);
static inline int imx_sc_to_linux_errno(int errno)
{
@@ -194,6 +213,86 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
}
EXPORT_SYMBOL(imx_scu_call_rpc);
+int imx_scu_register_notifier(struct notifier_block *nb)
+{
+ return blocking_notifier_chain_register(&imx_scu_notifier_chain, nb);
+}
+EXPORT_SYMBOL(imx_scu_register_notifier);
+
+int imx_scu_unregister_notifier(struct notifier_block *nb)
+{
+ return blocking_notifier_chain_unregister(&imx_scu_notifier_chain, nb);
+}
+EXPORT_SYMBOL(imx_scu_unregister_notifier);
+
+static int imx_scu_notifier_call_chain(unsigned long status, u8 *group)
+{
+ return blocking_notifier_call_chain(&imx_scu_notifier_chain,
+ status, (void *)group);
+}
+
+static void imx_scu_general_irq_work_handler(struct work_struct *work)
+{
+ struct imx_sc_msg_irq_get_status msg;
+ struct imx_sc_rpc_msg *hdr = &msg.hdr;
+ u32 irq_status;
+ int ret;
+ u8 i;
+
+ for (i = 0; i < IMX_SC_IRQ_NUM_GROUP; i++) {
+ hdr->ver = IMX_SC_RPC_VERSION;
+ hdr->svc = IMX_SC_RPC_SVC_IRQ;
+ hdr->func = IMX_SC_IRQ_FUNC_STATUS;
+ hdr->size = 2;
+
+ msg.data.send.resource = IMX_SC_R_MU_1A;
+ msg.data.send.group = i;
+
+ ret = imx_scu_call_rpc(imx_sc_ipc_handle, &msg, true);
+ if (ret) {
+ pr_err("get irq status failed, ret %d\n", ret);
+ return;
+ }
+
+ irq_status = msg.data.receive.status;
+ if (!irq_status)
+ continue;
+
+ imx_scu_notifier_call_chain(irq_status, &i);
+ }
+}
+
+static void imx_scu_rxdb_callback(struct mbox_client *c, void *msg)
+{
+ schedule_work(&imx_sc_general_irq_work);
+}
+
+static int imx_scu_enable_general_irq_channel(struct device *dev)
+{
+ struct mbox_client *cl;
+ struct mbox_chan *ch;
+ int ret = 0;
+
+ cl = devm_kzalloc(dev, sizeof(*cl), GFP_KERNEL);
+ if (!cl)
+ return -ENOMEM;
+
+ cl->dev = dev;
+ cl->rx_callback = imx_scu_rxdb_callback;
+
+ /* SCU general IRQ uses general interrupt channel 3 */
+ ch = mbox_request_channel_byname(cl, "gi3");
+ if (IS_ERR(ch)) {
+ ret = PTR_ERR(ch);
+ dev_err(dev, "failed to request mbox chan gi3, ret %d\n", ret);
+ return ret;
+ }
+
+ INIT_WORK(&imx_sc_general_irq_work, imx_scu_general_irq_work_handler);
+
+ return ret;
+}
+
static int imx_scu_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -246,6 +345,8 @@ static int imx_scu_probe(struct platform_device *pdev)
imx_sc_ipc_handle = sc_ipc;
+ imx_scu_enable_general_irq_channel(dev);
+
dev_info(dev, "NXP i.MX SCU Initialized\n");
return devm_of_platform_populate(dev);
diff --git a/include/linux/firmware/imx/sci.h b/include/linux/firmware/imx/sci.h
index ebc5509..9d608db 100644
--- a/include/linux/firmware/imx/sci.h
+++ b/include/linux/firmware/imx/sci.h
@@ -15,4 +15,7 @@
#include <linux/firmware/imx/svc/misc.h>
#include <linux/firmware/imx/svc/pm.h>
+
+int imx_scu_register_notifier(struct notifier_block *nb);
+int imx_scu_unregister_notifier(struct notifier_block *nb);
#endif /* _SC_SCI_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH V3 2/4] firmware: imx: enable imx scu general irq function
2019-02-19 3:10 ` [PATCH V3 2/4] firmware: imx: enable imx scu general irq function Anson Huang
@ 2019-02-20 5:46 ` Aisheng Dong
0 siblings, 0 replies; 6+ messages in thread
From: Aisheng Dong @ 2019-02-20 5:46 UTC (permalink / raw)
To: Anson Huang, robh+dt, mark.rutland, shawnguo, s.hauer, kernel,
festevam, a.zummo, alexandre.belloni, ulf.hansson, Daniel Baluta,
devicetree, linux-kernel, linux-arm-kernel, linux-rtc
Cc: dl-linux-imx
> From: Anson Huang
> Sent: Tuesday, February 19, 2019 11:11 AM
>
> The System Controller Firmware (SCFW) controls RTC, thermal and WDOG etc.,
> these resources' interrupt function are managed by SCU. When any IRQ
> pending, SCU will notify Linux via MU general interrupt channel #3, and Linux
> kernel needs to call SCU APIs to get IRQ status and notify each module to
> handle the interrupt.
>
> Since there is no data transmission for SCU IRQ notification, so doorbell mode
> is used for this MU channel, and SCU driver will use notifier mechanism to
> broadcast to every module which registers the SCU block notifier.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> No change since V2.
> ---
> drivers/firmware/imx/imx-scu.c | 101
> +++++++++++++++++++++++++++++++++++++++
> include/linux/firmware/imx/sci.h | 3 ++
> 2 files changed, 104 insertions(+)
>
> diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c
> index 2bb1a19..e93bea5 100644
> --- a/drivers/firmware/imx/imx-scu.c
> +++ b/drivers/firmware/imx/imx-scu.c
> @@ -7,6 +7,7 @@
> *
> */
>
> +#include <dt-bindings/firmware/imx/rsrc.h>
> #include <linux/err.h>
> #include <linux/firmware/imx/types.h>
> #include <linux/firmware/imx/ipc.h>
> @@ -21,6 +22,8 @@
>
> #define SCU_MU_CHAN_NUM 8
> #define MAX_RX_TIMEOUT (msecs_to_jiffies(30))
> +#define IMX_SC_IRQ_FUNC_STATUS 2
> +#define IMX_SC_IRQ_NUM_GROUP 6
>
> struct imx_sc_chan {
> struct imx_sc_ipc *sc_ipc;
> @@ -77,7 +80,23 @@ static int imx_sc_linux_errmap[IMX_SC_ERR_LAST] = {
> -EIO, /* IMX_SC_ERR_FAIL */
> };
>
> +struct imx_sc_msg_irq_get_status {
> + struct imx_sc_rpc_msg hdr;
> + union {
> + struct {
> + u16 resource;
> + u8 group;
> + u8 reserved;
> + } send;
} __packed req
> + struct {
> + u32 status;
> + } receive;
resp
> + } data;
> +} __packed;
No need __packed anymore
> +
> static struct imx_sc_ipc *imx_sc_ipc_handle;
> +static struct work_struct imx_sc_general_irq_work; static
> +BLOCKING_NOTIFIER_HEAD(imx_scu_notifier_chain);
>
> static inline int imx_sc_to_linux_errno(int errno) { @@ -194,6 +213,86 @@
> int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp) }
> EXPORT_SYMBOL(imx_scu_call_rpc);
>
> +int imx_scu_register_notifier(struct notifier_block *nb) {
> + return blocking_notifier_chain_register(&imx_scu_notifier_chain, nb);
> +} EXPORT_SYMBOL(imx_scu_register_notifier);
> +
> +int imx_scu_unregister_notifier(struct notifier_block *nb) {
> + return blocking_notifier_chain_unregister(&imx_scu_notifier_chain,
> +nb); } EXPORT_SYMBOL(imx_scu_unregister_notifier);
> +
> +static int imx_scu_notifier_call_chain(unsigned long status, u8 *group)
> +{
> + return blocking_notifier_call_chain(&imx_scu_notifier_chain,
> + status, (void *)group);
> +}
> +
> +static void imx_scu_general_irq_work_handler(struct work_struct *work)
> +{
> + struct imx_sc_msg_irq_get_status msg;
> + struct imx_sc_rpc_msg *hdr = &msg.hdr;
> + u32 irq_status;
> + int ret;
> + u8 i;
> +
> + for (i = 0; i < IMX_SC_IRQ_NUM_GROUP; i++) {
> + hdr->ver = IMX_SC_RPC_VERSION;
> + hdr->svc = IMX_SC_RPC_SVC_IRQ;
> + hdr->func = IMX_SC_IRQ_FUNC_STATUS;
> + hdr->size = 2;
> +
> + msg.data.send.resource = IMX_SC_R_MU_1A;
Please make sure if it's fixed to MU_1A.
> + msg.data.send.group = i;
> +
> + ret = imx_scu_call_rpc(imx_sc_ipc_handle, &msg, true);
> + if (ret) {
> + pr_err("get irq status failed, ret %d\n", ret);
> + return;
> + }
> +
> + irq_status = msg.data.receive.status;
> + if (!irq_status)
> + continue;
> +
> + imx_scu_notifier_call_chain(irq_status, &i);
> + }
> +}
> +
> +static void imx_scu_rxdb_callback(struct mbox_client *c, void *msg) {
> + schedule_work(&imx_sc_general_irq_work);
> +}
> +
> +static int imx_scu_enable_general_irq_channel(struct device *dev) {
> + struct mbox_client *cl;
> + struct mbox_chan *ch;
> + int ret = 0;
> +
> + cl = devm_kzalloc(dev, sizeof(*cl), GFP_KERNEL);
> + if (!cl)
> + return -ENOMEM;
> +
> + cl->dev = dev;
> + cl->rx_callback = imx_scu_rxdb_callback;
> +
> + /* SCU general IRQ uses general interrupt channel 3 */
> + ch = mbox_request_channel_byname(cl, "gi3");
> + if (IS_ERR(ch)) {
> + ret = PTR_ERR(ch);
> + dev_err(dev, "failed to request mbox chan gi3, ret %d\n", ret);
> + return ret;
return PTR_ERR(ch)
> + }
> +
> + INIT_WORK(&imx_sc_general_irq_work,
> imx_scu_general_irq_work_handler);
> +
> + return ret;
> +}
> +
> static int imx_scu_probe(struct platform_device *pdev) {
> struct device *dev = &pdev->dev;
> @@ -246,6 +345,8 @@ static int imx_scu_probe(struct platform_device
> *pdev)
>
> imx_sc_ipc_handle = sc_ipc;
>
> + imx_scu_enable_general_irq_channel(dev);
> +
Check return in case a failure
Regards
Dong Aisheng
> dev_info(dev, "NXP i.MX SCU Initialized\n");
>
> return devm_of_platform_populate(dev); diff --git
> a/include/linux/firmware/imx/sci.h b/include/linux/firmware/imx/sci.h
> index ebc5509..9d608db 100644
> --- a/include/linux/firmware/imx/sci.h
> +++ b/include/linux/firmware/imx/sci.h
> @@ -15,4 +15,7 @@
>
> #include <linux/firmware/imx/svc/misc.h> #include
> <linux/firmware/imx/svc/pm.h>
> +
> +int imx_scu_register_notifier(struct notifier_block *nb); int
> +imx_scu_unregister_notifier(struct notifier_block *nb);
> #endif /* _SC_SCI_H */
> --
> 2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH V3 3/4] arm64: dts: freescale: imx8qxp: enable scu general irq channel
2019-02-19 3:10 [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Anson Huang
2019-02-19 3:10 ` [PATCH V3 2/4] firmware: imx: enable imx scu general irq function Anson Huang
@ 2019-02-19 3:10 ` Anson Huang
2019-02-19 3:11 ` [PATCH V3 4/4] rtc: imx-sc: add rtc alarm support Anson Huang
2019-02-20 5:33 ` [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Aisheng Dong
3 siblings, 0 replies; 6+ messages in thread
From: Anson Huang @ 2019-02-19 3:10 UTC (permalink / raw)
To: robh+dt, mark.rutland, shawnguo, s.hauer, kernel, festevam,
a.zummo, alexandre.belloni, Aisheng Dong, ulf.hansson,
Daniel Baluta, devicetree, linux-kernel, linux-arm-kernel,
linux-rtc
Cc: dl-linux-imx
On i.MX8QXP, SCU uses MU1 general interrupt channel #3 to notify
user for IRQs of RTC alarm, thermal alarm and WDOG etc., mailbox
RX doorbell mode is used for this function, this patch adds
support for it.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
No change since V2.
---
arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index bfb77a5..a95a3a3 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -88,7 +88,8 @@
scu {
compatible = "fsl,imx-scu";
mbox-names = "tx0", "tx1", "tx2", "tx3",
- "rx0", "rx1", "rx2", "rx3";
+ "rx0", "rx1", "rx2", "rx3",
+ "gi3";
mboxes = <&lsio_mu1 0 0
&lsio_mu1 0 1
&lsio_mu1 0 2
@@ -96,7 +97,8 @@
&lsio_mu1 1 0
&lsio_mu1 1 1
&lsio_mu1 1 2
- &lsio_mu1 1 3>;
+ &lsio_mu1 1 3
+ &lsio_mu1 3 3>;
clk: clock-controller {
compatible = "fsl,imx8qxp-clk";
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V3 4/4] rtc: imx-sc: add rtc alarm support
2019-02-19 3:10 [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Anson Huang
2019-02-19 3:10 ` [PATCH V3 2/4] firmware: imx: enable imx scu general irq function Anson Huang
2019-02-19 3:10 ` [PATCH V3 3/4] arm64: dts: freescale: imx8qxp: enable scu general irq channel Anson Huang
@ 2019-02-19 3:11 ` Anson Huang
2019-02-20 5:33 ` [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Aisheng Dong
3 siblings, 0 replies; 6+ messages in thread
From: Anson Huang @ 2019-02-19 3:11 UTC (permalink / raw)
To: robh+dt, mark.rutland, shawnguo, s.hauer, kernel, festevam,
a.zummo, alexandre.belloni, Aisheng Dong, ulf.hansson,
Daniel Baluta, devicetree, linux-kernel, linux-arm-kernel,
linux-rtc
Cc: dl-linux-imx
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@nxp.com>
---
Changes since V2:
- add .read_alarm callback to make sure RTC set alarm work, system controller firmware does
NOT support read alarm, so simply return 0;
- add rtc alarm enable setting in .set_alarm to control RTC alarm status.
---
drivers/rtc/rtc-imx-sc.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
index 60570a2..3557f12 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,92 @@ 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_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+ 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;
+ }
+
+ ret = imx_sc_rtc_alarm_irq_enable(dev, alrm->enabled);
+ if (ret) {
+ dev_err(dev, "enable rtc alarm failed, ret %d\n", ret);
+ return ret;
+ }
+
+ 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,
+ .read_alarm = imx_sc_rtc_read_alarm,
+ .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 +181,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 +197,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
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support
2019-02-19 3:10 [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support Anson Huang
` (2 preceding siblings ...)
2019-02-19 3:11 ` [PATCH V3 4/4] rtc: imx-sc: add rtc alarm support Anson Huang
@ 2019-02-20 5:33 ` Aisheng Dong
3 siblings, 0 replies; 6+ messages in thread
From: Aisheng Dong @ 2019-02-20 5:33 UTC (permalink / raw)
To: Anson Huang, robh+dt, mark.rutland, shawnguo, s.hauer, kernel,
festevam, a.zummo, alexandre.belloni, ulf.hansson, Daniel Baluta,
devicetree, linux-kernel, linux-arm-kernel, linux-rtc
Cc: dl-linux-imx
> From: Anson Huang
> Sent: Tuesday, February 19, 2019 11:11 AM
> Subject: [PATCH V3 1/4] dt-bindings: fsl: scu: add general interrupt support
>
> Add scu general interrupt function support.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
> ---
> No change since V2.
> ---
> .../devicetree/bindings/arm/freescale/fsl,scu.txt | 18
> ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
> b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
> index f388ec6..e5def3e 100644
> --- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
> +++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
> @@ -22,9 +22,11 @@ Required properties:
> -------------------
> - compatible: should be "fsl,imx-scu".
> - mbox-names: should include "tx0", "tx1", "tx2", "tx3",
> - "rx0", "rx1", "rx2", "rx3".
> -- mboxes: List of phandle of 4 MU channels for tx and 4 MU channels
> - for rx. All 8 MU channels must be in the same MU instance.
> + "rx0", "rx1", "rx2", "rx3",
> + "gi3".
Should it be optional as SCU firmware does not require it for normal function?
And as MU also support sending interrupt via GIRn register,
How about using gip3 to distinguish sending general purpose interrupt?
Regards
Dong Aisheng
> +- mboxes: List of phandle of 4 MU channels for tx, 4 MU channels for
> + rx, and 1 MU channel for general interrupt. All 9 MU channels
> + must be in the same MU instance.
> Cross instances are not allowed. The MU instance can only
> be one of LSIO MU0~M4 for imx8qxp and imx8qm. Users need
> to make sure use the one which is not conflict with other @@ -34,6
> +36,7 @@ Required properties:
> Channel 1 must be "tx1" or "rx1".
> Channel 2 must be "tx2" or "rx2".
> Channel 3 must be "tx3" or "rx3".
> + General interrupt channel must be "gi3".
This can be:
General interrupt Rx channel must be "gip3"
Regards
Dong Aisheng
> e.g.
> mboxes = <&lsio_mu1 0 0
> &lsio_mu1 0 1
> @@ -42,7 +45,8 @@ Required properties:
> &lsio_mu1 1 0
> &lsio_mu1 1 1
> &lsio_mu1 1 2
> - &lsio_mu1 1 3>;
> + &lsio_mu1 1 3
> + &lsio_mu1 3 3>;
> See Documentation/devicetree/bindings/mailbox/fsl,mu.txt
> for detailed mailbox binding.
>
> @@ -153,7 +157,8 @@ firmware {
> scu {
> compatible = "fsl,imx-scu";
> mbox-names = "tx0", "tx1", "tx2", "tx3",
> - "rx0", "rx1", "rx2", "rx3";
> + "rx0", "rx1", "rx2", "rx3",
> + "gi3";
> mboxes = <&lsio_mu1 0 0
> &lsio_mu1 0 1
> &lsio_mu1 0 2
> @@ -161,7 +166,8 @@ firmware {
> &lsio_mu1 1 0
> &lsio_mu1 1 1
> &lsio_mu1 1 2
> - &lsio_mu1 1 3>;
> + &lsio_mu1 1 3
> + &lsio_mu1 3 3>;
>
> clk: clk {
> compatible = "fsl,imx8qxp-clk", "fsl,scu-clk";
> --
> 2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread