From patchwork Mon Jul 31 11:55:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1975646vqg; Mon, 31 Jul 2023 05:21:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlFwgzxOz0zCdI/8igqf2+ZVWyegK6rcaOzKUi4AlwohH1JLJbn2ly32MaeKS+rzb9mfMT6w X-Received: by 2002:a17:903:41cf:b0:1b8:a65f:b49d with SMTP id u15-20020a17090341cf00b001b8a65fb49dmr11438717ple.12.1690806061019; Mon, 31 Jul 2023 05:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690806061; cv=none; d=google.com; s=arc-20160816; b=BsyqHS3jXxKarHtORq3rVAs6olnNqgCCyZqO13c/ALmWIOI64JtbdU9vNFI1xqMi0/ bMn5Rwj1k55YzfqKuGgiydhwHfm9FzCI/uwz8lbdzLGAtMBmUEQB5tGmU3ZQ5kpERzzu Zbu2f/ZYSMcaVSbo53SmAc2FtHd5pFCn0EjTge0ZFk0Ry0iEnXJTttiyb+5p7v5HMrLB dVo8z9wGBrMa7nCwM7YKLR6zg903VteFuGiylKUtDVt6oFrI1M3pnTAaQ5xACDdIHpeO v/KCoqATqopIBcwg8IrV1csXc/ZQGOAeNoK7v9dJHTS7NtOYw9mZi1UsdsOnhu+Y49VN gJ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=Cq2n9QmbD2WycC+d2YF5O87cWK5IGYo/lg8LnjYN4vI=; fh=6D2CRRfm7C/SiikmZtdX3L/QzZnWmWOp6NcPEvdg35k=; b=h+q1L3Hpi5s+kYL/vDrAnGTONn+l6CLFmwn6nnNPSMKa2Ifr24Pr2dAmwrF4pmC8qT yUyCvootFdpti5POoP/56hEUtCjawjEYxgETzVsrOxMd855FKUAkrUndKZhKXF3lw5dh RDM3pLt9UF6zc4iKK50bJd1/0ZgYak8bbkGedDCSvN8RB/3dqB7TkAP5TB07OZv9Bsuu J3Zhq6d7kkJFGEuz9TMvtN22PYbpAIq+Si3nlgTcs3Q1y9iQJa0ZajUP4AnBj7BJ40Gg xKMWS+TG7JCddISJewahBrE25/fekA7eTjQvInFakT5juXzw0uBfck2MGl2mOH56usAD NyTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Gp8L3cIX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f17-20020a170902ce9100b001b8921fbd87si4068099plg.490.2023.07.31.05.20.47; Mon, 31 Jul 2023 05:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Gp8L3cIX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232066AbjGaLzM (ORCPT + 99 others); Mon, 31 Jul 2023 07:55:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229986AbjGaLzK (ORCPT ); Mon, 31 Jul 2023 07:55:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E39391A3; Mon, 31 Jul 2023 04:55:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 74B796104B; Mon, 31 Jul 2023 11:55:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 018F9C433C8; Mon, 31 Jul 2023 11:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690804507; bh=OiQLH0Ur4QsXIAElfzydLwPQ911lsGirTGBgpfbRwNo=; h=From:Date:Subject:To:Cc:From; b=Gp8L3cIX/YchDpHcrZzplSGCO8NXaBnSbRvUxa3GZznPnFhCRO5PRqKIzdfMcsafl 0ssi9FO0gguKNjm0m1avf5B+hwol66ttDYEOKY9MshYsPb+lNhHaTAxniHyAFo+76l U4YZcunUoaFQterr8PMZbezMfOJvRZwelQpd+WU2sa96EkWfZsaMh+gkiRp/pEx7eS dg4ZfQOHvguQz7PY/mV1JwRRRWy1UYxlEq9OBumUz+m0B1i0HGAUG3bfsNIIbqeHkv DeD20tiKBAJGkSVSoDIYGeJ/JGMI0MFdhWzhl/7Sjgug/bHUeiuylQ6s1qVXP2ijtT 4U7UbQN4g1eDA== From: Mark Brown Date: Mon, 31 Jul 2023 12:55:01 +0100 Subject: [PATCH RESEND v2] PCI: dwc: Provide deinit callback for i.MX MIME-Version: 1.0 Message-Id: <20230731-pci-imx-regulator-cleanup-v2-1-fc8fa5c9893d@kernel.org> To: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1930; i=broonie@kernel.org; h=from:subject:message-id; bh=OiQLH0Ur4QsXIAElfzydLwPQ911lsGirTGBgpfbRwNo=; b=owEBbAGT/pANAwAKASTWi3JdVIfQAcsmYgBkx6EXdxRz1dTT/OShq0p+bzBjHKJQarXXyyX7DZCP xpUHn0OJATIEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMehFwAKCRAk1otyXVSH0Jz6B/ j7M6pqTOungd9oa6NmOq9Ps6fa/WLCmxbVm2DutkAeWjfVtQm6MWoFNnSceaavenIn8HH/DgjResM0 nQZ+NlYhtGiHe+c1aN5TNFF9iQD9/CvMXCCdTdLLIOEiiVrhHdrAYbZWg5ehxOK9GfX1kkWjkAufiX 2f/PsZtlkEuC2p4EAu6IKnWBVEx2PCLyhVa7jA91NUunHp7N7x75M1K+7FojQN77eVH2H57Tx4XaO2 ooNhdHd+eD0HuP1DZ4NmtDJaHZcb+JhjzYMO8ONSTDOY686nUxQ0zlHSYmAd4NbRBRADsxpeNUUvY4 E12cGp1MIDUKg37LH2H6omLcwUOLQ= X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772938656200826942 X-GMAIL-MSGID: 1772938656200826942 The i.MX integration for the DesignWare PCI controller has a _host_exit() operation which undoes everything that the _host_init() operation does but does not wire this up as the host_deinit callback for the core, or call it in any path other than suspend. This means that if we ever unwind the initial probe of the device, for example because it fails, the regulator core complains that the regulators for the device were left enabled: imx6q-pcie 33800000.pcie: iATU: unroll T, 4 ob, 4 ib, align 64K, limit 16G imx6q-pcie 33800000.pcie: Phy link never came up imx6q-pcie 33800000.pcie: Phy link never came up imx6q-pcie: probe of 33800000.pcie failed with error -110 ------------[ cut here ]------------ WARNING: CPU: 2 PID: 46 at drivers/regulator/core.c:2396 _regulator_put+0x110/0x128 Wire up the callback so that the core can clean up after itself. Reviewed-by: Richard Zhu Tested-by: Fabio Estevam Signed-off-by: Mark Brown Acked-by: Manivannan Sadhasivam --- Changes in v2: - Rebase onto v6.5-rc1. - Link to v1: https://lore.kernel.org/r/20230703-pci-imx-regulator-cleanup-v1-1-b6c050ae2bad@kernel.org --- drivers/pci/controller/dwc/pci-imx6.c | 1 + 1 file changed, 1 insertion(+) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230703-pci-imx-regulator-cleanup-a17c8fd15ec5 Best regards, diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 27aaa2a6bf39..a18c20085e94 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1040,6 +1040,7 @@ static void imx6_pcie_host_exit(struct dw_pcie_rp *pp) static const struct dw_pcie_host_ops imx6_pcie_host_ops = { .host_init = imx6_pcie_host_init, + .host_deinit = imx6_pcie_host_exit, }; static const struct dw_pcie_ops dw_pcie_ops = {