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 94FF1255F2D for ; Thu, 15 Oct 2026 05:56:41 +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=1792043803; cv=none; b=GGTAvE7ugIOvoU2CZQ5A3t+sA3oT3q3WVOHLH1h0sj7A314u6SLI2QWG1u+SqAa38/xRM6r2ci93LS9yy0ZsxFS86Ncj9RQ9j/BfkL7/MCAh1biuOB+3LHX0C7MoyCC1+sp6WuLwdeskHd/qy9Ym8BirMMvaUyORBO567oIXJfs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792043803; c=relaxed/simple; bh=Uju09DfXQ3q/uOvmAij95aY3BQCzb9jjR/bvJJeHH+s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hyYTLvymFzgJt3y452I+xb3ctJIbf7Lxl4DtMWPOG+1+P/u4HxaZj5LeJ+AIhh7R1cDEVwQOxJ9SB5fZK5cK5Z+K6ztaDk/tSTx305cr2E5Vua2aqVU3BNTjUN+7D640CbO/wwITbhlWpwGCowlh/19PrGvUtNOlPGe7yAe4Fuk= 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=FTXtroHg; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YcUpupMj; 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="FTXtroHg"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YcUpupMj" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69F3wZGJ1889496 for ; Thu, 15 Oct 2026 05:56:40 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= /e7mBS9wRW6SLFwLnnEtwIIq5+gTTwqbqv3dUCfQniA=; b=FTXtroHgMZsH3Ljo P6LeJftIhW8IOI00/F8eJGKWN6mg9xmkmwLkpBmYKnX/7sRu1t7e3lnYDW0rrUZa gj5U230y+uUyCY7fHqDXQdZOLnrxjSNkynqZyh5JKVabWtjyxnGgrfxL5xmH+ZhC lXPdzrS9gaoSQL5/tUDKi5OyNSgCZNnv/7t361DOlbitUctC4Xv/MEjlNs5q5CFe Li+xtqF8tNTj3PBqviaGfjX8xFLJghZ7Ytbvok4HOH4qJoDJVFhHaTKM37sQXx2C 5udFtVVujyrghJoxWmi2R0t5DrW8V2+hLWb8gO1Zgt7+dZvTpT/rBYQDsM/AvKEy MmgEaA== Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4haqda0cjx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 15 Oct 2026 05:56:40 +0000 (GMT) Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-33c35f5ca6cso10259195eec.1 for ; Wed, 14 Oct 2026 22:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1792043799; x=1792648599; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/e7mBS9wRW6SLFwLnnEtwIIq5+gTTwqbqv3dUCfQniA=; b=YcUpupMjJyKXFVVpYbi4JPDkz3RLNo0WHIOfdtEcyEhcEJyWQJds4bSF2Oc63PdTLk Gt9MKkC6de1wDuquppXPcjvGbvWr0h34vjvCvtyouLq0jFmoxxUsMNi3UHDeqOF7ii8y K0/8eafHyEjLz8SBEGoL3D3pi70U0Y/MLZN/H0+AdrZ3X1I3Q6dhdudCuCWIaoDg0Csc +R9uFrvK3kka+dYmUnHmZzVTHE0ZNMr0QKHDtAEyO7eViBA1hCfN/ZNftBq1Q/RK5bYk plDhTlrlYMb+D9xtV9+OLoPEI4KsVed1AjD4Ja4lAfkPNOJ+8xP4mteuiwlxweLN6Ze6 m7CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792043799; x=1792648599; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=/e7mBS9wRW6SLFwLnnEtwIIq5+gTTwqbqv3dUCfQniA=; b=h+LEs44OIIQNk9nZGeO+RkQguX6LARwbzyxbhaUxQruOrG1dGVDud+l8qlVXvsxiuu AbWfsmf5HBXj8ZCdqbICbeMXbzpDi+WqJd8mngnvxtNPrIvNsvqVxHwj/7xFuCxlZ3+Y cBwzqIlJeV5Ueo+GXmB6FMrDbqWOkostBaAGp1YNjw2YLI8utFERKsg5kwbpyR1Reyl3 mRvWvn2Le3RXKTTi3h6hAFzbJjGpAX2oPt03BBt0sQUl5boSdOLZt/sEl6LQQPWGaqg+ 8P67jpfZ5Y1DGgKYo9+IKICkbTUHKEKCZwW6MssC/f9+/6zs7ALGYXOgWkI7ru5CwRKl M68Q== X-Forwarded-Encrypted: i=1; AKwUvBwiMLMQemUOxhLlS1Q7R37WgT0A0zvEXfC1yTuSuVZTLtlktoN1GT6tEKKggbyirXR4Hq1RRQVBqj0RgjU=@vger.kernel.org X-Gm-Message-State: AFq9FYKMhE5KSJcTPBVTQ0Z5X0POCAg5LIgoH+kRw+hpP++Ked5f8ntZ lLPeC+kSLIwLOPGcLi/ljr9+Be3UvMhgMiNJyKWvA0vc4RBbf2Q7EnVUHWyyQY4j5+ybr2O71Xw Ha4DB1Csi/L/yyBDKcyWS8oAmElZikeOFGOhUWocLBORGVr6GHOrlSnGkVnib+B+Es5c= X-Gm-Gg: AYBFou17dxnKXeV0yF/EwU2aTo25q94lMYJikCxtwwncR12RYVEivlPsjenvnArYUyB qyKTHHAWSAHR/t4RGoaM7lMw9q9VRokAZb2MOZSho2OOjRlXmGFgPrU7SKMQAtdcFLLZrnOVgne FakZFw/UHC3MaAonomS3Pg4NE0tuyrm/YCsDsHEfLT0nzzdae8aUhcvlcQ52jMbhtrTkqF/yquu z9FJCk4JdcOKEYhZbHqJTWMGMyxp0EWAHAbtSLSmfC9kIoP7/RReglAXSAvtHadqVqkVArEEG3e Dx71a3OVB8/f+LZaPc2hrZp2Cy2vlMgmN+wnh9qakusB2paifW+rf3tgiL3S18gjZRJoSgxeuyq 07SlLtVTPZDwaAHQrF5Shprosz8iIy5JQRBa9sffqK5pLiao3QPSHNs+4lWLWwpqX2egkMQXO+D i5v1MzyhxOwEs= X-Received: by 2002:a05:7300:828a:b0:34c:d1f2:b552 with SMTP id 5a478bee46e88-3537dedaa87mr23106331eec.4.1792043799084; Wed, 14 Oct 2026 22:56:39 -0700 (PDT) X-Received: by 2002:a05:7300:828a:b0:34c:d1f2:b552 with SMTP id 5a478bee46e88-3537dedaa87mr23106298eec.4.1792043798334; Wed, 14 Oct 2026 22:56:38 -0700 (PDT) Received: from hu-ajainp-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3537c61eaa0sm64791975eec.0.2026.10.14.22.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 22:56:37 -0700 (PDT) From: Anvesh Jain P Date: Thu, 15 Oct 2026 11:25:50 +0530 Subject: [PATCH v2 2/4] remoteproc: qcom: pas: Support secondary images 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-Transfer-Encoding: 7bit Message-Id: <20261015-oob-support-glymur-v2-2-715435f52dd7@oss.qualcomm.com> References: <20261015-oob-support-glymur-v2-0-715435f52dd7@oss.qualcomm.com> In-Reply-To: <20261015-oob-support-glymur-v2-0-715435f52dd7@oss.qualcomm.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sibi Sankar , Anvesh Jain P X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1792043784; l=14675; i=anvesh.p@oss.qualcomm.com; s=20260313; h=from:subject:message-id; bh=Uju09DfXQ3q/uOvmAij95aY3BQCzb9jjR/bvJJeHH+s=; b=3F8bmffeDOGMOnktvwoEpzcK8VeNI6B3JfCX+6RSmskqPmRF7yMseH6Nla86B4Enqy7Zc6Mla 6Iyrrtjxn3xDGPwQvUPt12MUM/R2MuTgC6nLZWKTwU0ZTEceyHnKPAf X-Developer-Key: i=anvesh.p@oss.qualcomm.com; a=ed25519; pk=8o9EG7gkPe2Er9y9UVCx8MTdcFCwU8Pa54hBZPuduXE= X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE1MDAyMyBTYWx0ZWRfX7mZR+uU9tVJe RU5irolgAS9lwoA91LrZ/9tT34vl/l2TN390jzYrPmFciFLFyTSknuc/Xpavo0yqm3/oQHsFaxB oWRWTbRzIFW90zYf50Rqo1vk1QMGtYE= X-Authority-Analysis: v=2.4 cv=K9u3jCWI c=1 sm=1 tr=0 ts=6ad06b18 cx=c_pps a=Uww141gWH0fZj/3QKPojxA==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=WQtI_U3e13HlgX_oKn0A:9 a=QEXdDO2ut3YA:10 a=PxkB5W3o20Ba91AHUih5:22 X-Proofpoint-GUID: d6no1ustQNS14CvIhz82hKzZoGyNAXMn X-Proofpoint-ORIG-GUID: d6no1ustQNS14CvIhz82hKzZoGyNAXMn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE1MDAyMyBTYWx0ZWRfX1jPNSX+6BYJE hXRBdf7BFjWEd6op4cbsJy260Ry0gIXolcN1+HNCEvpUSPnw8gihKPi/Dz8Pmkl5BtfqSRX2aQz XmfxX3wfkRgndB94yVwtPTXvGoVKIkIGQGd80QCQAav2/CIPv62Hvbqp+o/nEozSMGBKIgPie/K Ot1/zr53yl0mHn01lHaR8DRGVsLpMd+28wFos4dtsMHwGxw3rf//U1y8bIrP0jGTBAgSdfUIq0C qfjBId/ORjlKC2mmF8QXlQ+te4cdUFOa+fyFjh7zbQaV9LCt7VLGG9sxCCTIqRHIDDhAlmGaoZ+ y4wemFJyxXMcT1fmuLTQ7mnngrGt5DkN+IMPH25nN/1BaFOtFa0DrLkn8AJxfKUMxyobLG2PgLA /8uYviBqY4R4KJlhPXoNCIOB/QD9a7wA1Zn0CISUil0ZQVhIycfMSDL6gE5XeyzNx+qzuo0JYPu LsECqoZJ+z/v6VIdmKw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-13_01,2026-10-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 clxscore=1015 spamscore=0 priorityscore=1501 phishscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610150023 The Out-of-Band Management Subsystem (OOBMSS) is managed by a common remote processor and consists of two Zephyr subsystems: +----------------------------------------------------------+ | OOBMSS | | | | +------------------------+ +------------------------+ | | | OOB-TEE | | OOB-Non-Secure | | | | Primary processor | | Auxiliary processor | | | | Primary image and DTB | | Secondary image and DTB| | | +------------------------+ +------------------------+ | +----------------------------------------------------------+ The primary processor is the Out-of-Band Trusted Execution Environment (OOB-TEE) processor. The OOB-Non-Secure processor is an auxiliary processor that depends on the primary processor and cannot function independently. The PAS remoteproc driver currently supports one primary image and its optional DTB. OOBMSS additionally requires the secondary image and DTB to be loaded, authenticated, mapped, shut down, and released through their own PAS identifiers and carveouts. Add generic PAS support for loading, authenticating, and mapping a secondary image and its DTB, then shutting down and releasing both while keeping the existing primary-image lifecycle unchanged. Signed-off-by: Anvesh Jain P --- drivers/remoteproc/qcom_q6v5_pas.c | 240 ++++++++++++++++++++++++++++++++++--- 1 file changed, 222 insertions(+), 18 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index ca8e61254c44..0bce2f0d5b4a 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -42,8 +42,12 @@ struct qcom_pas_data { int crash_reason_smem; const char *firmware_name; const char *dtb_firmware_name; + const char *secondary_firmware_name; + const char *secondary_dtb_firmware_name; int pas_id; int dtb_pas_id; + int secondary_pas_id; + int secondary_dtb_pas_id; int lite_pas_id; int lite_dtb_pas_id; unsigned int minidump_id; @@ -83,8 +87,12 @@ struct qcom_pas { int proxy_pd_count; const char *dtb_firmware_name; + const char *secondary_firmware_name; + const char *secondary_dtb_firmware_name; int pas_id; int dtb_pas_id; + int secondary_pas_id; + int secondary_dtb_pas_id; int lite_pas_id; int lite_dtb_pas_id; unsigned int minidump_id; @@ -95,17 +103,25 @@ struct qcom_pas { const struct firmware *firmware; const struct firmware *dtb_firmware; + const struct firmware *secondary_firmware; + const struct firmware *secondary_dtb_firmware; phys_addr_t mem_phys; phys_addr_t dtb_mem_phys; + phys_addr_t secondary_mem_phys; + phys_addr_t secondary_dtb_mem_phys; phys_addr_t mem_reloc; phys_addr_t dtb_mem_reloc; + phys_addr_t secondary_mem_reloc; + phys_addr_t secondary_dtb_mem_reloc; phys_addr_t region_assign_phys[MAX_ASSIGN_COUNT]; void __iomem *mem_region; size_t mem_size; size_t dtb_mem_size; + size_t secondary_mem_size; + size_t secondary_dtb_mem_size; size_t region_assign_size[MAX_ASSIGN_COUNT]; int region_assign_idx; @@ -123,6 +139,8 @@ struct qcom_pas { struct qcom_pas_context *pas_ctx; struct qcom_pas_context *dtb_pas_ctx; + struct qcom_pas_context *secondary_pas_ctx; + struct qcom_pas_context *secondary_dtb_pas_ctx; }; static void qcom_pas_segment_dump(struct rproc *rproc, @@ -198,19 +216,37 @@ static void qcom_pas_pds_disable(struct qcom_pas *pas, struct device **pds, } } -static int qcom_pas_shutdown_poll_decrypt(struct qcom_pas *pas) +static int qcom_pas_shutdown_poll_decrypt(int pas_id) { unsigned int retry_num = 50; int ret; do { msleep(QCOM_PAS_DECRYPT_SHUTDOWN_DELAY_MS); - ret = qcom_pas_shutdown(pas->pas_id); + ret = qcom_pas_shutdown(pas_id); } while (ret == -EINVAL && --retry_num); return ret; } +static void qcom_pas_release_firmware(struct qcom_pas *pas) +{ + if (pas->dtb_firmware) { + release_firmware(pas->dtb_firmware); + pas->dtb_firmware = NULL; + } + + if (pas->secondary_firmware) { + release_firmware(pas->secondary_firmware); + pas->secondary_firmware = NULL; + } + + if (pas->secondary_dtb_firmware) { + release_firmware(pas->secondary_dtb_firmware); + pas->secondary_dtb_firmware = NULL; + } +} + static int qcom_pas_unprepare(struct rproc *rproc) { struct qcom_pas *pas = rproc->priv; @@ -224,6 +260,10 @@ static int qcom_pas_unprepare(struct rproc *rproc) qcom_pas_metadata_release(pas->pas_ctx); if (pas->dtb_pas_id) qcom_pas_metadata_release(pas->dtb_pas_ctx); + if (pas->secondary_pas_id) + qcom_pas_metadata_release(pas->secondary_pas_ctx); + if (pas->secondary_dtb_pas_id) + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx); return 0; } @@ -241,19 +281,29 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) if (pas->lite_dtb_pas_id) qcom_pas_shutdown(pas->lite_dtb_pas_id); - if (pas->dtb_pas_id) { - ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name, pas->dev); + if (pas->secondary_dtb_pas_id) { + ret = request_firmware(&pas->secondary_dtb_firmware, + pas->secondary_dtb_firmware_name, pas->dev); + if (ret) { + qcom_pas_release_firmware(pas); + return ret; + } + } + + if (pas->secondary_pas_id) { + ret = request_firmware(&pas->secondary_firmware, + pas->secondary_firmware_name, pas->dev); if (ret) { - dev_err(pas->dev, "request_firmware failed for %s: %d\n", - pas->dtb_firmware_name, ret); + qcom_pas_release_firmware(pas); return ret; } + } - ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, - pas->dtb_firmware_name, &pas->dtb_mem_reloc); + if (pas->dtb_pas_id) { + ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name, + pas->dev); if (ret) { - qcom_pas_metadata_release(pas->dtb_pas_ctx); - release_firmware(pas->dtb_firmware); + qcom_pas_release_firmware(pas); return ret; } } @@ -310,10 +360,51 @@ static int qcom_pas_start(struct rproc *rproc) goto disable_cx_supply; } + if (pas->secondary_dtb_pas_id) { + ret = qcom_mdt_pas_load(pas->secondary_dtb_pas_ctx, + pas->secondary_dtb_firmware, + pas->secondary_dtb_firmware_name, + &pas->secondary_dtb_mem_reloc); + if (ret) + goto release_secondary_dtb_metadata; + + ret = qcom_pas_map_carveout(rproc, pas->secondary_dtb_mem_phys, + pas->secondary_dtb_mem_size); + if (ret) + goto release_secondary_dtb_metadata; + + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_dtb_pas_ctx); + if (ret) + goto unmap_secondary_dtb_carveout; + } + + if (pas->secondary_pas_id) { + ret = qcom_mdt_pas_load(pas->secondary_pas_ctx, + pas->secondary_firmware, + pas->secondary_firmware_name, + &pas->secondary_mem_reloc); + if (ret) + goto release_secondary_metadata; + + ret = qcom_pas_map_carveout(rproc, pas->secondary_mem_phys, + pas->secondary_mem_size); + if (ret) + goto release_secondary_metadata; + + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_pas_ctx); + if (ret) + goto unmap_secondary_carveout; + } + if (pas->dtb_pas_id) { + ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, + pas->dtb_firmware_name, &pas->dtb_mem_reloc); + if (ret) + goto release_dtb_metadata; + ret = qcom_pas_map_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size); if (ret) - goto disable_px_supply; + goto release_dtb_metadata; ret = qcom_pas_prepare_and_auth_reset(pas->dtb_pas_ctx); if (ret) { @@ -344,13 +435,16 @@ static int qcom_pas_start(struct rproc *rproc) ret = qcom_q6v5_wait_for_start(&pas->q6v5, msecs_to_jiffies(5000)); if (ret == -ETIMEDOUT) { dev_err(pas->dev, "start timed out\n"); - qcom_pas_shutdown(pas->pas_id); goto unmap_carveout; } qcom_pas_metadata_release(pas->pas_ctx); if (pas->dtb_pas_id) qcom_pas_metadata_release(pas->dtb_pas_ctx); + if (pas->secondary_pas_id) + qcom_pas_metadata_release(pas->secondary_pas_ctx); + if (pas->secondary_dtb_pas_id) + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx); /* firmware is used to pass reference from qcom_pas_start(), drop it now */ pas->firmware = NULL; @@ -358,16 +452,37 @@ static int qcom_pas_start(struct rproc *rproc) return 0; unmap_carveout: + qcom_pas_shutdown(pas->pas_id); qcom_pas_unmap_carveout(rproc, pas->mem_phys, pas->mem_size); release_pas_metadata: qcom_pas_metadata_release(pas->pas_ctx); - if (pas->dtb_pas_id) - qcom_pas_metadata_release(pas->dtb_pas_ctx); - unmap_dtb_carveout: + if (pas->dtb_pas_id) { + qcom_pas_shutdown(pas->dtb_pas_id); + qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, + pas->dtb_mem_size); + } +release_dtb_metadata: if (pas->dtb_pas_id) - qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size); -disable_px_supply: + qcom_pas_metadata_release(pas->dtb_pas_ctx); +unmap_secondary_carveout: + if (pas->secondary_pas_id) { + qcom_pas_shutdown(pas->secondary_pas_id); + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys, + pas->secondary_mem_size); + } +release_secondary_metadata: + if (pas->secondary_pas_id) + qcom_pas_metadata_release(pas->secondary_pas_ctx); +unmap_secondary_dtb_carveout: + if (pas->secondary_dtb_pas_id) { + qcom_pas_shutdown(pas->secondary_dtb_pas_id); + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys, + pas->secondary_dtb_mem_size); + } +release_secondary_dtb_metadata: + if (pas->secondary_dtb_pas_id) + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx); if (pas->px_supply) regulator_disable(pas->px_supply); disable_cx_supply: @@ -413,7 +528,7 @@ static int qcom_pas_stop(struct rproc *rproc) ret = qcom_pas_shutdown(pas->pas_id); if (ret && pas->decrypt_shutdown) - ret = qcom_pas_shutdown_poll_decrypt(pas); + ret = qcom_pas_shutdown_poll_decrypt(pas->pas_id); if (ret) dev_err(pas->dev, "failed to shutdown: %d\n", ret); @@ -426,6 +541,27 @@ static int qcom_pas_stop(struct rproc *rproc) qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size); } + if (pas->secondary_pas_id) { + ret = qcom_pas_shutdown(pas->secondary_pas_id); + if (ret && pas->decrypt_shutdown) + ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id); + if (ret) + dev_err(pas->dev, "failed to shutdown secondary: %d\n", ret); + + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys, + pas->secondary_mem_size); + } + + if (pas->secondary_dtb_pas_id) { + ret = qcom_pas_shutdown(pas->secondary_dtb_pas_id); + if (ret) + dev_err(pas->dev, + "failed to shutdown secondary dtb: %d\n", ret); + + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys, + pas->secondary_dtb_mem_size); + } + qcom_pas_unmap_carveout(rproc, pas->mem_phys, pas->mem_size); handover = qcom_q6v5_unprepare(&pas->q6v5); @@ -740,6 +876,42 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas) if (IS_ERR(pas->dtb_pas_ctx)) return PTR_ERR(pas->dtb_pas_ctx); + if (!pas->secondary_pas_id) + return 0; + + ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 2, &res); + if (ret) + return ret; + + pas->secondary_mem_phys = res.start; + pas->secondary_mem_reloc = res.start; + pas->secondary_mem_size = resource_size(&res); + + pas->secondary_pas_ctx = + devm_qcom_pas_context_alloc(pas->dev, pas->secondary_pas_id, + pas->secondary_mem_phys, + pas->secondary_mem_size); + if (IS_ERR(pas->secondary_pas_ctx)) + return PTR_ERR(pas->secondary_pas_ctx); + + if (!pas->secondary_dtb_pas_id) + return 0; + + ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 3, &res); + if (ret) + return ret; + + pas->secondary_dtb_mem_phys = res.start; + pas->secondary_dtb_mem_reloc = res.start; + pas->secondary_dtb_mem_size = resource_size(&res); + + pas->secondary_dtb_pas_ctx = + devm_qcom_pas_context_alloc(pas->dev, pas->secondary_dtb_pas_id, + pas->secondary_dtb_mem_phys, + pas->secondary_dtb_mem_size); + if (IS_ERR(pas->secondary_dtb_pas_ctx)) + return PTR_ERR(pas->secondary_dtb_pas_ctx); + return 0; } @@ -823,6 +995,8 @@ static int qcom_pas_probe(struct platform_device *pdev) struct rproc *rproc; struct device_node *node; const char *fw_name, *dtb_fw_name = NULL; + const char *secondary_fw_name = NULL; + const char *secondary_dtb_fw_name = NULL; const struct rproc_ops *ops = &qcom_pas_ops; int ret; @@ -847,6 +1021,24 @@ static int qcom_pas_probe(struct platform_device *pdev) return ret; } + if (desc->secondary_firmware_name) { + secondary_fw_name = desc->secondary_firmware_name; + ret = of_property_read_string_index(pdev->dev.of_node, + "firmware-name", 2, + &secondary_fw_name); + if (ret < 0 && ret != -EINVAL) + return ret; + } + + if (desc->secondary_dtb_firmware_name) { + secondary_dtb_fw_name = desc->secondary_dtb_firmware_name; + ret = of_property_read_string_index(pdev->dev.of_node, + "firmware-name", 3, + &secondary_dtb_fw_name); + if (ret < 0 && ret != -EINVAL) + return ret; + } + if (desc->minidump_id) ops = &qcom_pas_minidump_ops; @@ -879,6 +1071,14 @@ static int qcom_pas_probe(struct platform_device *pdev) pas->dtb_firmware_name = dtb_fw_name; pas->dtb_pas_id = desc->dtb_pas_id; } + if (secondary_fw_name) { + pas->secondary_firmware_name = secondary_fw_name; + pas->secondary_pas_id = desc->secondary_pas_id; + } + if (secondary_dtb_fw_name) { + pas->secondary_dtb_firmware_name = secondary_dtb_fw_name; + pas->secondary_dtb_pas_id = desc->secondary_dtb_pas_id; + } platform_set_drvdata(pdev, pas); ret = device_init_wakeup(pas->dev, true); @@ -925,6 +1125,10 @@ static int qcom_pas_probe(struct platform_device *pdev) pas->pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; if (pas->dtb_pas_id) pas->dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; + if (pas->secondary_pas_id) + pas->secondary_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; + if (pas->secondary_dtb_pas_id) + pas->secondary_dtb_pas_ctx->use_tzmem = desc->needs_tzmem || rproc->has_iommu; if (desc->early_boot) pas->rproc->state = RPROC_DETACHED; -- 2.34.1