From patchwork Mon Jul 25 15:12:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12928245 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 0F9F7C43334 for ; Mon, 25 Jul 2022 15:39:44 +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: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:In-Reply-To:References: List-Owner; bh=wfsgTQ823ftLaUZv/AS9yQ3dF7/WoZWIGc+X2ZvN7ns=; b=JxpL054fm3wtiP 7OohUm/B++HzzB/y+HmO7ENA6HQT5sXPxbp7ZHPal24cktc3nvgohQUKiMF56bwhJFp9jjCGzkYOt fDkxdq07sINMImSEF79sFxVHTD3p+xP7sCGJzLGp/IpzRazcv5+oTq/J8MM9aSD6Jw7YP+HRImSCi wRN+2fl757eY2LOmjGZXTq1+YJ0i+xAExGJv/8+ei9Z2LUT2h8GcXCt/Ap7Q9Xq0Rdu5/FPj7R4CY i3BAiWqPYskfjXkzWqZs1xwrEBqGVjTClZnVRXpNkgafcYN6oebUAXYo2Z0dDtffP2yT7vKzd4wxC EosY7qnWCg2CtBghg6eA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oG0A2-00FPZL-Vu; Mon, 25 Jul 2022 15:38:24 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFzlr-00FGut-51; Mon, 25 Jul 2022 15:13:24 +0000 Received: by mail-pf1-x42d.google.com with SMTP id w205so7366954pfc.8; Mon, 25 Jul 2022 08:13:21 -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; bh=vClZEDHW/p/nRPc4T2OtKWpsEU80qB0nIfVJ1m6OHYg=; b=PiD+kKPGc4Pm9OcZQZJwoMV3H+yXJCQjYhEzcQJJYC2lKA2LyX9CNLTurlguPmz/BD N6jJGH0qORg74v0B7iaS52QPlrLohHdqbARsv1KrPjuEX575/HlU3fgBxP9rFn1JbFOs 8LfPqUSH7qL0BbkY5LU6M3Sn/vOCsV6x+GZVbLdEMSTeBtcTAnhTskxx7QraJKs8x/1M uvD6mEzN6OF4vfBD64EOdKSwRoyUuB+o/uvthi8MgGPBX/Iq31tZlASDKPHnb5rh8SWo WgFLYdUvp127aYedetMr5vIlqH5JjOrCpCIwlHHitnTIYGE1ijc2cLnR5hTuaV2POFBr 2auA== 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; bh=vClZEDHW/p/nRPc4T2OtKWpsEU80qB0nIfVJ1m6OHYg=; b=7Fdc99ntwoRVU464mr4ayPUWUDIhUQC+O8/L0bnjalQ0gIATpJBm+ySBocWuJTLal8 XbIDIVNEAqUVUS75w1Xj0LNQTmdwRIxGhRKVwAGSNIqUtBQIXICJPPp+Af1PGdZHrw6q srDfZvG2LwZaq9Dy3vfBKH4pWzE5tt4jx3XDhehbvThwZjbSoJbMDZT7uEL/milLrUvu r6q94uwLDmF/jwjPe7VsFakvcCR2J+6mffn/L8fxudoYqElG3k66/1PYILBg8N7amqnc wjgSw/VcW0ndbWp9gQ4KWG9vt+i/e5krYm2Y8l0+xiWnyyeJ/PdMvC+eyEALCU63wLyy Nc5A== X-Gm-Message-State: AJIora+xf65uXvymh7t5dodPy5PDxB3GHuQLMHJ9XjPypjZKpVZDlNzW ZBL6YvRE6PiEf2ipD2VPo7A= X-Google-Smtp-Source: AGRyM1sODvWco/wy/JwP4+nnbMCuyaPj/uRKlViVYr6xlq2RO9aNdFighhUzr9JC6hRduAn8/tZWMA== X-Received: by 2002:a63:4e09:0:b0:412:1ba3:672a with SMTP id c9-20020a634e09000000b004121ba3672amr11728676pgb.597.1658762000782; Mon, 25 Jul 2022 08:13:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 08:13:19 -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: =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), Rob Herring Subject: [PATCH v3 0/7] PCI: brcmstb: Re-submit reverted patchset Date: Mon, 25 Jul 2022 11:12:49 -0400 Message-Id: <20220725151258.42574-1-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220725_081323_255048_B17B8A9F X-CRM114-Status: GOOD ( 19.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 v3 -- Replaced "refusal mode" commit with one that gates config space accesses based on link status (Bjorn) -- Restrict the brcm_pcie_start_link() code to only those things related to link-up and put the rest in brcm_pcie_setup() -- Added commit to change map functions to end with 'map_bus' (Bjorn) -- s/0x060400/PCI_CLASS_BRIDGE_PCI_NORMAL/ (Pali) -- Limit config space accesess to 4k window. -- Remove wording in a commit message that said the regulators could be endpoint power supplies V2 -- As v1 included the minimal code to fix a regression. v2 does the same but adds some improvements suggested by Bjorn. -- In the unlikely but possible case that some other driver starts using the port driver's dev_data field, do not overwrite it but issue an error and return. -- Functions probe() and resume() do similar operations but did them in a different order; make this order consistent for both. -- New commit to remove forward declarations. -- New commit for only the PCIe config-space access "refusal mode". -- brcm_pcie_linkup renamed to brcm_pcie_start_link -- Add '_noirq' to the brcm_pcie_{suspend,resume} function names to match the dev_pm_ops names. -- Changes to commit messages: o Explain why we are splitting a function in two parts. o s/RB/Root Port/ NOTE for Bjorn: The two commits "add mechanism .." and "add control ..." would probably be more clear if they were squashed. They are kept separate as the first one's code may someday be moved under the Port driver. As such, there's some churn. NOTE for Bjorn: There is no hurry on Broadcom's side wrt which release cycle/phase this patchset is applied. It goes in when you think it is ready. V1 -- Resubmission of patchset after original was reverted for a regression. A submission [1] was made to enable a PCIe root port to turn on regulators for downstream devices. It was accepted. Months later, a regression was discovered on an RPi CM4 [2]. The patchset was reverted [3] as the fix came too late in the release cycle. The regression in question is triggered only when the PCIe RC DT node has no root port subnode, which is a perfectly reasonsable configuration. The original commits are now being resubmitted with some modifications to fix the regression. The modifcations on the original commits are described below (the SHA is that of the original commit): [830aa6f29f07 PCI: brcmstb: Split brcm_pcie_setup() into two funcs] NOTE: In the originally submitted patchset, this commit introduced a regression that was corrected by a subsequent commit in the same patchset. Let's not do this again. @@ -1411,6 +1411,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) if (ret) goto fail; + ret = brcm_pcie_linkup(pcie); + if (ret) + goto fail; [67211aadcb4b PCI: brcmstb: Add mechanism to turn on subdev regulators] NOTE: Not related to the regression, the regulators must be freed whenever the PCIe tree is dismantled: @@ -507,6 +507,7 @@ static void pci_subdev_regulators_remove_bus(struct pci_bus *bus) if (regulator_bulk_disable(sr->num_supplies, sr->supplies)) dev_err(dev, "failed to disable regulators for downstream device\n"); + regulator_bulk_free(sr->num_supplies, sr->supplies); dev->driver_data = NULL; [93e41f3fca3d PCI: brcmstb: Add control of subdevice voltage regulators] NOTE: If the PCIe RC DT node was missing a Root Port subnode, the PCIe link-up was skipped. This is the regression. Fix it by attempting link-up even if the Root Port DT subnode is missing. @@ -503,11 +503,10 @@ static int pci_subdev_regulators_add_bus(struct pci_bus *bus) static int brcm_pcie_add_bus(struct pci_bus *bus) { - struct device *dev = &bus->dev; struct brcm_pcie *pcie = (struct brcm_pcie *) bus->sysdata; int ret; - if (!dev->of_node || !bus->parent || !pci_is_root_bus(bus->parent)) + if (!bus->parent || !pci_is_root_bus(bus->parent)) return 0; ret = pci_subdev_regulators_add_bus(bus); [1] https://lore.kernel.org/r/20220106160332.2143-1-jim2101024@gmail.com [2] https://bugzilla.kernel.org/show_bug.cgi?id=215925 [3] https://lore.kernel.org/linux-pci/20220511201856.808690-1-helgaas@kernel.org/ Jim Quinlan (7): PCI: brcmstb: Remove unnecessary forward declarations PCI: brcmstb: Split brcm_pcie_setup() into two funcs PCI: brcmstb: Gate config space access on link status PCI: brcmstb: Add mechanism to turn on subdev regulators PCI: brcmstb: Add control of subdevice voltage regulators PCI: brcmstb: Do not turn off WOL regulators on suspend PCI: brcmstb: Have .map_bus function names end with 'map_bus' drivers/pci/controller/pcie-brcmstb.c | 476 ++++++++++++++++++-------- 1 file changed, 341 insertions(+), 135 deletions(-) base-commit: e0dccc3b76fb35bb257b4118367a883073d7390e Tested-by: Florian Fainelli