From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C28AF606A327 for ; Sat, 31 Oct 2026 09:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=H0LUD384; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=D9WW2Q00 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=YHFAYRGh5wjlOU/3KkfepJZ4w5BkAhXZY3CTz6dsIzI=; b=H0LUD384c1S+Fo X8xKNTLjnSnVYrvRCasZGjv0zlEOSWp+nwlA1CW6fTbOcT5yVkXQadNG1NlKOoM1xfKftGLr4Xow0 zUYIMIyE2I9YW06wRHYQH8kGnGNE3l55AUe4X3HHsdq4aEE2zuVVwEBQzaiT9xiZOT6YjlrG4UEbn R+7rTSxjiD+VOsmKoZW6M/IEuBmIfizxhBr0/pmE76zWf8NO1magRPQ025XwnSKqp0n62V/v+9BPT yyQjwNSrJA8WW8f0iIUP8ytrYWj8T3k4veCTqC5GzCt/qnbFhCbSFxZIOU0k11nHYlhrT3YQmNrx8 JEjhA6BCyDDzVCogrevg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xN5ih-0000000DBNE-0zV7; Sat, 31 Oct 2026 09:49:51 +0000 Received: from mail-dy1-x132c.google.com ([2607:f8b0:4864:20::132c]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xN5ie-0000000DBMJ-3MZd for linux-arm-kernel@lists.infradead.org; Sat, 31 Oct 2026 09:49:49 +0000 Received: by mail-dy1-x132c.google.com with SMTP id 5a478bee46e88-33bf40b0c8bso1406154eec.0 for ; Sat, 31 Oct 2026 02:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793440188; x=1794044988; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=YHFAYRGh5wjlOU/3KkfepJZ4w5BkAhXZY3CTz6dsIzI=; b=D9WW2Q00YRdTIrNKjUSqd1SwPZ5TGanY8NwqCRaJNYE1w9ExyvwzhB43VKzs3Oozn5 DIY2trsA4h+0u2q3KwdXr3MIQFcjEtrS7BO7CmgQ04Kgr0K18UAad9enOTTiBDi5yyAa R3Xo09pJyICaFlfSg0y9i6WVdB7U2PftqNw3i2EHumZM3TTFYsFi0HDAEPIeHYZPLlLa 2YAHSt8h3xWmhn8bEvlPa+VY6wIsnkk2eBhUcAg+z9/oROkMOcSHq/hxkKmU5ynWO0jH ktYV9F/HOLhLgay8zDaLrhD9gHpH5+rVNEwimoDozaewMq79mCJNVTLJFvIFfAAMcyh7 kEOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793440188; x=1794044988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=YHFAYRGh5wjlOU/3KkfepJZ4w5BkAhXZY3CTz6dsIzI=; b=nxjosjfXVC3esnicij0RjVJavUDdch41yBPSolJ/25xpD0xwMrNnWL4fh4z662jhwD HduMMDLrkiDlH1nwY9ROZD5l5BFprlSbDHqKFpoAJnncDjsRSRB3PNXzwDH9JQFjJn12 UZyFGTAq2refimcGLIsqGdfJl8yFLpas99GD2v6Zt7DKCuQAdI10ThQu33vWHwaKBr25 l3qLfuSaib0Q9FkVwbzmPRzVvWc8YcUMEcyNi3rUBa90byKt8aYI8LL76ixmg7yHRUBs k/P+jHY4DZGDkoSheiRZV+DMk5556XVC+iMYTMQtGJJPeni/aBhBSLFFqXTJ81Qxj6lw tXQg== X-Forwarded-Encrypted: i=1; AKwUvBwu/o/XkL+ZMs3pIqWeK2h8zyHkYCKMX7akiaE1KuckzW1ABVuMsgpZOCcLt0ZjAHVF/+Y2bCjvBxfnZu7Xu2ty@lists.infradead.org X-Gm-Message-State: AFq9FYLBLX4qqlQStZd5U1hoUHhbDOzW1Ej06OWhc/qvIizIG9/1WSU4 PbLmslBKBsjW8Izoz6Ta+qTUsi5UwHeTkJj7nOypWJA+YTycUE8TyIga X-Gm-Gg: AYBFou3yqxRcqGZqOS7euGDVNL96G8MXsM9fNgQjkTnKWy3m5QbRIhTwY3hKg+6z4UG i7V7rDP2fOgoJHMIPWj8/XaYVHUL1PcRKktW28G0qX/PrBUbQM3b6+20GJZdqk1ES+eaB7IxR6y PWAykvllwdO4OHdZez+d9ZfOUzdBjqYaOJ5BOIDsLmJtQLuTc45aKs8qiDw/mBSexIbRcFUQ8xv FwlbuRuPhYbfJ4Sb87uPZXxkhguksjqS48SH5qDsDGFRnUJZIW/5Nw5LEUCVOMLVYjaYJgoElaP 5P7YrmUUczIOE5DODnyT02CCtnXLyTwlhQObFCVB2pO/Khrw8xbSlCRvPmi7V8sDdRHJLZ3wDlE 6hEVKzuvFFnyuXJQZMT/EdGzY08SHPU6M5grg5Ckx7MMxmQ+K0GmZcS0HZolBuutVt8t8sdtDqb 33dzN8L2/X7omamicAc1M2YMeqtAedZAwD+x8rEhix4mta7PGVmlNGp5eXwVV8jsGqE9x0TClrZ ADuZ/XOeQjr9Dabi+pC0ytSCLt6f+P13WStKGpqJ1fUb1k9TFUKjWI7sak1mdA+tBsFi/i+/Nzx tc6l8BjT79lWhDz8NA7f6U8Svu4OLJu2M4V4ZOQPxQgLt+qWE7nw9n0eZFvgNbv5eyuo9Xk= X-Received: by 2002:a05:7300:c39f:b0:366:6644:2839 with SMTP id 5a478bee46e88-36a42203e90mr7023547eec.3.1793440187660; Sat, 31 Oct 2026 02:49:47 -0700 (PDT) Received: from localhost.localdomain ([103.170.55.71]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a42935b4asm20975811eec.16.2026.10.31.02.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2026 02:49:47 -0700 (PDT) From: Sreeraj S Kurup To: sreekuttan2156239@gmail.com Cc: alim.akhtar@samsung.com, bhelgaas@google.com, jingoohan1@gmail.com, krzk@kernel.org, kwilczynski@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-samsung-soc@vger.kernel.org, lpieralisi@kernel.org, mani@kernel.org, peter.griffin@linaro.org, robh@kernel.org Subject: [PATCH v9] PCI: exynos: Handle PCIe PHY initialization errors Date: Sat, 31 Oct 2026 09:49:11 +0000 Message-ID: <20261031094911.3304-1-sreekuttan2156239@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261029131006.2744-1-sreekuttan2156239@gmail.com> References: <20261029131006.2744-1-sreekuttan2156239@gmail.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261031_024948_846989_66C8BBA8 X-CRM114-Status: GOOD ( 19.20 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Check the return values of phy_init() and phy_power_on() to avoid continuing PCIe host initialization when PHY setup fails. Track PHY initialization, PHY power, and regulator enable state across probe, remove, suspend, and resume to ensure cleanup is performed only when appropriate and to prevent unbalanced reference counts. Assert core reset on probe failure after PHY initialization has been reached, and handle cleanup errors during teardown and suspend. Also check the return value of exynos_pcie_host_init() during resume and abort the resume sequence if PHY initialization fails. Signed-off-by: Sreeraj S Kurup --- v9: - Fix regulator state tracking in exynos_pcie_suspend_noirq() by updating ep->supplies_enabled only when regulator_bulk_disable() succeeds, preventing reference count leaks on failure. v8: - Fix state desynchronization in exynos_pcie_phy_exit() by returning early if phy_power_off() fails, preventing calls to phy_exit() on a still-powered PHY - Prevent PM core desynchronization and orphaned controller states during suspend-abort sequences in exynos_pcie_suspend_noirq() by logging teardown errors and returning 0 instead of aborting system suspend v7: - Guard PHY initialization and power-on against duplicate calls - Guard regulator enable against duplicate calls during resume - Preserve PHY and regulator state when cleanup operations fail - Update commit message to describe regulator tracking and core reset handling v6: - Prevent state/reference count desynchronization in exynos_pcie_phy_exit() by ensuring both phy_power_off() and phy_exit() attempt cleanup even if one fails - Assert core reset on post-init probe failures in fail_probe if PHY/host initialization was reached v5: - Avoid PM core state desynchronization in exynos_pcie_suspend_noirq() by logging teardown errors and returning 0 instead of aborting suspend on teardown failure v4: - Fix invalid return in void exynos_pcie_remove() and ensure regulator cleanup - Add core reset deassertion on error in exynos_pcie_suspend_noirq() - Prevent regulator leaks in exynos_pcie_resume_noirq() error recovery path v3: - Address review feedback on PHY and regulator state tracking - Avoid powering down the controller when link detection fails v2: - Track PHY initialization and power state to prevent duplicate cleanup - Handle host initialization failures during resume drivers/pci/controller/dwc/pci-exynos.c | 126 +++++++++++++++++++++--- 1 file changed, 112 insertions(+), 14 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c index e3c05ade381b..857814cd107e 100644 --- a/drivers/pci/controller/dwc/pci-exynos.c +++ b/drivers/pci/controller/dwc/pci-exynos.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -55,8 +56,34 @@ struct exynos_pcie { struct clk_bulk_data *clks; struct phy *phy; struct regulator_bulk_data supplies[2]; + bool phy_initialized; + bool phy_powered; + bool supplies_enabled; }; +static int exynos_pcie_phy_exit(struct exynos_pcie *ep) +{ + int ret; + + if (ep->phy_powered) { + ret = phy_power_off(ep->phy); + if (ret) + return ret; + + ep->phy_powered = false; + } + + if (ep->phy_initialized) { + ret = phy_exit(ep->phy); + if (ret) + return ret; + + ep->phy_initialized = false; + } + + return 0; +} + static void exynos_pcie_writel(void __iomem *base, u32 val, u32 reg) { writel(val, base + reg); @@ -225,13 +252,27 @@ static int exynos_pcie_host_init(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct exynos_pcie *ep = to_exynos_pcie(pci); + int ret; pp->bridge->ops = &exynos_pci_ops; exynos_pcie_assert_core_reset(ep); - phy_init(ep->phy); - phy_power_on(ep->phy); + if (!ep->phy_initialized) { + ret = phy_init(ep->phy); + if (ret) + return ret; + + ep->phy_initialized = true; + } + + if (!ep->phy_powered) { + ret = phy_power_on(ep->phy); + if (ret) + return ret; + + ep->phy_powered = true; + } exynos_pcie_deassert_core_reset(ep); exynos_pcie_enable_irq_pulse(ep); @@ -314,6 +355,7 @@ static int exynos_pcie_probe(struct platform_device *pdev) if (ret) return ret; + ep->supplies_enabled = true; platform_set_drvdata(pdev, ep); ret = exynos_add_pcie_port(ep, pdev); @@ -323,8 +365,22 @@ static int exynos_pcie_probe(struct platform_device *pdev) return 0; fail_probe: - phy_exit(ep->phy); - regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (ep->phy_initialized || ep->phy_powered) + exynos_pcie_assert_core_reset(ep); + + if (exynos_pcie_phy_exit(ep)) + dev_err(&pdev->dev, "failed to exit PCIe PHY\n"); + + if (ep->supplies_enabled) { + int err; + + err = regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (err) + dev_err(&pdev->dev, "failed to disable regulators: %d\n", err); + else + ep->supplies_enabled = false; + + } return ret; } @@ -332,22 +388,42 @@ static int exynos_pcie_probe(struct platform_device *pdev) static void exynos_pcie_remove(struct platform_device *pdev) { struct exynos_pcie *ep = platform_get_drvdata(pdev); + int ret; dw_pcie_host_deinit(&ep->pci.pp); exynos_pcie_assert_core_reset(ep); - phy_power_off(ep->phy); - phy_exit(ep->phy); - regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + + ret = exynos_pcie_phy_exit(ep); + if (ret) + dev_err(&pdev->dev, "failed to exit PCIe PHY: %d\n", ret); + + if (ep->supplies_enabled) { + ret = regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (ret) + dev_err(&pdev->dev, "failed to disable regulators: %d\n", ret); + else + ep->supplies_enabled = false; + } } static int exynos_pcie_suspend_noirq(struct device *dev) { struct exynos_pcie *ep = dev_get_drvdata(dev); + int ret; exynos_pcie_assert_core_reset(ep); - phy_power_off(ep->phy); - phy_exit(ep->phy); - regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + + ret = exynos_pcie_phy_exit(ep); + if (ret) + dev_err(dev, "failed to exit PCIe PHY during suspend: %d\n", ret); + + if (ep->supplies_enabled) { + ret = regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (ret) + dev_err(dev, "failed to disable regulators during suspend: %d\n", ret); + else + ep->supplies_enabled = false; + } return 0; } @@ -358,13 +434,35 @@ static int exynos_pcie_resume_noirq(struct device *dev) struct dw_pcie *pci = &ep->pci; struct dw_pcie_rp *pp = &pci->pp; int ret; + int err; - ret = regulator_bulk_enable(ARRAY_SIZE(ep->supplies), ep->supplies); - if (ret) - return ret; + if (!ep->supplies_enabled) { + ret = regulator_bulk_enable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (ret) + return ret; + + ep->supplies_enabled = true; + } /* exynos_pcie_host_init controls ep->phy */ - exynos_pcie_host_init(pp); + ret = exynos_pcie_host_init(pp); + if (ret) { + err = exynos_pcie_phy_exit(ep); + if (err) + dev_err(dev, "failed to exit PCIe PHY during resume error: %d\n", err); + + if (ep->supplies_enabled) { + err = regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); + if (err) + dev_err(dev, "failed to disable regulators: %d\n", err); + else + ep->supplies_enabled = false; + } + + return ret; + + } + dw_pcie_setup_rc(pp); exynos_pcie_start_link(pci); return dw_pcie_wait_for_link(pci); -- 2.55.0