From patchwork Fri Jun 10 11:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 581304 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DAD2CCA47B for ; Fri, 10 Jun 2022 12:04:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347691AbiFJMEO (ORCPT ); Fri, 10 Jun 2022 08:04:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347649AbiFJMEO (ORCPT ); Fri, 10 Jun 2022 08:04:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 294DE3EB8F; Fri, 10 Jun 2022 05:04:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B27E0B834C6; Fri, 10 Jun 2022 12:04:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 744D5C3411E; Fri, 10 Jun 2022 12:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654862650; bh=ua8W2pZlEypzIR2/CA+H/l0UdSWdUU5VoLv1riU4QhU=; h=From:To:Cc:Subject:Date:From; b=lLs8LlnrNR5UZPmnW+WEQ8HeX+UpI1jn66y9nEaV2sIga1PJlS7L+MOVo64AyJjQ7 HpOqd0OaZznKSjm4VjaWm+LwuKsucac4C5yz3QLSLdLFPL784D0+8WciC3QW4NOu+D 1KWinJlguDbDd/cK1VQdCQPVviSVShrdANZSdtJsx7bXMtLbRyQbFUsq0ZeB3Mq5ix +Z0R5oyfWL+nvAwbbBlBYHfeYoW9VNSjJ+C8iva73OqH9cdGlEKcVhG53w1aW5u+eH r/gATTdz4eCfEB5+xTDt0EAHftrxzd3M1hX7EumDXUr/NrIr92Y1f4fM3qhRn6n5NQ DgM+e8baC9uiQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1nzdMz-0002ky-0V; Fri, 10 Jun 2022 14:04:05 +0200 From: Johan Hovold To: stable@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Lorenzo Pieralisi , Bjorn Helgaas , Manivannan Sadhasivam , Stanimir Varbanov Subject: [PATCH stable-4.14] PCI: qcom: Fix unbalanced PHY init on probe errors Date: Fri, 10 Jun 2022 13:58:57 +0200 Message-Id: <20220610115857.10455-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org commit 83013631f0f9961416abd812e228c8efbc2f6069 upstream. Undo the PHY initialisation (e.g. balance runtime PM) if host initialisation fails during probe. Link: https://lore.kernel.org/r/20220401133854.10421-3-johan+linaro@kernel.org Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Johan Hovold Signed-off-by: Lorenzo Pieralisi Signed-off-by: Bjorn Helgaas Reviewed-by: Manivannan Sadhasivam Acked-by: Stanimir Varbanov Cc: stable@vger.kernel.org # 4.5 [ johan: adjust context to 4.14 ] Signed-off-by: Johan Hovold --- drivers/pci/dwc/pcie-qcom.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c index 374b2b3afb59..19a78fcf609c 100644 --- a/drivers/pci/dwc/pcie-qcom.c +++ b/drivers/pci/dwc/pcie-qcom.c @@ -1302,10 +1302,15 @@ static int qcom_pcie_probe(struct platform_device *pdev) ret = dw_pcie_host_init(pp); if (ret) { dev_err(dev, "cannot initialize host\n"); - return ret; + goto err_phy_exit; } return 0; + +err_phy_exit: + phy_exit(pcie->phy); + + return ret; } static const struct of_device_id qcom_pcie_match[] = {