From patchwork Wed Nov 25 19:24:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 11932075 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HEADER_CTYPE_ONLY, SPF_HELO_NONE,SPF_PASS,T_TVD_MIME_NO_HEADERS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4028C64E7A for ; Wed, 25 Nov 2020 19:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67F3D207BC for ; Wed, 25 Nov 2020 19:24:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="GH9vzEQS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727648AbgKYTYm (ORCPT ); Wed, 25 Nov 2020 14:24:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727611AbgKYTYk (ORCPT ); Wed, 25 Nov 2020 14:24:40 -0500 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FC18C0613D4 for ; Wed, 25 Nov 2020 11:24:40 -0800 (PST) Received: by mail-pg1-x544.google.com with SMTP id t3so3257331pgi.11 for ; Wed, 25 Nov 2020 11:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A+TdoEe84TyXxxNLvQK1rzO9ngN0cZFReBOzLFbELZw=; b=GH9vzEQSbsM8OKZax5/QzWZ4kDUVidAHV8AfehlcY0X+qD9Jik2FeoZKxYN3Ebg3Hq De6/f0V7JJa0APB7aTRoMLMA6SLKwbw4YKYHExVVqmnJ+JiP/rIllvJ74YC2gQ0dHin9 6y8EB2+V9aNCDV7wNMzFYqv/xzVI/Ywe206Ic= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A+TdoEe84TyXxxNLvQK1rzO9ngN0cZFReBOzLFbELZw=; b=fCxOp8oFc7ukhH2hOYQli3cdfy8kGKC90j+3hOz4a4VZU1XchypGI8L/htH2wVjpX2 wrEVUEs4GC+jahYXGwBuhdT82mIs66WKssT+UEbP4lz+n4VKlotw2IEokCssZmgfaIxD dlMz/QKm/DmgKWjPddnXVSLxb+MsNBuqdbH7KUZd8DURYnoexJQ9FMciqGrBNe9BLLie ezDfjkOU5I+NYdgzDdKVH1I1ureEXfE62n8PrbrWgXCwukbF3Hqmr2GbkOhb+asviHkC ZHVk65XFjTgD05cLaxRHuVRHPE7pycVDicHv6MnfBrQDoYZ7hLobgX8BEWqFSwPmHvOW 3euA== X-Gm-Message-State: AOAM530bOE/rLvseZjW3t8XKoJZa6dtrECpXy1wcam3tr/raPqYZimMV FgtAKcoXpY2AZbZ7TLZ1kaNAPNb0HArgFmGIvAEkfHhfdXB+1gRcAi+gi/XiHjfelPmHTxXCU2X 5D9BMJTeZwwmbsPhOl7MAWqUm91O12qaNE1OccZJGZvZLQc28sbUNSgz6x6oiHj1UgNVtalv81O 7eB5nT X-Google-Smtp-Source: ABdhPJwposgK3ASJeROd0YtGbYiFsiVaMVGhH8Nra5JbCSHskmj72aQKwqEp1e3OKGMKsuVf8Y0gmg== X-Received: by 2002:a62:768b:0:b029:197:dea6:586e with SMTP id r133-20020a62768b0000b0290197dea6586emr1054436pfc.44.1606332279039; Wed, 25 Nov 2020 11:24:39 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id j69sm2574885pfd.37.2020.11.25.11.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 11:24:38 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Florian Fainelli , 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 v1 3/6] PCI: brcmstb: Do not turn off regulators if EP can wake up Date: Wed, 25 Nov 2020 14:24:20 -0500 Message-Id: <20201125192424.14440-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125192424.14440-1-james.quinlan@broadcom.com> References: <20201125192424.14440-1-james.quinlan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.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 | 56 ++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 34d6bad07b66..9b888846f0bc 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -193,6 +193,7 @@ static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 static inline void brcm_pcie_bridge_sw_init_set_generic(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); enum { RGR1_SW_INIT_1, @@ -302,6 +303,7 @@ struct brcm_pcie { void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); struct regulator *regulators[PCIE_REGULATORS_MAX]; int num_regulators; + bool ep_wakeup_capable; }; static int brcm_parse_regulators(struct brcm_pcie *pcie) @@ -324,18 +326,60 @@ static int brcm_parse_regulators(struct brcm_pcie *pcie) return 0; } -static void brcm_set_regulators(struct brcm_pcie *pcie, bool on) +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; +} + +enum { + TURN_OFF, /* Turn egulators off, unless an EP is wakeup-capable */ + TURN_OFF_ALWAYS, /* Turn Regulators off, no exceptions */ + TURN_ON, /* Turn regulators on, unless pcie->ep_wakeup_capable */ +}; + +static void brcm_set_regulators(struct brcm_pcie *pcie, int how) +{ + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); struct device *dev = pcie->dev; int ret, i; if (pcie->num_regulators == 0) return; + if (how == TURN_ON) { + 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; + } + } else if (how == TURN_OFF) { + /* + * If at least one device on this bus is enabled as a + * wake-up source, do not turn off regulators. + */ + pcie->ep_wakeup_capable = false; + if (bridge->bus && brcm_pcie_link_up(pcie)) { + pci_walk_bus(bridge->bus, pci_dev_may_wakeup, &pcie->ep_wakeup_capable); + if (pcie->ep_wakeup_capable) + return; + } + } + for (i = 0; i < PCIE_REGULATORS_MAX; i++) { if (!pcie->regulators[i]) continue; - if (on) { + if (how == TURN_ON) { ret = regulator_enable(pcie->regulators[i]); dev_dbg(dev, "enable regulator %s (%s)\n", ep_regulator_names[i], ret ? "fail" : "pass"); @@ -1197,7 +1241,7 @@ static int brcm_pcie_suspend(struct device *dev) brcm_pcie_turn_off(pcie); ret = brcm_phy_stop(pcie); clk_disable_unprepare(pcie->clk); - brcm_set_regulators(pcie, false); + brcm_set_regulators(pcie, TURN_OFF); return ret; } @@ -1210,7 +1254,7 @@ static int brcm_pcie_resume(struct device *dev) int ret; base = pcie->base; - brcm_set_regulators(pcie, true); + brcm_set_regulators(pcie, TURN_ON); clk_prepare_enable(pcie->clk); ret = brcm_phy_start(pcie); @@ -1249,7 +1293,7 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie) brcm_phy_stop(pcie); reset_control_assert(pcie->rescal); clk_disable_unprepare(pcie->clk); - brcm_set_regulators(pcie, false); + brcm_set_regulators(pcie, TURN_OFF_ALWAYS); } static int brcm_pcie_remove(struct platform_device *pdev) @@ -1338,7 +1382,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) return ret; } - brcm_set_regulators(pcie, true); + brcm_set_regulators(pcie, TURN_ON); ret = brcm_pcie_setup(pcie); if (ret) goto fail;