From patchwork Fri Apr 25 23:48:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unnathi Chalicheemala X-Patchwork-Id: 884860 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 91C6225E448 for ; Fri, 25 Apr 2025 23:48:11 +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=1745624893; cv=none; b=HmeC9Yu/4sO/cDNKorW97rSMHx2EqGdsiA9W43MjXARFWXBOWMq0wuHewgpzZWxoeMhXtCvWk6cj8uRIuRwmE019x87n+qUST7BP8DhFPip1lwpMM61i6iA4ZhZhfb9PwDFpHMVqGP+VZTlUTaaMEe3H9QWVYwVlJ4QzmwIEfDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745624893; c=relaxed/simple; bh=HwSmczY1BPfAzd6mqaQZTmW0WxFuAC6Q6eQmyL2FVcg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ACvm9W50CJVY9dS9h6cBKQEX/SOWlH5JVcIb/2gJcxHqs56UaGVtJcOTR57I9qs16CV6bNHaHrKEVtm8nzcbNHLvalVNT319qQtvlrYiO6wzFerlOK5SATa2fJWuItEUBJOn2HopHbeJ+oNm+IG9MB2ua8cvpqcUd08B4TR1rCk= 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=MgvFntlW; 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="MgvFntlW" 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 53PGJv2A032005 for ; Fri, 25 Apr 2025 23:48:10 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= 7gZa73dpF26SkhvPxVhZQa4YDow7tdo2+PqHj6dpVRM=; b=MgvFntlWJRBpjfj1 ctyOM+dV02WzYZTULRX4rG0IGA/Lva9BBRCGquFX7cfq1gz/5YgwWq3caYnmZxK7 9IW3rK28YPTTVCpUW2pKZ2CY5TS0a4dYVxTwCFQxB6SKp76FZeufdVHGzwnDRpO7 SlINXOzntXTtJW1Rv/BSACQ8C4QSEjZ4Hpoyt3IrvhIm+FUAjIauujSi9RoT9FUK zIyBVUeZsrR96hYA/xLWTIbCMARtUcUo3hIn/ZpwiMtG8vVR99au7UGkhLV8Y4Bv xt+pEbly4mHCUqQdjLtuJsMYOZT6HWqtw3PeIjK05vhbcOGYKUp2yyPHXnBwoAU9 z0lSGQ== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jgyagjt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 23:48:10 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-af5156fbe79so3155316a12.1 for ; Fri, 25 Apr 2025 16:48:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745624888; x=1746229688; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7gZa73dpF26SkhvPxVhZQa4YDow7tdo2+PqHj6dpVRM=; b=FGjQxq7Zx6jPiw5/Xeg5aaNr7WfzKsN/DaQhlfC0SsnWzomQnFLvMhn0YP78t56Nqe gvcWtWXP3oc6BGuz5nf3HdJEZiYObikqZFeF7aN4oTNuDb+eiFghT4qDQNH4sftwKnOJ r5DYGcAziSKMh6jfvCUzLZaAGVmvfTjOBqK+EfXB3dOdlNIN+mvD7Lbgdsnm6ZmhtunG 2TOScWUnDbt2lnHnARoanpxVCEMT3OkUtLev7Vjzkf7lfkL3EWXnfoFHtHxLSfIXsBU1 V85c44vtYGWIyyAu3igau3SUDTIZg5Ogr/9od+j0EGxEbSW9DyUvsI2KiA/NxELnKWmH 61YQ== X-Gm-Message-State: AOJu0Yz/mCiTupjvo4bChI8gDIZAljzfX3GWIbEaiURzbC7k5QlSFmK3 6ASLvy4jpNMokHojG9pTWP46VHKTOqO4xFNZsgkZgmIgTx9PuuwsvB4/jprZgZanrOmcp/9jX7R ZGic4RSD8wiGgrdjkRtD420jp2sSuoykBsIyv4IduC6kSve7hHoIJ9ScCkocqk3lqbQWcAdOx X-Gm-Gg: ASbGncvygxTa/9yfmz67+wXz0MScFawmr1N1HHH1rhPikOO8rB0Sjw5Y5nLSxE/v5Cc CSxewrkAMa1juxP7JFSSFSqf60MRCVAPB5tjIupDkg/VF4OHvr2IVSRh9jYS+xlOz5y3uAoHslX 9BdWu/onPrzrGNFszZil06T9VyGhvxlz/NBrr0bnE2nEwdL9nYHDQdqai/9iyvTzJSd+e9r2sHj kj68E5mxXO1oTL3f8Dhzj67yvAfQ7CLHD7+uouv4BO2+0PYIA4VPadzoSUiPVvhcYABIwXGdYKf BG6wNxPiOqeraVgZjiHzx/AXl8g68YWmxEOmh4YvAsxq1X9K4UqtTbjfG8dfN/RK37577Pl6UYW 2Umo= X-Received: by 2002:a05:6a20:3d93:b0:1f5:63f9:9eb4 with SMTP id adf61e73a8af0-2046a6f0de3mr1519269637.35.1745624888487; Fri, 25 Apr 2025 16:48:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwrDEc6Ma5eNwTZjAnXvfiCHVusufWG0jmBbY9U2tOihoJatkfDj4bF2BySc0j/Qd+JYlreg== X-Received: by 2002:a05:6a20:3d93:b0:1f5:63f9:9eb4 with SMTP id adf61e73a8af0-2046a6f0de3mr1519243637.35.1745624888056; Fri, 25 Apr 2025 16:48:08 -0700 (PDT) Received: from hu-uchalich-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a9a308sm3868948b3a.136.2025.04.25.16.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 16:48:07 -0700 (PDT) From: Unnathi Chalicheemala Date: Fri, 25 Apr 2025 16:48:01 -0700 Subject: [PATCH v6 1/3] firmware: qcom_scm: Add API to get waitqueue IRQ info Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-multi_waitq_scm-v6-1-cba8ca5a6d03@oss.qualcomm.com> References: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> In-Reply-To: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@oss.qualcomm.com, Prasad Sodagudi , Satya Durga Srinivasu Prabhala , Trilok Soni , Bartosz Golaszewski , Unnathi Chalicheemala X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745624885; l=4335; i=unnathi.chalicheemala@oss.qualcomm.com; s=20240514; h=from:subject:message-id; bh=HwSmczY1BPfAzd6mqaQZTmW0WxFuAC6Q6eQmyL2FVcg=; b=uDBkoWIyiXlYh0Cny/rX2dEV+G7u6bEMULbDg3HWxfc5BNFsYGmpNODZ8wpdviHmeNUdCLEj/ IXbMilpSbdRBhR8zZJng++qWgGrvusNCJ30TkEe4tS0zSgsGNVmWm9T X-Developer-Key: i=unnathi.chalicheemala@oss.qualcomm.com; a=ed25519; pk=o+hVng49r5k2Gc/f9xiwzvR3y1q4kwLOASwo+cFowXI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE3MiBTYWx0ZWRfX899wdmxlQIrl 9uLjbe7tcmd1dEjH7gIHBVJc0189BvkquukMAfBTPzYk5tmeXbufzHlet1YBSkKGfR+CBfDGvoM WYV2dR0tYfkCAdzD0dsaFxQX/k/vqD0SjhfMMnBanTf7EE+gg7un+Bh9iUyJquBxYGybs5avPIp g2+v7qI3Yk4eG7oRMcp0fnxeokbZNWvW3YWFsVq5+XWqNGw5gC0kSnUnGn/6ES7/bYahx7vdtjN KYR1hNZl/byrYdvK7BIVfSlMalR656F28BpsnGayyjbN+J8Hq6WV/UK/IdWSPIybAvdCJ/yVGCH o9Oqweezzza8R/qj9J/wWeGg8Gdkdlv28rXxUGjeV0SPhIiCDuQ5biZ/d3hzkwno8G2M24Llidy 41gSCBjzZn7EKtTElDoKVTs+PPh1wEb8HVXFZ+mv353YeqQ1X9caVlOG1cXFW1QsmWU5u3Om X-Proofpoint-GUID: JKTHXMzAEoZGp3zQ69Ka_vEiwo0S07Zo X-Proofpoint-ORIG-GUID: JKTHXMzAEoZGp3zQ69Ka_vEiwo0S07Zo X-Authority-Analysis: v=2.4 cv=M5VNKzws c=1 sm=1 tr=0 ts=680c1f3a cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=BWC7kBQSOfkspHPoMaoA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_07,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250172 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 defined 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 --- 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 fc4d67e4c4a67efc77e0135c06db47bc14d0aeaa..529e1d067b1901c4417a1f1fd9c3255ee31de532 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -29,12 +29,18 @@ #include #include #include +#include #include "qcom_scm.h" #include "qcom_tzmem.h" static u32 download_mode; +#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; @@ -2094,6 +2100,55 @@ bool qcom_scm_is_available(void) } EXPORT_SYMBOL_GPL(qcom_scm_is_available); +static int qcom_scm_fill_irq_fwspec_params(struct irq_fwspec *fwspec, u32 virq) +{ + if (virq >= GIC_SPI_BASE && virq <= GIC_MAX_SPI) { + fwspec->param[0] = GIC_SPI; + fwspec->param[1] = virq - GIC_SPI_BASE; + } else if (virq >= GIC_ESPI_BASE && virq <= GIC_MAX_ESPI) { + fwspec->param[0] = GIC_ESPI; + fwspec->param[1] = virq - GIC_ESPI_BASE; + } else { + WARN(1, "Unexpected virq: %d\n", virq); + return -ENXIO; + } + fwspec->param[2] = IRQ_TYPE_EDGE_RISING; + fwspec->param_count = 3; + + return 0; +} + +static int qcom_scm_get_waitq_irq(void) +{ + int ret; + u32 hwirq; + struct qcom_scm_desc desc = { + .svc = QCOM_SCM_SVC_WAITQ, + .cmd = QCOM_SCM_WAITQ_GET_INFO, + .owner = ARM_SMCCC_OWNER_SIP + }; + struct qcom_scm_res res; + struct irq_fwspec fwspec; + struct device_node *parent_irq_node; + + ret = qcom_scm_call_atomic(__scm->dev, &desc, &res); + if (ret) + return ret; + + hwirq = res.result[1] & GENMASK(15, 0); + + ret = qcom_scm_fill_irq_fwspec_params(&fwspec, hwirq); + if (ret) + return ret; + parent_irq_node = of_irq_find_parent(__scm->dev->of_node); + + fwspec.fwnode = of_node_to_fwnode(parent_irq_node); + + ret = irq_create_fwspec_mapping(&fwspec); + + return ret; +} + static int qcom_scm_assert_valid_wq_ctx(u32 wq_ctx) { /* FW currently only supports a single wq_ctx (zero). @@ -2250,7 +2305,10 @@ static int qcom_scm_probe(struct platform_device *pdev) /* Paired with smp_load_acquire() in qcom_scm_is_available(). */ smp_store_release(&__scm, scm); - irq = platform_get_irq_optional(pdev, 0); + irq = qcom_scm_get_waitq_irq(); + if (irq < 0) + irq = platform_get_irq_optional(pdev, 0); + if (irq < 0) { if (irq != -ENXIO) { ret = irq; diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_scm.h index 097369d38b84efbce5d672c4f36cc87373aac24b..7c6cb3154b394ab910bf7775a5ae07a28e0b57a5 100644 --- a/drivers/firmware/qcom/qcom_scm.h +++ b/drivers/firmware/qcom/qcom_scm.h @@ -148,6 +148,7 @@ struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void); #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 #define QCOM_SCM_SVC_GPU 0x28 #define QCOM_SCM_SVC_GPU_INIT_REGS 0x01 From patchwork Fri Apr 25 23:48:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unnathi Chalicheemala X-Patchwork-Id: 884859 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 C952E297A5D for ; Fri, 25 Apr 2025 23:48:12 +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=1745624894; cv=none; b=JQj7XIa2gy+f3TRG8hbsPGaopbOa129IqTlMA4+XLf0r8tnOEH909w+hK7O5jrIUcA9/xc6f7sQI4aHPSAQoRXnDPQmYOrSzBYp1MGek2U3DeNs5NCHaJ6nLH5+9zqpZrteLrZjwfTQxEHXQ5L6khwHF9ZbvgfE3B2rroRmclzg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745624894; c=relaxed/simple; bh=CxAQMDuh9krf1N30Zll9vwqxkcHp/5I1Da/5rxIOxLU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mj+Q9QeNhhGo4L/oF0BQAse0aeA2gJI03vB4EIzqYmn2IFuj35xRZ4MEZcyxmz9YE8TCzbafxo7CT1sgj+mNFnjnAthqoOwBfW+SL9hCnI6dTbclWPpEXkMlgxmRSIbCVsYnUzJQzhFnP4w//LOCvF36VWnaMnlU7uBO6V8yJ9I= 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=cNYu5m4B; 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="cNYu5m4B" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJweH032080 for ; Fri, 25 Apr 2025 23:48:11 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= /cM78RDPLdFeQcNGGFl0xqNHvrHRmJYbSLftRUJXI/Q=; b=cNYu5m4BiRtqvetd /LHKYtfMQ1NyWTc3OXwmptl5gEzAL2pSabcYTqfmvUEJo138DVG/Bz87AwswfMdM 8bQJj/mcr0Pq9vJk55bqcBBadREspaLSJm69Ta5xNqwzjupG+1uDkECo4SKZwXls WCEUv/7YIwvn5Mbc99PWd161uYDqB5VGNrUXJ7//QyGIP3Mhi1ViZiXI4Db7vofC vYxqwMJb/aQId5flgoEovFRjKIi6f8JkKl4dfeZGoudsOSNJDe3q8D0+fVzwqrcN Xq8ykvzjsnLX4t7d5KaaNaaPyiB6CWyMIYKjEC5V+X85DK5bx/MllW3sUnmoWKV/ q5n3Bg== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh1ad2c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 23:48:11 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-739525d4d7bso2159018b3a.2 for ; Fri, 25 Apr 2025 16:48:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745624890; x=1746229690; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/cM78RDPLdFeQcNGGFl0xqNHvrHRmJYbSLftRUJXI/Q=; b=biUoBbq5GbRQ5NYxGPy9hg28srZwDdnuLQQhEaeQUBW7fSloE/Q3hGx5oNT1s9zJQ/ +YDUiqI/+ndovzKjObtPCkmjt0CuN2l+4c3URTNkJStBHrDztpEHKDehtAd11IrL9H0X weOCsFf6V3eUJ98spXPYo1XB/61zPiPWMdTgyghI4r6pY00ui0iaTn+j0uVnKm04EIq/ CU9yHaq+3D/6v0GIEQ33Q8Ys3E+qk/2aoYIhT0M8AtWbgAWwaqe1Ed/JAFaM80vMsw/Z 7pRlGlw+JgRAK4/BmEEOurvxBiqOQtnLgJABQa0Jxnhn/y5B04090sY1QM1XXt0j9Toj 1wdw== X-Gm-Message-State: AOJu0Yz6t8xK1gGgcVQ8yXzr6clNrxNTVjzHnYLprcc4tZ7eF7ksnezY uEV8dDi/jjV7k7DV6B5OtBvRhnBnBwLZvtpZVAuLBMpAIdTEIn4OSzaDXCGcqbFiRVr2RJ6WQPV CZV5mE9arGccu/ERzRlUEQTwZSglLFkG9hPNczgR3MrjcTkq9mt5apfTjIdKCOy9QV5OTa7qT X-Gm-Gg: ASbGncu2f6hkXSGfprB55AqynbsAfLbmnyvDsRKrF/BtVIIAb6iGzZQ6F8IPNguDbSw 2Lc0ljPWGJwjM/AcKD9GpihI9Z8w5iEdp0Bxq28LITLjHiMtE6IXoFUlyCj2PdzqLLso859eRpD rszjLlun9Ll66UDbllkiDuy5KQ4V+yrcYT/65DtNUr76QjVsUBugxHIio+NkwxJ0PkkEstKxPrK y9ERDkx3Ge7GcdVrv2Ig8TF+UQyHBa+0P4OPz65/KBEmMUBFg9yXmP5OeooDwDnYgmwMs8jFXM3 FbwXgJjpfYhA2wrMtypwLgOxDs/Ip/NAVuf6g5cuPolVema5wlbIgu5yhdKrXbTA6YaKL6zLUZO JECc= X-Received: by 2002:a05:6a00:3a12:b0:73e:2dc8:94f3 with SMTP id d2e1a72fcca58-73ff725247amr1612736b3a.1.1745624889725; Fri, 25 Apr 2025 16:48:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+S26bInhZBenA2dmE7t07ZXFkmKEWQS4evqWc88J7A2otJ6UPmPtEA9c7IzbqwWzy2fhtog== X-Received: by 2002:a05:6a00:3a12:b0:73e:2dc8:94f3 with SMTP id d2e1a72fcca58-73ff725247amr1612710b3a.1.1745624889365; Fri, 25 Apr 2025 16:48:09 -0700 (PDT) Received: from hu-uchalich-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a9a308sm3868948b3a.136.2025.04.25.16.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 16:48:08 -0700 (PDT) From: Unnathi Chalicheemala Date: Fri, 25 Apr 2025 16:48:02 -0700 Subject: [PATCH v6 2/3] firmware: qcom_scm: Support multiple waitq contexts Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-multi_waitq_scm-v6-2-cba8ca5a6d03@oss.qualcomm.com> References: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> In-Reply-To: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@oss.qualcomm.com, Prasad Sodagudi , Satya Durga Srinivasu Prabhala , Trilok Soni , Unnathi Chalicheemala X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745624885; l=4913; i=unnathi.chalicheemala@oss.qualcomm.com; s=20240514; h=from:subject:message-id; bh=CxAQMDuh9krf1N30Zll9vwqxkcHp/5I1Da/5rxIOxLU=; b=dz2NiBZ9DGZH4/87bJKCw9aH1uTMzvimIZ3Ing3QOSgd092wkyhzGNap/LUVA9DhgcYTM0wfa Ix6f0hXcRETAzOHs8oABuucTO4yO1ccZvK3wnsnn/S0rSL7roKBMA48 X-Developer-Key: i=unnathi.chalicheemala@oss.qualcomm.com; a=ed25519; pk=o+hVng49r5k2Gc/f9xiwzvR3y1q4kwLOASwo+cFowXI= X-Proofpoint-GUID: 2GPOx0I-BDGj1MyBLQJTELHRT0UKtnEf X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680c1f3b cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=IoDWPEjDBkkTTY39AZoA:9 a=+jEqtf1s3R9VXZ0wqowq2kgwd+I=:19 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-ORIG-GUID: 2GPOx0I-BDGj1MyBLQJTELHRT0UKtnEf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE3MiBTYWx0ZWRfX2NTkpZk7pqTW RwdtO0ZfAuRxYJQRnW1v26b5Az/pFPk/NNo8zxsVao7UFWrwKjoEZWPNDqxrCEcPTBge9pexnIc IwgmPGQ/8ZQeOWVUvV0w3t+keEj+kSYnRyWXU9tD8aAtVCJfM/2ektIJIGxNdpiPwvylOxQaKau fYiARKefLit8YKVFVhOow3Hxe+57wm6qO1bqtyrY7y69WyfBonFKRv8svdvw6Usj71Gqmrizeym u/t7tlA1vSYqmgpI9/jnyvLWa7x3lz7Swmmd3gHK+26y2EkvdmsCujmSgHGy2UB+Z1hmd32M6n/ UYWSC1WNAFAF0OcXCCjBFiZ2N/ySQq42bFyjtswYVtIjZxXi5tbMxkHcAI42qGP0+g3dZOtnZbx 1SQFyynsWdjb7H/9Q42pZ3iZ9Oe33EavH8xyjemGVFGV880W0Pz6ftsWJheoY9MMW2yN9K+q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_07,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250172 Currently, only a single waitqueue context exists, with waitqueue id zero. 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. When VMs make SMC call, firmware will allocate waitqueue context assuming the SMC call to be a blocking call. SMC calls that cannot acquire resources are returned to sleep in the calling VM. When resource is available, VM will be notified to wake sleeping thread and resume SMC call. SM8650 firmware can allocate two such waitq contexts so create these two waitqueue contexts. Unique waitqueue contexts are supported by a dynamically sized array where each unique wq_ctx is associated with a struct completion variable for easy lookup. To get the number of waitqueue contexts directly from firmware, qcom_scm_query_waitq_count() is introduced. On older targets which support only a single waitqueue, wq_cnt is set to 1 as SCM call for query_waitq_count() is not implemented for single waitqueue case. Signed-off-by: Unnathi Chalicheemala --- drivers/firmware/qcom/qcom_scm.c | 78 ++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 529e1d067b1901c4417a1f1fd9c3255ee31de532..9f8db13ef1ce14cc324fa9f0abf5c6a97ceb7b8b 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -47,7 +47,7 @@ struct qcom_scm { struct clk *iface_clk; struct clk *bus_clk; struct icc_path *path; - struct completion waitq_comp; + struct completion *waitq; struct reset_controller_dev reset; /* control access to the interconnect path */ @@ -57,6 +57,7 @@ struct qcom_scm { u64 dload_mode_addr; struct qcom_tzmem_pool *mempool; + unsigned int wq_cnt; }; struct qcom_scm_current_perm_info { @@ -2118,6 +2119,28 @@ static int qcom_scm_fill_irq_fwspec_params(struct irq_fwspec *fwspec, u32 virq) return 0; } +static int qcom_scm_query_waitq_count(struct qcom_scm *scm) +{ + int ret; + struct qcom_scm_desc desc = { + .svc = QCOM_SCM_SVC_WAITQ, + .cmd = QCOM_SCM_WAITQ_GET_INFO, + .owner = ARM_SMCCC_OWNER_SIP + }; + struct qcom_scm_res res; + + if (!__qcom_scm_is_call_available(scm->dev, QCOM_SCM_SVC_WAITQ, QCOM_SCM_WAITQ_GET_INFO)) { + dev_info(scm->dev, "Multi-waitqueue support unavailable\n"); + return 1; + } + + ret = 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(void) { int ret; @@ -2149,42 +2172,40 @@ static int qcom_scm_get_waitq_irq(void) return ret; } -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 != 0) { - dev_err(__scm->dev, "Firmware unexpectedly passed non-zero wq_ctx\n"); - return -EINVAL; - } + struct completion *wq; - return 0; + if (WARN_ON_ONCE(wq_ctx >= __scm->wq_cnt)) + return ERR_PTR(-EINVAL); + + wq = &__scm->waitq[wq_ctx]; + + return wq; } int qcom_scm_wait_for_wq_completion(u32 wq_ctx) { - int ret; + struct completion *wq; - ret = qcom_scm_assert_valid_wq_ctx(wq_ctx); - if (ret) - return ret; + wq = qcom_scm_get_completion(wq_ctx); + if (IS_ERR(wq)) + return PTR_ERR(wq); - wait_for_completion(&__scm->waitq_comp); + wait_for_completion(wq); return 0; } static int qcom_scm_waitq_wakeup(unsigned int wq_ctx) { - int ret; + struct completion *wq; - ret = qcom_scm_assert_valid_wq_ctx(wq_ctx); - if (ret) - return ret; + wq = qcom_scm_get_completion(wq_ctx); + if (IS_ERR(wq)) + return PTR_ERR(wq); - complete(&__scm->waitq_comp); + complete(wq); return 0; } @@ -2260,6 +2281,7 @@ static int qcom_scm_probe(struct platform_device *pdev) struct qcom_tzmem_pool_config pool_config; struct qcom_scm *scm; int irq, ret; + int i; scm = devm_kzalloc(&pdev->dev, sizeof(*scm), GFP_KERNEL); if (!scm) @@ -2270,7 +2292,19 @@ static int qcom_scm_probe(struct platform_device *pdev) if (ret < 0) return ret; - init_completion(&scm->waitq_comp); + ret = qcom_scm_query_waitq_count(scm); + if (ret < 0) + return ret; + + scm->wq_cnt = ret; + + scm->waitq = devm_kcalloc(&pdev->dev, scm->wq_cnt, sizeof(*scm->waitq), GFP_KERNEL); + if (!scm->waitq) + return -ENOMEM; + + for (i = 0; i < scm->wq_cnt; i++) + init_completion(&scm->waitq[i]); + mutex_init(&scm->scm_bw_lock); scm->path = devm_of_icc_get(&pdev->dev, NULL); From patchwork Fri Apr 25 23:48:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Unnathi Chalicheemala X-Patchwork-Id: 884555 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 BFF4F297A5C for ; Fri, 25 Apr 2025 23:48:12 +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=1745624894; cv=none; b=ATCmoqjmCq5hUfAMQo1gdduG06DtWUXAelW59VaXkgmtjqam8eEnv0bc/wObu0He+3phcXUsZBxpK8Y9ep/GMsnRrHBN7vhjrBR2XWJRaXLkcW32N9tIy2SiFfBKqc2EmKnk646AWu5W/VjSqImmTWp8IaTOoEjGMiVCTpiRPbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745624894; c=relaxed/simple; bh=gwwTPMyq05pjTkKOQrslTYp8aVG/FQQzoFZPwY0uOew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lRVGSlS8rSIaHzUJFqoBasH3mQKz8KDPwsx/G3gigKgTtc+fBsZtj4zepPeCe8LkJ7/aPUiqq9zPQPjcNW0CR66yUSq927TuXOCkO0v4Sy9lMfbWDLliCOUT9yuiSCIiT54iteBJpkwP/BLR35B5MYMP0HbG/IvpO5g1TnRYxf8= 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=UmJTjqsn; 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="UmJTjqsn" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PGJtPX011069 for ; Fri, 25 Apr 2025 23:48:12 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= ql/GedPHsogfCaw+Of5MFjkN2fS6Wzdt5YLHuFucyK8=; b=UmJTjqsn91dMrfym 30yGQBWukHXKlcxOU9BiHipRfva700WZk/Hvl6CPEx4GdQ4eYLwMbMRDb1jHumH3 zUxcHrgeGfPjaqV58BkwqxTOaMbw+9Z/C30Hktl1zK+9c7ro79bzCT+L5k6oHMD/ XNeAh0GfL8olQw3XRFFtYWy04m+hTs2n8WzcC+JPpUzCw1xlrfc9jeIwLpEJyG6a 5PqoPFeBFDrTeK9oZFhFgFApWygPWt8phjD16nLsDbmSbVVlIerKLPSKqEnrpO1u q7ITnReEhspvGa0YZnCckLU5qQoATxmXbKJ26BvSlXNxRmyaMOrAj+GnbWox60Ow 0yA8rg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh0jpy0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 25 Apr 2025 23:48:11 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-736b5f9279cso2527474b3a.2 for ; Fri, 25 Apr 2025 16:48:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745624891; x=1746229691; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ql/GedPHsogfCaw+Of5MFjkN2fS6Wzdt5YLHuFucyK8=; b=nSNBUCJ3tSFM0DoA/0z8UdVfm0v7PsLhFgQVYOJVsrdVxfR49jJiEz/r+YG49soAXr C9EgDkrfufO21GUWmws2MEM3vJ3uhCUh9PdeZpQB9TghSJ22xegl9BrUlZsAdBEcEb3z UHHFW4ky2DzsvXjjePmXwBpU6OJGqTKHlfIfuD8mIJqy3ew4VeQy/SwtnHTMfPunjOZj a0TJul1bsk20rRVyKPnpDLvhIRTagFltyZf8/TxA1IYHiZegRl411JT9yfDmGeDIlxuN s/yCT0MIPGS8Mft3paZn8BIVFFuu1sr+EKEGrxL8jqCuFdYJCgYE44J/ooy5sqDfEjQH oFyA== X-Gm-Message-State: AOJu0YxoxPwYE2qNiMy5AsWpfkUSSBfKHPibYAdIuaiBS2+WjOZDpaw8 gnvP/EgoVUcmNJAfnElnn4xNzsgLZZqQKEhyS9dMoBu/tpFxumnIhHo0WPxtdz9U5EYLNQiboTY q3EzSQ/GiEiLQlU2jIbUrILiRZecR7Uvdpu0lQOuaJJ780OVXIoOZwaLvB8v5rh3+ X-Gm-Gg: ASbGncsrJLsF6TgaqPb4M0wZIgzO01MqSJApkmynwigTGBX0ocZbohvYpnPA+iothKS bb06dxkUJ31NSytmqPUAoMFwR79NhVVA+6dXcVWNz5YQq/a5fzODKb2/wzscyxTyVQjAZXVH5Bp dz62hVH6WJ3IbZ1mnG9SVxFA825Y+QCo53XJ9+1QVkWdG5tjlXecaaxjlq8XHb5fz74+ke3SSvI jlCqWtOwdNOC+SURWFPA8K7qreM2gKCfhabkIVARL5LDVGdCybEej6tUCGuQe+PC4ZkGzjEFJp6 jZIhHTOhESWhJWh0GbvF8vwkdHpGzlD2/Fj/Kx8UjXKlr8O8k6AlIAnn/EGAfhwzYDQxqbf5ZCp r/Dg= X-Received: by 2002:a05:6a00:2e08:b0:73e:1e24:5a4e with SMTP id d2e1a72fcca58-73ff73a63bamr1864847b3a.24.1745624890997; Fri, 25 Apr 2025 16:48:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHezxpYHXCCMetb617T7Rci53xT0wLk2loNMf3snuVi5zRli+LkvdJ3GxYxD64Vb1hRLfTu4w== X-Received: by 2002:a05:6a00:2e08:b0:73e:1e24:5a4e with SMTP id d2e1a72fcca58-73ff73a63bamr1864820b3a.24.1745624890666; Fri, 25 Apr 2025 16:48:10 -0700 (PDT) Received: from hu-uchalich-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a9a308sm3868948b3a.136.2025.04.25.16.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 16:48:10 -0700 (PDT) From: Unnathi Chalicheemala Date: Fri, 25 Apr 2025 16:48:03 -0700 Subject: [PATCH v6 3/3] firmware: qcom_scm: Check for waitq state in wait_for_wq_completion() Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-multi_waitq_scm-v6-3-cba8ca5a6d03@oss.qualcomm.com> References: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> In-Reply-To: <20250425-multi_waitq_scm-v6-0-cba8ca5a6d03@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@oss.qualcomm.com, Prasad Sodagudi , Satya Durga Srinivasu Prabhala , Trilok Soni , Unnathi Chalicheemala X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745624885; l=956; i=unnathi.chalicheemala@oss.qualcomm.com; s=20240514; h=from:subject:message-id; bh=gwwTPMyq05pjTkKOQrslTYp8aVG/FQQzoFZPwY0uOew=; b=0CAPlycTtrHQjH6dpC9Sdnb9RW1CnD6mYUNayot61XtWt57KYcFiLU7eYQ6KnMoHBBYP18axg e2GNFHyEQhwDP6GZwlGtLFvVF7BGPj7iGY9+Jq776+O1DnCXYXdrONp X-Developer-Key: i=unnathi.chalicheemala@oss.qualcomm.com; a=ed25519; pk=o+hVng49r5k2Gc/f9xiwzvR3y1q4kwLOASwo+cFowXI= X-Proofpoint-GUID: 5aium46vN1M63I-jLZ9E3Njmv5nOcgAo X-Proofpoint-ORIG-GUID: 5aium46vN1M63I-jLZ9E3Njmv5nOcgAo X-Authority-Analysis: v=2.4 cv=Fv0F/3rq c=1 sm=1 tr=0 ts=680c1f3b cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=X2av7gLQQKfhQ01XcpoA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDE3MiBTYWx0ZWRfXy7/Rgp2Ms32V HZXosXcXG6WU9X2KhsP9iPGe/VzTyMNhycj2h+ZAZ581jQmWFTq2n9RiWMIFznbXA7DYkCJ1+d9 4yVKKr9t0DUvZvxsxntAwcEe5zXP0pRyJoBEr7fLU3jdUWwb5qAtqz7TKhFQF9TrEyAL2rOEu9Z bpi7h9yjXFN22vc6wQqMuODwIhm7rgpC4MHIdq9bhBrVEXjIbIdqM03KG2zP7+ir2hrLrsZ2aPS vSah0j1m1ZyoOvUAc3ecGqnywpid2Zk9B4tvn/HsN+zcmcI0KQQo0dBMxTC1tdCIVycrGo/xpbT gKMjPxD/IDiLgWrE15psonsHW3mcu8XVylnWtcLHUl4OIS0mrTc4kfq1cYuSIoL06g00FX5jRvY OE4tpvwWv56LpzGl0aOSlUlkHEovp21qgun2vXY/HPILrI3o286UBVkr1g2m+NbecGSoT1FV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_07,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=889 priorityscore=1501 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504250172 Modify wait_for_wq_completion() to check if task is in idle state using wait_for_completion_state(). This allows for detecting when waitq contexts are in idle state and propagates it to __scm_smc_do(), which is beneficial when task is idle and waiting for a kick to accept new requests. Signed-off-by: Unnathi Chalicheemala --- drivers/firmware/qcom/qcom_scm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 9f8db13ef1ce14cc324fa9f0abf5c6a97ceb7b8b..a03c18fadd9c6ca6ab5fcd5e386834dcc3663eb8 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2192,7 +2192,7 @@ int qcom_scm_wait_for_wq_completion(u32 wq_ctx) if (IS_ERR(wq)) return PTR_ERR(wq); - wait_for_completion(wq); + wait_for_completion_state(wq, TASK_IDLE); return 0; }