From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 67B4E1D0787; Wed, 2 Oct 2024 13:44:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876668; cv=none; b=Q27EDxAdCw45I+hZ/sE15S/JqsIyqFj9OwswDrc2ZVVZSnl9orcHn4aBJUpCi5K2ZGfvx/6rp1biETKDWTRRc+s7+g3qmtZW09tgQvEkO0GZ+MEEMAj+9pxgYysUwGI/CLMXHoplQtcm6qAER05rGYkO2QFs251nFOyRhiySaVA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876668; c=relaxed/simple; bh=pr0jZFUyyKjIxZrnR7yuDhxrCWyE7Pxzs/GI5RII3w4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Itz5uuebfsw2t0cuzvEZ40m7U/LOA/BQVgwAyA1CixZX7+0jSVTx2jfeAOdxgJ4JGo7mtkfkuioKadP9rTBGJYSzr9RD+uA2hWddxwIeMN5ULuM2+dmpABzf1FhtgLPN9VlHyMvoriPFnjIWWlXDhaNNDIQ6PqE3aBSwvROGFqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=e0iWFggJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="e0iWFggJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9282FC4CEC5; Wed, 2 Oct 2024 13:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876668; bh=pr0jZFUyyKjIxZrnR7yuDhxrCWyE7Pxzs/GI5RII3w4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e0iWFggJzppgwmM9WeXk0qCHREnWRtzEVkLrBDYsrSWlmW+HhSzBgjYY7i4S2ujy7 GYw0Ni/tFw7omxE9QZXvG+yaePWY+Wn2tB98O+8cdIfNLdRr9ma7Ehm2Kqh94mLSAk iizKVOKDxzCmgAsmePkQSHWNvGow4icSUISK5WoM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Udit Kumar , Siddharth Vadapalli , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Kevin Hilman , Manivannan Sadhasivam Subject: [PATCH 6.11 521/695] PCI: dra7xx: Fix error handling when IRQ request fails in probe Date: Wed, 2 Oct 2024 14:58:39 +0200 Message-ID: <20241002125843.283059631@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Siddharth Vadapalli commit 4d60f6d4b8fa4d7bad4aeb2b3ee5c10425bc60a4 upstream. Commit d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq() call to the bottom of probe") moved the IRQ request for "dra7xx-pcie-main" towards the end of dra7xx_pcie_probe(). However, the error handling does not take into account the initialization performed by either dra7xx_add_pcie_port() or dra7xx_add_pcie_ep(), depending on the mode of operation. Fix the error handling to address this. Fixes: d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq() call to the bottom of probe") Link: https://lore.kernel.org/linux-pci/20240827122422.985547-3-s-vadapalli@ti.com Tested-by: Udit Kumar Signed-off-by: Siddharth Vadapalli [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński Reviewed-by: Kevin Hilman Reviewed-by: Manivannan Sadhasivam Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/pci/controller/dwc/pci-dra7xx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -854,11 +854,17 @@ static int dra7xx_pcie_probe(struct plat "dra7xx-pcie-main", dra7xx); if (ret) { dev_err(dev, "failed to request irq\n"); - goto err_gpio; + goto err_deinit; } return 0; +err_deinit: + if (dra7xx->mode == DW_PCIE_RC_TYPE) + dw_pcie_host_deinit(&dra7xx->pci->pp); + else + dw_pcie_ep_deinit(&dra7xx->pci->ep); + err_gpio: err_get_sync: pm_runtime_put(dev);