From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B08752F3607 for ; Wed, 8 Oct 2025 07:37:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759909070; cv=none; b=sysXMtFC2PTtnz4zXuSZNcr+N96H8zMfpYxfDBvL61BfGBVhkPNIxtE1Jo1NCYJ2uMu/pngPVsTG9Kn8hn59BkFMuC2orI0FUYD9qMXHn7bKK+Tu2Jq1/j3vD53+ecMLraH1UccsHwpjpb5JaRED6z1S+MPaZty7flUyg7Ff0Bc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759909070; c=relaxed/simple; bh=UmJmAReAY/jF3ItLrlKSZT7z9wMkPQICrwk+v4kExEs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=KnFotSWPnpNI1RC/79YGXfotDI+OcOE2EPjq/bKbWCR/y+2rtJ0JYXPF4buio5iSylntyLU+Ns8yaWW0kSRWJRYSf8z1Tsqxvvd19y9EM4t1I5/FzRJEUM7I3ZVQDpeD8XRwgPawkrx+1m9/JaPbREWevOE0tpnIA9aYy1avFDg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=FZjW4lyQ; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="FZjW4lyQ" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5987aYgc002739 for ; Wed, 8 Oct 2025 07:37:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= nEeCmEmfnHwSIvF0jtyqfFMfczTk2xlyvYDbM9SaDUM=; b=FZjW4lyQyTNCldwN VAglafu1CqtEEpiVsxL7rYC6rL2jK2DTqS8+j+vDrhF1mRq8/metv5pJuSuwbWP+ kNzKUOTXD4cbRsU9bnJ8Ov1XKRLqY+Mg3ni24SWcqUmZ/QRSN2+HweEJb4EioEk/ t2ULzfrhDFeStXn9bzmqMLG7gDcPJlGK8XAeoG0BonpSfoEzV73i5mdv3vR9SrEG 9BzRdNBkVyqDorDDC6iWRd2YGZwHokPg41Lok6MOty49r7BEc/rAEDzqxTwhGd/q AjWK/4NqthCZYOWMLtkI7js/c4CE/mqIufiXLGeF/gKMcl+tAh+WwuUtk5hvS7Ap 1uwXqw== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49jrxna0b7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 08 Oct 2025 07:37:47 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b59682541d5so11379649a12.0 for ; Wed, 08 Oct 2025 00:37:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759909066; x=1760513866; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nEeCmEmfnHwSIvF0jtyqfFMfczTk2xlyvYDbM9SaDUM=; b=DQBnNoFlgwWY3qu0jwXUevRkHIyhSCeRHdBV8B515W3xREvbo07v+tQENZM2gyOmUD DB9Hm8tBPoF3M56lSb37d0/fQMbsyenRyLb7C8QZJV15FMdxhls2fl9wk1balUNU6/Fw 9O5LvbCIvkgjT9HzU54aacQnOkNGmJNO9hsFI9sYNcTFrkppec89BmSde+aAxwx5KcNZ yv51/IXnb2oOf6HczSO1adu8w9O+mX2b1SmiTnKNtPp8nUxx+lPF1PKLJHgvRZBxNZBk Rf/T3EmlWTlXeMAQ2nDzCmyqzdh17/aA6NSyFr7w7Ju4VU8FMnvfK0C5Iv1mQWelYNq7 x8Yw== X-Forwarded-Encrypted: i=1; AJvYcCXhDie6LE0DX0GnwvUjvpc9b/14eCmZ47Tz0q2xy7t+HznfhfaFtgGdPBL8c//umET+dmvQXTKaqBdBMQE=@vger.kernel.org X-Gm-Message-State: AOJu0YxHJrDzGOF9+wJp70QN6JPyVlcmJbRLIGpZMPPAJVak3rnqvhyD WqS8KR8NMue6lP6tZSY+22tBKasRBDLXsa0oELwYAXWKwfEqfMrTyc3xBntg+0+vl+DPDJYCbpb /5AulxngTic/9Ur2jkZF5M7yhdmK52fDN5T23ft9ahPsg0BgaC3W6oAVwkd/soQ6xiQ0= X-Gm-Gg: ASbGncsTsTokeIM2TLPCV5PkL0BBhpFPfQGV85CbutqFj9ORNXY+NuapiVmaR5mWeTr 3tCVu63ASbGuELNsvTAFKgYCiM0iY09bghilbmYJxz25PlLraZztwEK4BYrpetg5ikCs56CcBhn qK4wh1kQ+NTM4mn2348U0F0PxdSs7O+Uu+g3gbljesOekFcTCOK9C9BLV/t5AgyHXAaDApd7Vow SUYddoC3mx0GmNrjOcHs8Bl58qha4x8ce9KexlPSEK1XClY4TbDlVd0d0V3201SBWWZ40DoWoet 4S5TGZB/3ybil9DXPjddFQmOUd3F4TyGkWpoA2Alw7txLvRfJvHISTegpuNXVOHRnNYMwmRq X-Received: by 2002:a17:903:1a23:b0:271:479d:3de3 with SMTP id d9443c01a7336-290272152eamr35569525ad.12.1759909065882; Wed, 08 Oct 2025 00:37:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtOQphOowBe6Hg/t0ShWeX70LzlCSScSpdIGal/lhehLMwq+1q9QA9k7hG2OyyZPdbNLzMiw== X-Received: by 2002:a17:903:1a23:b0:271:479d:3de3 with SMTP id d9443c01a7336-290272152eamr35569135ad.12.1759909065205; Wed, 08 Oct 2025 00:37:45 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-28e8d11080csm189262545ad.1.2025.10.08.00.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 00:37:44 -0700 (PDT) Date: Wed, 8 Oct 2025 13:07:38 +0530 From: Mukesh Ojha To: Manivannan Sadhasivam Cc: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 05/12] remoteproc: pas: Replace metadata context with PAS context structure Message-ID: <20251008073738.prbgdvcwsvgn2db2@hu-mojha-hyd.qualcomm.com> References: <20251007-kvm_rprocv4_next-20251007-v4-0-de841623af3c@oss.qualcomm.com> <20251007-kvm_rprocv4_next-20251007-v4-5-de841623af3c@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA0MDAwMSBTYWx0ZWRfXyJ0Gh0kHjP94 a0RcaF0sZ12cd8fy2rURbFE+500bf87UgEvYhN4SqgnopZnlHT+OC3awFFL3E08BC2l32trMLM+ sMRpMvANp0iBC41UvOYFHjJnIxy7eBmybzVheVxL6RZdoRRqLmaLhwi/r/c77/CJ8welS3QqO/j xWtRchl2eB8asreN1J3Hmp3CgByZejnTjrLpm8uR+DSb0pS1WIFMs1I8vMoojLoC665jxz4FFU7 cbiELT/FuM83Q1f7fhdgQkIJMF4PvHVR4G1mW4SIx3iWPXT3uuMvdCnXG+Ell5lAl0f3Uw+DU33 1hMSiD5sc8MiwzvXXvMnYWECcjSAyqoWTACoGFVoNN08dOSu3b9aG1uuUBcpG7wmK5yGzcGn4Vl zxOwU8zf7zwryu0nlMCntyV/YSwINw== X-Proofpoint-GUID: 0tsxxc9i2VhKwdANHvor840PwkpWRXk6 X-Proofpoint-ORIG-GUID: 0tsxxc9i2VhKwdANHvor840PwkpWRXk6 X-Authority-Analysis: v=2.4 cv=EqnfbCcA c=1 sm=1 tr=0 ts=68e614cb cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=EUspDBNiAAAA:8 a=ITxB3YW7ubr_P7K2B3gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-08_01,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 suspectscore=0 bulkscore=0 impostorscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2510040001 On Tue, Oct 07, 2025 at 02:34:29PM -0700, Manivannan Sadhasivam wrote: > On Tue, Oct 07, 2025 at 10:18:50PM +0530, Mukesh Ojha wrote: > > 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 SMC and metadata functions are > > SCM? Yes, it should be SCM to be precise. > > - Mani > > > updated to incorporate PAS context awareness. > > > > Signed-off-by: Mukesh Ojha > > --- > > drivers/firmware/qcom/qcom_scm.c | 32 +++++++++-------- > > drivers/remoteproc/qcom_q6v5_pas.c | 66 +++++++++++++++++++--------------- > > drivers/soc/qcom/mdt_loader.c | 7 ++-- > > include/linux/firmware/qcom/qcom_scm.h | 4 +-- > > include/linux/soc/qcom/mdt_loader.h | 5 ++- > > 5 files changed, 62 insertions(+), 52 deletions(-) > > > > diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c > > index b8ce4fc34dbe..7b4ff3cb26ed 100644 > > --- a/drivers/firmware/qcom/qcom_scm.c > > +++ b/drivers/firmware/qcom/qcom_scm.c > > @@ -621,7 +621,7 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_context_destroy); > > * 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. > > * > > @@ -630,8 +630,9 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_context_destroy); > > * 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) > > { > > + struct qcom_scm_pas_metadata *mdt_ctx; > > dma_addr_t mdata_phys; > > void *mdata_buf; > > int ret; > > @@ -682,10 +683,11 @@ int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size, > > out: > > if (ret < 0 || !ctx) { > > dma_free_coherent(__scm->dev, size, mdata_buf, mdata_phys); > > - } else if (ctx) { > > - ctx->ptr = mdata_buf; > > - ctx->phys = mdata_phys; > > - ctx->size = size; > > + } else if (ctx && ctx->metadata) { > > + mdt_ctx = ctx->metadata; > > + mdt_ctx->ptr = mdata_buf; > > + mdt_ctx->phys = mdata_phys; > > + mdt_ctx->size = size; > > } > > > > return ret ? : res.result[0]; > > @@ -694,18 +696,20 @@ 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; > > + struct qcom_scm_pas_metadata *mdt_ctx; > > > > - dma_free_coherent(__scm->dev, ctx->size, ctx->ptr, ctx->phys); > > + mdt_ctx = ctx->metadata; > > + if (!mdt_ctx->ptr) > > + return; > > > > - ctx->ptr = NULL; > > - ctx->phys = 0; > > - ctx->size = 0; > > + dma_free_coherent(__scm->dev, mdt_ctx->size, mdt_ctx->ptr, mdt_ctx->phys); > > + mdt_ctx->ptr = NULL; > > + mdt_ctx->phys = 0; > > + mdt_ctx->size = 0; > > } > > EXPORT_SYMBOL_GPL(qcom_scm_pas_metadata_release); > > > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > > index 158bcd6cc85c..46a23fdefd48 100644 > > --- 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; > > } > > @@ -239,15 +239,8 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) > > return ret; > > } > > > > - 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); > > - if (ret) > > - goto release_dtb_firmware; > > - > > - ret = qcom_mdt_load_no_init(pas->dev, pas->dtb_firmware, pas->dtb_firmware_name, > > - pas->dtb_mem_region, pas->dtb_mem_phys, > > - pas->dtb_mem_size, &pas->dtb_mem_reloc); > > + ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, pas->dtb_firmware_name, > > + pas->dtb_mem_region, &pas->dtb_mem_reloc); > > if (ret) > > goto release_dtb_metadata; > > } > > @@ -255,9 +248,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); > > - > > -release_dtb_firmware: > > + qcom_scm_pas_metadata_release(pas->dtb_pas_ctx); > > release_firmware(pas->dtb_firmware); > > > > return ret; > > @@ -305,14 +296,8 @@ 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); > > - if (ret) > > - goto disable_px_supply; > > - > > - ret = qcom_mdt_load_no_init(pas->dev, pas->firmware, rproc->firmware, > > - pas->mem_region, pas->mem_phys, pas->mem_size, > > - &pas->mem_reloc); > > + ret = qcom_mdt_pas_load(pas->pas_ctx, pas->firmware, rproc->firmware, > > + pas->mem_region, &pas->dtb_mem_reloc); > > if (ret) > > goto release_pas_metadata; > > > > @@ -332,9 +317,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 +327,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); > > @@ -779,12 +764,33 @@ static int qcom_pas_probe(struct platform_device *pdev) > > } > > > > qcom_add_ssr_subdev(rproc, &pas->ssr_subdev, desc->ssr_name); > > + > > + pas->pas_ctx = qcom_scm_pas_context_init(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 = qcom_scm_pas_context_init(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 destroy_pas_ctx; > > + } > > + > > ret = rproc_add(rproc); > > if (ret) > > - goto remove_ssr_sysmon; > > + goto destroy_dtb_pas_ctx; > > > > return 0; > > > > +destroy_dtb_pas_ctx: > > + qcom_scm_pas_context_destroy(pas->dtb_pas_ctx); > > + > > +destroy_pas_ctx: > > + qcom_scm_pas_context_destroy(pas->pas_ctx); > > + > > remove_ssr_sysmon: > > qcom_remove_ssr_subdev(rproc, &pas->ssr_subdev); > > qcom_remove_sysmon_subdev(pas->sysmon); > > @@ -807,6 +813,8 @@ static void qcom_pas_remove(struct platform_device *pdev) > > { > > struct qcom_pas *pas = platform_get_drvdata(pdev); > > > > + qcom_scm_pas_context_destroy(pas->dtb_pas_ctx); > > + qcom_scm_pas_context_destroy(pas->pas_ctx); > > rproc_del(pas->rproc); > > > > qcom_q6v5_deinit(&pas->q6v5); > > diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c > > index 31855836b251..105a44f42ba7 100644 > > --- 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; > > @@ -505,8 +505,7 @@ int qcom_mdt_pas_load(struct qcom_scm_pas_context *ctx, const struct firmware *f > > { > > int ret; > > > > - ret = qcom_mdt_pas_init(ctx->dev, fw, firmware, ctx->pas_id, ctx->mem_phys, > > - ctx->metadata); > > + ret = qcom_mdt_pas_init(ctx->dev, fw, firmware, ctx->pas_id, ctx->mem_phys, ctx); > > if (ret) > > return ret; > > > > diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h > > index e82fdc200df7..af6ab837ad5a 100644 > > --- a/include/linux/firmware/qcom/qcom_scm.h > > +++ b/include/linux/firmware/qcom/qcom_scm.h > > @@ -84,8 +84,8 @@ void *qcom_scm_pas_context_init(struct device *dev, u32 pas_id, phys_addr_t mem_ > > size_t mem_size); > > void qcom_scm_pas_context_destroy(struct qcom_scm_pas_context *ctx); > > 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 2832e0717729..7d57746fbbfa 100644 > > --- a/include/linux/soc/qcom/mdt_loader.h > > +++ b/include/linux/soc/qcom/mdt_loader.h > > @@ -10,7 +10,6 @@ > > > > struct device; > > struct firmware; > > -struct qcom_scm_pas_metadata; > > struct qcom_scm_pas_context; > > > > #if IS_ENABLED(CONFIG_QCOM_MDT_LOADER) > > @@ -18,7 +17,7 @@ struct qcom_scm_pas_context; > > 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, > > @@ -43,7 +42,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; > > } > > > > -- > > 2.50.1 > > > > -- > மணிவண்ணன் சதாசிவம் -- -Mukesh Ojha