From patchwork Mon Jul 25 15:12:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12928251 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 61573C433EF for ; Mon, 25 Jul 2022 15:47:20 +0000 (UTC) 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=Cd72D6HFSJSKSn5EONRY+1v5AgIYKqq03dAPDC7koPI=; b=E4wm8yWzaDNPUe Iem4NyYATW3/Ae3uKtmmdAJO2ZY50Hzic3WuNE6Osd356VCa4BO9BidcY9s0wnWuT04BxGeLuT57v 3Oh7HeAjCheO+JBuAl4kK3djqcvo+sqEOXliNZ8qjYM+4wSVYTY4U+OWYWXo8I2bqIqV7UO3uEFE4 KRNTdOhxmxOw+PN0eLNN0hb+43aBvFiMI8AIAy/gehkt4iiSCFgvIdzKNCjHUHJcwZPcUD/+koLXe kmdHhAHT8IKMhXu5NFi/kmieSgZ54WCr3ki5OVol14b9fzAxjyWsRRcUpJCrV/ZgWSMVhgmdlIEyw h1ITTJdlzJzLJb7J7j8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oG0HO-00FRti-GK; Mon, 25 Jul 2022 15:45:58 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFzm9-00FH2s-CN; Mon, 25 Jul 2022 15:13:43 +0000 Received: by mail-pg1-x52e.google.com with SMTP id f65so10614453pgc.12; Mon, 25 Jul 2022 08:13:40 -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=cWqt3A+kTTr3GuQ/QKtvOTNiaH7+FtME/Jys/x5W9Qg=; b=RnHVXJ7QzoxC/Sb4hfqcVvvu5DQpUvhCBmwM3ZfgRwfuFoTwxujBXVmTDApsn5EFw9 JL9cAxz6gNHdtxWfy195R63xeEHToGNb3wCwYSSuCipWefhsDN54obbf36XGugonATR6 pkZSuaMmGyX6bXjcdWRhFVkvvc9CHgeafUcE+ow2bRHr3Cg8vTLwUGP/wAg3j69csvj1 /iOtfyxFG3WltjRMO0gdDJj4RvkUxx1bIlhaCQirgSYjvl7eFKG3wztVR5EVt8Cpxh37 P7zJWc6cYo64Vr5zPZ1sejbk3ohHiGia6ceCSqh7QQslmVn/dhdfx+ydUN8i4WjPnehU l+dw== 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=cWqt3A+kTTr3GuQ/QKtvOTNiaH7+FtME/Jys/x5W9Qg=; b=ZigPj3rUMOGYwY8jH71tED740/UgBbhGQWOde+il7nu475T6gbG2BKNvi6BOyt0bWW FN4wY0wCrhSa166BZFcqxXI/bXl61obnDT5fUC3ThJvryTVX2rw01VCkVtYjuQLu9clv Q1D0kSIT8PnplVL0nJthnsuBabqEVyK3sIjvBTp0hln1CeUdfbEBFTen+SlZf7f5fIKI mB5TKEGIT1FcRaUtlsorszB0FUSwWyEhfb7KJ+pqGgCEyCoLRAZ3IGGfduVH/zem++Rs GrDXBSw7o1y7/lONtL8d3M9b6DmIuI4X8G6QN7J++Uhyd5R5koREBdQ8iYCcXV+rrywP Ka9A== X-Gm-Message-State: AJIora+QccjRpkbR7svqV/517ZNvGLO/UpQ3w0XyjdccMKdfMgoNBC2L JP2c3xXjUNbZ12RYd3d1SUA= X-Google-Smtp-Source: AGRyM1uRxc0dreTIHkxKj089Ou1wxbKhCJI9jsthW/cnZ/UAr2TLk2D+Hk9H+Qdjneaasbc5pXkq3A== X-Received: by 2002:a63:fb01:0:b0:419:699f:a0bb with SMTP id o1-20020a63fb01000000b00419699fa0bbmr11334115pgh.4.1658762019875; Mon, 25 Jul 2022 08:13:39 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id a9-20020a170902ecc900b001641b2d61d4sm6649667plh.30.2022.07.25.08.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 08:13:39 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Philipp Zabel , 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 v3 6/7] PCI: brcmstb: Do not turn off WOL regulators on suspend Date: Mon, 25 Jul 2022 11:12:55 -0400 Message-Id: <20220725151258.42574-7-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220725151258.42574-1-jim2101024@gmail.com> References: <20220725151258.42574-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220725_081341_461171_031997B3 X-CRM114-Status: GOOD ( 17.64 ) 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 can be a wakeup device, do not turn off the regulators as the device will need them on. Link: https://lore.kernel.org/r/20220106160332.2143-8-jim2101024@gmail.com Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 54 ++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index aa199b0a39e2..fc1d36f6094e 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -263,6 +263,7 @@ struct brcm_pcie { void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); bool regulator_oops; struct subdev_regulators *sr; + bool ep_wakeup_capable; }; static inline bool is_bmips(const struct brcm_pcie *pcie) @@ -1283,9 +1284,21 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie) pcie->bridge_sw_init_set(pcie, 1); } +static int pci_dev_may_wakeup(struct pci_dev *dev, void *data) +{ + bool *ret = data; + + if (device_may_wakeup(&dev->dev)) { + *ret = true; + dev_info(&dev->dev, "disable cancelled for wake-up device\n"); + } + return (int) *ret; +} + static int brcm_pcie_suspend_noirq(struct device *dev) { struct brcm_pcie *pcie = dev_get_drvdata(dev); + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); int ret; brcm_pcie_turn_off(pcie); @@ -1304,11 +1317,22 @@ static int brcm_pcie_suspend_noirq(struct device *dev) } if (pcie->sr) { - ret = regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); - if (ret) { - dev_err(dev, "Could not turn off regulators\n"); - reset_control_reset(pcie->rescal); - return ret; + /* + * Now turn off the regulators, but if at least one + * downstream device is enabled as a wake-up source, do not + * turn off regulators. + */ + pcie->ep_wakeup_capable = false; + pci_walk_bus(bridge->bus, pci_dev_may_wakeup, + &pcie->ep_wakeup_capable); + if (!pcie->ep_wakeup_capable) { + ret = regulator_bulk_disable(pcie->sr->num_supplies, + pcie->sr->supplies); + if (ret) { + dev_err(dev, "Could not turn off regulators\n"); + reset_control_reset(pcie->rescal); + return ret; + } } } clk_disable_unprepare(pcie->clk); @@ -1352,11 +1376,21 @@ static int brcm_pcie_resume_noirq(struct device *dev) goto err_reset; if (pcie->sr) { - ret = regulator_bulk_enable(pcie->sr->num_supplies, - pcie->sr->supplies); - if (ret) { - dev_err(dev, "Could not turn on regulators\n"); - goto err_reset; + if (pcie->ep_wakeup_capable) { + /* + * We are resuming from a suspend. In the 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; + } else { + ret = regulator_bulk_enable(pcie->sr->num_supplies, + pcie->sr->supplies); + if (ret) { + dev_err(dev, "Could not turn on regulators\n"); + goto err_reset; + } } }