From patchwork Mon Mar 20 22:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1473218wrt; Mon, 20 Mar 2023 15:41:35 -0700 (PDT) X-Google-Smtp-Source: AK7set9/dr7mU3FKDJj4++3o9z8EhvBXuxbVD/D3Ho+BJwlK6n7Dqj5Ej6dBqzqmJPFw9bmxJSaY X-Received: by 2002:a62:1b4a:0:b0:627:f9ac:8a33 with SMTP id b71-20020a621b4a000000b00627f9ac8a33mr343192pfb.13.1679352094962; Mon, 20 Mar 2023 15:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679352094; cv=none; d=google.com; s=arc-20160816; b=JaPnBR4y/ySd8ywqD6mlw64EOEPifgwcTUsQpufORqEz/AvbmO9XWjXSwvBGpi3IgO 8rcYp2nRMa2VV8ZwlWWeNWmEVn8RuJkdvpV2WZrsQhsWTuOY6cFxOyclwn2I/3UR60Rx jlXCEQAP6OzbRxVd5j5m87Lo8WTqFMRbYhpF+LxoiAqWMaYXz6kU/gmff6MzpL0HjkZ4 Cm7h0xe+sNCLk0Eg5Oso0Pa1cP8uwMIzisjCvDJwoRyeMFfQHPXQ/mWSoBeHq3j46rnu qsKHlD5KAspn6dCoTsekmM9Z5TldlXiOmtUptotNuhfqdoSZwADHW48kdaBZGw2Fkekr /cWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=s/LgoSGK+GmE6/EU93H8+NXO4ccsf9u+CovKfDKWumc=; b=Y0YATx52CtgkZzYFKXb6rhyAXVg0aQNNcy4GvrGoJYDPqEg7XngYWduqvUcxzVuBr8 rbU9ksGA7zP9ZwlcpQjc+8x3KPw7CBFD0ZasCwJE54DlAaiSK1hC/hIoksDQWGXYr0k7 kJAx0qXiD5IDaLb5eJdU9mcFwzJzmHhZsCcSTBG0HcNjCuORt4wSEQnoIyUBEO3xPm86 DTz4LyPbXTJIYKFb25r2iDgfNzDKTDLf+ft9wMIVWcPomP/G5jENB7f6xgkxiyiU8Oi2 pX/NAng4nJx/DWbcfi6JCRoxRItOf2ZIGhXnTPmsbwNOlMG0EHdB3Nk6RR+RPm19P0V6 OZjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Juoyvhyh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p7-20020a056a000a0700b005a8b856ad4csi12149818pfh.205.2023.03.20.15.41.21; Mon, 20 Mar 2023 15:41:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Juoyvhyh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230030AbjCTWUy (ORCPT + 99 others); Mon, 20 Mar 2023 18:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbjCTWUZ (ORCPT ); Mon, 20 Mar 2023 18:20:25 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9801838E86 for ; Mon, 20 Mar 2023 15:18:47 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id q189so7512794pga.9 for ; Mon, 20 Mar 2023 15:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679350717; 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=s/LgoSGK+GmE6/EU93H8+NXO4ccsf9u+CovKfDKWumc=; b=Juoyvhyhe4EVorBJbKfJG5cW+0Su9a6XcIbbfOnxvZcr96R7XCEUjwKzp651fA4P3B xQTMyT2BESSeUn79Pnqz6OzC9LUrZzUtdLXqACH4HLqOKxrIL2/NZdJvjGJGXpsLtYAE nw/AVLyzWI6JfiCXqm/EczR9AWvVtpUC9CXwXegc3rAI8RNdOTls4xpkQza4+o/no/6Y 7hr3Fti1zNNrz37wUl546X8sx1IB46mbLF2BrQqeqPEYcwljyanNJ2xpNTqfBtIq2KtA bFHJc5KVtP416bgv6YlM5DHuQ600W/290Wiq5+8gdOH8t14XYl3jAr9ENimoM/Yo8Xgd DXyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679350717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s/LgoSGK+GmE6/EU93H8+NXO4ccsf9u+CovKfDKWumc=; b=FyBUPGjmYIDD9jO7RudD81Khl2s6Kq1YRSEWs9KfXTkGAz9sjox2sx8ai0L4ITS9kI 652iNQuO8nKBTuMJTeavmr9A66K5LgVIRrgWNAFH6X+0pqJvCFbOGwvp4aN2cCGcTSp3 h8cnbq66OVpZK29Fn5OBJe9/i8QBjdTgUHuTTD9MUfL3YYL7LnS3IH8npozvVG+Iq8oI d9wsmbnoKpPMuzVEnKlsDsZz5nw6opYPDt9HRTOaX+ircpW18sF1XvFGdToH8SyIO9HS Osvea2pDQ57RolwDYYmr7ZDqwCnvLk39v8tH6Cm3XB2VgawYY3CR5Eumuxz7DolncaWm UN8A== X-Gm-Message-State: AO0yUKVNZMkIRWjCRMxvtqSEycmSvA779OggEu2KQA7uT4TEiMZNluT+ GTxBhlSENETHaNrR2Zbtfz4LNw== X-Received: by 2002:a62:7910:0:b0:625:d630:4e1b with SMTP id u16-20020a627910000000b00625d6304e1bmr293831pfc.31.1679350717432; Mon, 20 Mar 2023 15:18:37 -0700 (PDT) Received: from p14s.cg.shawcable.net ([2604:3d09:148c:c800:4ab5:5131:bafc:4428]) by smtp.gmail.com with ESMTPSA id e15-20020a62aa0f000000b006259e883ee9sm4459196pff.189.2023.03.20.15.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 15:18:36 -0700 (PDT) From: Mathieu Poirier To: andersson@kernel.org Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, patrice.chotard@foss.st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, arnaud.pouliquen@st.com, hongxing.zhu@nxp.com, peng.fan@nxp.com, shengjiu.wang@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] retmoteproc: imx_dsp_rproc: Call of_node_put() on iteration error Date: Mon, 20 Mar 2023 16:18:26 -0600 Message-Id: <20230320221826.2728078-6-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320221826.2728078-1-mathieu.poirier@linaro.org> References: <20230320221826.2728078-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760928302074091921?= X-GMAIL-MSGID: =?utf-8?q?1760928302074091921?= Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly. Fixes: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX") Cc: stable@vger.kernel.org Signed-off-by: Mathieu Poirier Acked-by: Shengjiu Wang --- drivers/remoteproc/imx_dsp_rproc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c index b8f268d41773..21759d9e5b7b 100644 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@ -650,15 +650,19 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) rmem = of_reserved_mem_lookup(it.node); if (!rmem) { + of_node_put(it.node); dev_err(dev, "unable to acquire memory-region\n"); return -EINVAL; } - if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) + if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) { + of_node_put(it.node); return -EINVAL; + } cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size); if (!cpu_addr) { + of_node_put(it.node); dev_err(dev, "failed to map memory %p\n", &rmem->base); return -ENOMEM; } @@ -667,10 +671,12 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base, rmem->size, da, NULL, NULL, it.node->name); - if (mem) + if (mem) { rproc_coredump_add_segment(rproc, da, rmem->size); - else + } else { + of_node_put(it.node); return -ENOMEM; + } rproc_add_carveout(rproc, mem); }