From patchwork Fri Apr 1 13:33:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12798302 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 CBAD3C433FE for ; Fri, 1 Apr 2022 13:34:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346313AbiDANgl (ORCPT ); Fri, 1 Apr 2022 09:36:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245196AbiDANgl (ORCPT ); Fri, 1 Apr 2022 09:36:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DCB315DA98; Fri, 1 Apr 2022 06:34:51 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 295D561B33; Fri, 1 Apr 2022 13:34:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87EA5C340EC; Fri, 1 Apr 2022 13:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648820090; bh=RVL0O4S/hfFXNZm/0gRGl40ZHTehWVbfCwmjbxXvNVk=; h=From:To:Cc:Subject:Date:From; b=U8kPmkGzpgKuAjC5et7CoGaXJC738aSBSBpE3g5hOfg9tCqXH9/xKHqBJNVxAIugc oLTIibB1ddbaEqHcyBoUURCSyvT6sxaTSNqjcITgWUiQO6J4D3hbAV/I9+bd91fedg RL7Hq3blqSLfDJVKTuRWR2qnELw6mRyzK4l8QkW0e4AiQBT6qZAKY9MtGCu2OFHAPq Bk71HzM/K3rlelJDFzqen7r72mmxc2GUvG6KAwPltkoQLKUZpNcP63sZ7WLH71IKwp R76NKxqqm30rrbWVKH+7iYnwgouuv4bI5tMtPu49eoA7GoH6cwCOiXgiY/eAU2tqxm q2Nmhh9TFyEgA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1naHQP-0002dz-Ss; Fri, 01 Apr 2022 15:34:50 +0200 From: Johan Hovold To: Lorenzo Pieralisi , Stanimir Varbanov , Andy Gross , Bjorn Andersson Cc: Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , Dmitry Baryshkov , linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2] PCI: qcom: Fix pipe clock imbalance Date: Fri, 1 Apr 2022 15:33:51 +0200 Message-Id: <20220401133351.10113-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 ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller") introduced a clock imbalance by enabling the pipe clock both in init() and in post_init() but only disabling in post_deinit(). Note that the pipe clock was also never disabled in the init() error paths and that enabling the clock before powering up the PHY looks questionable. Fixes: ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller") Cc: stable@vger.kernel.org # 5.6 Cc: Bjorn Andersson Signed-off-by: Johan Hovold Reviewed-by: Bjorn Andersson --- Changes in v2 - Capitalise "Fix" in subject line according to PCI subsystem convention drivers/pci/controller/dwc/pcie-qcom.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index b79d98e5e228..20a0e6533a1c 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1238,12 +1238,6 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) goto err_disable_clocks; } - ret = clk_prepare_enable(res->pipe_clk); - if (ret) { - dev_err(dev, "cannot prepare/enable pipe clock\n"); - goto err_disable_clocks; - } - /* Wait for reset to complete, required on SM8450 */ usleep_range(1000, 1500);