From mboxrd@z Thu Jan 1 00:00:00 1970 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 A9F06C433EF for ; Tue, 5 Jul 2022 21:09:56 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qx51DhjRsEW6t85zwjcmV634kpmARcRTtIcw3Q5IAdg=; b=j6AsUEwxN6qB02 bONKTryTbWEHCzONRKosefC0SIrHowG+19o5YsR5BEH32s8bWdEvBzlYmSOTLnsGTkLK59H6aB/C3 bCRy1kAkjXpwFa8rDNR6tQ9qTbn00TUuAGir0ZmGqa5WYptAu67mAkgnYhCCpJV2UUgs7mfuiYvP2 N/+zQmtcDPGXB6Ps6Hk8pAeiwa/O9KsfmAi1hxDL2kLL01U+3q/DqE5/Z8ndrTY4k0vmWDxZNHizt 8y0Oe8aIlaeu5PrezLWPQ5+JC+x3Qow3S4YMcQniVNrT3ErWk1chzTANC0MMCYGtdvFTACldEtW/R DsqImY/v0FEV//L2PA1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8pmc-002pgu-DU; Tue, 05 Jul 2022 21:08:35 +0000 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8peT-002mdw-J9; Tue, 05 Jul 2022 21:00:11 +0000 Received: by mail-qt1-x82a.google.com with SMTP id he28so15585996qtb.13; Tue, 05 Jul 2022 14:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=vcs2J2koXt5O4RSuShYBHdUW1jRgrQ5hJpRCB/pXcoE=; b=VJJoHuBykHZEAIU8sBqGBDpW2ZnicplMXNyikl1ZTuB0SMoT0ZfYx9UkWx+oL3sCOu +P6lpiOa7RqZ9ups99PwRTeZuoWTgbd6/+eUT3nC5IjcGkFGa39cfj+oAMt5a7mCPvp9 GxnaMdNumrd4IBjDMbUJb1sXiBYYsrIY+0pmmhKDOxlppsvKQTUenJSy7CqBTtBLPBBE 042Aw8KiXlAFydX47Rx6C812GUMUY2XgwwfI+pNCOgE+om8iSphXQraPSCigTGMZw+sm PhkzGuvtqfGjWlSVtjfi3S8XeNrgpg+yHwG6sgaqKkg8mTKf7H/GYYWi0Brut4s5FiTP oJIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=vcs2J2koXt5O4RSuShYBHdUW1jRgrQ5hJpRCB/pXcoE=; b=1u4J4V41/z630S3BFedTK2H7o40vhkMQ4Dc0xW5aWUDJh5wBSKoj7i4psgYvTAYGsl IPZmLyCE0tDGRBGK9ygpLki/rS8TKB3yxDeXjeAsDPNj3c5OT08WAfCBA07Nz/7M39b/ FnJU46nz56X3FywFDIBwsZsSiBQA0gaPKgW+UYqv6ion0vACPF6NZ71uYWU4fHxPRj5G Q4BWoV2pISOC+8tTrI2HwAE9OnMXur5JL3vJvrxHU18W+pA45zuhr8AINDDiOXC+jh6S DNqJpbBB0cz7ow4woOtCofk4jREbGiERJuMPtLfqxvfxktKtMLdNS8RggH9Hv79Vk+V1 2Zsw== X-Gm-Message-State: AJIora9v653TcEGj22h8YmlkERyQdwlPi8iyqEP+c4qscP/UkIL5RCTn Tolt1adZjfpxSEy50PYsM7g= X-Google-Smtp-Source: AGRyM1u9Kk4QZdYtB4YjIMI1O9dGRQYc+tFz1eub9fVBSgeLb51G4s/E71mobbSRTPUQx/lxvpaAkw== X-Received: by 2002:a05:622a:13d1:b0:317:c964:6b1d with SMTP id p17-20020a05622a13d100b00317c9646b1dmr29964520qtk.538.1657054808414; Tue, 05 Jul 2022 14:00:08 -0700 (PDT) Received: from [10.67.48.245] ([192.19.223.252]) by smtp.googlemail.com with ESMTPSA id c4-20020a05620a268400b006aee03a95dfsm27649930qkp.124.2022.07.05.14.00.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jul 2022 14:00:07 -0700 (PDT) Message-ID: <68af8b36-76b7-23d2-c689-d05fd62086b1@gmail.com> Date: Tue, 5 Jul 2022 14:00:05 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH v1 0/4] PCI: brcmstb: Re-submit reverted patchset Content-Language: en-US To: Cyril Brulebois , Florian Fainelli Cc: Jim Quinlan , linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, =?UTF-8?Q?Krzysztof_Wilczy=c5=84ski?= , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , Rob Herring References: <20220701162726.31346-1-jim2101024@gmail.com> <1a50e8b0-1453-4561-bc3d-c428bb65288a@gmail.com> <20220705205551.phbaqqpgyg3pvtv7@mraw.org> From: Florian Fainelli In-Reply-To: <20220705205551.phbaqqpgyg3pvtv7@mraw.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220705_140009_787533_A6C9FD67 X-CRM114-Status: GOOD ( 25.57 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 7/5/22 13:55, Cyril Brulebois wrote: > Florian Fainelli (2022-07-01): >> On 7/1/22 09:27, Jim Quinlan wrote: >>> 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/ >> >> On a Raspberry Pi 4B: >> >> Tested-by: Florian Fainelli > > As it stands, CM4 support in master is less than ideal: the mmc issues > I've mentioned in some earlier discussion are making it very hard to > draw any definitive conclusions. Soft reboots or cold boots don't seem > to make a difference: the storage might not show up at all, leading to > getting dropped into an initramfs shell, or it might show up but further > accesses can be delayed so much that the system proceeds to booting but > very slowly, and it might even lead to getting dropped into some > emergency/maintenance mode. > > This affects both the CM4 Lite variant (no internal storage = SD card in > the CM4 IO slot) and some CM4 non-Lite variant (with internal storage), > with messages like this one getting repeated: > > [ 310.105020] mmc0: Timeout waiting for hardware cmd interrupt. > [ 310.110864] mmc0: sdhci: ============ SDHCI REGISTER DUMP =========== > [ 310.117390] mmc0: sdhci: Sys addr: 0x00000000 | Version: 0x00009902 > [ 310.123918] mmc0: sdhci: Blk size: 0x00000000 | Blk cnt: 0x00000000 > [ 310.130445] mmc0: sdhci: Argument: 0x000001aa | Trn mode: 0x00000000 > [ 310.136971] mmc0: sdhci: Present: 0x01ff0001 | Host ctl: 0x00000001 > [ 310.143496] mmc0: sdhci: Power: 0x0000000f | Blk gap: 0x00000000 > [ 310.150021] mmc0: sdhci: Wake-up: 0x00000000 | Clock: 0x00007187 > [ 310.156548] mmc0: sdhci: Timeout: 0x00000000 | Int stat: 0x00018000 > [ 310.163074] mmc0: sdhci: Int enab: 0x00ff0003 | Sig enab: 0x00ff0003 > [ 310.169600] mmc0: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000001 > [ 310.176126] mmc0: sdhci: Caps: 0x00000000 | Caps_1: 0x00000000 > [ 310.182652] mmc0: sdhci: Cmd: 0x0000081a | Max curr: 0x00000001 > [ 310.189178] mmc0: sdhci: Resp[0]: 0x00000000 | Resp[1]: 0x00000000 > [ 310.195704] mmc0: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000000 > [ 310.202230] mmc0: sdhci: Host ctl2: 0x00000000 > [ 310.206728] mmc0: sdhci: ============================================ > > That happens with current master (v5.19-rc5-56-ge35e5b6f695d2), with or > without this patchset. > > That being said, I'm not able to reproduce the showstopper regression > that I reported against the initial patchset (booting was breaking in > the very first few seconds), so I suppose it's fine to propose the > following even if that's somewhat tainted by those mmc issues. Any chance you can bisect the eMMC issues so we can investigate those separately? Thanks! > > > With Raspberry Pi CM4 (Lite and non-Lite), mounted on a CM4 IO Board: > - with a PCIe to quad-USB board, USB storage and USB keyboard; > - without anything in the PCIe slot. > > Tested-by: Cyril Brulebois Thanks! -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel