From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1B0F9C43458 for ; Sun, 5 Jul 2026 05:43:26 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4gtGZl7565z2yYd; Sun, 05 Jul 2026 15:41:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1783107642; cv=none; b=Dqe6PA9tL7nsCAQisFOboIsyM35X5076pqWJer+7XsssS7oJxBJdXxSI1JCHULS+nCeqhOnOmsoQNHS6Ijnog0OBd37nikiJr2EavKwEmDnvtt7IhRBv2ceFBvRakuZc3w43pZZih7r+7Qy3VJQnYm0s+D4NPOsQH41qX3M1LwGh9jYp1gfyRFDh9j0c3N8c287JpyNWR2Po6N1PeAIh1zYwojfDB8Juu34eydDMhSxIusiAG/ErIGSqFd92lr84W2kWIiW9zyoq6iXAdMY+pjjND5vgNBGN0rv6ZbVepafh5yUkA1zzcryyrKhr65GAbgmMud+EN5j55ROK43Kllw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1783107642; c=relaxed/relaxed; bh=zR9XRPc5AVucodt4jcddD2QULOfOq2FWZnJr+n7Dti8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H2qh4z2V5vMeSS+cS406ewpbCtdMA9PHBQm4AzhF12YSZ5RK6m6KgEByl9R7tCstcPDrD6TvO13znvzAMBOVoN97vW6AlLCSsr0n7b/NQizCjulwFXxz6JCMZLHUUhT40F7R/DxpQxEJcvSLEbBdGvHF1GmT3UDMXEwdoBDcuMhP1zjXD1Mpr2Fx+sZyAOjSGCKfU40mHVcYmKZD6A+WnWwAoc8tEx0HtsTsDt0SH8gCkGwsLmHynRFoFosKf8DZ3/3jjCiBgpjoNNU3RJbFs5v0nqreQLfU/yeEDR57HhqOPpbInC8lTatPw7AVfvNetiisi6Nanc6wvccW5/E68w== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=J8ZGLy0x; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=VlvKl3DW; dkim-atps=neutral; spf=pass (client-ip=205.220.168.131; helo=mx0a-0031df01.pphosted.com; envelope-from=mukesh.ojha@oss.qualcomm.com; receiver=lists.ozlabs.org) smtp.mailfrom=oss.qualcomm.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=J8ZGLy0x; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=VlvKl3DW; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=oss.qualcomm.com (client-ip=205.220.168.131; helo=mx0a-0031df01.pphosted.com; envelope-from=mukesh.ojha@oss.qualcomm.com; receiver=lists.ozlabs.org) X-Greylist: delayed 69 seconds by postgrey-1.37 at boromir; Sat, 04 Jul 2026 05:40:41 AEST Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4gsPHY2dPJz2xC3 for ; Sat, 04 Jul 2026 05:40:41 +1000 (AEST) 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 663HiLx7545429 for ; Fri, 3 Jul 2026 19:40:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=zR9XRPc5AVu codt4jcddD2QULOfOq2FWZnJr+n7Dti8=; b=J8ZGLy0xXXuEjWJGW3BRjxYS6bM 3+dbuT5zbOpIDAwUtNGrTXtoVnVWOwNUo6eIEA3DECCTEOtiBQ1DMFD0phWfoFf2 dZFkiD8S7fenOGLkh0uuwz0ZkVjPa2JedzgOBGqFoBe+xMf5ZHKUOiSR5XFIcwzg mhGkObWbnIWinotY2TsclIJMO3qilpuGC9sJY+SB7NtO+LXzC21V17p4igcMbF62 pjaIAo6TLB7y0l6+cDM1nurvPxHtA5vcKRXylW6Y4a/iQr5UqazN6A1IsYRX+Vhz /sKeBg0qQU3hsuEMTB5UiS1sB1Gi2oxTql7R/jI1L9tJWier4ElBv2IRhgQ== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f682btqr5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 03 Jul 2026 19:40:39 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-381250979d5so911762a91.0 for ; Fri, 03 Jul 2026 12:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783107639; x=1783712439; darn=lists.ozlabs.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zR9XRPc5AVucodt4jcddD2QULOfOq2FWZnJr+n7Dti8=; b=VlvKl3DWLaz9uGX08gn16JMempUQNzVqeIdJo2Bz7slpJmfrt76ZrtCkBBxNa0zxLi wIXszHY2pRAcksbjz8sSE9aLP76oMKE377+5kCcWr3Djl2XY81fc63dr+xnJX4S4nWxm tocef+sSTKLXyK8VVy5E8lj1opo9Qd9J72MwceMC3sV9CFuXdSR08RWV1Ycq/k9Q4GPJ 8mf1mqONxPgCCnqFM3c+IGDZe+fYv8ANhzkMFrV7YgzELrF6ljgARU8uOzHthPO/tK4v 0aeaLmnzTEKrsvrzHafKGFKLXbIAox4L0TCGc7o9fHoYVKxHzjsTbFrUUPDSi+5KRRJ8 PqfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783107639; x=1783712439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zR9XRPc5AVucodt4jcddD2QULOfOq2FWZnJr+n7Dti8=; b=iv/K89Q7fEZ2fi7ZpPfv/aLG+2e8bTkRfwuWnrz2bOsbMdiSh6lGJoTAp7rHCGumZ9 qM6bohDtdaIJvaYEAdW45n9DRzcYNGnDO6HC8l+CKzZ+3cBnu5XjMRennHOGYQVD4cx9 2Oso3Z2LwWUh5eOlBx1u/69Da3NBgg87g0XqwQnnvMMBJWQuoddpPwcdP741nmeg3CKX eYFJXCp2aVPxpdYSAWCkbbarAKhkhbrAmJ3N6W0YdUEsbP+Edf77gFKa80ZLKETsFuMa PSBcXLnhzzlIOa1ldVU3p6QiI+t7gvrmz5uM8fIwbfM6rPwhdQIL9O4ScPQLKnoiWe7V dGuQ== X-Forwarded-Encrypted: i=1; AHgh+RrBwNUn64T8KlXXDGhTU6dheDKC7sitdoP2wf0CsizPWS31wXPliZLot1dqS1elvuNg1aU1eOO+1aLGeUA=@lists.ozlabs.org X-Gm-Message-State: AOJu0Yyekt+1dWR5jWbCcjUjc+eU5KleSnwegcKHAQTolEhPhV6giOII vxZ6ZyT7/eYlYOaeY475SFs6gN0fRKGkIsCUNbtweK3AAm5et4J6V/HOdoPcNrG8BACFEd6vVyh 3E4OXhJrA1u4QJSyFjc7/5VkeQKGMe2sQU2vUWajBZxCjcgJTkzUz4wVWQSQJKOXGAEgn X-Gm-Gg: AfdE7cmFOOHsP8pp91sP4OX2/kCxmZ6b0Pd9PpiCXXVKgzLDpG/DiVV51JU4dXbeA/l o+HFd+hIV5bn0okIcr4iHmulENBSEMwiUB0UNh3dn7g1Fy4cDvImv3MFl5+rY9OcQT5zCl6R4Mm lqsBIlNVu3SCKNiMiHVtwKQ9Jg4X0Hg0bf9Ty/uKwpxr6PGvy/YwdRr4YSqlWRgav50xXZLpiYH qQzr+2+9nD4NmKLanGQBqx9uq0mofVYUnCRFXNtLbeay1SAR8Hmj8GfBJaBuVhCouA3PFKd/1Z8 XJSf0e9RvzXGnH6YxgNxxWi5C1dJxWfnpx1R4ri9UTOnVtkafUOIdCy/BUNpa/sLXapnz4/0NGz DzkyISvhgfh7tDtBYNyy/xcT7YcfVpHFPUMa6wA== X-Received: by 2002:a17:90b:3808:b0:380:8b14:d8e1 with SMTP id 98e67ed59e1d1-3829effb428mr834203a91.24.1783107638281; Fri, 03 Jul 2026 12:40:38 -0700 (PDT) X-Received: by 2002:a17:90b:3808:b0:380:8b14:d8e1 with SMTP id 98e67ed59e1d1-3829effb428mr834169a91.24.1783107637623; Fri, 03 Jul 2026 12:40:37 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30f290b6bc2sm10065845eec.27.2026.07.03.12.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 12:40:37 -0700 (PDT) From: Mukesh Ojha To: Bjorn Andersson , Konrad Dybcio , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Joel Stanley , Andrew Jeffery , Paul Cercueil , Anitha Chrisanthus , Paul Kocialkowski , Linus Walleij , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Alexey Brodkin , Laurent Pinchart , Tomi Valkeinen , Michal Simek , Daniel Scally , Jacopo Mondi , Mauro Carvalho Chehab , Eddie James , Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Minghsiu Tsai , Houlong Wei , Matthias Brugger , AngeloGioacchino Del Regno , Joseph Liu , Marvin Lin , Dmitry Osipenko , Krzysztof Kozlowski , Thierry Reding , Jonathan Hunter , Srinivas Kandagatla , Arnd Bergmann , Greg Kroah-Hartman , Ge Gordon , Adrian Hunter , Ulf Hansson , Rob Herring , Saravana Kannan , Mathieu Poirier , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Xiubo Li , Liam Girdwood , Mark Brown , Frank Li , Sascha Hauer , Peter Ujfalusi , Bard Liao , Daniel Baluta , Orson Zhai , Baolin Wang , Peter Chen , Fugang Duan Cc: Ekansh Gupta , BST Linux Kernel Upstream Group , Fabio Estevam , Nicolin Chen , Pengutronix Kernel Team , Kai Vehmanen , Pierre-Louis Bossart , Vijendar Mukunda , Chunyan Zhang , CIX Linux Kernel Upstream Group , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-media@vger.kernel.org, openbmc@lists.ozlabs.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, linux-tegra@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-staging@lists.linux.dev, linux-sound@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, imx@lists.linux.dev, sound-open-firmware@alsa-project.org, Mukesh Ojha Subject: [PATCH 03/42] firmware: qcom: scm: Use devm_of_reserved_mem_device_init() Date: Sat, 4 Jul 2026 01:08:16 +0530 Message-ID: <20260703193855.110619-4-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260703193855.110619-1-mukesh.ojha@oss.qualcomm.com> References: <20260703193855.110619-1-mukesh.ojha@oss.qualcomm.com> X-Mailing-List: linux-aspeed@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAzMDE5OCBTYWx0ZWRfXxYbtu/qYVF6T idC6P8LL0nMtKNJ+1Wewqw8C4UpCvP329k+tvne1RoBKGf/WPfNzjl7pQ35kixyGntaxbKnu/GH jSJM7LAC3YWN6ZYivtS04Gtyc7fM+1rAlHtecSBJmjjnm6dQEa4zM1IKbYa8tiAcA4SKCMuwUnU H3si8e4gSP3+kPPQgD1NjcSax8nJYUPgziDywzvQbLKgL7l5IbnNgQZK2rLm9czZJkiQiU5tBQp iw1viMQ56GCQZwHMMoEHOUqgLImkQt2/lZdin0fuMPu87b8V/oZpoQRtRuaNzmDh0LEYjTzN7by 09q+XRXk4QOkzbHvhLjp2JV6aQBE3E9ZUBRJwXn50FuMKflt/OTlVCvdlF5dK40mfgIX0wk8iRD iZVgUOo2my1j4DYRF+c9BUSZmb0szk+mm5ST8ybbLB3KA6x6ffZeIN7xw3Nuqxttd8lfSfxvrdk GHG1sC7YpWZvqWOGTbw== X-Proofpoint-ORIG-GUID: YvJL2Ke24Opd-VI5Ns8fdsSAkBFI5lbF X-Authority-Analysis: v=2.4 cv=cc3iaHDM c=1 sm=1 tr=0 ts=6a481037 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=-SVse2xkFbf2KMwQCVkA:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAzMDE5OCBTYWx0ZWRfX1aBgR/Ug3woU p1SNX2SLTpD7aJ80jZ1goaC0qkkHJD1RMMm784cKtFMUs9yF6rTLeEkjHPserOTkIt4shz6ndVp l7ZwSEnyTCUTRBGNR6rOTqKV0VLvIfY= X-Proofpoint-GUID: YvJL2Ke24Opd-VI5Ns8fdsSAkBFI5lbF 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-03_03,2026-07-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 suspectscore=0 adultscore=0 bulkscore=0 priorityscore=1501 phishscore=0 spamscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607030198 Switch from of_reserved_mem_device_init() to the new resource managed devm_of_reserved_mem_device_init() so that the reserved memory region is released automatically on probe failure or device unbind. This eliminates the err_rmem cleanup label and the need to call of_reserved_mem_device_release() explicitly on error paths. Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 26bf87247afa..0f9559b9cc53 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2779,17 +2779,15 @@ static int qcom_scm_probe(struct platform_device *pdev) if (ret) return ret; - ret = of_reserved_mem_device_init(scm->dev); + ret = devm_of_reserved_mem_device_init(scm->dev); if (ret && ret != -ENODEV) return dev_err_probe(scm->dev, ret, "Failed to setup the reserved memory region for TZ mem\n"); ret = qcom_tzmem_enable(scm->dev); - if (ret) { - ret = dev_err_probe(scm->dev, ret, - "Failed to enable the TrustZone memory allocator\n"); - goto err_rmem; - } + if (ret) + return dev_err_probe(scm->dev, ret, + "Failed to enable the TrustZone memory allocator\n"); memset(&pool_config, 0, sizeof(pool_config)); pool_config.initial_size = 0; @@ -2797,11 +2795,9 @@ static int qcom_scm_probe(struct platform_device *pdev) pool_config.max_size = SZ_256K; scm->mempool = devm_qcom_tzmem_pool_new(scm->dev, &pool_config); - if (IS_ERR(scm->mempool)) { - ret = dev_err_probe(scm->dev, PTR_ERR(scm->mempool), - "Failed to create the SCM memory pool\n"); - goto err_rmem; - } + if (IS_ERR(scm->mempool)) + return dev_err_probe(scm->dev, PTR_ERR(scm->mempool), + "Failed to create the SCM memory pool\n"); ret = qcom_scm_query_waitq_count(scm); scm->wq_cnt = ret < 0 ? QCOM_SCM_DEFAULT_WAITQ_COUNT : ret; @@ -2872,10 +2868,6 @@ static int qcom_scm_probe(struct platform_device *pdev) qcom_scm_gunyah_wdt_init(scm); return 0; - -err_rmem: - of_reserved_mem_device_release(scm->dev); - return ret; } static void qcom_scm_shutdown(struct platform_device *pdev) -- 2.53.0