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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E20DC433F5 for ; Wed, 27 Apr 2022 07:55:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242405AbiD0H6g (ORCPT ); Wed, 27 Apr 2022 03:58:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354290AbiD0H6f (ORCPT ); Wed, 27 Apr 2022 03:58:35 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E90038BE0 for ; Wed, 27 Apr 2022 00:55:24 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id gj17-20020a17090b109100b001d8b390f77bso4340880pjb.1 for ; Wed, 27 Apr 2022 00:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fNHux1IBm/5HLefyE9ps8fak1p3KFESTuY/jt3ka9yU=; b=tSN2lkK/7BcMnlnxCd588MGTAMk8P9VpuIntdx/jrVnwngmDS5zBggXknGWi5gYqTJ G687yRsYUeUk7zhyYGgm22RBDjK129UdzPVt0Mf7GW6ACQAcXbAeSTc1D1WsHTMvjmtH +/yCG9IBKWEqT5xyk+YTp34azvWamK1lLUavDSfergvN0KQDZVTUHDQgJFfQsjA/Eziu K5BG89W+0uj6F+n7sIqpRLb2t07tZH3cO19Oe/QZUxuo8dFajUuxN5I37n1Nlvuk/Qrp oS0ixZUty499qGio0DVX0/5km4fMf9mP+eY6bgDXCqnWUNEIExm2C1xbJXbhS97WhxSz ZBmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fNHux1IBm/5HLefyE9ps8fak1p3KFESTuY/jt3ka9yU=; b=IbLHv0tF98AEHICoG+LB7Ow3iHVgIISA+eOdwH4Pgd2qdIFBIRm/ikJJH1+r/S0b4n CkOPdncbCmasbNwjJgD0pLst8/K0T/j+6Y3cHm+AWxNAoTmjaan/g2tss8gaiXhfVk9J dRFr9Vcxh+wFTIDxEpBA/O2dNtcigVMgKyYkSd7gSLbThoKmUqZ4bB1hOSpO7WQ1XYLm SxaeGSsDjqXRSBLenlcHOkqwYbXLVE39FnOzGcyT4TI+2rX5KGkhLssrJ3X9V27Z9sQ2 TdK6dSnmAsHLJhq8VVYBrVdT8eREnbkn/mCNdbmZzVjyPD9BRHkQdq1Ha86/SR7akfYD ULYg== X-Gm-Message-State: AOAM532a6GZwryaEHJRmlhE2i/F7cCaTbU1fK2nCU8nmBAMOVTx0e4KC uXNDlS31InSujorNDZjRADnY X-Google-Smtp-Source: ABdhPJy+dOT8tPKckt8Xy6LcaOJl1PSgWgXOrviXgmnw02makXUuKn/BDlPXt0wCkZmeJqEWPFRriw== X-Received: by 2002:a17:90a:7acb:b0:1d9:85a5:e1e3 with SMTP id b11-20020a17090a7acb00b001d985a5e1e3mr13841507pjl.172.1651046123549; Wed, 27 Apr 2022 00:55:23 -0700 (PDT) Received: from thinkpad ([117.207.26.174]) by smtp.gmail.com with ESMTPSA id u3-20020a626003000000b00505a38fc90bsm18447482pfb.173.2022.04.27.00.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 00:55:23 -0700 (PDT) Date: Wed, 27 Apr 2022 13:25:16 +0530 From: Manivannan Sadhasivam To: Johan Hovold Cc: Lorenzo Pieralisi , Stanimir Varbanov , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Bjorn Helgaas , Dmitry Baryshkov , linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2 2/2] PCI: qcom: Fix unbalanced PHY init on probe errors Message-ID: <20220427075516.GB2182@thinkpad> References: <20220401133854.10421-1-johan+linaro@kernel.org> <20220401133854.10421-3-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220401133854.10421-3-johan+linaro@kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Apr 01, 2022 at 03:38:54PM +0200, Johan Hovold wrote: > Make sure to undo the PHY initialisation (e.g. balance runtime PM) in > case host initialisation fails during probe. > > Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") > Cc: stable@vger.kernel.org # 4.5 > Cc: Stanimir Varbanov > Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam Thanks, Mani > --- > drivers/pci/controller/dwc/pcie-qcom.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 0b0bd71f1bd2..df47986bda29 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -1624,11 +1624,13 @@ static int qcom_pcie_probe(struct platform_device *pdev) > ret = dw_pcie_host_init(pp); > if (ret) { > dev_err(dev, "cannot initialize host\n"); > - goto err_pm_runtime_put; > + goto err_phy_exit; > } > > return 0; > > +err_phy_exit: > + phy_exit(pcie->phy); > err_pm_runtime_put: > pm_runtime_put(dev); > pm_runtime_disable(dev); > -- > 2.35.1 >