From patchwork Fri Oct 29 20:03:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12593699 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B7B9C433EF for ; Fri, 29 Oct 2021 20:23:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D7FF160E76 for ; Fri, 29 Oct 2021 20:23:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D7FF160E76 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NgN4dTt2ZMK53WEvCwjivWOQuS/6b8rM3371gDntu/c=; b=sxCHpqtGJEufYX Tzfp6ZQ3oERLZO/Xi67+Vu51BI7v2dZNPmBc13kKZuvaKi452jbJYBnigPD9fPiQiYR+mDjFP5GgI ZVDX7V18rtDg3f+PsqBiyw+nSBSfvwnlNX7cqwM94xe5lkJtrhR0OyisdY2+6ONevoq7+s3fM/PrI TM+E7sPEvfnkOJ+C4R0z/DsSsOO2SV68fATc5zw7mJ7fDIUbWO9kB2z4C1WZtwIXb/vm6GbFt+Zug ISOK6nJ0VyMBSQdaRMRroGZcljbzCe0cCLVoEqlP7CAnJbTG7H0D6vH7f3oiQowX8FVfMfDVKzbIh Wtc1sP9auzlfOcUz16pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgYN5-00CE9P-1C; Fri, 29 Oct 2021 20:21:04 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgY6J-00C9dt-1l; Fri, 29 Oct 2021 20:03:45 +0000 Received: by mail-pj1-x1029.google.com with SMTP id o6-20020a17090a0a0600b001a64b9a11aeso819037pjo.3; Fri, 29 Oct 2021 13:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xm4SxmqwuOzBa/eZu2FFd0i6Z3G+Vk7bausmQ5xw+Wk=; b=Ukpz40DOhJCbTS0qUysan/cT59elQe3QGvN3TqPOJ9ouYTGiABkDBzs0G1TJ2/++sy NZa+I1/MJ02SV0AyDQg+x4sIvcSelYgVP/IWVgX6WB69sY6bz1VDX2HELr47w3nzxFC6 jypWTJ9BUYStdK+qnKNDygx3BqwIE7Lw0XuWitHusQxOCE6QoqDMppBhQAIo18gc0g4q TgjhJNCa8R7+IDZFWfAWl73IkeIjGkoMHW/EMkWO+YjHKQaPerU35AftWjCs/dkofE9q eNh9WdNCqh0u15YoGMH2smxpI5r33H62uC0qGr8YeJxoxEJXuZQ04jJtcVIyMOzgMsnk EIvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xm4SxmqwuOzBa/eZu2FFd0i6Z3G+Vk7bausmQ5xw+Wk=; b=bD9q2hDFEADZAfG5hbG6BzjedDRhKQZCk2p7oLSlnaJCUbpjYNJpo8mLfe1/305bqj uxF16cX5iWKmI4n8rwEGel6blBsTM3b+7cD5frz12fttNqFNih0+KVNvjb4LBuir72+7 oMYX/vk8V9TdkfaZgpuAEyFO7yxevPDPm8t1wZ2VInH/hv1cFU4AXkxIGm4xmnAtDVQ3 ER5k/DdkPc0dRfL9VDicW3mlonuMfxYUquWN8rJ4tOfciLuCufBq0cDXcNIzr8xrn8FC kpNfitPfiJTNEkpUvxOgEWDzT1PwwQ0BblPonxsJDU+H3IJpPv/uDPnXzzpgiHVJbW/o sd7A== X-Gm-Message-State: AOAM533bGsXyk0IDV2R7BSWSEOzQhAU5IIYLAxRvU2yXiIMgB8hAmfbw TZ4q4QNqw+RIJiN18O2z56I= X-Google-Smtp-Source: ABdhPJyBfG5E+MF9U5ej9v+kNG6zjDbhbmOpAJsBRFAGkk7Xi3emFFxmGH3ASKOyUClSZjy3uUvTeQ== X-Received: by 2002:a17:90b:33c7:: with SMTP id lk7mr13790866pjb.172.1635537821370; Fri, 29 Oct 2021 13:03:41 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.11.250]) by smtp.gmail.com with ESMTPSA id j16sm8775041pfj.16.2021.10.29.13.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 13:03:41 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Rob Herring , Mark Brown , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 8/9] PCI: brcmstb: Do not turn off regulators if EP can wake up Date: Fri, 29 Oct 2021 16:03:16 -0400 Message-Id: <20211029200319.23475-9-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211029200319.23475-1-jim2101024@gmail.com> References: <20211029200319.23475-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211029_130343_166430_8B055A61 X-CRM114-Status: GOOD ( 18.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If any downstream device may wake up during S2/S3 suspend, we do not want to turn off its power when suspending. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 49 ++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 6635e143cfcb..18b9f7c97864 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -192,6 +192,7 @@ static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_generic(struct brcm_pcie *pcie, u32 val); +static bool brcm_pcie_link_up(struct brcm_pcie *pcie); static const char * const supplies[] = { "vpcie3v3", @@ -304,8 +305,20 @@ struct brcm_pcie { void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); struct regulator_bulk_data supplies[ARRAY_SIZE(supplies)]; unsigned int num_supplies; + bool ep_wakeup_capable; }; +static int pci_dev_may_wakeup(struct pci_dev *dev, void *data) +{ + bool *ret = data; + + if (device_may_wakeup(&dev->dev)) { + *ret = true; + dev_dbg(&dev->dev, "disable cancelled for wake-up device\n"); + } + return (int) *ret; +} + static int brcm_regulators_on(struct brcm_pcie *pcie) { struct device *dev = pcie->dev; @@ -313,6 +326,18 @@ static int brcm_regulators_on(struct brcm_pcie *pcie) if (!pcie->num_supplies) return 0; + + if (pcie->ep_wakeup_capable) { + /* + * We are resuming from a suspend. In the previous suspend + * we did not disable the power supplies, so there is no + * need to enable them (and falsely increase their usage + * count). + */ + pcie->ep_wakeup_capable = false; + return 0; + } + ret = regulator_bulk_enable(pcie->num_supplies, pcie->supplies); if (ret) dev_err(dev, "failed to enable EP regulators\n"); @@ -320,13 +345,28 @@ static int brcm_regulators_on(struct brcm_pcie *pcie) return ret; } -static int brcm_regulators_off(struct brcm_pcie *pcie) +static int brcm_regulators_off(struct brcm_pcie *pcie, bool force) { + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); struct device *dev = pcie->dev; int ret; if (!pcie->num_supplies) return 0; + + pcie->ep_wakeup_capable = false; + + if (!force && bridge->bus && brcm_pcie_link_up(pcie)) { + /* + * If at least one device on this bus is enabled as a + * wake-up source, do not turn off regulators. + */ + pci_walk_bus(bridge->bus, pci_dev_may_wakeup, + &pcie->ep_wakeup_capable); + if (pcie->ep_wakeup_capable) + return 0; + } + ret = regulator_bulk_disable(pcie->num_supplies, pcie->supplies); if (ret) dev_err(dev, "failed to disable EP regulators\n"); @@ -1248,7 +1288,7 @@ static int brcm_pcie_suspend(struct device *dev) reset_control_rearm(pcie->rescal); clk_disable_unprepare(pcie->clk); - return brcm_regulators_off(pcie); + return brcm_regulators_off(pcie, false); } static int brcm_pcie_resume(struct device *dev) @@ -1264,6 +1304,7 @@ static int brcm_pcie_resume(struct device *dev) ret = reset_control_reset(pcie->rescal); if (ret) goto err_disable_clk; + ret = brcm_regulators_on(pcie); if (ret) goto err_reset; @@ -1311,7 +1352,7 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie) reset_control_rearm(pcie->rescal); clk_disable_unprepare(pcie->clk); if (pcie->num_supplies) { - brcm_regulators_off(pcie); + brcm_regulators_off(pcie, true); regulator_bulk_free(pcie->num_supplies, pcie->supplies); } } @@ -1382,7 +1423,7 @@ static int brcm_pcie_pci_subdev_prepare(struct pci_bus *bus, int devfn, return 0; err_out1: - brcm_regulators_off(pcie); + brcm_regulators_off(pcie, true); err_out0: regulator_bulk_free(pcie->num_supplies, pcie->supplies); pcie->num_supplies = 0;