remoteproc: pas: Replace metadata context with PAS context structure

As a superset of the existing metadata context, the PAS context
structure enables both remoteproc and non-remoteproc subsystems to
better support scenarios where the SoC runs with or without the Gunyah
hypervisor. To reflect this, relevant SCM and metadata functions are
updated to incorporate PAS context awareness and remove metadata context
data structure completely.

Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260105-kvmrprocv10-v10-5-022e96815380@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 5162c02f5f88fa91054c41e603ef12b11a70825d..4edd475ef8481e153f8794073744ddaa598e21cf 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -601,7 +601,7 @@ EXPORT_SYMBOL_GPL(devm_qcom_scm_pas_context_alloc);
  *             and optional blob of data used for authenticating the metadata
  *             and the rest of the firmware
  * @size:      size of the metadata
- * @ctx:       optional metadata context
+ * @ctx:       optional pas context
  *
  * Return: 0 on success.
  *
@@ -610,7 +610,7 @@ EXPORT_SYMBOL_GPL(devm_qcom_scm_pas_context_alloc);
  * qcom_scm_pas_metadata_release() by the caller.
  */
 int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size,
-                           struct qcom_scm_pas_metadata *ctx)
+                           struct qcom_scm_pas_context *ctx)
 {
        dma_addr_t mdata_phys;
        void *mdata_buf;
@@ -674,9 +674,9 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_init_image);
 
 /**
  * qcom_scm_pas_metadata_release() - release metadata context
- * @ctx:       metadata context
+ * @ctx:       pas context
  */
-void qcom_scm_pas_metadata_release(struct qcom_scm_pas_metadata *ctx)
+void qcom_scm_pas_metadata_release(struct qcom_scm_pas_context *ctx)
 {
        if (!ctx->ptr)
                return;

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 52680ac995893bd9b07dae532b879a841f2c2b9a..bfcb65aed00862868bd0c6b2c8655bb42dab2c86 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -117,8 +117,8 @@ struct qcom_pas {
        struct qcom_rproc_ssr ssr_subdev;
        struct qcom_sysmon *sysmon;
 
-       struct qcom_scm_pas_metadata pas_metadata;
-       struct qcom_scm_pas_metadata dtb_pas_metadata;
+       struct qcom_scm_pas_context *pas_ctx;
+       struct qcom_scm_pas_context *dtb_pas_ctx;
 };
 
 static void qcom_pas_segment_dump(struct rproc *rproc,
@@ -211,9 +211,9 @@ static int qcom_pas_unprepare(struct rproc *rproc)
         * auth_and_reset() was successful, but in other cases clean it up
         * here.
         */
-       qcom_scm_pas_metadata_release(&pas->pas_metadata);
+       qcom_scm_pas_metadata_release(pas->pas_ctx);
        if (pas->dtb_pas_id)
-               qcom_scm_pas_metadata_release(&pas->dtb_pas_metadata);
+               qcom_scm_pas_metadata_release(pas->dtb_pas_ctx);
 
        return 0;
 }
@@ -241,7 +241,7 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
 
                ret = qcom_mdt_pas_init(pas->dev, pas->dtb_firmware, pas->dtb_firmware_name,
                                        pas->dtb_pas_id, pas->dtb_mem_phys,
-                                       &pas->dtb_pas_metadata);
+                                       pas->dtb_pas_ctx);
                if (ret)
                        goto release_dtb_firmware;
 
@@ -255,7 +255,7 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
        return 0;
 
 release_dtb_metadata:
-       qcom_scm_pas_metadata_release(&pas->dtb_pas_metadata);
+       qcom_scm_pas_metadata_release(pas->dtb_pas_ctx);
 
 release_dtb_firmware:
        release_firmware(pas->dtb_firmware);
@@ -306,7 +306,7 @@ static int qcom_pas_start(struct rproc *rproc)
        }
 
        ret = qcom_mdt_pas_init(pas->dev, pas->firmware, rproc->firmware, pas->pas_id,
-                               pas->mem_phys, &pas->pas_metadata);
+                               pas->mem_phys, pas->pas_ctx);
        if (ret)
                goto disable_px_supply;
 
@@ -332,9 +332,9 @@ static int qcom_pas_start(struct rproc *rproc)
                goto release_pas_metadata;
        }
 
-       qcom_scm_pas_metadata_release(&pas->pas_metadata);
+       qcom_scm_pas_metadata_release(pas->pas_ctx);
        if (pas->dtb_pas_id)
-               qcom_scm_pas_metadata_release(&pas->dtb_pas_metadata);
+               qcom_scm_pas_metadata_release(pas->dtb_pas_ctx);
 
        /* firmware is used to pass reference from qcom_pas_start(), drop it now */
        pas->firmware = NULL;
@@ -342,9 +342,9 @@ static int qcom_pas_start(struct rproc *rproc)
        return 0;
 
 release_pas_metadata:
-       qcom_scm_pas_metadata_release(&pas->pas_metadata);
+       qcom_scm_pas_metadata_release(pas->pas_ctx);
        if (pas->dtb_pas_id)
-               qcom_scm_pas_metadata_release(&pas->dtb_pas_metadata);
+               qcom_scm_pas_metadata_release(pas->dtb_pas_ctx);
 disable_px_supply:
        if (pas->px_supply)
                regulator_disable(pas->px_supply);
@@ -760,6 +760,22 @@ static int qcom_pas_probe(struct platform_device *pdev)
        }
 
        qcom_add_ssr_subdev(rproc, &pas->ssr_subdev, desc->ssr_name);
+
+       pas->pas_ctx = devm_qcom_scm_pas_context_alloc(pas->dev, pas->pas_id,
+                                                      pas->mem_phys, pas->mem_size);
+       if (IS_ERR(pas->pas_ctx)) {
+               ret = PTR_ERR(pas->pas_ctx);
+               goto remove_ssr_sysmon;
+       }
+
+       pas->dtb_pas_ctx = devm_qcom_scm_pas_context_alloc(pas->dev, pas->dtb_pas_id,
+                                                          pas->dtb_mem_phys,
+                                                          pas->dtb_mem_size);
+       if (IS_ERR(pas->dtb_pas_ctx)) {
+               ret = PTR_ERR(pas->dtb_pas_ctx);
+               goto remove_ssr_sysmon;
+       }
+
        ret = rproc_add(rproc);
        if (ret)
                goto remove_ssr_sysmon;

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index c239107cb93017eca6f6b00876e2c10706a3e50d..b125140100db770e00b0605c0bb4a47ba0103b7d 100644 (file)
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -234,13 +234,13 @@ EXPORT_SYMBOL_GPL(qcom_mdt_read_metadata);
  * @fw_name:   name of the firmware, for construction of segment file names
  * @pas_id:    PAS identifier
  * @mem_phys:  physical address of allocated memory region
- * @ctx:       PAS metadata context, to be released by caller
+ * @ctx:       PAS context, ctx->metadata to be released by caller
  *
  * Returns 0 on success, negative errno otherwise.
  */
 int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw,
                      const char *fw_name, int pas_id, phys_addr_t mem_phys,
-                     struct qcom_scm_pas_metadata *ctx)
+                     struct qcom_scm_pas_context *ctx)
 {
        const struct elf32_phdr *phdrs;
        const struct elf32_phdr *phdr;

diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h
index 5045f8fe876da85f569befe368d47c131a50b369..ad69b51fe6fcca22a47997e224161e4ed94b537a 100644 (file)
--- a/include/linux/firmware/qcom/qcom_scm.h
+++ b/include/linux/firmware/qcom/qcom_scm.h
@@ -66,12 +66,6 @@ int qcom_scm_set_warm_boot_addr(void *entry);
 void qcom_scm_cpu_power_down(u32 flags);
 int qcom_scm_set_remote_state(u32 state, u32 id);
 
-struct qcom_scm_pas_metadata {
-       void *ptr;
-       dma_addr_t phys;
-       ssize_t size;
-};
-
 struct qcom_scm_pas_context {
        struct device *dev;
        u32 pas_id;
@@ -87,8 +81,8 @@ struct qcom_scm_pas_context *devm_qcom_scm_pas_context_alloc(struct device *dev,
                                                             phys_addr_t mem_phys,
                                                             size_t mem_size);
 int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size,
-                           struct qcom_scm_pas_metadata *ctx);
-void qcom_scm_pas_metadata_release(struct qcom_scm_pas_metadata *ctx);
+                           struct qcom_scm_pas_context *ctx);
+void qcom_scm_pas_metadata_release(struct qcom_scm_pas_context *ctx);
 int qcom_scm_pas_mem_setup(u32 pas_id, phys_addr_t addr, phys_addr_t size);
 int qcom_scm_pas_auth_and_reset(u32 pas_id);
 int qcom_scm_pas_shutdown(u32 pas_id);

diff --git a/include/linux/soc/qcom/mdt_loader.h b/include/linux/soc/qcom/mdt_loader.h
index 8ea8230579a20cdc1b4c06b4e5fb4a6ea955b6aa..07c27884181669b7a9c4522c70c537b81ea5bdff 100644 (file)
--- a/include/linux/soc/qcom/mdt_loader.h
+++ b/include/linux/soc/qcom/mdt_loader.h
@@ -10,14 +10,14 @@
 
 struct device;
 struct firmware;
-struct qcom_scm_pas_metadata;
+struct qcom_scm_pas_context;
 
 #if IS_ENABLED(CONFIG_QCOM_MDT_LOADER)
 
 ssize_t qcom_mdt_get_size(const struct firmware *fw);
 int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw,
                      const char *fw_name, int pas_id, phys_addr_t mem_phys,
-                     struct qcom_scm_pas_metadata *pas_metadata_ctx);
+                     struct qcom_scm_pas_context *pas_ctx);
 int qcom_mdt_load(struct device *dev, const struct firmware *fw,
                  const char *fw_name, int pas_id, void *mem_region,
                  phys_addr_t mem_phys, size_t mem_size,
@@ -39,7 +39,7 @@ static inline ssize_t qcom_mdt_get_size(const struct firmware *fw)
 
 static inline int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw,
                                    const char *fw_name, int pas_id, phys_addr_t mem_phys,
-                                   struct qcom_scm_pas_metadata *pas_metadata_ctx)
+                                   struct qcom_scm_pas_context *pas_ctx)
 {
        return -ENODEV;
 }