* [PATCH v4 1/2] firmware: qcom_scm: Add API to get waitqueue IRQ info
2024-11-04 18:01 [PATCH v4 0/2] SCM: Support latest version of waitq-aware firmware Unnathi Chalicheemala
@ 2024-11-04 18:01 ` Unnathi Chalicheemala
2024-11-04 18:01 ` [PATCH v4 2/2] firmware: qcom_scm: Support multiple waitq contexts Unnathi Chalicheemala
1 sibling, 0 replies; 3+ messages in thread
From: Unnathi Chalicheemala @ 2024-11-04 18:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio
Cc: Unnathi Chalicheemala, linux-arm-msm, linux-kernel, kernel
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
defined fill_irq_fwspec_params(). This Linux IRQ number is then supplied
to the threaded_irq call.
Signed-off-by: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
---
drivers/firmware/qcom/qcom_scm.c | 54 +++++++++++++++++++++++++++++++-
drivers/firmware/qcom/qcom_scm.h | 1 +
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 10986cb11ec0..4cffd0684b78 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -35,6 +35,14 @@
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
+
+#define GIC_IRQ_TYPE_SPI 0
+#define GIC_IRQ_TYPE_ESPI 2
+
struct qcom_scm {
struct device *dev;
struct clk *core_clk;
@@ -1830,6 +1838,50 @@ 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 virq)
+{
+ if (virq >= GIC_SPI_BASE && virq <= GIC_MAX_SPI) {
+ fwspec->param[0] = GIC_IRQ_TYPE_SPI;
+ fwspec->param[1] = virq - GIC_SPI_BASE;
+ } else if (virq >= GIC_ESPI_BASE && virq <= GIC_MAX_ESPI) {
+ fwspec->param[0] = GIC_IRQ_TYPE_ESPI;
+ fwspec->param[1] = virq - GIC_ESPI_BASE;
+ } else {
+ WARN(1, "Unexpected virq: %d\n", virq);
+ return -ENXIO;
+ }
+ fwspec->param[2] = IRQ_TYPE_EDGE_RISING;
+ fwspec->param_count = 3;
+
+ return 0;
+}
+
+static int qcom_scm_get_waitq_irq(void)
+{
+ int ret;
+ u32 hwirq;
+ struct qcom_scm_desc desc = {
+ .svc = QCOM_SCM_SVC_WAITQ,
+ .cmd = QCOM_SCM_WAITQ_GET_INFO,
+ .owner = ARM_SMCCC_OWNER_SIP
+ };
+ struct qcom_scm_res res;
+ struct irq_fwspec fwspec;
+
+ ret = qcom_scm_call_atomic(__scm->dev, &desc, &res);
+ if (ret)
+ return ret;
+
+ fwspec.fwnode = of_node_to_fwnode(__scm->dev->of_node);
+ hwirq = res.result[1] & GENMASK(15, 0);
+ ret = qcom_scm_fill_irq_fwspec_params(&fwspec, hwirq);
+ if (ret)
+ return ret;
+ ret = irq_create_fwspec_mapping(&fwspec);
+
+ return ret;
+}
+
static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx)
{
/* FW currently only supports a single wq_ctx (zero).
@@ -1986,7 +2038,7 @@ static int qcom_scm_probe(struct platform_device *pdev)
/* Let all above stores be available after this */
smp_store_release(&__scm, scm);
- irq = platform_get_irq_optional(pdev, 0);
+ irq = qcom_scm_get_waitq_irq();
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 685b8f59e7a6..ab0f88f5f777 100644
--- a/drivers/firmware/qcom/qcom_scm.h
+++ b/drivers/firmware/qcom/qcom_scm.h
@@ -143,6 +143,7 @@ struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void);
#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
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v4 2/2] firmware: qcom_scm: Support multiple waitq contexts
2024-11-04 18:01 [PATCH v4 0/2] SCM: Support latest version of waitq-aware firmware Unnathi Chalicheemala
2024-11-04 18:01 ` [PATCH v4 1/2] firmware: qcom_scm: Add API to get waitqueue IRQ info Unnathi Chalicheemala
@ 2024-11-04 18:01 ` Unnathi Chalicheemala
1 sibling, 0 replies; 3+ messages in thread
From: Unnathi Chalicheemala @ 2024-11-04 18:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio
Cc: Unnathi Chalicheemala, linux-arm-msm, linux-kernel, kernel
Currently, only a single waitqueue context exists, with waitqueue id zero.
Multi-waitqueue mechanism is added in firmware to support the case when
multiple VMs make SMC calls or single VM making multiple calls on same CPU.
When VMs make SMC call, firmware will allocate waitqueue context assuming
the SMC call to be a blocking call. SMC calls that cannot acquire resources
are returned to sleep in the calling VM. When resource is available, VM
will be notified to wake sleeping thread and resume SMC call.
SM8650 firmware can allocate two such waitq contexts so create these two
waitqueue contexts.
Unique waitqueue contexts are supported by a dynamically sized array where
each unique wq_ctx is associated with a struct completion variable for easy
lookup. To get the number of waitqueue contexts directly from firmware,
qcom_scm_query_waitq_cnt() is introduced. On older targets which support
only a single waitqueue, wq_cnt is set to 1 as SCM call for
query_waitq_cnt() is not implemented for single waitqueue case.
Signed-off-by: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
---
drivers/firmware/qcom/qcom_scm.c | 76 +++++++++++++++++++++++---------
1 file changed, 54 insertions(+), 22 deletions(-)
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 4cffd0684b78..91c3f57ddf41 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -49,7 +49,7 @@ struct qcom_scm {
struct clk *iface_clk;
struct clk *bus_clk;
struct icc_path *path;
- struct completion waitq_comp;
+ struct completion *waitq;
struct reset_controller_dev reset;
/* control access to the interconnect path */
@@ -59,6 +59,7 @@ struct qcom_scm {
u64 dload_mode_addr;
struct qcom_tzmem_pool *mempool;
+ unsigned int wq_cnt;
};
struct qcom_scm_current_perm_info {
@@ -1856,6 +1857,26 @@ static int qcom_scm_fill_irq_fwspec_params(struct irq_fwspec *fwspec, u32 virq)
return 0;
}
+static int qcom_scm_query_waitq_count(void)
+{
+ int ret;
+ struct qcom_scm_desc desc = {
+ .svc = QCOM_SCM_SVC_WAITQ,
+ .cmd = QCOM_SCM_WAITQ_GET_INFO,
+ .owner = ARM_SMCCC_OWNER_SIP
+ };
+ struct qcom_scm_res res;
+
+ if (!__qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_WAITQ, QCOM_SCM_WAITQ_GET_INFO))
+ return 1;
+
+ ret = qcom_scm_call_atomic(__scm->dev, &desc, &res);
+ if (ret)
+ return ret;
+
+ return res.result[0] & GENMASK(7, 0);
+}
+
static int qcom_scm_get_waitq_irq(void)
{
int ret;
@@ -1882,42 +1903,40 @@ static int qcom_scm_get_waitq_irq(void)
return ret;
}
-static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx)
+static struct completion *qcom_scm_get_completion(u32 wq_ctx)
{
- /* FW currently only supports a single wq_ctx (zero).
- * TODO: Update this logic to include dynamic allocation and lookup of
- * completion structs when FW supports more wq_ctx values.
- */
- if (wq_ctx != 0) {
- dev_err(__scm->dev, "Firmware unexpectedly passed non-zero wq_ctx\n");
- return -EINVAL;
- }
+ struct completion *wq;
- return 0;
+ if (WARN_ON_ONCE(wq_ctx >= __scm->wq_cnt))
+ return ERR_PTR(-EINVAL);
+
+ wq = &__scm->waitq[wq_ctx];
+
+ return wq;
}
int qcom_scm_wait_for_wq_completion(u32 wq_ctx)
{
- int ret;
+ struct completion *wq;
- ret = qcom_scm_assert_valid_wq_ctx(wq_ctx);
- if (ret)
- return ret;
+ wq = qcom_scm_get_completion(wq_ctx);
+ if (IS_ERR(wq))
+ return PTR_ERR(wq);
- wait_for_completion(&__scm->waitq_comp);
+ wait_for_completion(wq);
return 0;
}
static int qcom_scm_waitq_wakeup(unsigned int wq_ctx)
{
- int ret;
+ struct completion *wq;
- ret = qcom_scm_assert_valid_wq_ctx(wq_ctx);
- if (ret)
- return ret;
+ wq = qcom_scm_get_completion(wq_ctx);
+ if (IS_ERR(wq))
+ return PTR_ERR(wq);
- complete(&__scm->waitq_comp);
+ complete(wq);
return 0;
}
@@ -1993,6 +2012,7 @@ static int qcom_scm_probe(struct platform_device *pdev)
struct qcom_tzmem_pool_config pool_config;
struct qcom_scm *scm;
int irq, ret;
+ int i;
scm = devm_kzalloc(&pdev->dev, sizeof(*scm), GFP_KERNEL);
if (!scm)
@@ -2003,7 +2023,19 @@ static int qcom_scm_probe(struct platform_device *pdev)
if (ret < 0)
return ret;
- init_completion(&scm->waitq_comp);
+ ret = qcom_scm_query_waitq_count();
+ if (ret < 0)
+ return ret;
+
+ scm->wq_cnt = ret;
+
+ scm->waitq = devm_kcalloc(&pdev->dev, scm->wq_cnt, sizeof(*scm->waitq), GFP_KERNEL);
+ if (!scm->waitq)
+ return -ENOMEM;
+
+ for (i = 0; i < scm->wq_cnt; i++)
+ init_completion(&scm->waitq[i]);
+
mutex_init(&scm->scm_bw_lock);
scm->path = devm_of_icc_get(&pdev->dev, NULL);
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread