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 X-Spam-Level: X-Spam-Status: No, score=-7.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 8A661C2B9F8 for ; Tue, 25 May 2021 16:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69BE7613FA for ; Tue, 25 May 2021 16:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232989AbhEYRBH (ORCPT ); Tue, 25 May 2021 13:01:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbhEYRBG (ORCPT ); Tue, 25 May 2021 13:01:06 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4431C061574; Tue, 25 May 2021 09:59:36 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id jt22so4234567ejb.7; Tue, 25 May 2021 09:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=t1FNl9lJs3TkwUO5mRkcIam/8qaXYZFbY1nREa5MM+Y=; b=O81YBBHZolgjiTTqZKMqj9UO/yQA1fxGVCITzWVEFLZs7dU6Jidb72SMJsVbeNAZHm Kr+MVXyZSlD1HCV7snoRYjm2EsjU4X/vQzX1pKyO9giu6pdF87yvTSXl8XdvQlz73yN9 goOyeiG90AWWy3QkNN/Im7eQi/3e6jwc3xApqht+tcYeRTwkDm2tf26RGdj2SsH/VAOb /9Ix9VI012kbzbF6kEKZtwCC+FuI1X0+/2KZdFlMRzWbUe8KvLr7lll65XPdE7IMiQmB YrMbPdVdUlD92yWihrvIZyfnxQR86H9KVMUOBcYe9n/ttCkGntU1AKhyHLg39WkBfcGe GeJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=t1FNl9lJs3TkwUO5mRkcIam/8qaXYZFbY1nREa5MM+Y=; b=XTdWXKXbzIUc+H6sqrt7ohczUbtHH8OaY+WhueWYAcCAcsUp3V29zopUzoSWVNrw1n nGgZ/BQmidHwJg7MnpZfwaHB56K9ewXPNpLcLWfGSt+/UUtW6M6fz82EwMbtbq1g0AKB dbUBpqK5WFBLKeXD9Pd6e0vjOwIzihYxmr/W54KVjve/Gf3fquY3Sr3TVo/P5ON3Zimh qBcCojGIFTM2DgYGpew3lVsVTWQ7fC9vxHzKQz0nq0AvWuToRWy1VwaEPgOjMrVOKyuN mUkxfCXg0y4J4qFqpFWzCbgqMpZtl/i1j1YGYYti8Chc44diXOO+G9p/C+FWxe/+JIsY x4mg== X-Gm-Message-State: AOAM5316lKoui2GajpExZhX9+xHnUV/sLYunbq0ap4HyUCqyYz9LwhUq a7ylwWFhNpmMNIkkEBgqjtEuBLaznGecKyknN3E= X-Google-Smtp-Source: ABdhPJwt7RSI4ukReV5wkC4uQ7Jqoe5nbzP6AOBn/McdseLNcZUs1xCZEukUS3l7VDdoNK0mrzWVeFZQpCZa33u0U5I= X-Received: by 2002:a17:906:2749:: with SMTP id a9mr9432685ejd.498.1621961975229; Tue, 25 May 2021 09:59:35 -0700 (PDT) MIME-Version: 1.0 References: <7a1e2ebc-f7d8-8431-d844-41a9c36a8911@arm.com> <01efd004-1c50-25ca-05e4-7e4ef96232e2@arm.com> <87eedxbtkn.fsf@stealth> <877djnaq11.fsf@stealth> In-Reply-To: From: Anand Moon Date: Tue, 25 May 2021 22:29:22 +0530 Message-ID: Subject: Re: [BUG] rockpro64: PCI BAR reassignment broken by commit 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses") To: Ard Biesheuvel Cc: Punit Agrawal , Robin Murphy , Alexandru Elisei , Linux Kernel Mailing List , linux-rockchip@lists.infradead.org, arm-mail-list , Heiko Stuebner , leobras.c@gmail.com, Rob Herring , PCI Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Hi Ard, On Tue, 25 May 2021 at 19:27, Ard Biesheuvel wrote: > > On Tue, 25 May 2021 at 15:42, Punit Agrawal wrote: > > > > Hi Ard, > > > > Ard Biesheuvel writes: > > > > > On Sun, 23 May 2021 at 13:06, Punit Agrawal wrote: > > >> > > >> Robin Murphy writes: > > >> > > >> > [ +linux-pci for visibility ] > > >> > > > >> > On 2021-05-18 10:09, Alexandru Elisei wrote: > > >> >> After doing a git bisect I was able to trace the following error when booting my > > >> >> rockpro64 v2 (rk3399 SoC) with a PCIE NVME expansion card: > > >> >> [..] > > >> >> [ 0.305183] rockchip-pcie f8000000.pcie: host bridge /pcie@f8000000 ranges: > > >> >> [ 0.305248] rockchip-pcie f8000000.pcie: MEM 0x00fa000000..0x00fbdfffff -> > > >> >> 0x00fa000000 > > >> >> [ 0.305285] rockchip-pcie f8000000.pcie: IO 0x00fbe00000..0x00fbefffff -> > > >> >> 0x00fbe00000 > > >> >> [ 0.306201] rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy > > >> >> regulator > > >> >> [ 0.306334] rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy > > >> >> regulator > > >> >> [ 0.373705] rockchip-pcie f8000000.pcie: PCI host bridge to bus 0000:00 > > >> >> [ 0.373730] pci_bus 0000:00: root bus resource [bus 00-1f] > > >> >> [ 0.373751] pci_bus 0000:00: root bus resource [mem 0xfa000000-0xfbdfffff 64bit] > > >> >> [ 0.373777] pci_bus 0000:00: root bus resource [io 0x0000-0xfffff] (bus > > >> >> address [0xfbe00000-0xfbefffff]) > > >> >> [ 0.373839] pci 0000:00:00.0: [1d87:0100] type 01 class 0x060400 > > >> >> [ 0.373973] pci 0000:00:00.0: supports D1 > > >> >> [ 0.373992] pci 0000:00:00.0: PME# supported from D0 D1 D3hot > > >> >> [ 0.378518] pci 0000:00:00.0: bridge configuration invalid ([bus 00-00]), > > >> >> reconfiguring > > >> >> [ 0.378765] pci 0000:01:00.0: [144d:a808] type 00 class 0x010802 > > >> >> [ 0.378869] pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit] > > >> >> [ 0.379051] pci 0000:01:00.0: Max Payload Size set to 256 (was 128, max 256) > > >> >> [ 0.379661] pci 0000:01:00.0: 8.000 Gb/s available PCIe bandwidth, limited by > > >> >> 2.5 GT/s PCIe x4 link at 0000:00:00.0 (capable of 31.504 Gb/s with 8.0 GT/s PCIe > > >> >> x4 link) > > >> >> [ 0.393269] pci_bus 0000:01: busn_res: [bus 01-1f] end is updated to 01 > > >> >> [ 0.393311] pci 0000:00:00.0: BAR 14: no space for [mem size 0x00100000] > > >> >> [ 0.393333] pci 0000:00:00.0: BAR 14: failed to assign [mem size 0x00100000] > > >> >> [ 0.393356] pci 0000:01:00.0: BAR 0: no space for [mem size 0x00004000 64bit] > > >> >> [ 0.393375] pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x00004000 64bit] > > >> >> [ 0.393397] pci 0000:00:00.0: PCI bridge to [bus 01] > > >> >> [ 0.393839] pcieport 0000:00:00.0: PME: Signaling with IRQ 78 > > >> >> [ 0.394165] pcieport 0000:00:00.0: AER: enabled with IRQ 78 > > >> >> [..] > > >> >> to the commit 9d57e61bf723 ("of/pci: Add IORESOURCE_MEM_64 to > > >> >> resource flags for > > >> >> 64-bit memory addresses"). > > >> > > > >> > FWFW, my hunch is that the host bridge advertising no 32-bit memory > > >> > resource, only only a single 64-bit non-prefetchable one (even though > > >> > it's entirely below 4GB) might be a bit weird and tripping something > > >> > up in the resource assignment code. It certainly seems like the thing > > >> > most directly related to the offending commit. > > >> > > > >> > I'd be tempted to try fiddling with that in the DT (i.e. changing > > >> > 0x83000000 to 0x82000000 in the PCIe node's "ranges" property) to see > > >> > if it makes any difference. Note that even if it helps, though, I > > >> > don't know whether that's the correct fix or just a bodge around a > > >> > corner-case bug somewhere in the resource code. > > >> > > >> From digging into this further the failure seems to be due to a mismatch > > >> of flags when allocating resources in pci_bus_alloc_from_region() - > > >> > > >> if ((res->flags ^ r->flags) & type_mask) > > >> continue; > > >> > > >> Though I am also not sure why the failure is only being reported on > > >> RK3399 - does a single 64-bit window have anything to do with it? > > >> > > > > > > The NVMe in the example exposes a single 64-bit non-prefetchable BAR. > > > Such BARs can not be allocated in a prefetchable host bridge window > > > (unlike the converse, i.e., allocating a prefetchable BAR in a > > > non-prefetchable host bridge window is fine) > > > > > > 64-bit non-prefetchable host bridge windows cannot be forwarded by PCI > > > to PCI bridges, they simply lack the BAR registers to describe them. > > > Therefore, non-prefetchable endpoint BARs (even 64-bit ones) need to > > > be carved out of a host bridge's non-prefetchable 32-bit window if > > > they need to pass through a bridge. > > > > Thank you for the explanation. I also looked at the PCI-to-PCI Bridge > > spec to understand where some of the limitations are coming from. > > > > > So the error seems to be here that the host bridge's 32-bit > > > non-prefetchable window has the 64-bit attribute set, even though it > > > resides below 4 GB entirely. I suppose that the resource allocation > > > could be made more forgiving (and it was in the past, before commit > > > 9d57e61bf723 was applied). However, I would strongly recommend not > > > deviating from common practice, and just describe the 32-bit > > > addressable non-prefetchable resource window as such. > > > > IIUC, the host bridge's configuration (64-bit on non-prefetchable > > window) is based on what the hardware advertises. > > > > What do you mean by 'what the hardware advertises'? The host bridge is > apparently configured to decode a 32-bit addressable window as MMIO, > and the question is why this window has the 64-bit attribute set in > the DT description. > > > Can you elaborate on what you have in mind to correct the > > non-prefetchable resource window? Are you thinking of adding a quirk > > somewhere to address this? > > > > No. Just fix the DT. Yes DTS changes are needed as well as some more core driver changes. As per the Rk3399 TRM (Rockchip RK3399 TRM V1.3 Part2.pdf) [0] https://rockchip.fr/Rockchip%20RK3399%20TRM%20V1.3%20Part2.pdf I had made the following dts changes relates to ranges as per PCI below. *17.6.1 Internal Register Address Mapping Table 17-23 Global Address Map for Core Local Management* diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 634a91af8e83..796b44e07be1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -199,7 +199,7 @@ xin24m: xin24m { pcie0: pcie@f8000000 { compatible = "rockchip,rk3399-pcie"; - reg = <0x0 0xf8000000 0x0 0x2000000>, + reg = <0x0 0xf8000000 0x0 0x6000000>, <0x0 0xfd000000 0x0 0x1000000>; reg-names = "axi-base", "apb-base"; device_type = "pci"; @@ -227,8 +227,8 @@ pcie0: pcie@f8000000 { <&pcie_phy 2>, <&pcie_phy 3>; phy-names = "pcie-phy-0", "pcie-phy-1", "pcie-phy-2", "pcie-phy-3"; - ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, - <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; + ranges = <0x83000000 0x0 0xfd800000 0x0 0xfd810000 0x0 0x100000>, + <0x81000000 0x0 0xfd800000 0x0 0xfda00000 0x0 0x100000>; resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>, <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>, @@ -2040,6 +2040,21 @@ pcfg_pull_up_2ma: pcfg-pull-up-2ma { drive-strength = <2>; Also, the BAR configuration is missing some tuning bits missing, * 17.6.7.1.45 Root Complex BAR Configuration Register.* Earlier I had to face this issue on my Rk3399 board (Odroid n1), but I could not resolve the issue. [1] https://patchwork.kernel.org/project/linux-rockchip/patch/1590023130-137406-1-git-send-email-shawn.lin@rock-chips.com/ How can I debug the PCIe handshake messages to explore further? [alarm@alarm ~]$ dmesg | grep pci [ 1.399919] ehci-pci: EHCI PCI platform driver [ 1.538434] ohci-pci: OHCI PCI platform driver [ 7.112556] rockchip-pcie f8000000.pcie: host bridge /pcie@f8000000 ranges: [ 7.120583] rockchip-pcie f8000000.pcie: Parsing ranges property... [ 7.134628] rockchip-pcie f8000000.pcie: MEM 0x00fd810000..0x00fd90ffff -> 0x00fd800000 [ 7.144148] rockchip-pcie f8000000.pcie: IO 0x00fda00000..0x00fdafffff -> 0x00fd800000 [ 7.165435] rockchip-pcie f8000000.pcie: can't request region for resource [mem 0xf8000000-0xfdffffff] [ 7.182904] rockchip-pcie: probe of f8000000.pcie failed with error -16 Best Regards -Anand > > > I am happy to put something together once I understand the preferred way > > to go about it. > > > > Thanks, > > Punit > > > > [...] > > > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip