firmware: imx: scu-irq: add imx_scu_irq_get_status

Extract the scu irq get status code from imx_scu_irq_work_handler and
make into a new function imx_scu_irq_get_status which could be used
by others, such as SECO.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/firmware/imx/imx-scu-irq.c b/drivers/firmware/imx/imx-scu-irq.c
index 4408f150b3d5b75fa3536fd85aefeb527e569f25..6549f3792a0f930b5634fab70b3b04dfb9c4000b 100644 (file)
--- a/drivers/firmware/imx/imx-scu-irq.c
+++ b/drivers/firmware/imx/imx-scu-irq.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2019 NXP
+ * Copyright 2019,2023 NXP
  *
  * Implementation of the SCU IRQ functions using MU.
  *
@@ -66,29 +66,18 @@ static int imx_scu_irq_notifier_call_chain(unsigned long status, u8 *group)
 
 static void imx_scu_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.req.resource = mu_resource_id;
-               msg.data.req.group = i;
-
-               ret = imx_scu_call_rpc(imx_sc_irq_ipc_handle, &msg, true);
+               ret = imx_scu_irq_get_status(i, &irq_status);
                if (ret) {
                        pr_err("get irq group %d status failed, ret %d\n",
                               i, ret);
                        return;
                }
 
-               irq_status = msg.data.resp.status;
                if (!irq_status)
                        continue;
 
@@ -97,6 +86,31 @@ static void imx_scu_irq_work_handler(struct work_struct *work)
        }
 }
 
+int imx_scu_irq_get_status(u8 group, u32 *irq_status)
+{
+       struct imx_sc_msg_irq_get_status 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_STATUS;
+       hdr->size = 2;
+
+       msg.data.req.resource = mu_resource_id;
+       msg.data.req.group = group;
+
+       ret = imx_scu_call_rpc(imx_sc_irq_ipc_handle, &msg, true);
+       if (ret)
+               return ret;
+
+       if (irq_status)
+               *irq_status = msg.data.resp.status;
+
+       return 0;
+}
+EXPORT_SYMBOL(imx_scu_irq_get_status);
+
 int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable)
 {
        struct imx_sc_msg_irq_enable msg;

diff --git a/include/linux/firmware/imx/sci.h b/include/linux/firmware/imx/sci.h
index 7fa0f3b329b5aa32007095b9fb71780a9b4dcc57..df17196df5ffe7bda18b81b6aba32926baf90fae 100644 (file)
--- a/include/linux/firmware/imx/sci.h
+++ b/include/linux/firmware/imx/sci.h
@@ -21,6 +21,7 @@ int imx_scu_enable_general_irq_channel(struct device *dev);
 int imx_scu_irq_register_notifier(struct notifier_block *nb);
 int imx_scu_irq_unregister_notifier(struct notifier_block *nb);
 int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable);
+int imx_scu_irq_get_status(u8 group, u32 *irq_status);
 int imx_scu_soc_init(struct device *dev);
 #else
 static inline int imx_scu_soc_init(struct device *dev)
@@ -47,5 +48,10 @@ static inline int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable)
 {
        return -EOPNOTSUPP;
 }
+
+static inline int imx_scu_irq_get_status(u8 group, u32 *irq_status)
+{
+       return -EOPNOTSUPP;
+}
 #endif
 #endif /* _SC_SCI_H */