From mboxrd@z Thu Jan 1 00:00:00 1970 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 7E17348A2DE for ; Wed, 1 Jul 2026 13:39:20 +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=1782913161; cv=none; b=WMmXAFq8C7tXaLCSW5W0415k0A/HXeOsih47i4maGUM23IwWQcmLE+driwx7MrnKki9HLHw9I5afL7HmQucuXqPSEXwK72rsUfk7VW1BV0dUxPpcmDB0UzimXXG6QcGy/jwF0wj33HEZDYPXO2JbvqnxZXdegYPDVVt/Mfmk2ak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782913161; c=relaxed/simple; bh=conRl8QOE21JFqocLekR3FtvDygycZzY3BQifICg5EY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nYJc/GT5qw5uyyAW3VPr/ZA5/eFtYcCQUJxmHGyzeXtAsjy0L1nHwR0H9l5QDPe9TZQSfJE+r6XwSIu83xhUmGrHlkfQGag0g8HO6sSSDtV9z8L0S2aloRelI6jDdfAsViTrwzTk5AjCsbQs1H/62emDZTXO/wfdCQrkvx1AH10= 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=jkMdHEz6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GbEdvpey; 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="jkMdHEz6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GbEdvpey" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 661A8XwN681092 for ; Wed, 1 Jul 2026 13:39:19 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= oSz9DdoE/gpZ6ZmSojjv2AvQz0YjZIPXtqJ+sSHVA2U=; b=jkMdHEz6wQNAZZUl 2LKtVvOw3y1JPaEIBG9K1qW9/XAWN7fhwsGIhnxRWvyfVoh0FF6Xy4ZPYrkVTUkw VqaItFM4KiJJCVRxhxObBfozXeA9XSrNnSVf08OpJATaBPCID0ls3sA+IvaUTNcX G58abcae9AAvbA4i3TTnhVp5RQYpUR0gxlvGNptwAGuH/Sr5DDi1ZDTwvm7WYNH+ IuYHJaEF8yAoCVxYk4nPD1znVFjOxnq8BjJhFhvvq+tQVyT+Xp4iCvixJKG7/ORm 9H3958Na4p3rrOjHu8/GJhk4zAbv4Q2Us837oEAuyfGZhqobPNkdBO3M0MB781UN GMbh5Q== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f4k3smfat-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 01 Jul 2026 13:39:19 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e68cb7a3eso137770685a.2 for ; Wed, 01 Jul 2026 06:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782913159; x=1783517959; 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=oSz9DdoE/gpZ6ZmSojjv2AvQz0YjZIPXtqJ+sSHVA2U=; b=GbEdvpey2w/5Q6/MH8EzYZ11uA0npG3dIU5Bcq0ckOZivSsO+ILcpW54BMKKg3GBev +wV2qE9vpXKcsg2uGNbRcykBARUHafTu5ie80qfSLMpYqhkMfUT2ITbVDqHizxl0y8Ix rZ1ckunE052e4ZMBwr0nZRU/Zv2dCsz2lnXYxkCDAyXZQy/qlKwPigloilL40XyvLJsX HBbg59Loog3I0N3h+OTsrHYhXwuut8UAM24M+QeYxLg3E1WR5jURnU+e0dKjJEMOH7Am JiuzjZfcuXhXC+tW+rzl3a2+/d3veE9gnCriq1EGW1udSM12qRY2wieEnSWFuVq+Mvp5 DyRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782913159; x=1783517959; 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=oSz9DdoE/gpZ6ZmSojjv2AvQz0YjZIPXtqJ+sSHVA2U=; b=jVOcW4ZEeKxMRMbT9QdFWd+kLh9tks13rz9YDcWeqAMYHNYBG/+ZPJa2ZrkbQnZIT0 tqth15J/MzpW0lckqay9csEokFTw1djvZvoGTdY+OAgt2DWzVgNR0/TNo7uSfG/NiFlO Fjv5hSwSZO3GRo5SecxEYn2D6+Rtca0ivyd6qmzvOL+H/WHDT0Go0uk5fSZSHNUKIU6a b/6XojQ1ceTQCcXTN28EYQP9DGYSMT4oDOVb/8k+/irTKk3Iqt0BfiJXQgDxkdKUIfIx vRHMy8y3xqSAjglxkLynn9ma5ZrsRiNfq+YHf+J5wLIr/fm6VXH1qc4LapHUzR1l0NYS OdEg== X-Forwarded-Encrypted: i=1; AFNElJ9TK+r+t9TKW1LolWufsW5NGDoSh4raYud8Zf8IQcpz06eG9pt67Cb4+/RSI3frYgapaKVQs6VsGJ9It9w=@vger.kernel.org X-Gm-Message-State: AOJu0YxA56R2QqwnK0YL67JRGP4rAGBKIhUdr72zKdOnTTn4DMrOrOSN KGckEaBe/8yIAj90k90Ajy4hbtSeedNLHnKCUQ97XoVu/426l6geJUl9sANF2jwbNP/RVI86+3A p2z9G0YgcSzplRKPHgNkgTSH+RG2prXBOD8TuConFB+VntkyGbPKlXiPw2/dbJbIqGKDQvfBX4u k= X-Gm-Gg: AfdE7cn2P51jaTat4MCkCJ3vt4TBWWBAz9O5gUebxAnRCEbGxV0/BJ7Vq9bYmK2229B ZKizi2WzrmPtotNsK9GxR040qIimG54Qdz6g4qZujT5yGu0Ux8z2lomo3CJL28S4tkROWp8qBYs Mfsu97vLmzRtPzVjZDC2lguNcc/5yZ9AgQmAqRXCGD1NokleB1JDDEl8D7FW8/1/0w1fXOFZ/xI EKiCvh7CAFQT9KA3jebqskvH7b67umks8BbNnL5gaqBZknl340UcX74Z36DMQObO/hQjbucmfPS jW/+ruPsTQXvzlU97I8OzyNAlxeG54MGVfUI8d6gmCe1GLgSK/JILdrioQDdBA9SY4F362AR2D2 iIVXwmLzkvYEMvEYcH/H8RBlJUgG+aCmET8lVaKlX X-Received: by 2002:a05:620a:4587:b0:92b:3720:bc5d with SMTP id af79cd13be357-92e784cbb96mr219660185a.38.1782913158710; Wed, 01 Jul 2026 06:39:18 -0700 (PDT) X-Received: by 2002:a05:620a:4587:b0:92b:3720:bc5d with SMTP id af79cd13be357-92e784cbb96mr219650885a.38.1782913157879; Wed, 01 Jul 2026 06:39:17 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:6619:ec60:6996:ac02]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493c3874f62sm18349985e9.2.2026.07.01.06.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 06:39:17 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 01 Jul 2026 15:38:56 +0200 Subject: [PATCH 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: 7bit Message-Id: <20260701-qcom-scm-code-shrink-v1-2-02f5ce02c95a@oss.qualcomm.com> References: <20260701-qcom-scm-code-shrink-v1-0-02f5ce02c95a@oss.qualcomm.com> In-Reply-To: <20260701-qcom-scm-code-shrink-v1-0-02f5ce02c95a@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4463; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=conRl8QOE21JFqocLekR3FtvDygycZzY3BQifICg5EY=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqRRh9m+6EhIGKqafSdgcun2Xj9sUAA3jLxsMfY 0+aXv9K5qqJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCakUYfQAKCRAFnS7L/zaE w03yD/4i7LBsBPB/Aq+cfRZLCemBvaC22dt6aTNtYD3MrpFCpBmfxz2e8+U8PP8j/DZ2N/8p2jX GklOt7p4n3JZ3/mS2MQPQ11YKPf1nZ2DY/fCfIicHzO4w7qrqoTqFU/GU/xrNpgXLMJtOMSSQc2 E47HtREMUZ5+u/FMT+7meldlJqUrpWc3EDuf9PJCnanV+/fHFYtx6EgE6jETbD7BCKnoEe3ILIV vaNkRHB6eofrTlLJdQeM99B468C4No+eBCYhZsSJvDC+3xzx1vU/AQ7hgqeqDPg5O0w7t+Jckcb kKFxItd/RJgRV33KDVC1MV5Xx8Hqwy9dRK0NcdGrI/aAOXI+7DGIQbT14g++X8VBvri8mE2B8uJ FK2T4Q7Qk+LbRWmBmC1AgouZNSgUbMFwX2Nvx6xhVUqCerT+hxNXphpIlQgAkUGZwToL6XQT2bV wSqpnlb8J5vvxFZ9fGoB7pokHEef+k+TPdIIwTggLpJeZwnNOyZ7sLGWWAFw2Z3F7o1CALwYG7F N6Gs4W3q3IDtuhXbYe2/ptPz3KUuU0ywhgpGXMKuNEz2XYHjl5bv1iZt4e3cJlKiBsr/btupYNo 4JspmqcZ9BK0KLkYWMAL6Ri2dE4A+skeh8nC5CJ9zq5ees295ipN1I/jvk9XS/pSR7mK16CudPT vs2gKyY6LvCLuMQ== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-GUID: xSQGk0Di6vQNcbsCjmKx8uNfXhNZcPnC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAxMDE0MyBTYWx0ZWRfXxvljNraRjyUc Y7Vn8fsCDlQ5IjXnHlb40Arqh8Q1Ru1uhVRMT30HG99wyF/pUYoJZODmkFUzeatFqRLX6Pc7yOH 8gOmBz/U2llC7kghYJxZWDDkLwpHMq7BdWWvwSxltdWSXS7wF7J25Qa3YViDKjysx3tHw4e9lHi fgaAhHJ5cVzeeUeHT5EVdGogfYnuDptMF6XR/P3Cwj7Ea/xRasCR+AU7xH2EmYz+l+dpyc5Zzw2 WXjisIr5GYLOQ+0nivBzfp1OON5NE7oQFq3qZ2aN7aHtTUp0mXVOCZEtGwyxa83O0apiVjFmUka cfzYp60cWQDU8EtIUrW3OUDnmtv9sSaUj3a7WYuybJ3X9ALvvbxKr8g03LJNiUfBg81YcDsy9aT Ey9p+9cFYtEBQKyrt7t7rObLYTVM3gUv9Fj3xUW93gMnEYJLnjZrf8iiafMXn35OM5dcPQUG3Ek did65HvNk4/M0dsR0hg== X-Proofpoint-ORIG-GUID: xSQGk0Di6vQNcbsCjmKx8uNfXhNZcPnC X-Authority-Analysis: v=2.4 cv=Ff4HAp+6 c=1 sm=1 tr=0 ts=6a451887 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=lzBMFA2zsglRjAhb4b0A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAxMDE0MyBTYWx0ZWRfXytZzu6iZr9WV wFsw8UwGfn4wQjsJeL8T13mykZMyVy40ktwWu2PNC/8/kfWnn24sQsS4qHx2NZ6El+zmeMkqBzS YMggXAczpPrxsEbxKClXGmfj7MNqNoc= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-07-01_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 spamscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607010143 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. Signed-off-by: Bartosz Golaszewski --- drivers/firmware/qcom/qcom_scm.c | 48 +++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 6b601a4b89dbf04322730aa22fc9590d180a383c..1684220617748e4890ecb45a1787a6798dafd5cc 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -640,10 +640,9 @@ static int qcom_scm_pas_prep_and_init_image(struct qcom_scm_pas_context *ctx, { struct qcom_scm_res res; phys_addr_t mdata_phys; - void *mdata_buf; int ret; - mdata_buf = qcom_tzmem_alloc(__scm->mempool, size, GFP_KERNEL); + void *mdata_buf __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool, size, GFP_KERNEL); if (!mdata_buf) return -ENOMEM; @@ -652,11 +651,10 @@ static int qcom_scm_pas_prep_and_init_image(struct qcom_scm_pas_context *ctx, ret = __qcom_scm_pas_init_image(ctx->pas_id, mdata_phys, &res); if (ret < 0) - qcom_tzmem_free(mdata_buf); - else - ctx->ptr = mdata_buf; + return ret; - return ret ? : res.result[0]; + ctx->ptr = no_free_ptr(mdata_buf); + return res.result[0]; } /** @@ -791,10 +789,11 @@ static void *__qcom_scm_pas_get_rsc_table(u32 pas_id, void *input_rt_tzm, .owner = ARM_SMCCC_OWNER_SIP, }; struct qcom_scm_res res; - void *output_rt_tzm; int ret; - output_rt_tzm = qcom_tzmem_alloc(__scm->mempool, *output_rt_size, GFP_KERNEL); + void *output_rt_tzm __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool, + *output_rt_size, + GFP_KERNEL); if (!output_rt_tzm) return ERR_PTR(-ENOMEM); @@ -814,20 +813,17 @@ static void *__qcom_scm_pas_get_rsc_table(u32 pas_id, void *input_rt_tzm, * be of unresonable size. */ ret = qcom_scm_call(__scm->dev, &desc, &res); - if (!ret && res.result[2] > SZ_1G) { - ret = -E2BIG; - goto free_output_rt; - } + if (!ret && res.result[2] > SZ_1G) + return ERR_PTR(-E2BIG); *output_rt_size = res.result[2]; if (ret && res.result[1] == RSCTABLE_BUFFER_NOT_SUFFICIENT) - ret = -EOVERFLOW; + return ERR_PTR(-EOVERFLOW); -free_output_rt: if (ret) - qcom_tzmem_free(output_rt_tzm); + return ERR_PTR(ret); - return ret ? ERR_PTR(ret) : output_rt_tzm; + return no_free_ptr(output_rt_tzm); } /** @@ -878,8 +874,6 @@ struct resource_table *qcom_scm_pas_get_rsc_table(struct qcom_scm_pas_context *c { struct resource_table empty_rsc = {}; size_t size = SZ_16K; - void *output_rt_tzm; - void *input_rt_tzm; void *tbl_ptr; int ret; @@ -901,7 +895,9 @@ struct resource_table *qcom_scm_pas_get_rsc_table(struct qcom_scm_pas_context *c input_rt_size = sizeof(empty_rsc); } - input_rt_tzm = qcom_tzmem_alloc(__scm->mempool, input_rt_size, GFP_KERNEL); + void *input_rt_tzm __free(qcom_tzmem) = qcom_tzmem_alloc(__scm->mempool, + input_rt_size, + GFP_KERNEL); if (!input_rt_tzm) { ret = -ENOMEM; goto disable_scm_bw; @@ -909,8 +905,9 @@ struct resource_table *qcom_scm_pas_get_rsc_table(struct qcom_scm_pas_context *c memcpy(input_rt_tzm, input_rt, input_rt_size); - output_rt_tzm = __qcom_scm_pas_get_rsc_table(ctx->pas_id, input_rt_tzm, - input_rt_size, &size); + void *output_rt_tzm __free(qcom_tzmem) = + __qcom_scm_pas_get_rsc_table(ctx->pas_id, input_rt_tzm, + input_rt_size, &size); if (PTR_ERR(output_rt_tzm) == -EOVERFLOW) /* Try again with the size requested by the TZ */ output_rt_tzm = __qcom_scm_pas_get_rsc_table(ctx->pas_id, @@ -919,21 +916,16 @@ struct resource_table *qcom_scm_pas_get_rsc_table(struct qcom_scm_pas_context *c &size); if (IS_ERR(output_rt_tzm)) { ret = PTR_ERR(output_rt_tzm); - goto free_input_rt; + goto disable_scm_bw; } tbl_ptr = kmemdup(output_rt_tzm, size, GFP_KERNEL); if (!tbl_ptr) { - qcom_tzmem_free(output_rt_tzm); ret = -ENOMEM; - goto free_input_rt; + goto disable_scm_bw; } *output_rt_size = size; - qcom_tzmem_free(output_rt_tzm); - -free_input_rt: - qcom_tzmem_free(input_rt_tzm); disable_scm_bw: qcom_scm_bw_disable(); -- 2.47.3