From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794846196; b=GPUmzS/9TpVo6u63zmjwaOIO6t4LnSrXJBHgER5RKCboYd7tdUuIwmj1+7hl0Yi3HatV a6/um85dD9wVUPZGQLlyTXC5z+BVff3f1MJhRS/kESGRHJv5oNbD75ZYRGnkwOT7k6W5d Hj9Uagos5A2Jgcik53mWIEnXs7wxECUtBwBr0gnFB4A/PBoBN7XpykA4WP7pgDV0tf+7e tCbcO8TNJQlyADh4igzLQnJynzn1TDidtUXqkZc3psbGk/Z9CrM0YUSswL/uIekiuSTsQ IOVFqV9Aw2fvwyFigEzkzK9dipmgz4UZusVuMQ8lbk/RoDwkwRnmfXg/oaMyXEZ+1qQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794846196; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:From:To:Cc: Subject:Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Proofpoint-GUID:X-Authority-Analysis: X-Proofpoint-ORIG-GUID:X-Proofpoint-Spam-Info: X-Proofpoint-Spam-Details-Enc:X-Proofpoint-Virus-Version: X-Proofpoint-Spam-Details; bh=EPho6yeU36Z5EZsv2aujXlYhkTqpLdJTwXH4ZQGbqvQ=; b=LUVq4hk21aLl+sF6pmAo7L/aPl7jxlHBq74cPv5pkbiTnwKOp9pvLvCE3B58dZJ6x4Sv 8c+vnVy9zoMesIFS2D0GaY0da7vYqxGiD9zaLWD0u4ocHuda6Z0hDfH7d5huCbLQ6+fP/ fwuk7ko6P4rKo4iF3C9VultsTT1QIH63UxEY7KYFDI6qLIunWJr0P5S9yqV/YEduFtAmf SUz7Fr2V7LNn5A7B3EUq8bBoKLfD/OWTi6HxkdJ4tgX7hJ5pPGm17sq232moVHGuVEyiA Ms4QNyGRclh3SGa8klRO8yMRPblLL02HxzfTyYG4gV1W/bhMbVt5MKGUxfLmpwV7UWQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=ZVZ3YHZ5; dkim=pass header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=RgJAw1R4; arc=none smtp.remote-ip=205.220.168.131 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA25606A331 for ; Mon, 16 Nov 2026 16:23:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9DA25606A331 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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.a=rsa-sha256 header.s=qcppdkim1 header.b=ZVZ3YHZ5; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=RgJAw1R4 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AGGIRCr451747 for ; Mon, 16 Nov 2026 16:23:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=EPho6yeU36Z 5EZsv2aujXlYhkTqpLdJTwXH4ZQGbqvQ=; b=ZVZ3YHZ59rK2FGx0nxxNalzsueK ClmYgIbnhi9BNOktRJNO8GHVNBEMgLHHHqXcPxVNvi4GMOLotmUfjxXjXI1/78s1 ucWStiSfbicw1PMbIw304IpZC2pK3vRbvuC/fHmPxdrnF7eQVlFBZLqIwSr6u/py TbbaQx2zMOXmAJ7DmcaH6HjBlLD/GDgq7RCmnhoVh69cJ2ERq0oxCxNcB9XVD3vT 1USdn9zmo6SfLRF3fsjYasmj/hKGi4m2RoCO2pwMpTkxgqgS99tfMLr0UXCr6inA M7irf1gkE0w3Jbz/mEYQuDvKBxb7mfRGxJynhqWAAAqN9eqbIL+Oo0ga+jw== Received: from mail-dl1-f69.google.com (mail-dl1-f69.google.com [74.125.82.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4j034y0m71-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Nov 2026 16:23:14 +0000 (GMT) Received: by mail-dl1-f69.google.com with SMTP id a92af1059eb24-1af203073e0so3226548c88.1 for ; Mon, 16 Nov 2026 08:23:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1794846194; x=1795450994; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EPho6yeU36Z5EZsv2aujXlYhkTqpLdJTwXH4ZQGbqvQ=; b=RgJAw1R4943sEz07rWePPy5rfhK3c8Pj/LRqf8QGm6cJoSOZuCm4I13MaFaP/AumSS VUKewYHC2l/cvevwyHOCfCAwQMfRwJnfC8/qnqAOZOuyXRfrEhNJurov33UVGH3lXQnp AOTOT9VKNRH381Me4euJNx3j+Q+QjjlSN4P2T4qHFwlObvuh2mCP80aBjVqWkJvT/bCl ejD1eF2LHxN1Xnn8N5VChagiBLpnjfwLjQALdR8OZCBh2Y83BgyCEtMoGTerZ2X1ErIv CpkmDne/mD7Xqy8ArdxsOpHqfGnUo4M+PN0Ga9Z1mzeOrZjwaq9cK9DJUkH9BZQ+mMzr 3dhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794846194; x=1795450994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EPho6yeU36Z5EZsv2aujXlYhkTqpLdJTwXH4ZQGbqvQ=; b=vLEyCm8Bi9eqGZq5whpYQIQ8++bTvW09OCS5du/aOIsTqCoOju1KmChuZ3Jco1Ayp6 fQo7Zp5r/JjQisjV8IvCDLZWNMu0qprPhVnHGUqyGPq/zIspQv+65tYj6BfPawlnne4o Y0DmgTmw954+xeK0/TY2PXZkIAJ9TVdK6I6xTqpNHofIkZujJw0dD2NMP8eiSMCtte4L xm7PO4aHYJDQFzLqEpt+TK36VJMuRDDV/4chY9X7GDGPfP75pjShB93b0+CW/YLh14KD Sj0gbyiwHTZ9uNMYDimaiNnRs0lYA6O3DpZNyIq6oaSNquiJ3hEnq1lGOKmw5Hu3zXNq ImsA== X-Forwarded-Encrypted: i=1; AL+hErGt2895fb6s5IquW3oh4JhJCuLoxne26ZVFGvg8M3Kzi1c8nwNAJDJURsTpYt1pK3PjwyVJyS5gkIuNkTk=@vger.kernel.org X-Gm-Message-State: APuU4Z9pJ9Akk/eGucXT2k1dErZ11/wXYYPOI8oL28kLekt3GC1V2gjl 5qhCt4qZnd7EyEYwlu68l+NCpH6lzJmOE+t0KhpJ9tOOL2smQZF7DDTWm/5EcdtfEWV2OkSz5sh 2rISlR4wDJP9Q6IC0GGl6T1L9HP1KftupbTLOpD/wK6Tb3N1DlWWOlK9vffcOI38tlio= X-Gm-Gg: AYBFou2derpChNemD70MLaZUAUxecRBpFaJnpEzrPPg6E8DxwSTYeWKh+8CzRefMMoY Jct0Uf9vQ8N7T9EJn5CUCFofC2Gi3zdORqRcDD7XMZWJGifLoW3lKg3q7r8r7cnDyIIsXsnmNrP +oP20P5IHuFZjLb76fnavKQkrfnIUYGE5oh7kv6lVvPA8Egzx4tPVQX7pfIfQ2yZqEx6XewzOJB O/wNy55whJiW+Orkj0D8pr1uzOx4sPbt497rw9Wc6rVIoVaeVtWNox6DfXht/ZfgSDElcY83PnY DXrb0+ZwgWkPJyu6Uemsnik5m7rWszYmRqUStiRyZDoBzZ9Oz66ROyXBJffvPomdTsYwkoqJlIx +ixu4q6XZ1c6mG5DuKzNKJB3/Ax+1h8rMrsW/M4ShVGBNNFzl1EEOkntHGbxcx3uJT8Gv1vS96y ZD X-Received: by 2002:a05:701b:4553:10b0:1b5:31e4:9970 with SMTP id a92af1059eb24-1b531e499a1mr2421707c88.8.1794846194092; Mon, 16 Nov 2026 08:23:14 -0800 (PST) X-Received: by 2002:a05:701b:4553:10b0:1b5:31e4:9970 with SMTP id a92af1059eb24-1b531e499a1mr2421666c88.8.1794846193436; Mon, 16 Nov 2026 08:23:13 -0800 (PST) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b5031468b7sm38623826c88.5.2026.11.16.08.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 08:23:13 -0800 (PST) From: Mukesh Ojha To: Sumit Garg , Bjorn Andersson , Konrad Dybcio , Rob Clark , Dmitry Baryshkov , David Airlie , Simona Vetter , Vikash Garodia , Dikshita Agarwal , "Bryan O'Donoghue" , Mauro Carvalho Chehab , Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier Cc: Abel Vesa , Sean Paul , Akhil P Oommen , Abhinav Kumar , Jessica Zhang , Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-media@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath12k@lists.infradead.org, linux-remoteproc@vger.kernel.org, Mukesh Ojha Subject: [PATCH v3 7/9] wifi: ath12k: migrate firmware loading to qcom_mdt_pas_load() and qcom_pas_prepare_and_auth_reset() Date: Mon, 16 Nov 2026 21:51:46 +0530 Message-ID: <20261116162148.2864501-8-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261116162148.2864501-1-mukesh.ojha@oss.qualcomm.com> References: <20261116162148.2864501-1-mukesh.ojha@oss.qualcomm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: M0VmHJgR0r4Wc0pp_TIJ_rh4UUsKK8vR X-Authority-Analysis: v=2.4 cv=aNZlOr9m c=1 sm=1 tr=0 ts=6afb2df3 cx=c_pps a=kVLUcbK0zfr7ocalXnG1qA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=zJRp6_cAMcgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=tFPd4D2tFowRDCwbfnIA:9 a=vr4QvYf-bLy2KjpDp97w:22 X-Proofpoint-ORIG-GUID: M0VmHJgR0r4Wc0pp_TIJ_rh4UUsKK8vR X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE2MDA2NCBTYWx0ZWRfX4dP9G7+sH0kS k9aeVKLT0NufTRJAdsJ2Re7Kh36uXbjmnog0UPd4lb26djX99ogiYQ/16U5V1Ic6YTjHzcdW6Di i8p3nM/J6BgV1sF19I07zFATtw9itXU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE2MDA2NCBTYWx0ZWRfX3D7tQP7s0uxW PSWbyMDVbKOofs1yCH/yjzFRXvjqBcNVzDqslPcniIuIqX9TcJggICDMs2jiNcrR0pIS2E6mZlD XLkf324oEUFM5pTm9sDWMKy07x5PQGxpIt6IrnFUNyRkhd4h8yK7f1aFAI1mqFE0EAU31mUwgeV xiR12IB/TwWZBlIBJaP6ViZsBOgtR+THKKYtWVQwS4dfouGFw0I7FTQZL5dROx8akcxWqKA1Bqi luKQO49H5RB+thPgKmPKsYGb74sDTKur/aM3Ijs5Xg8sS3c1m4iheugMS/tISfqCdKQkbXNMQ12 rNS5B5LwmieVU37RNCm0q2hHRdIUzEz4f9XlEnOalteR05epA2IpQgbcDmhcvVW4cv5wwkfqXxW lL9OwkLJCW7OQyHQRwaNP1dO/2AmI2M3+Z6DTKy3rCocmTUiwpCvi4vkl7ydKHZ4HADg99yafey uUV3gnf8LJppvN4KSSw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-16_05,2026-11-16_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 spamscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611160064 ath12k_ahb_power_up() calls qcom_mdt_load(), which bundles metadata initialization, memory setup, and segment loading into a single API that does not expose a PAS context. Later it calls qcom_pas_auth_and_reset() for TrustZone authentication, which is the intended behaviour. However, a new qcom_mdt_pas_load() has recently been introduced that works with a PAS context and can handle everything qcom_mdt_load() provides, along with additional functionality such as shmbridge creation and retrieving memory from the shmbridge buffer when the same remote processor needs to run while Linux runs at EL2. Replace qcom_mdt_load() with qcom_pas_context_init() + qcom_mdt_pas_load() and replace qcom_pas_auth_and_reset() with qcom_pas_prepare_and_auth_reset(), using a stack-allocated struct qcom_pas_context in ath12k_ahb_power_up(). The non-scm_auth path retains qcom_mdt_load_no_init() with the caller-provided mem_region. Apply the same pattern to ath12k_ahb_load_auth_shared_fw() for consistency. Acked-by: Jeff Johnson Signed-off-by: Mukesh Ojha --- drivers/net/wireless/ath/ath12k/ahb.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 8a3919675134..75d3141f968f 100644 --- a/drivers/net/wireless/ath/ath12k/ahb.c +++ b/drivers/net/wireless/ath/ath12k/ahb.c @@ -418,6 +418,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) struct ath12k_ahb_rproc_info *rproc_info = ab_ahb->rproc_info; char fw_name[ATH12K_USERPD_FW_NAME_LEN]; char fw2_name[ATH12K_USERPD_FW_NAME_LEN]; + struct qcom_pas_context ctx; struct device *dev = ab->dev; const struct firmware *fw, *fw2; unsigned long time_left; @@ -451,14 +452,15 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) ATH12K_AHB_UPD_SWID; /* Load FW image to a reserved memory location */ - if (ab_ahb->scm_auth_enabled) - ret = qcom_mdt_load(dev, fw, fw_name, pasid, rproc_info->mem_region, - rproc_info->mem_phys, rproc_info->mem_size, - NULL); - else + if (ab_ahb->scm_auth_enabled) { + qcom_pas_context_init(&ctx, dev, pasid, + rproc_info->mem_phys, rproc_info->mem_size); + ret = qcom_mdt_pas_load(&ctx, fw, fw_name, NULL); + } else { ret = qcom_mdt_load_no_init(dev, fw, fw_name, rproc_info->mem_region, rproc_info->mem_phys, rproc_info->mem_size, NULL); + } if (ret) { ath12k_err(ab, "Failed to load MDT segments: %d\n", ret); goto err_fw; @@ -492,7 +494,7 @@ static int ath12k_ahb_power_up(struct ath12k_base *ab) if (ab_ahb->scm_auth_enabled) { /* Authenticate FW image using peripheral ID */ - ret = qcom_pas_auth_and_reset(pasid); + ret = qcom_pas_prepare_and_auth_reset(&ctx); if (ret) { ath12k_err(ab, "failed to boot the remote processor %d\n", ret); goto err_fw2; @@ -1056,6 +1058,7 @@ static int ath12k_ahb_load_auth_shared_fw(struct ath12k_base *ab, struct ath12k_ahb_rproc_info *rproc_info, const char *fw_name, u32 pasid) { + struct qcom_pas_context ctx; int ret; const struct firmware *fw __free(firmware) = NULL; @@ -1074,14 +1077,16 @@ static int ath12k_ahb_load_auth_shared_fw(struct ath12k_base *ab, ath12k_dbg(ab, ATH12K_DBG_AHB, "loading firmware %s, size %zd\n", fw_name, fw->size); - ret = qcom_mdt_load(ab->dev, fw, fw_name, pasid, rproc_info->mem_region, - rproc_info->mem_phys, rproc_info->mem_size, NULL); + qcom_pas_context_init(&ctx, ab->dev, pasid, + rproc_info->mem_phys, rproc_info->mem_size); + + ret = qcom_mdt_pas_load(&ctx, fw, fw_name, NULL); if (ret) { ath12k_err(ab, "failed to load RO firmware %s: %d\n", fw_name, ret); return ret; } - ret = qcom_pas_auth_and_reset(pasid); + ret = qcom_pas_prepare_and_auth_reset(&ctx); if (ret) ath12k_err(ab, "failed to authenticate and boot shared firmware: %d\n", ret); -- 2.55.0