From patchwork Mon May 21 13:11:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10415291 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0864C6032C for ; Mon, 21 May 2018 13:12:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8E962898E for ; Mon, 21 May 2018 13:12:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3FE928958; Mon, 21 May 2018 13:12:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFBB6289D1 for ; Mon, 21 May 2018 13:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751719AbeEUNLp (ORCPT ); Mon, 21 May 2018 09:11:45 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:43272 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127AbeEUNLn (ORCPT ); Mon, 21 May 2018 09:11:43 -0400 Received: by mail-wr0-f194.google.com with SMTP id r13-v6so3613872wrj.10; Mon, 21 May 2018 06:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fsoEk4V+rVSRQd9IT2+luK4FaXxTqdyXPTrcBCRHgfY=; b=Vj2zZqpZ5Jn2OCPW14m1oNOJMJX30xqoRh47aEeOsBeGDedVfo6nsyKSitx3Qthkbe KooV2uj7VvaTlftYP4DXDUU3V9cJHhnSb7EWikif0Mfnw4vj/2tvlKwmJ45tIrYBzR7m SRXtaWlYNI2WrjC2oOpc+GSip30cXtkGq41c2FD5r1CyvgD+WzVVUu/dowz5tuTbBz6o wSiXzg9DIilgF6aBUieauGSSQuUKMiPxKRZ2s4VcL4JVj463a2Qat4+D3q6xMLvh8yJt XMT9GJkgPhI9zXKaKl4OAhTMdRL9PdZTiuQPxUgAPYM0YAO+xdUeA2rrM4aRUerAAZNv eOLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fsoEk4V+rVSRQd9IT2+luK4FaXxTqdyXPTrcBCRHgfY=; b=bnDEybDZu9wgpB5V/JqPj1J+POfoXN1WZM7gXKB42JtAxx3Mqtj1cilDfDsrMb/S17 nDfNeQh5P+yb+WwHn34VKRWD7+1zVqTpAt4beCgiOmunuO0BOKrs80J4AzPcg1fxaoMK YDB3RDtC9M7TWNcaOCCuEmQFeOWciQpTa3ya/oTjArBszMHCAYUGVtTOELDEtDyUlqfY w6FAOdpdDg94vItur+yQE0cTq7aal2uAJwbDnDhY469AXTfs20siAx6PAnaWmP4E+Im3 MaLeGYCW3/1nWXCcCXwOmy8Ck37qFCpy/F7HinJIRTNXmid1sSegSxhd/P/YGj3bgHmS 6O9A== X-Gm-Message-State: ALKqPwc0qwsXJCnn+SNbIFIfIjk1tFjOpZMZa9pnlOLGffM82HIJ7eSx GVZ4mprMmiQ6XzOhLWSpMz4KhfYn X-Google-Smtp-Source: AB8JxZrlE3AgvvVTIUmbmXMJOj2k/nje5jrf1zwFjnppWFq+UtMcpHXgSjlPLvYVlE/opjwh/nGqXQ== X-Received: by 2002:adf:904f:: with SMTP id h73-v6mr3839683wrh.188.1526908301540; Mon, 21 May 2018 06:11:41 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id f15-v6sm3077068wrm.52.2018.05.21.06.11.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 06:11:40 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 3/4] PCI: rcar: Add missing irq_dispose_mapping() into failpath Date: Mon, 21 May 2018 15:11:22 +0200 Message-Id: <20180521131123.2009-3-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180521131123.2009-1-marek.vasut+renesas@gmail.com> References: <20180521131123.2009-1-marek.vasut+renesas@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The rcar_pcie_get_resources() is another misnomer with a side effect. The function does not only get resources, but also maps MSI IRQs via irq_of_parse_and_map(). In case anything fails afterward, the IRQ mapping must be disposed through irq_dispose_mapping() which is not done. This patch handles irq_of_parse_and_map() failures in by disposing of the mapping in rcar_pcie_get_resources() as well as in probe. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Reviewed-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- drivers/pci/host/pcie-rcar.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index eac4b71d9c60..3cc84f7e05f7 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -923,18 +923,25 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) i = irq_of_parse_and_map(dev->of_node, 0); if (!i) { dev_err(dev, "cannot get platform resources for msi interrupt\n"); - return -ENOENT; + err = -ENOENT; + goto err_irq1; } pcie->msi.irq1 = i; i = irq_of_parse_and_map(dev->of_node, 1); if (!i) { dev_err(dev, "cannot get platform resources for msi interrupt\n"); - return -ENOENT; + err = -ENOENT; + goto err_irq2; } pcie->msi.irq2 = i; return 0; + +err_irq2: + irq_dispose_mapping(pcie->msi.irq1); +err_irq1: + return err; } static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, @@ -1118,7 +1125,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) err = clk_prepare_enable(pcie->bus_clk); if (err) { dev_err(dev, "failed to enable bus clock: %d\n", err); - goto err_pm_put; + goto err_unmap_msi_irqs; } err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); @@ -1156,6 +1163,10 @@ static int rcar_pcie_probe(struct platform_device *pdev) err_clk_disable: clk_disable_unprepare(pcie->bus_clk); +err_unmap_msi_irqs: + irq_dispose_mapping(pcie->msi.irq2); + irq_dispose_mapping(pcie->msi.irq1); + err_pm_put: pm_runtime_put(dev);