From nobody Fri Oct 2 13:04:15 2026 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 9D1C43B8D7E for ; Fri, 31 Jul 2026 08:00:56 +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=1785484858; cv=none; b=iuRgs7g8nDv+DwmQ95xKw2xat0c9cWtkO4SXPIcJjCyWBPlOSN+BJPZPw3WCgYv1XJpQOtsP6cdahVRHW3Qml1alToVvbYv97z4oVLhSUP60DftDXj4s4w43ID+mt19ZakTNiSao567i/mtYyRoxL+8f6qhdD8aqdQXZQkl8wtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785484858; c=relaxed/simple; bh=JvjgTsJZJ52y4kyW1nFUJTEfAu0hNknPq7wSNqID1I4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mm0LTpm5w3jwXp24yi9gjlwoE+2jSMpAhcdOpgjhgk5vUMkAUqWcqiAQgXyjGFfmpZYG7JpVvCpYKDbQvOIIdiXbIMB59U+Ap5QTUQsgy9l7PYAlvpYRdYyvsPwBVjGMCeBKPIRl+pZ9v40PWFjmV+YYX3zzTLc0GmQtywxTJw0= 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=cbSajw4g; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZimvV36s; 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="cbSajw4g"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZimvV36s" 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 66V7vdIr3410990 for ; Fri, 31 Jul 2026 08:00:55 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= dDZqAY+ezXfJh7xukUn90z48pHmek8RAP97eAMAhVww=; b=cbSajw4g9Dx/eUoG mvQ7oKAl+LDPbsAILCu4+OzqA2qHGJ1Svk68fZjf01aWEaLbC7LLU/VvACsG9Ags CsZvvLAsfWYErAswItX9SIT3FV4KzONtdevKQ4cg3ugKZXjlFwFzURn7hIXO5WdI EYwFKGxputPwr9XglJjWs5xINJ1IstbJwMMckSILNH9xu1733L9LyKz1MQblnOZT Hu+UVnAhcHtHFBJxgdVSrFIqXTbxu8y/wv0lGW4lNHdpZSCxMzESWG1MFXTHhnYz gdt33rMq8H1x1vD8oaJ57JhpJGntP6REQAqmYsiST8cfT1h1ueBQXUCBsd8AGs4X 8WKavw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frq8f84rh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:00:55 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51ebdfceddcso6384131cf.3 for ; Fri, 31 Jul 2026 01:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785484855; x=1786089655; 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=dDZqAY+ezXfJh7xukUn90z48pHmek8RAP97eAMAhVww=; b=ZimvV36sJ+uuw85V0ZNymsyM5nxiz5/WMHy1So1eZAqcfxLKWPMtIg4WZIRwIqU8V/ jTt3ulzt4vB0bgwJTX8p3+FSpfcurZFdqezKDS3qaObfdrnRwucr0HfKrm9WDODnbEPw LGr5LbD4xnF+9zeo3MDA9nA88AXKzoS1tDzSUnVZKx7zmDMjqfcyDiAEPLDMRl3eOycv UI0XK6lAnogWXnmTzV9r4JkLyay91gosw+YDDi+xweKYpoKP2qvMSdGTWKslXpzpy1Cm vfn7ZdOcUaxXw2gLw4roQ3D6+JA6nk9Fz2Fh9a8UhsIvzpIWDNmgIxiQJ1Uy/lAlKu7p S/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785484855; x=1786089655; 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=dDZqAY+ezXfJh7xukUn90z48pHmek8RAP97eAMAhVww=; b=NB6AboX8omW7WwTZRlhmuCBfvNPSm78mZodBzX+Cr6zKoAdxXAKPKQnOnlBqRPAAXo KG6P13fOnF3CeC5wIEIT9KWTHlURO6RBkUpRRc4OFYeeE1UDfbiFlIOt7pGZjb0LPdg/ P3CI/Y6i21zKtcIJGCYp8/Izoz7Lrk9gRcqOLZFfrh3rhOBtf5QuOM2WDJ4OO6fB/jAL 4uZbGi3KV94ZpwHfwcielTT3SMshmxGKsstc7hPHYYYvtoXiQQE37h+p4ks5694dHJwu PB2mIQ1dy5FjCy5sniqOniodp4ohcPqvyFuzMr9IJ453/xblTpicN2/ctKPNMQ1Z2Ady efNw== X-Forwarded-Encrypted: i=1; AHgh+Roys3TNX2c7Sby2/YaG0LtLB+hSH7YuVUq3y0Ee90BTpJ1X6n3PfFUvfe6fxoNUHwTxzDJ/IIoPMc+VqNc=@vger.kernel.org X-Gm-Message-State: AOJu0YzVLW4Av6EXxnOWY3x9CjYypVd2W1Uz3U54gE6zZivXyEdpxhnM 03w0hE4MWuBu4bf8vgLsLcUkE5DfjOyDdEuOutv37iZcl/yWWwhahX1zwXyxAUjkBZUvUrijWnR Zgexaxbj9A0i+uW9YnmC6uigW7R19g6c7qZpFDi2ouR8C/fkbzqb9H5hqL/dUNIhdnf8= X-Gm-Gg: AR+sD10J824+2ABHfAUifCli/hMvS8K7/xa2a0UiraA8cUpZy8VExu+C58db8dwDv+g rcvP8bP8HawRZeoO2rgjPlQ32zgloTIQCsndPkma2pwBqQ+lxLsOI8UP7+t8pYAuPYlfFpPeh8j w4wh5nBrQSpJlplOFczyQLQcOx4GhYTMxS/gF9bPDJKpZFv4OQ9K7JSi6L/W0bozMJA3fLFS4b2 VLOJ/376yVOp7Vpk0EfrfmN+7sKsh1mB5e1FQZnQUIJ2SRRsmR79BOe0HMw2lPAma0W9HbELGjT 8oq3RfPf+pWM6t/TWt3YgSIEawl0eTrqvcJylTaUWAZsc3DH1QGKubx1qPOHOsjHYTvU/k9qT7k uORYxKPVcd/9RF2BZXQqGEYpTivsGCg== X-Received: by 2002:a05:622a:4815:b0:516:ea30:8756 with SMTP id d75a77b69052e-52b4af2930bmr12569401cf.36.1785484854661; Fri, 31 Jul 2026 01:00:54 -0700 (PDT) X-Received: by 2002:a05:622a:4815:b0:516:ea30:8756 with SMTP id d75a77b69052e-52b4af2930bmr12568211cf.36.1785484854040; Fri, 31 Jul 2026 01:00:54 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4534fc4sm51032966b.51.2026.07.31.01.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:00:53 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:00:34 +0200 Subject: [PATCH v2 1/4] firmware: qcom: tzmem: guard against IS_ERR() in the cleanup handler 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: <20260731-qcom-scm-code-shrink-v2-1-4ba76096915f@oss.qualcomm.com> References: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> In-Reply-To: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1151; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=JvjgTsJZJ52y4kyW1nFUJTEfAu0hNknPq7wSNqID1I4=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFYuexYKe/avDWg8MfimsfWJG+ClDrPRsuq01 bYRPoELoWSJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxWLgAKCRAFnS7L/zaE w15sD/4x1Qc5ksTsJKtuekwV0UpWY0zRlFxtc5kBDQ/KgheAfzMz/Eg5Ho4IW6AABNRNJSR0/lh q7Xuf4bwHzqng/5Dc7TRgIqhrX6eypqiXP22YWtpGQXjwax/oU71Zw9zH36sm85Lwumr3289Q0G xB0JgrFTVz04r9t/YLx4Ix2FbvCFyDW1lih/n9mejB/2fyoqoc5s0hQ1VdLkUQEhL95URCPV2r0 zmHmWQpPWO5/by/MEiCS9t9LXk40qjgYzpVRxGM6AUfsfHRDrDOZEj8UeVL1793ymShR3cdr3XD SKaWeMuFA1RrIb3bX9o211eogDKenvWqTiIoJEp7Y5helO+7oL8Wbei7Jy2skeYjmlCYkzLGbbC 5YaR4PpEvZVmr6Ppy1HjTL0nROtaWz9V7Y88ZVslogPyvfM94ncZ1IE4bGac20N78ErZaKqeb5m EtHJHW5r8YwqPmn2gKd3Idx7KvMAQjNac4joLuZt6D73eMaWtbPeasJlmGKNeAVoRma9SEEHK0u 1h382hj+mdh9bDo/+AiRsBdC9+OGWQcETRhtTHA+B7VmfS8ajXzy6CQL2H6DejftzpDsQkKbfrF C10uk/P9ATL66e/CmzpJCUK/kQi5OJowoKZxnaGP9jmoS+0AU5WAEs7x/9FQWVGP94gb2g32GNM 2oB4VliNI7JOciA== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-GUID: JHeahfCVkRBciOcqBiztXw0MTP4veogr X-Proofpoint-ORIG-GUID: JHeahfCVkRBciOcqBiztXw0MTP4veogr X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX54suErpkVJ8k 3i1ZgC3bBEyxuw2rtGJpJL8adosMrwjsaabFhXEhuTP8H/6Ph3AF5xVqlKCFtNJlLEntjt59ch/ tQgTWSiXR7EaKJQzoyIyvdnAAMfHEoA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX7m2zYvQZqFY9 U8xj/9ZzEHdGj7BqJUSCZtxJ4maP7+hhCKNL4tM4WySMxtBZqqxm5Ue2UOOIbp7uP1JsAXOiZ+N nLB9QRoJ/aNWf3b12Ji/Rk9iNWooiZ7pZj+jXQZCrPGAj5Hy80dvU0XLaqzZmfKjhj1hvuzM6zR e7PQyh7aRmXE9c7rTQy4O5I8JLoIt4RxmIZzZxDDOYHy15gRLOQMPIoTPsFOpAdSjZAtzfiZ+o/ CT+qV/oUD8sLtpPg8tED895dMXKa3y4kXCcdTD5jtn2k5XFjSEJx3tEIJ/NmaymPXzqTiWFWbwN 6ExiBXiM6tvEDKtEU0PpT18agw2bdOhvwAp0V7CX6OHA4CznhwM3cIzgVjxX/mfeC45y2nQwwtf 21plH7PguOfiWNYya8mHjUaewandZCoc9/9zp3dcOuEhfTIK3I1S7/L6RoA4+ll++JfAyV7O1EW yQQrtTLrFLLaQSqByXg== X-Authority-Analysis: v=2.4 cv=K8US2SWI c=1 sm=1 tr=0 ts=6a6c5637 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=PGwebHSm6yYtckILb5AA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 adultscore=0 clxscore=1015 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310056 We currently only silently skip NULL-pointers in the cleanup handler for tzmem. It's possible that we get passed a pointer holding an ERR_PTR() value so skip it too. Reviewed-by: Konrad Dybcio Reviewed-by: Mukesh Ojha Signed-off-by: Bartosz Golaszewski --- include/linux/firmware/qcom/qcom_tzmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/firmware/qcom/qcom_tzmem.h b/include/linux/firmw= are/qcom/qcom_tzmem.h index 23173e0c3dddd154dd56dc3dcb56bd20ada0520a..b5520178bf6f53b86b530571a3b= e9f302225f022 100644 --- a/include/linux/firmware/qcom/qcom_tzmem.h +++ b/include/linux/firmware/qcom/qcom_tzmem.h @@ -58,7 +58,7 @@ devm_qcom_tzmem_pool_new(struct device *dev, void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, size_t size, gfp_t gf= p); void qcom_tzmem_free(void *ptr); =20 -DEFINE_FREE(qcom_tzmem, void *, if (_T) qcom_tzmem_free(_T)) +DEFINE_FREE(qcom_tzmem, void *, if (!IS_ERR_OR_NULL(_T)) qcom_tzmem_free(_= T)) =20 phys_addr_t qcom_tzmem_to_phys(void *ptr); =20 --=20 2.47.3 From nobody Fri Oct 2 13:04:15 2026 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 71A733C10A7 for ; Fri, 31 Jul 2026 08:00:58 +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=1785484864; cv=none; b=Nu0XmZ1RGQgcjgPId7mwbrfIHPjO8btHD5ZLR3JV/l28KhgkevzPmCYZFiUk2WFxNm6F/H3aIB2fuCjEE9oFATx8LcCkswsaPvEjZIh9NoOfEhUCdho/NAeSKKVpoXZ+nLWivSyawHMdS90tAAVetAu9oVQPEknaMNDiAnFC+1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785484864; c=relaxed/simple; bh=0whSEe//CO94x6I24SwYVmeMkMqOL/rDwvKXMUEHhpA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Cslq9ijjzB90XZiGx0CFd1cgmkrC1WMNHZqF4qSRPJ72/GW1HI/aTlcwYyup9XVJqL1rXVBz4TetTYVTpwuWofqUiKouTrq+dClUCSd5v/dfw8Fg17ndTbJ+Phr8nlvWBCdSegModa4frjBMSnDrLB2+CWv6oD50PYASueu98tQ= 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=kAaKGbyX; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KYaQzRA9; 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="kAaKGbyX"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KYaQzRA9" 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 66V7vBlI3594230 for ; Fri, 31 Jul 2026 08:00:57 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= bBN8lNPPtt/lWpA/t02HhzfXro9jgXIJFZ+bjpHuviE=; b=kAaKGbyXE70kDKK4 paf98PS4Xtt8nq6i/lTZl4Wu2XXSNE0D1/2hmSmBYKf+wqlvh5rDl1BliIEorO0n FIxHS6DA/g+bmg0dupGQ1bXEeiynybPJHRhLVg2FfriOVEvhBJOSZ5lzbskkHIaf KkuDbsnX/FwrliSPP+rXsiEbwsspM2DEVo5CvlZLq4+zgjayFrLJdLRDusOFJzGz bZYwc5e1VkMarS1Ov7JlYPYAAuBrih/ABl17304zpbaG7/9m5uEzS5aiXAHMq1Xv VanLlnptl1mlIeolGIMWeg1N2avPz/0oaB4S7Uf5HnY2gr6DRRL9HgYZXVcjBgkr cOeXDA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frqc283b0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:00:57 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-930b6bdcb4fso99443185a.2 for ; Fri, 31 Jul 2026 01:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785484856; x=1786089656; 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=bBN8lNPPtt/lWpA/t02HhzfXro9jgXIJFZ+bjpHuviE=; b=KYaQzRA97wmF6dkLSius7spb/uc8gLyHSkyGxo88td+UzuhcnbW/dtsuX5WzErUROm kkpCeEg+sjsTw7vMN20kO89M5ZZlehm2fHOrPrEiY/qtMVrhxLoIJlxlf5VwW+3p9CNf yQkhkbuhtIzJUeF2Hd8hOZIbJpDWFzR1yr4HqnWwWR6xRv9q7Lfgg8cN32hv4iJT6SFy 4DjwRLnJtIiVD28mZDaCDTPPF3UNSXlnrtiz55NsPPMvXV+PmqEMbtpkDYw5ddJxGfw+ tOHirhIviVoMYq71vY+ThZtzTXRe54Pt5C5V3/hVBhWNhESVbc9gR6r1FVoJOUzq8005 tAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785484856; x=1786089656; 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=bBN8lNPPtt/lWpA/t02HhzfXro9jgXIJFZ+bjpHuviE=; b=XpkHpFiGgYKJTDhihQlLHjdHr7VRFp6OGH2Q+571mL1HG+VxHV3Yt47SSU7td3pxVj wG+hW9y+X1/fRCBzvWjLw2AiUr4Qd5uGIN0lQoQVU39Bsmn01XKKMCDxBscPcrnC5Kva 6LwD+pHRoynDr436WpJ0hgAJmjHK9KvUT46eBVToApUZdt+/3oN+x4CEzFbIpavC3zFn Lof1bKfP5XOoCRk/m/N7wKxCyEO5DQU568m1uSQ80/Xhup5l3E7e+Xcucoo5FHwAwZ/D Z8uSYjUH26U4eHa4aqdNo9W6rVi+VbwB1039zNiHC6ECP8fx+MeoJeQU0Tpjhz8NHxZ1 EAKA== X-Forwarded-Encrypted: i=1; AHgh+RrQKvx2K1UCFPkZmYEVHe/0qTB/wZG+iCxkXkMEiNXD+EEAUu8LHycV+0hvD16CcKBSHFP7d/6BaF5wuEw=@vger.kernel.org X-Gm-Message-State: AOJu0YxpQWdwDKwmN3Prjd4PS6KWlE06zIISB1EIfALX+qq0ErzNX/or wk2/SGNkfIDaOi7gI/drgmCa51m7kaDTzBNPHZGyo3m6sRxa2/+0Oad7Mbff6amdnZ7FHSOI9qL XHaV0qJONEKf+RAHh+GPdQkj2TjQveX7fr5R4HbkwP69Bmz8lBSc0edD7JZ3/7+olaJw= X-Gm-Gg: AR+sD12emL1TKi4ZpvGjKZWVm0rqX7fSrt+w76o/icL1APwRoxIPxX9wvhGzrmmhs4q Bq4r6DbAXZWeW+eZtg95vRfoXM0i+VRkP3/iGZ+qJ9SphXlt/sUeYRSaihOvfcMTXSzsCpxV2b7 d1kma5sAQRaEdvERa2KQTeppHOUVgJp0ukI0v+qpqAYwwW4rX0zqUD5BNoOpeY8mvGnybQbJcS7 NskAE07obr/qlkTzvmBQRhLr/ZItJXSByfOeF4FivsnkxLlaWuGOXZPPufijWmYJkRtYDXpJbVf f77QH6tdh1u8+IcKs4P9393L1IV8KkyqRnRH5QF2WiuDEgBW8SzX+JiQQqFgP/NggpOLWHnedqC oXGDdWoG3rqcuI4yKkJrUsFBZrhj3nw== X-Received: by 2002:a05:622a:4ccb:b0:51a:8dc5:bf89 with SMTP id d75a77b69052e-52b4af50156mr12262541cf.5.1785484856060; Fri, 31 Jul 2026 01:00:56 -0700 (PDT) X-Received: by 2002:a05:622a:4ccb:b0:51a:8dc5:bf89 with SMTP id d75a77b69052e-52b4af50156mr12261731cf.5.1785484855596; Fri, 31 Jul 2026 01:00:55 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4534fc4sm51032966b.51.2026.07.31.01.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:00:54 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:00:35 +0200 Subject: [PATCH v2 2/4] firmware: qcom: scm: use __free(qcom_tzmem) to simplify cleanup 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: <20260731-qcom-scm-code-shrink-v2-2-4ba76096915f@oss.qualcomm.com> References: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> In-Reply-To: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4632; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=0whSEe//CO94x6I24SwYVmeMkMqOL/rDwvKXMUEHhpA=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFYvdC57id+KW2IrNR/Vy6bn3sNm70XwT2xnE k3SKhPHUO6JAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxWLwAKCRAFnS7L/zaE w3hhD/kBNwI5O4g83kNsrrFebtdNSFwptFwJQiobWN7OLss0AJarfL1GMQOxpNkv2agsr+O5G34 EGQtyzEJa8YxlUSDmuth7dHmaPYH7US8X8WLi4gSBWFWj6ty8yFXCOI+eyjWFVhnQfNbjefKoJJ JeCWiKOR/c20d0EU4bHVzjVtsXhN7Ho8CLCvR0sIq0Hfe8ZzoU5q4KGODokxBEwavVsbPaSsaz0 T66WG3x+1krwOdFCg10fPNGa5h4e4PTAygZU6tUwQmVxJ7CIKTYwa1PQS3ilXDxTTDamsN5ZHf1 N2C3D8Y6FX6pHMVtXr6qB75lH2K7vA58iN/tgfF1imKZRdeQC98rBGBsURK7nB5qyIimeaLq8b6 BNfqzym+JN03hUdcCQiH+9gsiv/CbOJ8PeR+/SzB/mS+EV1TjlG2eZgCmqskFSMo9bTQg9wNHLJ s0I00KbCxYrVps9LhH/Qt/N7LnKThbIvrr7TaggcxQ5bd95hESEOhhWIPsQfE6mHRsQc/aEbRVS ri84gOTaYabzaf+1t5rH1r0BkCqzkGK9M/VPaCl4wI7DKraFfRj2yTSAWl/KQM5t8Hwl/IQ2pR/ 7eStHqb6LMZx5i+71N3fGG1p2RAe7yTjI83ato7qY1dAaJpgcoUZFWZVZ99gp6XM5lzuWlkvuun ISAEqo/JBbrEVoQ== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX55YNH1t9q+2F n7MWY8OdfQMRk9BDF/bSkckd9tRNdXKuy0d2iy26thKfaG0ZUUD1Pf0uKXvLrEPptd1dOXv4dGZ xA60tVkIlvlssMpjK8074JxTsbRqPU0j1O4JhFQ4WXpuFt0t043M0NDYagzil/4fQMhWL4GUNdB TqI9Sl6ge4hctTkFATo4F7D2JBkYZon5xKLrekHjTopqEp5dakVwtjkekQPOL2K9vOKjMUWiMJz LPLAUGceGDuwHoeqdu9pAnyKgMIyOKlGv+ZA25hftw2sfAQBdR7+JIR3wLxVGduQEQVChvA2UOt VWrXlBoNKDHPtu64tp3JDuLNMKBytEBfWlpP/Q/qRfYP4C29G6BuYd7+FmjuRiW3XmDJWyAS9H0 pehhoIYJfKFvp0GOSNwSGOOiIapbXo3L/j4Da67LQKjW0f9TGSghoQZScIQTu9cfTt3seNqbxB/ 1dNugETEgjrpdP72zbQ== X-Authority-Analysis: v=2.4 cv=dZSwG3Xe c=1 sm=1 tr=0 ts=6a6c5639 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=lzBMFA2zsglRjAhb4b0A:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: LEcs4NNZQE09TL9zRQh8qXa-AB9P3Cct X-Proofpoint-GUID: LEcs4NNZQE09TL9zRQh8qXa-AB9P3Cct X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX220DjASbckmL 0vobv1I8CzDc1eOQWQJKMR1qU7C7s2vCzUBz/UH3JNaw9mRbM55oFNZZ2EzD/vLqq0jkInAIInj xNqwrmNGi7Wfo0Qc1ZWGa2pbeAF0kyg= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 bulkscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310056 Use the __free(qcom_tzmem) cleanup attribute (together with no_free_ptr() whenever ownership is transferred) to replace open-coded qcom_tzmem_free() calls and their associated goto labels. Reviewed-by: Konrad Dybcio Reviewed-by: Mukesh Ojha Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 49 ++++++++++++++++--------------------= ---- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index f35f2ee39130413ab3798551b4055228008222b4..10c79d2e59a14af0532c515d332= f65bdfea05621 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -634,10 +634,9 @@ static int qcom_scm_pas_prep_and_init_image(struct dev= ice *dev, { struct qcom_scm_res res; phys_addr_t mdata_phys; - void *mdata_buf; int ret; =20 - mdata_buf =3D qcom_tzmem_alloc(__scm->mempool, size, GFP_KERNEL); + void *mdata_buf __free(qcom_tzmem) =3D qcom_tzmem_alloc(__scm->mempool, s= ize, GFP_KERNEL); if (!mdata_buf) return -ENOMEM; =20 @@ -646,11 +645,10 @@ static int qcom_scm_pas_prep_and_init_image(struct de= vice *dev, =20 ret =3D __qcom_scm_pas_init_image(dev, ctx->pas_id, mdata_phys, &res); if (ret < 0) - qcom_tzmem_free(mdata_buf); - else - ctx->ptr =3D mdata_buf; + return ret; =20 - return ret ? : res.result[0]; + ctx->ptr =3D no_free_ptr(mdata_buf); + return res.result[0]; } =20 static int __qcom_scm_pas_init_image2(struct device *dev, u32 pas_id, @@ -773,10 +771,11 @@ static void *__qcom_scm_pas_get_rsc_table(struct devi= ce *dev, u32 pas_id, .owner =3D ARM_SMCCC_OWNER_SIP, }; struct qcom_scm_res res; - void *output_rt_tzm; int ret; =20 - output_rt_tzm =3D qcom_tzmem_alloc(__scm->mempool, *output_rt_size, GFP_K= ERNEL); + void *output_rt_tzm __free(qcom_tzmem) =3D qcom_tzmem_alloc(__scm->mempoo= l, + *output_rt_size, + GFP_KERNEL); if (!output_rt_tzm) return ERR_PTR(-ENOMEM); =20 @@ -796,20 +795,17 @@ static void *__qcom_scm_pas_get_rsc_table(struct devi= ce *dev, u32 pas_id, * be of unresonable size. */ ret =3D qcom_scm_call(dev, &desc, &res); - if (!ret && res.result[2] > SZ_1G) { - ret =3D -E2BIG; - goto free_output_rt; - } + if (!ret && res.result[2] > SZ_1G) + return ERR_PTR(-E2BIG); =20 *output_rt_size =3D res.result[2]; if (ret && res.result[1] =3D=3D RSCTABLE_BUFFER_NOT_SUFFICIENT) - ret =3D -EOVERFLOW; + return ERR_PTR(-EOVERFLOW); =20 -free_output_rt: if (ret) - qcom_tzmem_free(output_rt_tzm); + return ERR_PTR(ret); =20 - return ret ? ERR_PTR(ret) : output_rt_tzm; + return no_free_ptr(output_rt_tzm); } =20 static void *__qcom_scm_pas_get_rsc_table2(struct device *dev, @@ -820,8 +816,6 @@ static void *__qcom_scm_pas_get_rsc_table2(struct devic= e *dev, { struct resource_table empty_rsc =3D {}; size_t size =3D SZ_16K; - void *output_rt_tzm; - void *input_rt_tzm; void *tbl_ptr; int ret; =20 @@ -843,7 +837,9 @@ static void *__qcom_scm_pas_get_rsc_table2(struct devic= e *dev, input_rt_size =3D sizeof(empty_rsc); } =20 - input_rt_tzm =3D qcom_tzmem_alloc(__scm->mempool, input_rt_size, GFP_KERN= EL); + void *input_rt_tzm __free(qcom_tzmem) =3D qcom_tzmem_alloc(__scm->mempool, + input_rt_size, + GFP_KERNEL); if (!input_rt_tzm) { ret =3D -ENOMEM; goto disable_scm_bw; @@ -851,9 +847,9 @@ static void *__qcom_scm_pas_get_rsc_table2(struct devic= e *dev, =20 memcpy(input_rt_tzm, input_rt, input_rt_size); =20 - output_rt_tzm =3D __qcom_scm_pas_get_rsc_table(dev, ctx->pas_id, - input_rt_tzm, - input_rt_size, &size); + void *output_rt_tzm __free(qcom_tzmem) =3D + __qcom_scm_pas_get_rsc_table(dev, ctx->pas_id, input_rt_tzm, + input_rt_size, &size); if (PTR_ERR(output_rt_tzm) =3D=3D -EOVERFLOW) /* Try again with the size requested by the TZ */ output_rt_tzm =3D __qcom_scm_pas_get_rsc_table(dev, ctx->pas_id, @@ -862,21 +858,16 @@ static void *__qcom_scm_pas_get_rsc_table2(struct dev= ice *dev, &size); if (IS_ERR(output_rt_tzm)) { ret =3D PTR_ERR(output_rt_tzm); - goto free_input_rt; + goto disable_scm_bw; } =20 tbl_ptr =3D kmemdup(output_rt_tzm, size, GFP_KERNEL); if (!tbl_ptr) { - qcom_tzmem_free(output_rt_tzm); ret =3D -ENOMEM; - goto free_input_rt; + goto disable_scm_bw; } =20 *output_rt_size =3D size; - qcom_tzmem_free(output_rt_tzm); - -free_input_rt: - qcom_tzmem_free(input_rt_tzm); =20 disable_scm_bw: qcom_scm_bw_disable(); --=20 2.47.3 From nobody Fri Oct 2 13:04:15 2026 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 019453C108D for ; Fri, 31 Jul 2026 08:00:59 +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=1785484865; cv=none; b=GU4JQTnpV6OjS4SXjs9bsxaGSoIIWzwPtHSU+oRC2TO2WIugVx6PTEePYXvraD1N22XgRkKfDfxzDOphtxELIOAr/6G6ibl0+YNWBJ6/16HGA8S4kpk32nOeYtIB/sBTCZBWg271LpqjwkxdFzrD4hjqYoZirTlrznGKj+1AUO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785484865; c=relaxed/simple; bh=BrOiZmqjDQA4SOX/tFJ9OG7jOwQsX4AlgwumHNQ6g7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dAzv9FyoyazMTDxUBw1i1Bui0DKbWU9Yy5eRvs+THkD7vk2JecpmuAgoAwrhMBLD8eDzRhOfdnvZhvKqA+3ziwuhXzvlX923GS28wwSexSDvMAIXHwc47HDZFeah//aKIQUKwwHqyGyRITLSgEk8mgXGvquO1RnREGoWypzujyM= 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=h4UZLNu2; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IElzC+1x; 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="h4UZLNu2"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IElzC+1x" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66V7vXg13672609 for ; Fri, 31 Jul 2026 08:00:58 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= 2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=h4UZLNu2Rj8N/DBq 8kZdyCEc0SBUs9GU6uZUuw/smkdYBWjqW705IvBxf0Y52nz0foiytR+HiGS2c/pC SvGHtBOJ1cySIrQsypzmRGUnoarhTfVtYUuzP8J4EDANauHPB4FxKWcCJuc/Wynu 5ZKlW2g3j4F45I0K9kb4V+8lA/F97iX1lzLaoMC1dcU2+CVdpSfT5vtO+iSzOC/Q vqihXnivn31fvixoF/+U3oA91YlQFxvifHH5cONy4GJySHAHjFxnfxZlsvCqe1BD DCiEqcWDi+F5SYx2ymuyitgPdCR25Q1iOrfGYvi7mY3OKv6qF+1yiTh50OCg5Yog hSoSxQ== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frpgk0b49-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:00:58 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c12e43b98so6170271cf.1 for ; Fri, 31 Jul 2026 01:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785484858; x=1786089658; 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=2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=IElzC+1x5DVOIpJuY5S7BtOFj8e+VZJnc4K60iCHGm25O1q0c8kS393ZpOEKVk+CZx 360tpNIlfGxDWxf5gA5yVwvFlgqio5vSm4hrhojA7yP9UDF1PwEWpF5D+J1lX8BXbVzZ nW89VStOY/OI1P1BkV/+feUqv7KOWKb9m3aZp1jqBEt2W8PXzaY9EEgFbdo6Dt1Z4+Vz aktdf5KnAFGg15/LrLW0x9bkDBt9aMmgOGRBm1/mbDMFIU0hudTP8Ty505FgjuhJbpx+ Oka8HKth7jB6lPFf2SkmzF2n+LRGvShQtFfP204ytNYrt6Dt32Uub/LqJQHCze7HgYM+ kZDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785484858; x=1786089658; 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=2pDxPDiiaZcrKgTDQUne5eQDWUVnlE1MaiQL6gCnqsA=; b=o4rqIn+kdv46f8n71+WXJxGoxkJkSmoAGddVmjzRQK9PX/Rayuau2GKevDCl+vPwpO 9SFQykEgrBmUG0zMmvLneGUSGkyTROBNtF65rxWTmf2zW9SpQEakwEwGDrbsd0ikTnSM YXLD0We6L7mlbCuNLeezRc0lKeHrj8mBiO2JXhGpMaZ9X9IYbBJcAEEZbCQ04YCxhuoE FI89o364HD6pIgqN+mqt6kqRxH/zIwEXygnH0iWJbJjh2rC1a6jthDto3xbAgTxVWTpx MQov35BA/d6SFdLx82h2hHkrP79m8E1Xgy2DB+NEvBE0z+ohohRsO32ejuk3gRh2Cvb/ CGpw== X-Forwarded-Encrypted: i=1; AHgh+RoGsb4juo8YJOYIPioVdDMY1ppLkRymeS4DdtbvVYc0rp5mPwNmTO6YFlF9xySTRr7YC3ztwgvSVwhf7AQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1/wRiDwiT4fHgyYPT+8CNMbGub0puOmk0JF2jMmMBPvMumt1L PUML/BpyfpT0tuYQgtgpLSHsIUbcqrf67D1Yr769Q0Y0p72RaeOn012H+k6b/tnHEPpB/sBIbtZ db/n+lLPMLwMnpuGPQUEWVzaIxJ/0aCRm1ZVjIh1yzk+yt8KNO1ZU+mY8qUxrmxe1NGw= X-Gm-Gg: AR+sD10HVP5Ay559Lm+3L2cSJ0h2Zx6IUgfNPAZilYoo5y25lt6RHtIf/uufRBtmwnb ZFgR/8fvyO8qepvPZKAiCEfG4EkOhKLpDYmDYZBKyEW61Z87Xzu4rUwmXGNomCWlkhHDhBR1EDG pBStQrw99Nt08yhmgIPPk3FHs2iJ1NLqh2ZgHq1y8AwvRQUF4T2z96kBiyXTKlx5u1SeWwfRaxx 8tn0QGm2rxwgDwM/GhFegMi7A05cvHtkxf9JrkzrqiaY8XnaQe1GIZgOc1JdKe3M61Syv7+Mumu GIMF1/ZycKAC1vdGWNqK0l38sHrQAf/xIpV7/gCrImGYOhqOPbtaepEQKNHYpou8D4kMPxO6xZU VZRV9VzO42sIzBLeh+klegyRw4MmnLQ== X-Received: by 2002:a05:622a:1f95:b0:51c:1005:d096 with SMTP id d75a77b69052e-52b4af4fbb4mr13030281cf.24.1785484857812; Fri, 31 Jul 2026 01:00:57 -0700 (PDT) X-Received: by 2002:a05:622a:1f95:b0:51c:1005:d096 with SMTP id d75a77b69052e-52b4af4fbb4mr13029631cf.24.1785484857273; Fri, 31 Jul 2026 01:00:57 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4534fc4sm51032966b.51.2026.07.31.01.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:00:56 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:00:36 +0200 Subject: [PATCH v2 3/4] firmware: qcom: scm: introduce qcom_scm_clk class for clock management 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: <20260731-qcom-scm-code-shrink-v2-3-4ba76096915f@oss.qualcomm.com> References: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> In-Reply-To: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5215; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=BrOiZmqjDQA4SOX/tFJ9OG7jOwQsX4AlgwumHNQ6g7E=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFYwuGtYO7y/9saNMqx1Ip/1IsVoTDPqMZ7i8 SL+vs3qLaWJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxWMAAKCRAFnS7L/zaE wzLLD/97KXFtD7LIQ+56gmRatJ3ybY4StPN3fSpJIBpTfPObNiMTa7OPkyEjxyvnWShXN00ZY7i sgLUl1DAFNa9s8MkyBKTO/xJoTYAfv1ea6UXyOvUkvIspbSe+2S4HgDTa8511pu5uGJ6z0VI/86 lfa469ecD8HVOYOt51gGhTvLJBTGOZu8pfEwEPSBBdfQqRxctjilElcyfl52ZkUDIUwhBrTRYKi ypQmdDm4TZgUyqbCXRg1oTPfDo/XuXzq+WPsh7vxOambi5wjLJtVgqhBfWhNNOU8K9T+U9EZ8Ui iboodhpuBb2+jpVrDalYTxMYTZYWjBzWG3BjRYtHcuTxzVM56d5eQBaQkZu+f9PdLSXbi1PQMzb lDO7v9wbNN5aV1PGG4QmzIoHPV+iTRbM8IqpoScxsclYnuYn9Nbn4+uDmqMa6ylCe///N7T0D10 uD1llJ934755UF7FzmEVnz6e/lqtbW2APF9nNVL787Qy0va/7aFtjKi8MoiH+78Q5UfUHg1krsB BZQ7WEW6v89SxS7dHPMPm8/djr2IUhE9VaqBCcrck4j+t9ykNrNigDv2A5uaT7wRT8XzUWPjdPx 341t8uRCESI/F5FTFCeS770bz4YAZ6Ajb+0BEnW/xkxTZf9L1pNXfQW3DokGtLsXjnfF812a7/D L58IyXLqoLGyZAg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-ORIG-GUID: 9IY_sTbOPrSrruMir2yYR5pTCeitDOI_ X-Authority-Analysis: v=2.4 cv=P4sKQCAu c=1 sm=1 tr=0 ts=6a6c563a cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=NlXoPVkAUwU2Be_QxucA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX6TIVlYzNBeoo 6RxpJwFQVcyq6eoZ5USbhMN9B/gR/Ghs0gnwhlL5dKEUKQGBsf1wbxxFygT8kbLSueXoREioIyP nokaQ3tskCKarTlGSoKVkjjm3x05+L8= X-Proofpoint-GUID: 9IY_sTbOPrSrruMir2yYR5pTCeitDOI_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfXxo97OgzVe+mJ Fgd7xRgWYhmGNSYpIWv6V1alwt18nsXa11/ubVs6UGWvVqMwOXYzQjm/C79SDPIqWiBqt54hrE1 puxmhK9Vie/3EJKX09b3yHvI62hnFZlWV52GRmOOTyWjROgeOm93q2a43KGSlQbW1YkH/zzcgcM 2ROCKnaXcwkOpzo1k7KxPIjm2sSLlHLEKP/TWtl1bREfg9h9Bq7PkORzPBfCg8mnHx4mh9PbNjE +tcDCS9zh+PD8FwzFWs9IKfBEF+Ch2LzlPTIgZ1H6YIlLGQ99qIszfRxFSmdT//nsrYdFC2vaQL SXJCkvYWZg1V5p4fFhe3rS4sGyumCzLWl4Vgj4iNtiJbri6pZ/69R/2HcxSJAz+jvoO/gKar0FW 7mydVGOnz7KXFTXwqLIw5ex2CHa4akhJZeYwDFpTKNDNomg0G8DMgm5CGwQ9kJdCKQTA/08F6MP nd/u+/1gQcXhILk9DGQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 spamscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310056 Define DEFINE_CLASS(qcom_scm_clk) that calls qcom_scm_clk_enable() on construction and automatically calls qcom_scm_clk_disable() at scope exit *if* the enable succeeded. This allows us to convert all call sites to using CLASS(qcom_scm_clk, clk)() instead of the manual enable/check/disable pattern and to remove the associated goto labels. Reviewed-by: Konrad Dybcio Reviewed-by: Mukesh Ojha Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 89 +++++++++++++++---------------------= ---- 1 file changed, 34 insertions(+), 55 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index 10c79d2e59a14af0532c515d332f65bdfea05621..bb213f64703a7adb9ce413ec005= 24a7d0a1d3856 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -209,6 +209,9 @@ static void qcom_scm_clk_disable(void) clk_disable_unprepare(__scm->bus_clk); } =20 +DEFINE_CLASS(qcom_scm_clk, int, if (!_T) qcom_scm_clk_disable(), + qcom_scm_clk_enable(), void) + static int qcom_scm_bw_enable(void) { int ret =3D 0; @@ -509,13 +512,11 @@ static int qcom_scm_disable_sdi(void) }; struct qcom_scm_res res; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; ret =3D qcom_scm_call(__scm->dev, &desc, &res); =20 - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } =20 @@ -609,22 +610,19 @@ static int __qcom_scm_pas_init_image(struct device *d= ev, u32 pas_id, }; int ret; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; =20 ret =3D qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; =20 desc.args[1] =3D mdata_phys; =20 ret =3D qcom_scm_call(dev, &desc, res); qcom_scm_bw_disable(); =20 -disable_clk: - qcom_scm_clk_disable(); - return ret; } =20 @@ -734,20 +732,17 @@ static int __qcom_scm_pas_mem_setup(struct device *de= v, u32 pas_id, }; struct qcom_scm_res res; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; =20 ret =3D qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; =20 ret =3D qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); =20 -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } =20 @@ -819,13 +814,13 @@ static void *__qcom_scm_pas_get_rsc_table2(struct dev= ice *dev, void *tbl_ptr; int ret; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ERR_PTR(ret); + CLASS(qcom_scm_clk, clk)(); + if (clk) + return ERR_PTR(clk); =20 ret =3D qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ERR_PTR(ret); =20 /* * TrustZone can not accept buffer as NULL value as argument hence, @@ -872,9 +867,6 @@ static void *__qcom_scm_pas_get_rsc_table2(struct devic= e *dev, disable_scm_bw: qcom_scm_bw_disable(); =20 -disable_clk: - qcom_scm_clk_disable(); - return ret ? ERR_PTR(ret) : tbl_ptr; } =20 @@ -902,20 +894,17 @@ static int __qcom_scm_pas_auth_and_reset(struct devic= e *dev, u32 pas_id) }; struct qcom_scm_res res; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; =20 ret =3D qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; =20 ret =3D qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); =20 -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } =20 @@ -997,20 +986,17 @@ static int __qcom_scm_pas_shutdown(struct device *dev= , u32 pas_id) }; struct qcom_scm_res res; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; =20 ret =3D qcom_scm_bw_enable(); if (ret) - goto disable_clk; + return ret; =20 ret =3D qcom_scm_call(dev, &desc, &res); qcom_scm_bw_disable(); =20 -disable_clk: - qcom_scm_clk_disable(); - return ret ? : res.result[0]; } =20 @@ -1780,18 +1766,13 @@ EXPORT_SYMBOL_GPL(qcom_scm_import_ice_key); */ bool qcom_scm_hdcp_available(void) { - bool avail; - int ret =3D qcom_scm_clk_enable(); + CLASS(qcom_scm_clk, clk)(); =20 - if (ret) - return ret; - - avail =3D __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, - QCOM_SCM_HDCP_INVOKE); - - qcom_scm_clk_disable(); + if (clk) + return false; =20 - return avail; + return __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, + QCOM_SCM_HDCP_INVOKE); } EXPORT_SYMBOL_GPL(qcom_scm_hdcp_available); =20 @@ -1829,15 +1810,13 @@ int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req= , u32 req_cnt, u32 *resp) if (req_cnt > QCOM_SCM_HDCP_MAX_REQ_CNT) return -ERANGE; =20 - ret =3D qcom_scm_clk_enable(); - if (ret) - return ret; + CLASS(qcom_scm_clk, clk)(); + if (clk) + return clk; =20 ret =3D qcom_scm_call(__scm->dev, &desc, &res); *resp =3D res.result[0]; =20 - qcom_scm_clk_disable(); - return ret; } EXPORT_SYMBOL_GPL(qcom_scm_hdcp_req); --=20 2.47.3 From nobody Fri Oct 2 13:04:15 2026 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 DD442392C25 for ; Fri, 31 Jul 2026 08:01:01 +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=1785484865; cv=none; b=D7p9pLPD0lT1B/l4rqSp8OOOgU9k6SaYyQ1YpJi8Hp8udhoahzGaPk24DGC3QfZ+RWMc4SZxUbAgRgm64RU08rWQAvQ4AHHaL7M/G+p/C5ICGikRI/ebtqRP0140NyvlkyfHURtpci7646EPilkr7ZkeLz5GkeARoFm9tD+jLVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785484865; c=relaxed/simple; bh=Hy8R84Eu/7OyDCxeYoL8X44vkHsNUdsxxCIRr88gZTg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q8QbBmmUx0I+rhYbNmDybhQXM6fm5mdfl9ArWkjE7sovlfe5BO866kBbZ2utwkd07LPQuO6JnYfn8rInELXx2yrKc7xKU/wI8uHGgmShwxhTvx7c8sCXs4atrqDugwNa8/BdPTbqam8ANbkXFYCpSJeF2xGwu9OyskYL4Z5qXDQ= 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=bnQil9E4; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=fZxf4pEb; 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="bnQil9E4"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="fZxf4pEb" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66V7vCUh392801 for ; Fri, 31 Jul 2026 08:01:01 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= owW0wC+4MfMpqINsogtI/uNF/RUbm48B+1QB7d3un7s=; b=bnQil9E42o+ucRNZ C5K+bMIJw6RiDur+8XsGfhSjuAk2ILNMGr+NqwuvDTqRr/FSLM+2VepYJdpbP8yO JEXeYBluQzqyjcfzJkAAVOxpfKaxxWsttd/z16iw8JeET5WIsgqmKHb5oK7p+W5T 7KdAyxqXlbYtgP2qFJdb7Ko2E0Rq3W7Vfig67r+9yb47O0U6vWKOrQxa2VM4Z8U+ qWmFB4bp2j+0TUeIz/kCwr3qXga2uN8DhReOLdn3SbK6kps6eKOQkN5KsAHDKoec KSGzD4xAo4lz49valMI+WuiujJYjeuSX4c+tO6J0eFfY86Mham8Ta2k52vfs6uMM 3gnvMQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frq6dr4nr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 31 Jul 2026 08:01:00 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8f1e4e0eac1so9230696d6.1 for ; Fri, 31 Jul 2026 01:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785484860; x=1786089660; 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=owW0wC+4MfMpqINsogtI/uNF/RUbm48B+1QB7d3un7s=; b=fZxf4pEbM0GoGGbPxhK4k3MWeOI4sLk5vH2H3/xplnPV1lVMMahqX1HikJvDxSHbzv 4XqngwX+FHymedLqdSXW7NccwZkjxFQ8PIZE6d4tZuzS4asIcryTG6W5PuE/xT6Wg8QV WrcMI6YpP4T6/SP7V7ycNJO+0bVUUgH9kqfMS63IjFSUnR0YK0RTL54Fayl76L8jEHmI UsoZz2m4K3ZFSDKvrEFGhgPG3d7a/MuNYK9wuOuenBFFsCE4wjMHtnD5FOrnOXkctkgU 2E5OelIyKgkDxySstlEVUit+CsHRC0UxjYeugKq45cYYra9mUTBKQReWt9mR44uP1en0 9XyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785484860; x=1786089660; 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=owW0wC+4MfMpqINsogtI/uNF/RUbm48B+1QB7d3un7s=; b=a2Yaw5Jn5L3US4aGzvu6W2ca7g7WCMqeFL0/gS2hrj8vjhtwlmhDmav3W+ETdAVY1e aPvzvs9KMXJpBX/BVsIKfv0q9u4hKwznx/M9go3+fJfDAon+6P8KWDa1STn1vPzjbG9X lj7jAMmL5i/w2EhJC7QDWxNbze/qWWmqwU96Rpe7582paZcnyFPX9eAn3XStKMF3iYvg pNL1F7p5QpFkfnmcacKD3iA77k3QpAJPH3ljYvUY32MNGls/HLzsvqPROs9OyQi11jar FdKvanEWy6Ljk5zDlwFqfrCpnninfQT9ok5nA1WMyG+w1yRaiwEKOAFvC/m2UROtB+bt JAdQ== X-Forwarded-Encrypted: i=1; AHgh+RqxiZYhp4GWt5+luaAai3NJn6+nfFSQZF/1xm5U2OO0W/cKhu4XuH1FKFBR8URKfEis0zGBCIkH/O/gjuA=@vger.kernel.org X-Gm-Message-State: AOJu0YyvXOnrW3KtryaSJwkwZlJqrHH4dhwnHbWggbTBQOjLpzr3kG/0 z5vYe8CioVilWhM6vrHIYCT5g3UvvPQh8NM20j3Mwx3a6aoVoIh74gOpaOJwF1r5jQVJYNk3QEQ dVqkDKgb9hzDygGrCSKY11ZhT88GoaESCVsTcEtgbj84/+gcjIw7MmwqXXN324TcL9RI= X-Gm-Gg: AR+sD13qC1iuS8YaPKxIukrr9ECuhn79U/kIrbWoWEP8GkxUq8pWIc+G4hUN7iIJcj6 nvOQyhn1TnTANijG7wr1c6iRfNaYFeigduIVeO6BYnm48cfOoqu/xnOf4p53OWkW4/cKXEooM5H 8Mho1UyDumXBfB/BjBKFhFGyttS8SHLWkqkOG+P3EvS0nCwnnKgf0APlGrRCRMgmL5MW4pjNmSk ka6ZJ5VbquLkrPn1Y837DusieHQn56c5FpNh6Tg+5AygAJD1IVVLaw549IPHCBTmyLPLMAvrK6F FoLMqXXz+sddAvH7pMVwpHOLR9WUOFkRxp3/7j23ifCh7LYi6hp2xnuDGkos0SEGdqRvJnSUeqZ +kujWj3aAR+NjZLh4k5ejoJO1/UNl4A== X-Received: by 2002:a05:622a:90b:b0:50d:9e8d:9837 with SMTP id d75a77b69052e-52b4afd83b9mr11875071cf.11.1785484859725; Fri, 31 Jul 2026 01:00:59 -0700 (PDT) X-Received: by 2002:a05:622a:90b:b0:50d:9e8d:9837 with SMTP id d75a77b69052e-52b4afd83b9mr11873441cf.11.1785484858887; Fri, 31 Jul 2026 01:00:58 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:40fa:e8e6:4785:ce70]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd4534fc4sm51032966b.51.2026.07.31.01.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:00:57 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 31 Jul 2026 10:00:37 +0200 Subject: [PATCH v2 4/4] firmware: qcom: scm: introduce qcom_scm_bw class for bandwidth management 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: <20260731-qcom-scm-code-shrink-v2-4-4ba76096915f@oss.qualcomm.com> References: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> In-Reply-To: <20260731-qcom-scm-code-shrink-v2-0-4ba76096915f@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio , Mukesh Ojha X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4284; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=Hy8R84Eu/7OyDCxeYoL8X44vkHsNUdsxxCIRr88gZTg=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqbFYx8H1hD7SEi+BQp/zxdaLa4SzA6rGax7Gr0 8aiCMEfaKOJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCamxWMQAKCRAFnS7L/zaE w1EfD/9mYdMefpsDvfF8dt+cnPsZDI5Q1bHogf7UAYOLbHWSoGSuPuf99HJIAQQFYYOPjNu7IRn nGVmAdrNAlNBVjQJaUTAzCKGT26M4DOJYlZ2obUck0A+hkY6HZi3RLXAZoSHj0X6/8fnBEPbbjT v/7ekzpKSd0bjLf0Qy6qKYXvMS8Udm8cTN0HFlWh2RZOguRxf2SOnwqzwP6HaPgxJWH9fOwsu0m 0kkb8Jw+zLgnvTB8GNzJ3OStBlz/bfuxjREyIVpE5sFOejbCcaxUUBH34pFKw3yC//9z3tF626Y B4dHUeR2eCmLftTrUL+/54tVOCzexTjbb1mYFb1n11b2kbX4rZN/mRDAJG5/cTeAi1DQ+R+gXPN Omi6T43+9ihlMGqRNjsIoQC+t4xvbzhQpcqPTyatj771JzF1SKh8MfGK/UKHL/FTnxPlR+lDPDM MGt5x9KE6kA8GOdZCuvX/mMGRXN4z7AhUX0DKLH6V00+5Ero0Wh3FwU0bOKfNdVBwwEwMbnPI4O vCbZ1ydil2HQMxbbeADZiZHA36yBxrPUnPChb/f2scQCk1XMVyby+6/A2VYVfaLMvkZH97cvYxn KCtsgOELhELKZcTVhS7OP9LaSjbL+mvRdx9uX8myaAYjs6SFAhwZmmW2WIOGP7Jhzc28B8b/ukH h+P1h4ex8aaILqg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Authority-Analysis: v=2.4 cv=CLIamxrD c=1 sm=1 tr=0 ts=6a6c563c cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=AJRLcc76jKkRl9dWX3gA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX0Z0zqJBUZB9c DhJtTbv76ERPu5+futZx+9smOciaIYcMoAkRmUF/RuWTxE0MiVVPLCoKMI18nvHnBJo2M72EjpV W4VEVk+G8xDoRGLumdJHxmYUupQjbnJXMyun8hMw16SxVmweiJsLyInBm57wjA3R8hYh+Rj8zBr jARLmMdsyX/Umx+JqZ+kNYioqox5fjdw+xaA8mG80FLDl5HyD2m7oUeuEzADPWoY1H6TWYxSrg6 n8hR7ImCrCtMcbqoStNYlka6/vhFsvm/LVGJB9WDPrjZK5TrnEtsMMfrcI7bKJjiiAEWaT+S0c/ GyWz6nn8/UjntMZmR6+1IptQlQhKTp83ja+VWe+dXpMsS529hOcTVQchzgJpXJd21/XUeSfwTMH 3kpLzXXyHrbjdAa9WGM+oBUHELdmYc7UqhWj/tIrcpJBKxsDsd2H+xXbWEmX8Thkah91sJYhDdR WLFH81fpCrZKa7i4WpA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA1NiBTYWx0ZWRfX4mCdbzN10RaW u9kvjMLi1oxYTnEY/oC6FqeOBHW8pe9MDmfNJYHPmne0/6xtA5d2gsmiXLhil1ZTQqsPHQB1b39 ouNCJ6ZgaUxeYtihJE9XZH7O6a513Ck= X-Proofpoint-ORIG-GUID: qrMzalw5mulVICpHkRVrcYj-5GNkyDam X-Proofpoint-GUID: qrMzalw5mulVICpHkRVrcYj-5GNkyDam X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_03,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 suspectscore=0 spamscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310056 Define DEFINE_CLASS(qcom_scm_bw) that calls qcom_scm_bw_enable() on construction and automatically calls qcom_scm_bw_disable() at scope exit *if* the enable succeeded. This allows us to convert all call sites to using CLASS(qcom_scm_bw, bw)() instead of the manual enable/check/disable pattern and to remove the associated goto labels in cleanup path. Reviewed-by: Konrad Dybcio Reviewed-by: Mukesh Ojha Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 61 ++++++++++++++++--------------------= ---- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index bb213f64703a7adb9ce413ec00524a7d0a1d3856..512fc51fee3cc4da811bfe03ae7= 9509af4888803 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -244,6 +244,9 @@ static void qcom_scm_bw_disable(void) mutex_unlock(&__scm->scm_bw_lock); } =20 +DEFINE_CLASS(qcom_scm_bw, int, if (!_T) qcom_scm_bw_disable(), + qcom_scm_bw_enable(), void) + enum qcom_scm_convention qcom_scm_convention =3D SMC_CONVENTION_UNKNOWN; static DEFINE_SPINLOCK(scm_query_lock); =20 @@ -614,14 +617,13 @@ static int __qcom_scm_pas_init_image(struct device *d= ev, u32 pas_id, if (clk) return clk; =20 - ret =3D qcom_scm_bw_enable(); - if (ret) - return ret; + CLASS(qcom_scm_bw, bw)(); + if (bw) + return bw; =20 desc.args[1] =3D mdata_phys; =20 ret =3D qcom_scm_call(dev, &desc, res); - qcom_scm_bw_disable(); =20 return ret; } @@ -736,12 +738,11 @@ static int __qcom_scm_pas_mem_setup(struct device *de= v, u32 pas_id, if (clk) return clk; =20 - ret =3D qcom_scm_bw_enable(); - if (ret) - return ret; + CLASS(qcom_scm_bw, bw)(); + if (bw) + return bw; =20 ret =3D qcom_scm_call(dev, &desc, &res); - qcom_scm_bw_disable(); =20 return ret ? : res.result[0]; } @@ -812,15 +813,14 @@ static void *__qcom_scm_pas_get_rsc_table2(struct dev= ice *dev, struct resource_table empty_rsc =3D {}; size_t size =3D SZ_16K; void *tbl_ptr; - int ret; =20 CLASS(qcom_scm_clk, clk)(); if (clk) return ERR_PTR(clk); =20 - ret =3D qcom_scm_bw_enable(); - if (ret) - return ERR_PTR(ret); + CLASS(qcom_scm_bw, bw)(); + if (bw) + return ERR_PTR(bw); =20 /* * TrustZone can not accept buffer as NULL value as argument hence, @@ -835,10 +835,8 @@ static void *__qcom_scm_pas_get_rsc_table2(struct devi= ce *dev, void *input_rt_tzm __free(qcom_tzmem) =3D qcom_tzmem_alloc(__scm->mempool, input_rt_size, GFP_KERNEL); - if (!input_rt_tzm) { - ret =3D -ENOMEM; - goto disable_scm_bw; - } + if (!input_rt_tzm) + return ERR_PTR(-ENOMEM); =20 memcpy(input_rt_tzm, input_rt, input_rt_size); =20 @@ -851,23 +849,16 @@ static void *__qcom_scm_pas_get_rsc_table2(struct dev= ice *dev, input_rt_tzm, input_rt_size, &size); - if (IS_ERR(output_rt_tzm)) { - ret =3D PTR_ERR(output_rt_tzm); - goto disable_scm_bw; - } + if (IS_ERR(output_rt_tzm)) + return output_rt_tzm; =20 tbl_ptr =3D kmemdup(output_rt_tzm, size, GFP_KERNEL); - if (!tbl_ptr) { - ret =3D -ENOMEM; - goto disable_scm_bw; - } + if (!tbl_ptr) + return ERR_PTR(-ENOMEM); =20 *output_rt_size =3D size; =20 -disable_scm_bw: - qcom_scm_bw_disable(); - - return ret ? ERR_PTR(ret) : tbl_ptr; + return tbl_ptr; } =20 struct resource_table *qcom_scm_pas_get_rsc_table(struct qcom_scm_pas_cont= ext *ctx, @@ -898,12 +889,11 @@ static int __qcom_scm_pas_auth_and_reset(struct devic= e *dev, u32 pas_id) if (clk) return clk; =20 - ret =3D qcom_scm_bw_enable(); - if (ret) - return ret; + CLASS(qcom_scm_bw, bw)(); + if (bw) + return bw; =20 ret =3D qcom_scm_call(dev, &desc, &res); - qcom_scm_bw_disable(); =20 return ret ? : res.result[0]; } @@ -990,12 +980,11 @@ static int __qcom_scm_pas_shutdown(struct device *dev= , u32 pas_id) if (clk) return clk; =20 - ret =3D qcom_scm_bw_enable(); - if (ret) - return ret; + CLASS(qcom_scm_bw, bw)(); + if (bw) + return bw; =20 ret =3D qcom_scm_call(dev, &desc, &res); - qcom_scm_bw_disable(); =20 return ret ? : res.result[0]; } --=20 2.47.3