From nobody Mon Dec 1 22:37:13 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 26BB319E97B for ; Sun, 30 Nov 2025 14:41:14 +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=1764513676; cv=none; b=KreYJmRKVnMw0lS/hHFFbaBJ/apaXlYBNFBoZyaJ1c+9UdkOr9lIPzCkBI7GEqXcp0L9j8/ocRCGoOqJEX1S+O63nUKD56NCAGFEkIEyBPs9gXRHMCn8FUUgRUwYHxNgJ2Q0K2PziKPBInL7hDZo05I1byVwAs+0MvUHeREXWW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764513676; c=relaxed/simple; bh=K+XCHjC8KWupOYTNWBlXk+nWg8FYug0wz5XSG4bR8J4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gliGoHF62Lq42ZjGLPHQXzXsLOscF0Zq6TfhLKPrkV267CfK8yZFaVx904y7fhqJY57yC7kqUK5Dlb8xfi2iZ9JJ4r9aekZs2i7RmlEnK3sjaSG98EVSlLJAbsbiaWFX+p2ZYfYozEyaFiK96fCAep5bsfCQRZjf8zrx2OYsmnk= 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=RrNcISqh; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=kOhm66h1; 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="RrNcISqh"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="kOhm66h1" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AUELhib1188266 for ; Sun, 30 Nov 2025 14:41:14 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= H5+ufLvy/HmVXY04G0FNH65Lg/GXMDaCxoGP3bQSCUs=; b=RrNcISqhPiXkxG6p i24yV+j8VtE4H6Kc1dkf2/r7U5pvdJELbEN44JTpSS095n1FfDTDK/0pAtEs4KUP ZuOFfZJh9PVJfOIgazkfQIk2SFVHK8kpQqQKLMQkKsB1MCla+nsO/RbxxFLq35qr 1TEqUqoz/y/3LGN1KW6V/bPq9zDEIcSkO45DVGFv8DpIDNpopqS4DpMiasbSek6U HyfaFGC2cYxGiyNq5F4n6hwC2zmPkFD165bpr6h9QEiEigdzCjGpJFhzKbMVlN82 2RY2nF3rrS3xIEVIiMbHLujmFYVXsbbdL1yt1pVuejQGiV7/uEHp15EalEdssMri 8uBy0Q== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4aqt46a7kx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Nov 2025 14:41:14 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-7c1df71b076so5715892b3a.0 for ; Sun, 30 Nov 2025 06:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764513674; x=1765118474; 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=H5+ufLvy/HmVXY04G0FNH65Lg/GXMDaCxoGP3bQSCUs=; b=kOhm66h1DgcX2YFKCGVjjy4QpPXSlBTbjNc92Mp2ZUbi5Ot6Yp/bGYkWLAasQ6iq6l PLapk6DYe/2ZnjESfesfYmDqAizj+9YH+7zADhx+yvkJ83nHQnItLaS7Ys6LvQwqnNZJ EO3cRFtyMJDwATmOBwGJ39HL3+dVJXsKNRFxdGroKJnYEABeXFxD+ifePy8PB/qTxZ7/ fjzMesiI253MGV4hPwFQ8xkfX/KTGmTT6x6W3UabdsLdtWCuXzZJv1y3JqkpodiwdeYi XoKlwLoPsXM2KnY5r3O9UVK9tQ9sZjqXNF/edP8PXQEDM9Lx4LcMGf0c7B5yYNbFbGTu vwQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764513674; x=1765118474; 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=H5+ufLvy/HmVXY04G0FNH65Lg/GXMDaCxoGP3bQSCUs=; b=g7emDXB16OIC0cQ3f1CJgdTiKrK3JxYX31hMFTAs842/KXkB1TnwIYwj4BJZHDE4Zc PY5BC6Ml4GTTKW2qMjedAKVLC+wUNzNY1m/Q/4Ah17vQs9ophrb28ml/98ViHPFFR4IA UyorOXWtJkuQL5xKyZExvZg5z80r7F4Vqnw6+SgqFB9lSKwI6/3muIOYKQ8xfzTRhT3C hFvg6rs54p//fKCGe1DWAwYGIlxoPl+YM7G4t2evBKpPryvwO67WN6KBb6zJpwlHaQx+ svXELXpU5xEYcQObHJlLE3feO2FNA8VJGZTfl+agL8lgr0Nhmdu2qElezo0ML5Fu/GgH 0PHQ== X-Forwarded-Encrypted: i=1; AJvYcCVzfeCdj6OnQm1S17RxMFnRJAGwjOOviqfJ0wXxMYj3Ecx4Yid3+b7dTK2neIdsYX2SmQZSkEh+3XLLInE=@vger.kernel.org X-Gm-Message-State: AOJu0Yyg2GbflW69nHkRW8zFyU/ZIhxhFIFDTDCDoBzbcbx/1r/mJ/49 hDOpvycjyjYbWLaJs+CcKqIzrfU031TDpsjQE/DkHzigxoQMdQUypeU2Hdy66/Jv8IyGgH01/c+ NyCGg3EC2ZsJnXvZMP7GNufO+wNJrdc1AAMgvaI/MTzh/TTROrRUwTLCETK//sof/Oqc= X-Gm-Gg: ASbGncuN3+i6mT0FGHKRpQugeFHumaHYjy25lTRWdaUCmyp12PUOdFQ7lIS6eU0D5fq 1GXjtKk7CxwvRyKNi6Xqh6rflmZ7hbADFYw6fI6GpSr4DG6Mviyx3GklnuWNr3Te7ckM+OCyRS0 EgoHt/6N9ijJgzuQGlUvO5+XOG52nR8OIynAPZLizUNxDCx/j9z8GI7ZoB2RDMFFBvQ9xfRfONc uUY75ZiLin9fYc7KIrpv7wM4ThiYYlsphExW+TGIF9JnjTP1Vfkhfi/6vDLKhK+Tjmxf1AYKLaY 1rVIWksuf9pSB+kLQwYHhLtZYG85nY8Xg8TQuHfOsINS8nXN+Kt45Gte0yVoSTunZGgbu4YzHd2 zO5ARLH/xwnAqhoZ9Qm9J7o3QkVPKDY9l1llTlkdpiVz0hQ== X-Received: by 2002:a05:6a00:3cc8:b0:7a2:70c5:f74f with SMTP id d2e1a72fcca58-7c58eaf2ec3mr36785000b3a.32.1764513673619; Sun, 30 Nov 2025 06:41:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsgXvnKYqn7A6wSDwd2SNfOU+ke4D/AO+k7zsNV2oQCjWvwQCBiqkX2NXQo/RIjhbCsIBSBg== X-Received: by 2002:a05:6a00:3cc8:b0:7a2:70c5:f74f with SMTP id d2e1a72fcca58-7c58eaf2ec3mr36784979b3a.32.1764513673174; Sun, 30 Nov 2025 06:41:13 -0800 (PST) Received: from hu-spratap-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d54b003177sm5240065b3a.14.2025.11.30.06.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Nov 2025 06:41:12 -0800 (PST) From: Shivendra Pratap Date: Sun, 30 Nov 2025 20:11:02 +0530 Subject: [PATCH v10 1/3] firmware: qcom_scm: Add API to get waitqueue IRQ info 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: <20251130-multi_waitq_scm-v10-1-5a5f2f05a417@oss.qualcomm.com> References: <20251130-multi_waitq_scm-v10-0-5a5f2f05a417@oss.qualcomm.com> In-Reply-To: <20251130-multi_waitq_scm-v10-0-5a5f2f05a417@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio Cc: 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=1764513668; l=4465; i=shivendra.pratap@oss.qualcomm.com; s=20250710; h=from:subject:message-id; bh=KfWJv+YDd10f+5NwbiCP5vaNOv+wkhfxctDmxzsCvwY=; b=zo6kL7pRsmIF56G1Wl+o3tcDLjoaNZXc5fv9/xx1h3BagLoAheVYGdkaKc/xl/uMx4ozHb6+3 eEmxo635feOBHKYjEVvcyl//bOeIbK/e5i2AI9D5HURXUOao+ARQPYy X-Developer-Key: i=shivendra.pratap@oss.qualcomm.com; a=ed25519; pk=CpsuL7yZ8NReDPhGgq6Xn/SRoa59mAvzWOW0QZoo4gw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTMwMDEyNiBTYWx0ZWRfX3X9PKBU4/TFF dydwJqTq1bxAn90kJAXNyeEJehdlS8D5ANRhezlbr87/Gl1UDG8VM6pBhu1aUhax2A9HdsE0bwl gQ85FJocwMAy++of3m5Y0KbA1z3bM3N8pIsEKTkK5ykKQK6JViGTsFKn580/eXwuLf4cTwFULMh 2ytWoJ24aT3Pkxs4R2AFlBtJllvPpcuLhmeBJzLuWwYebawB5lIsK4xF/9c9zbZOjx/78I6wrB2 MLqtoNYRDfxk6Q/O7LTn+e3h598KolT6pgTYNOzETmwrXXPrcxjAgev4vmUTiHWEkmbnISAb5tg EMzlXPLMmtg/uy/IhgtEgAC+U73CXGYAFQNM6uWC819ku6D3jQ3QIpNsj38MYpm6hj0hjSGWANA VDdUygr8d2veCRGqBvwlUabdLd9HhQ== X-Proofpoint-ORIG-GUID: SWwzwKPLTZJt2ZxwfF7oSOTJs9sLsXof X-Authority-Analysis: v=2.4 cv=aO79aL9m c=1 sm=1 tr=0 ts=692c578a cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=l69UaY8b6P0ZDUfUprYA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: SWwzwKPLTZJt2ZxwfF7oSOTJs9sLsXof 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-11-28_08,2025-11-27_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511300126 From: Unnathi Chalicheemala Bootloader and firmware for SM8650 and older chipsets expect node name as "qcom_scm", in order to patch the wait queue IRQ information. However, DeviceTree uses node name "scm" and this mismatch prevents firmware from correctly identifying waitqueue IRQ information. Waitqueue IRQ is used for signaling between secure and non-secure worlds. To resolve this, introduce qcom_scm_get_waitq_irq() that'll get the hardware IRQ number to be used from firmware instead of relying on data provided by devicetree, thereby bypassing the DeviceTree node name mismatch. This hardware IRQ number is converted to a Linux IRQ number using newly qcom_scm_fill_irq_fwspec_params(). This Linux IRQ number is then supplied to the threaded_irq call. Reviewed-by: Bartosz Golaszewski Signed-off-by: Unnathi Chalicheemala Signed-off-by: Shivendra Pratap --- drivers/firmware/qcom/qcom_scm.c | 60 ++++++++++++++++++++++++++++++++++++= +++- drivers/firmware/qcom/qcom_scm.h | 1 + 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index e777b7cb9b127944fe112f453cae9cbc40c06cae..79ab1707f71b0157835deaea630= 9f33016e3de8c 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -29,12 +29,18 @@ #include #include #include +#include =20 #include "qcom_scm.h" #include "qcom_tzmem.h" =20 static u32 download_mode; =20 +#define GIC_SPI_BASE 32 +#define GIC_MAX_SPI 1019 // SPIs in GICv3 spec range from 32..1019 +#define GIC_ESPI_BASE 4096 +#define GIC_MAX_ESPI 5119 // ESPIs in GICv3 spec range from 4096..5119 + struct qcom_scm { struct device *dev; struct clk *core_clk; @@ -2223,6 +2229,55 @@ bool qcom_scm_is_available(void) } EXPORT_SYMBOL_GPL(qcom_scm_is_available); =20 +static int qcom_scm_fill_irq_fwspec_params(struct irq_fwspec *fwspec, u32 = hwirq) +{ + if (hwirq >=3D GIC_SPI_BASE && hwirq <=3D GIC_MAX_SPI) { + fwspec->param[0] =3D GIC_SPI; + fwspec->param[1] =3D hwirq - GIC_SPI_BASE; + } else if (hwirq >=3D GIC_ESPI_BASE && hwirq <=3D GIC_MAX_ESPI) { + fwspec->param[0] =3D GIC_ESPI; + fwspec->param[1] =3D hwirq - GIC_ESPI_BASE; + } else { + WARN(1, "Unexpected hwirq: %d\n", hwirq); + return -ENXIO; + } + fwspec->param[2] =3D IRQ_TYPE_EDGE_RISING; + fwspec->param_count =3D 3; + + return 0; +} + +static int qcom_scm_get_waitq_irq(struct qcom_scm *scm) +{ + struct device_node *parent_irq_node; + 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 irq_fwspec fwspec; + struct qcom_scm_res res; + u32 hwirq; + int ret; + + ret =3D qcom_scm_call_atomic(scm->dev, &desc, &res); + if (ret) + return ret; + + hwirq =3D res.result[1] & GENMASK(15, 0); + + ret =3D qcom_scm_fill_irq_fwspec_params(&fwspec, hwirq); + if (ret) + return ret; + parent_irq_node =3D of_irq_find_parent(scm->dev->of_node); + if (!parent_irq_node) + return -ENODEV; + + fwspec.fwnode =3D of_fwnode_handle(parent_irq_node); + + return irq_create_fwspec_mapping(&fwspec); +} + static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx) { /* FW currently only supports a single wq_ctx (zero). @@ -2396,7 +2451,10 @@ 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 - irq =3D platform_get_irq_optional(pdev, 0); + irq =3D qcom_scm_get_waitq_irq(scm); + if (irq < 0) + irq =3D platform_get_irq_optional(pdev, 0); + if (irq < 0) { if (irq !=3D -ENXIO) return irq; diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_= scm.h index a56c8212cc0c41021e5a067d52b7d5dcc49107ea..8b1e2ea18a59ac143907a381b73= 236148bace189 100644 --- a/drivers/firmware/qcom/qcom_scm.h +++ b/drivers/firmware/qcom/qcom_scm.h @@ -152,6 +152,7 @@ int qcom_scm_shm_bridge_enable(struct device *scm_dev); #define QCOM_SCM_SVC_WAITQ 0x24 #define QCOM_SCM_WAITQ_RESUME 0x02 #define QCOM_SCM_WAITQ_GET_WQ_CTX 0x03 +#define QCOM_SCM_WAITQ_GET_INFO 0x04 =20 #define QCOM_SCM_SVC_GPU 0x28 #define QCOM_SCM_SVC_GPU_INIT_REGS 0x01 --=20 2.34.1