From nobody Fri Dec 19 07:35:10 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 DE4A6354AD2 for ; Wed, 17 Dec 2025 14:34:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765982092; cv=none; b=W/RFHUhxYXTGUfGJ2ad681HhbGTDhECMMb3DCJKsO7q365np5IvjE24l7AVM6xCuFj98jR5q4M+diO9TluJy8K4VZUsfyxT2fAL8oRfjvYqeEwHxigIMAv/yZUM3ej3annAHq+BR5L7aNdysNMC52HlfAqpDGVFaibeKmxn2IAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765982092; c=relaxed/simple; bh=cL7P33opRlxB/ZxwhF3Ae5/6HQ05AN//2JfQpo1rxjQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EBaLIQ+70w4Nz535zgh+RC/xFDblugCztxRM8liXv3A5OcKOBTj2jjKwXSILW+MGWLj6P7MuuueoGN6OinFh/mkrY+aHAIfliN1Up3HI2RRIw16Czods7Alrc4uvVUpunEWprwq2ESO5/JlODSFe6vJT+h6uggj1hLne6U4WoSY= 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=m5MZO0zN; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=aiBEhhCA; arc=none smtp.client-ip=205.220.168.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="m5MZO0zN"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="aiBEhhCA" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BHCL0vc2502769 for ; Wed, 17 Dec 2025 14:34:46 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= gcxfjHNUUxoNrhYvvMfARevUh/fq1nrXear68fw0qdA=; b=m5MZO0zNR5b5g6j7 ok7gKiKcBDMB8DA1rxNtJyOEoEoZWY+OD15rc5NyvnnR3fFBG0WgqaDj2elnxe3n xM2rrfo/wpH5Ad2V1XlcXJbc7zmrGlzotrfgKoraTRAY8Es2ttKroFpvS+lk0p80 FqhlOBMlSIlLdpuCq6tfQQGQeM42X0ZqoPcqXQg2/Nv2VMs5KGCTjT7aE9rPAhLN GFy8qle7Rf0TmHgfd71qRofJpAgvLap2Te3wmAfBDxxkMPaUkbanUhBkXkOAik4Z 0S2a4teu0Ldw7yjxnqcK3bx4YvqV+iyWChSqw9ATiyhNDBpMgF/IJd/66a3qHRmx VkRDzg== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b3rqa97g1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Dec 2025 14:34:46 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-34c6e05af3bso7551601a91.3 for ; Wed, 17 Dec 2025 06:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1765982086; x=1766586886; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gcxfjHNUUxoNrhYvvMfARevUh/fq1nrXear68fw0qdA=; b=aiBEhhCAoMlRUqcbxro40NrL4sbxZTbTCeG7uaHNw4pSq79P3xeOYdh+NjXX9Ay2aa Avq0LtIYL0+370kPcTtehoLCk3YmsiKk5t3ZUGLo5UIpz0NfRJk96w+yQFeGBlaT05XA qQooIkaSLd/1lqgHhUG5Ikt6YpS3pSadH74OwG6ZhvvtFeOQMYn+r64OIW8T9HCbl5vQ 5dsXZHwTiVKoa12Dk2oE2E7zIjBNhFLWNnBOf6cLIW5sWJqb4826ya1td7ND1jHQ9m1e TFZuRIDXQqoR4lEWtEzwecoQjUsvV4ZO1UyGBrZYChYe/wPD9ZCYpvb7w9UlHi+45yFD S5sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765982086; x=1766586886; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gcxfjHNUUxoNrhYvvMfARevUh/fq1nrXear68fw0qdA=; b=mLGdK7TdXD4Xr9KKQeaY6qaalpYV765YLrAenMTshksxNtfVsvSuiryS96HPhJVg8i CztgBLxU9w7h9qylePRlZXcxGPBoj0KWHCCKrDiBFz2ufLJYd2XIprB7mLV3VBAVn/kF 0Ntb0XII28tLue4fuTfz20xUCk9753e2BelIMi52TFXgLiK36EqWpd9+XK5vjwLrqDNX Mxq5oSoJSKeSKKed35DRfbIFr6YltN2IfA0X+ocubTKsgAMQBg0hhYOv5nW7uoQzq3mu Ou1kNU/U11NeMU/NQ641MsOki7PIMCf5z0L3JfxQ3/T0TmqNe2oFqP43TjJe4YgOEUXF gdzg== X-Forwarded-Encrypted: i=1; AJvYcCVF8sjIlzz74C0tELahcrTiISGXmL40BCcME4mlDntRcyyzIW2uqnyxUXnOJFlu8W45eZdVD7JToNuFc2Y=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqci6zqHXGUzk8ehiaYIUuR42BZnhYm8u8QWJwy0YlZuqoUKMk L4dluLfrk6/mgyNux0QYVubxJosmZqzAxcsGuqWbcdlnpRcK5p3h2hK4yqNNxCEltMNFVcLkDrS IV7kwd5vHqSXCuFJdQfpwM7VQiiXXHGJrR15lMBkTU4oYK9DT38dIdsYJQFP4aJhxcBM= X-Gm-Gg: AY/fxX6weh3dB3akZasGyh9PfEnnTI3bB74U5qm009DiifJp7KABeIibR9veyjxLQ1U Q7oqLpu0SukwIFu0QV5+ufHJi0jmK14Jh50WAtFEFmktgUxLMcSrIJyYkrmGLhoSXEEbD5+tz4Q i1vbF/MlQxFI3TbBJXYuEPuuhOrDVliuT192CbYCSBLLoZX9aXbEdqul9+YCOzb5eJ7cvT9oCHa sJ5+ILMNBK5gO3wY4FOJCblUJ2LgRrdj+PjI2bpgj/eTFLJUhDYpzLH/NgDBOmP68SdlQAr+xKf QCGaiUgMvS1BDWL2Wq7OZvaR2yL7GKhLeTHmHhMeh772REWuWZ3BS31/uc8s7ZsAay9xrNDnR9C wK2ZcXCTSG9Qvlp+xjwxbISbtCV/3ftverhknME5jrRKucg== X-Received: by 2002:a17:90b:270a:b0:341:abdc:8ea2 with SMTP id 98e67ed59e1d1-34abd791365mr18920768a91.37.1765982085760; Wed, 17 Dec 2025 06:34:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHygA2R83m/yCLclat0SEZEzQGoaqqJ3KkOJOg33OyVvOD6XJ+2pHa5BnFQY9CM4YPoXi5zRg== X-Received: by 2002:a17:90b:270a:b0:341:abdc:8ea2 with SMTP id 98e67ed59e1d1-34abd791365mr18920742a91.37.1765982085245; Wed, 17 Dec 2025 06:34:45 -0800 (PST) Received: from hu-spratap-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34cfce5eb5csm2615529a91.0.2025.12.17.06.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 06:34:44 -0800 (PST) From: Shivendra Pratap Date: Wed, 17 Dec 2025 20:04:20 +0530 Subject: [PATCH v11 2/3] firmware: qcom_scm: Support multiple waitq contexts 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: quoted-printable Message-Id: <20251217-multi_waitq_scm-v11-2-f21e50e792b8@oss.qualcomm.com> References: <20251217-multi_waitq_scm-v11-0-f21e50e792b8@oss.qualcomm.com> In-Reply-To: <20251217-multi_waitq_scm-v11-0-f21e50e792b8@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio Cc: Bartosz Golaszewski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Unnathi Chalicheemala , Shivendra Pratap , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1765982076; l=6294; i=shivendra.pratap@oss.qualcomm.com; s=20250710; h=from:subject:message-id; bh=7v/rX34Bq7zFiwLV1H6k91m5mrXvGfR0yHtINoULT/U=; b=NbOYO+awk7kMu1EDBlBfCNVZMNAK2AiR3rh+WlMDtcDSA84Ypib5paZiNdnDCSXR0rWHGHKVH EnW57ZVtb5+C/LFRZoIr3NSFhjZMVFEZPs3cBOlL2Y7TWjwQkk2kfoE X-Developer-Key: i=shivendra.pratap@oss.qualcomm.com; a=ed25519; pk=CpsuL7yZ8NReDPhGgq6Xn/SRoa59mAvzWOW0QZoo4gw= X-Proofpoint-ORIG-GUID: Yk59DI4naH8ydOkZ0cogaIkEWDQGmoPa X-Authority-Analysis: v=2.4 cv=ALq93nRn c=1 sm=1 tr=0 ts=6942bf86 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=5olPtX_GuO7v3P1VzgMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE3MDExMiBTYWx0ZWRfX6uCDjYbb0XE2 3eYUcZMQ8MmVR2XJ9dKZLOn7gaKc2TFtyyv9t4xirkFN/dw90liR9vnqJ0G17nmCYAhMBk29oua jS5AuE5R/zW4KQdBxYLGbB4821kUOoBmJydSFp2biFG9udg6Dh9jLk3ADCY1EkXoQyIv2uJMHup ozG05pQ+FqqUvRWtATRYTsDmbFT+ni3sCatGBxP4gZ/T225zjoOR2oPL3PFGyjy4ega+sjsIUo8 OxDt7oZYHKye3up/rnyewJ+iF+bvtRpgi0/JcvhgKVyEVImwTpUbY/OZQyIs34i7VkgS5ApbcmH Nw9tVClJq+Qj89rNu2Wa8Du4u2WtoA6F6z9ok0gOBW086FcnMbfFIQ3giRhBBPscYjrcBvSxbTA eFGcJLI+jRP3yOHADHQTE4RAvjL5Vw== X-Proofpoint-GUID: Yk59DI4naH8ydOkZ0cogaIkEWDQGmoPa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-17_01,2025-12-16_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 impostorscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512170112 From: Unnathi Chalicheemala Currently, only a single waitqueue context exists in the driver. Multi-waitqueue mechanism is added in firmware to support the case, when multiple VMs make SMC calls or single VM making multiple calls on same CPU. Enhance the driver to support multiple waitqueue when support is present in the firmware. When VMs make a SMC call, firmware allocates a waitqueue context, assuming the SMC call to be a blocking call. The SMC calls that cannot acquire resources, while execution in firmware, are returned to sleep in the calling VM. When the resource becomes available in the firmware, the VM gets notified to wake the sleeping thread and resume SMC call. The current qcom_scm driver supports single waitqueue as the old firmwares support only single waitqueue with waitqueue id zero. Multi-waitqueue mechanism is added in firmware starting SM8650 to support the case when multiple VMs make SMC calls or single VM making multiple calls on same CPU. To enable this support in qcom_scm driver, add support for handling multiple waitqueues. For instance, SM8650 firmware can allocate two such waitq contexts, so the driver needs to implement two waitqueue contexts. For a generalized approach, the number of supported waitqueues can be queried from the firmware using a SMC call. Introduce qcom_scm_query_waitq_count to get the number of waitqueue contexts supported by the firmware and allocate =E2=80=9CN=E2=80=9D unique = waitqueue contexts with a dynamic sized array where each unique wq_ctx is associated with a struct completion variable for easy lookup. Older targets which support only a single waitqueue, may return an error for qcom_scm_query_waitq_count, set the wq_cnt to one for such failures. Reviewed-by: Bartosz Golaszewski Signed-off-by: Unnathi Chalicheemala Signed-off-by: Shivendra Pratap Reviewed-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 72 ++++++++++++++++++++++++++++--------= ---- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index f45dbe5f49ed65f4fffd0748c2e3c704dbb9ee0a..e16dbf18f731be9b0098dd683f4= 78c8c8fdeaf20 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -48,7 +48,7 @@ struct qcom_scm { struct clk *iface_clk; struct clk *bus_clk; struct icc_path *path; - struct completion waitq_comp; + struct completion *waitq_comps; struct reset_controller_dev reset; =20 /* control access to the interconnect path */ @@ -58,6 +58,7 @@ struct qcom_scm { u64 dload_mode_addr; =20 struct qcom_tzmem_pool *mempool; + unsigned int wq_cnt; }; =20 struct qcom_scm_current_perm_info { @@ -137,6 +138,8 @@ static const u8 qcom_scm_cpu_warm_bits[QCOM_SCM_BOOT_MA= X_CPUS] =3D { #define QCOM_DLOAD_MINIDUMP 2 #define QCOM_DLOAD_BOTHDUMP 3 =20 +#define QCOM_SCM_DEFAULT_WAITQ_COUNT 1 + static const char * const qcom_scm_convention_names[] =3D { [SMC_CONVENTION_UNKNOWN] =3D "unknown", [SMC_CONVENTION_ARM_32] =3D "smc arm 32", @@ -2234,6 +2237,23 @@ static int qcom_scm_fill_irq_fwspec_params(struct ir= q_fwspec *fwspec, u32 hwirq) return 0; } =20 +static int qcom_scm_query_waitq_count(struct qcom_scm *scm) +{ + struct qcom_scm_desc desc =3D { + .svc =3D QCOM_SCM_SVC_WAITQ, + .cmd =3D QCOM_SCM_WAITQ_GET_INFO, + .owner =3D ARM_SMCCC_OWNER_SIP + }; + struct qcom_scm_res res; + int ret; + + ret =3D qcom_scm_call_atomic(scm->dev, &desc, &res); + if (ret) + return ret; + + return res.result[0] & GENMASK(7, 0); +} + static int qcom_scm_get_waitq_irq(struct qcom_scm *scm) { struct qcom_scm_desc desc =3D { @@ -2265,42 +2285,40 @@ static int qcom_scm_get_waitq_irq(struct qcom_scm *= scm) return irq_create_fwspec_mapping(&fwspec); } =20 -static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx) +static struct completion *qcom_scm_get_completion(u32 wq_ctx) { - /* FW currently only supports a single wq_ctx (zero). - * TODO: Update this logic to include dynamic allocation and lookup of - * completion structs when FW supports more wq_ctx values. - */ - if (wq_ctx !=3D 0) { - dev_err(__scm->dev, "Firmware unexpectedly passed non-zero wq_ctx\n"); - return -EINVAL; - } + struct completion *wq; =20 - return 0; + if (WARN_ON_ONCE(wq_ctx >=3D __scm->wq_cnt)) + return ERR_PTR(-EINVAL); + + wq =3D &__scm->waitq_comps[wq_ctx]; + + return wq; } =20 int qcom_scm_wait_for_wq_completion(u32 wq_ctx) { - int ret; + struct completion *wq; =20 - ret =3D qcom_scm_assert_valid_wq_ctx(wq_ctx); - if (ret) - return ret; + wq =3D qcom_scm_get_completion(wq_ctx); + if (IS_ERR(wq)) + return PTR_ERR(wq); =20 - wait_for_completion(&__scm->waitq_comp); + wait_for_completion(wq); =20 return 0; } =20 static int qcom_scm_waitq_wakeup(unsigned int wq_ctx) { - int ret; + struct completion *wq; =20 - ret =3D qcom_scm_assert_valid_wq_ctx(wq_ctx); - if (ret) - return ret; + wq =3D qcom_scm_get_completion(wq_ctx); + if (IS_ERR(wq)) + return PTR_ERR(wq); =20 - complete(&__scm->waitq_comp); + complete(wq); =20 return 0; } @@ -2376,6 +2394,7 @@ static int qcom_scm_probe(struct platform_device *pde= v) struct qcom_tzmem_pool_config pool_config; struct qcom_scm *scm; int irq, ret; + int i; =20 scm =3D devm_kzalloc(&pdev->dev, sizeof(*scm), GFP_KERNEL); if (!scm) @@ -2386,7 +2405,6 @@ static int qcom_scm_probe(struct platform_device *pde= v) if (ret < 0) return ret; =20 - init_completion(&scm->waitq_comp); mutex_init(&scm->scm_bw_lock); =20 scm->path =3D devm_of_icc_get(&pdev->dev, NULL); @@ -2438,6 +2456,16 @@ static int qcom_scm_probe(struct platform_device *pd= ev) return dev_err_probe(scm->dev, PTR_ERR(scm->mempool), "Failed to create the SCM memory pool\n"); =20 + ret =3D qcom_scm_query_waitq_count(scm); + scm->wq_cnt =3D ret < 0 ? QCOM_SCM_DEFAULT_WAITQ_COUNT : ret; + scm->waitq_comps =3D devm_kcalloc(&pdev->dev, scm->wq_cnt, sizeof(*scm->w= aitq_comps), + GFP_KERNEL); + if (!scm->waitq_comps) + return -ENOMEM; + + for (i =3D 0; i < scm->wq_cnt; i++) + init_completion(&scm->waitq_comps[i]); + irq =3D qcom_scm_get_waitq_irq(scm); if (irq < 0) irq =3D platform_get_irq_optional(pdev, 0); --=20 2.34.1