FAILED: patch "[PATCH] remoteproc: qcom: pas: Guard dtb metadata release with" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x c06c5ab4945392d2c2aded6d832ab6b58cabe351
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026090336-dweller-sepia-b585@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c06c5ab4945392d2c2aded6d832ab6b58cabe351 Mon Sep 17 00:00:00 2001
From: Mukesh Ojha <[email protected]>
Date: Fri, 24 Jul 2026 23:58:54 +0530
Subject: [PATCH] remoteproc: qcom: pas: Guard dtb metadata release with
dtb_pas_id check
All other call sites of qcom_scm_pas_metadata_release() for the DTB context are guarded by a check on pas->dtb_pas_id, but the call inside qcom_pas_load() was not. Fix this by moving the call to the guarded block.
drivers/remoteproc/qcom_q6v5_pas.c +5 -8
@@ -245,17 +245,14 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) ret =qcom_mdt_pas_load (pas->dtb_pas_ctx, pas->dtb_firmware, pas->dtb_firmware_name, (__force void *)pas->dtb_mem_region, &pas->dtb_mem_reloc); -if (ret) - goto release_dtb_metadata; +if (ret) { +qcom_pas_metadata_release (pas->dtb_pas_ctx); +release_firmware (pas->dtb_firmware); +return ret; + } }return 0 ; - -release_dtb_metadata: -qcom_pas_metadata_release (pas->dtb_pas_ctx); -release_firmware (pas->dtb_firmware); - -return ret; }static void qcom_pas_unmap_carveout (struct rproc *rproc,phys_addr_t mem_phys,size_t size)
Sasha Levin
maintainerPATCH 1/2 remoteproc: pas: Replace metadata context with PAS context structure
From: Mukesh Ojha <[email protected]>
[ Upstream commit b13d8baf56016e7eec29395b52d18b91df081d48 ]
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.
For this 6.6 dependency backport, retain the stable SCM file location, peripheral argument naming and split MDT init/load API. Define the PAS context locally in the SCM header and allocate and initialize both contexts directly in adsp_probe(), before memory assignment and subdevice registration. Use the existing free_rproc error path on allocation failure; the newer allocator helper and its cleanup labels are absent here.
Rename the existing metadata-release implementation and export to qcom_pas_metadata_release(), matching target c06c5ab4945392, and update all callers. No new functions are introduced.
Use the target's local PAS pointer naming in adsp_load() and release the DTB firmware directly on MDT initialization failure. This preserves the stable error handling while removing the extra firmware-release label. Keep the load-error metadata-release label for the target to move into the dtb_pas_id guard. Align its call-site context so the original target can be cherry-picked without importing the later PAS loader or IOMMU refactors.
[ sashal: Reduced backport -- upstream b13d8baf56016 touches 5 file(s), this
backport carries 5. Not backported here:
drivers/firmware/qcom/qcom_scm.c
This note is generated from the file lists only; see the resolution record for the reasoning. ]
Stable-dep-of: c06c5ab49453 ("remoteproc: qcom: pas: Guard dtb metadata release with dtb_pas_id check")
--- drivers/firmware/qcom_scm.c | 14 ++--- drivers/remoteproc/qcom_q6v5_pas.c | 78 ++++++++++++++++---------- drivers/soc/qcom/mdt_loader.c | 4 +- include/linux/firmware/qcom/qcom_scm.h | 10 +++- include/linux/soc/qcom/mdt_loader.h | 6 +- 5 files changed, 68 insertions(+), 44 deletions(-)
drivers/firmware/qcom_scm.c +7 -7
@@ -456,16 +456,16 @@ static void qcom_scm_set_download_mode(bool enable)* 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. * * Upon successful return, the PAS metadata context (@ctx) will be used to * track the metadata allocation, this needs to be released by invoking -* qcom_scm_pas_metadata_release() by the caller. +* qcom_pas_metadata_release() by the caller. */ int qcom_scm_pas_init_image (u32 peripheral,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;
@@ -522,10 +522,10 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size,EXPORT_SYMBOL_GPL (qcom_scm_pas_init_image);/** -* qcom_scm_pas_metadata_release() - release metadata context -* @ctx: metadata context +* qcom_pas_metadata_release() - release metadata context +* @ctx: PAS context */ -void qcom_scm_pas_metadata_release (struct qcom_scm_pas_metadata *ctx) +void qcom_pas_metadata_release (struct qcom_scm_pas_context *ctx) {if (!ctx->ptr)return ;
@@ -536,7 +536,7 @@ void qcom_scm_pas_metadata_release(struct qcom_scm_pas_metadata *ctx) ctx->phys =0 ; ctx->size =0 ; } -EXPORT_SYMBOL_GPL (qcom_scm_pas_metadata_release); +EXPORT_SYMBOL_GPL (qcom_pas_metadata_release);/** * qcom_scm_pas_mem_setup() - Prepare the memory related to a given peripheral
drivers/remoteproc/qcom_q6v5_pas.c +49 -29
142 lines not on this page · raw message
drivers/soc/qcom/mdt_loader.c +2 -2
@@ -236,13 +236,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, 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;
include/linux/firmware/qcom/qcom_scm.h +7 -3
@@ -66,7 +66,11 @@ extern int qcom_scm_set_warm_boot_addr(void *entry);extern void qcom_scm_cpu_power_down (u32 flags);extern int qcom_scm_set_remote_state (u32 state,u32 id); -struct qcom_scm_pas_metadata { +struct qcom_scm_pas_context { +struct device *dev; +u32 pas_id; +phys_addr_t mem_phys; +size_t mem_size;void *ptr;dma_addr_t phys;ssize_t size;
@@ -74,8 +78,8 @@ struct qcom_scm_pas_metadata {extern int qcom_scm_pas_init_image (u32 peripheral,const void *metadata,size_t size, -struct qcom_scm_pas_metadata *ctx); -extern void qcom_scm_pas_metadata_release (struct qcom_scm_pas_metadata *ctx); +struct qcom_scm_pas_context *ctx); +extern void qcom_pas_metadata_release (struct qcom_scm_pas_context *ctx);extern int qcom_scm_pas_mem_setup (u32 peripheral,phys_addr_t addr,phys_addr_t size);extern int qcom_scm_pas_auth_and_reset (u32 peripheral);
include/linux/soc/qcom/mdt_loader.h +3 -3
@@ -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 ; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 remoteproc: qcom: pas: Guard dtb metadata release with dtb_pas_id check
From: Mukesh Ojha <[email protected]>
[ Upstream commit c06c5ab4945392d2c2aded6d832ab6b58cabe351 ]
All other call sites of qcom_scm_pas_metadata_release() for the DTB context are guarded by a check on pas->dtb_pas_id, but the call inside qcom_pas_load() was not. Fix this by moving the call to the guarded block.
--- drivers/remoteproc/qcom_q6v5_pas.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/remoteproc/qcom_q6v5_pas.c +5 -8
@@ -230,17 +230,14 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw) pas->dtb_pas_id, pas->dtb_mem_region, pas->dtb_mem_phys, pas->dtb_mem_size, &pas->dtb_mem_reloc); -if (ret) - goto release_dtb_metadata; +if (ret) { +qcom_pas_metadata_release (pas->dtb_pas_ctx); +release_firmware (pas->dtb_firmware); +return ret; + } }return 0 ; - -release_dtb_metadata: -qcom_pas_metadata_release (pas->dtb_pas_ctx); -release_firmware (pas->dtb_firmware); - -return ret; }static int adsp_start (struct rproc *rproc)
Signature · 1 line
2.53.0