firmware: qcom_scm: Add API to get waitqueue IRQ info

Bootloader and firmware for SM8650 and older chipsets expect node
name as "qcom_scm", in order to patch the wait queue IRQ information.
However, DeviceTree uses node name "scm" and this mismatch prevents
firmware from correctly identifying waitqueue IRQ information. Waitqueue
IRQ is used for signaling between secure and non-secure worlds.

To resolve this, introduce qcom_scm_get_waitq_irq() that'll get the
hardware IRQ number to be used from firmware instead of relying on data
provided by devicetree, thereby bypassing the DeviceTree node name
mismatch.

This hardware IRQ number is converted to a Linux IRQ number using newly
qcom_scm_fill_irq_fwspec_params(). This Linux IRQ number is then
supplied to the threaded_irq call.

Reviewed-by: Bartosz Golaszewski <brgl@kernel.org>
Signed-off-by: Unnathi Chalicheemala <unnathi.chalicheemala@oss.qualcomm.com>
Signed-off-by: Shivendra Pratap <shivendra.pratap@oss.qualcomm.com>
Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251217-multi_waitq_scm-v11-1-f21e50e792b8@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 3dabb04094f91811a430e84998d3c6c759b5c747..78ee8e22a6a8976edacbb2bf0feb16238dc030f2 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -30,11 +30,18 @@
 #include <linux/sizes.h>
 #include <linux/types.h>
 
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
 #include "qcom_scm.h"
 #include "qcom_tzmem.h"
 
 static u32 download_mode;
 
+#define GIC_SPI_BASE        32
+#define GIC_MAX_SPI       1019  // SPIs in GICv3 spec range from 32..1019
+#define GIC_ESPI_BASE     4096
+#define GIC_MAX_ESPI      5119 // ESPIs in GICv3 spec range from 4096..5119
+
 struct qcom_scm {
        struct device *dev;
        struct clk *core_clk;
@@ -2209,6 +2216,56 @@ bool qcom_scm_is_available(void)
 }
 EXPORT_SYMBOL_GPL(qcom_scm_is_available);
 
+static int qcom_scm_fill_irq_fwspec_params(struct irq_fwspec *fwspec, u32 hwirq)
+{
+       if (hwirq >= GIC_SPI_BASE && hwirq <= GIC_MAX_SPI) {
+               fwspec->param[0] = GIC_SPI;
+               fwspec->param[1] = hwirq - GIC_SPI_BASE;
+       } else if (hwirq >= GIC_ESPI_BASE && hwirq <= GIC_MAX_ESPI) {
+               fwspec->param[0] = GIC_ESPI;
+               fwspec->param[1] = hwirq - GIC_ESPI_BASE;
+       } else {
+               WARN(1, "Unexpected hwirq: %d\n", hwirq);
+               return -ENXIO;
+       }
+
+       fwspec->param[2] = IRQ_TYPE_EDGE_RISING;
+       fwspec->param_count = 3;
+
+       return 0;
+}
+
+static int qcom_scm_get_waitq_irq(struct qcom_scm *scm)
+{
+       struct qcom_scm_desc desc = {
+               .svc = QCOM_SCM_SVC_WAITQ,
+               .cmd = QCOM_SCM_WAITQ_GET_INFO,
+               .owner = ARM_SMCCC_OWNER_SIP
+       };
+       struct device_node *parent_irq_node;
+       struct irq_fwspec fwspec;
+       struct qcom_scm_res res;
+       u32 hwirq;
+       int ret;
+
+       ret = qcom_scm_call_atomic(scm->dev, &desc, &res);
+       if (ret)
+               return ret;
+
+       hwirq = res.result[1] & GENMASK(15, 0);
+       ret = qcom_scm_fill_irq_fwspec_params(&fwspec, hwirq);
+       if (ret)
+               return ret;
+
+       parent_irq_node = of_irq_find_parent(scm->dev->of_node);
+       if (!parent_irq_node)
+               return -ENODEV;
+
+       fwspec.fwnode = of_fwnode_handle(parent_irq_node);
+
+       return irq_create_fwspec_mapping(&fwspec);
+}
+
 static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx)
 {
        /* FW currently only supports a single wq_ctx (zero).
@@ -2382,7 +2439,10 @@ static int qcom_scm_probe(struct platform_device *pdev)
                return dev_err_probe(scm->dev, PTR_ERR(scm->mempool),
                                     "Failed to create the SCM memory pool\n");
 
-       irq = platform_get_irq_optional(pdev, 0);
+       irq = qcom_scm_get_waitq_irq(scm);
+       if (irq < 0)
+               irq = platform_get_irq_optional(pdev, 0);
+
        if (irq < 0) {
                if (irq != -ENXIO)
                        return irq;

diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_scm.h
index a56c8212cc0c41021e5a067d52b7d5dcc49107ea..8b1e2ea18a59ac143907a381b73236148bace189 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.h
+++ b/drivers/firmware/qcom/qcom_scm.h
@@ -152,6 +152,7 @@ int qcom_scm_shm_bridge_enable(struct device *scm_dev);
 #define QCOM_SCM_SVC_WAITQ                     0x24
 #define QCOM_SCM_WAITQ_RESUME                  0x02
 #define QCOM_SCM_WAITQ_GET_WQ_CTX              0x03
+#define QCOM_SCM_WAITQ_GET_INFO                0x04
 
 #define QCOM_SCM_SVC_GPU                       0x28
 #define QCOM_SCM_SVC_GPU_INIT_REGS             0x01