Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4575407pxj; Tue, 25 May 2021 11:03:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1q4ue7N/Tc6GAelZtWlOqmzF0pKp8JpR2bmO4iGqKjozKdkoC0sPpZQrt5ul4jvUECbeJ X-Received: by 2002:a02:b68c:: with SMTP id i12mr31917678jam.133.1621965822143; Tue, 25 May 2021 11:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621965822; cv=none; d=google.com; s=arc-20160816; b=nuSU7cRiOvzKjhtUt1NxWDFkitDLl72loykR/mhcx+E2UZQCSKYFSHxPE2QW6Deo/w nek5ur8hL7xzTXujSSMx2LXzjvsIVFXZdpKYUZxFYmoB5Gvyq5jxWPIOMh7WYOYDav4P GWc1x6UwPGTtD/fuAOrsDNxoAPowl5suEQTt3iSaPJAUu2tGpMTYbWMHtQBYq60D3B9l pvd0hSI+ZedtQFOd9YbofP03eooqItQDZUmUKxZbd6WbbbMc1s6DAFI2gd52561aj/T9 JP+eZ8Nb+ykRtwiz0n9uBq9LXuZbTdGp/19wn67ivCrVPagsXWzTc5Aew2s2LleSu+M4 yxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=8jUXVM2S2gK/c5ETB7A2sJX8fbsXoYtiNL/NJ7/FLeM=; b=cILA2AQYZyTjd54qgMG+c38QnzFxJcmFl5Dxja/g6AdxheGXvxFCTfsyjy/GiiTxgv ggkwZncddGUqJx7vXfpioN7mKPmlBPbXdysBnEiInGtXwvUPkhwc9fAYHfRbI9OYUJb+ LwgJ9AvdT6W6lhDs4scax+gnMdUQ5sgxIvY8ROCIywG+rimPSPLZKC6CfXVjkk1c2UkM SiFKWpaH/GmP/Pk6+xUOVJzTVSKp3UAu70RPsfUZohmspH/sQ2QVWQL3L1xhptyaQdH3 z8WzQsQ3MA3DvB6e10NWTp/kk/2FfGSIWMTHkxhgp1mphw9D6TIiu7q5+/MeZ7JKNzcN VMlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bIuSWTh2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i17si16302572ioi.33.2021.05.25.11.03.29; Tue, 25 May 2021 11:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bIuSWTh2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233159AbhEYQqE (ORCPT + 99 others); Tue, 25 May 2021 12:46:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:44976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232877AbhEYQqB (ORCPT ); Tue, 25 May 2021 12:46:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DAC3F6142C; Tue, 25 May 2021 16:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621961071; bh=5oN3EtTdmL5Px8suEvZdMe7wkPt2RTqTyoOe/6b1hCE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=bIuSWTh2ApRCba9KkZA1aDoOEmOFb28i8aBYXKixozE5dfV2Zw4bdvo77GXgphFxg MlpZ1HUJB8bFV6KhSYQCKtynQ6qOo1IqYbdW9i0HiHlfckIyddVjne9ELJl+1GmWF+ HS+/0CXcm9U5YlVpB0rO+v6nWNAyqEt4KnGuW8fFaz1NDET9Tt5v2N7BW4VrgZc4X2 mI2gpGRWIkUAjRMryN5D8owK0Fy2qlS+sYUaoRoBdnWJPGDQdPtyU4RBXrH26cuGH6 yHuiM3f9sNOSjLn9NDeNT9v5tmQdFL98jXFWi4zj3ToMO8AGel654CDIXMrhkToBzT tbuoD6invOitQ== Received: by mail-ot1-f52.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so29180098otc.12; Tue, 25 May 2021 09:44:31 -0700 (PDT) X-Gm-Message-State: AOAM5308Mc9H3UOEopm1J6uth/VqDY3BTJ/It/x+GjjSFF0/85OxEZN9 IsoxxFbva/uod1CrFNc9rrGUgZnOM6b+j5AjLH0= X-Received: by 2002:a05:6830:4da:: with SMTP id s26mr23175972otd.77.1621961071046; Tue, 25 May 2021 09:44:31 -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: Ard Biesheuvel Date: Tue, 25 May 2021 18:44:19 +0200 X-Gmail-Original-Message-ID: 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: Peter Geis Cc: Punit Agrawal , Robin Murphy , Alexandru Elisei , Linux Kernel Mailing List , "open list:ARM/Rockchip SoC..." , arm-mail-list , Heiko Stuebner , Leonardo Bras , Rob Herring , PCI , =?UTF-8?Q?Christian_K=C3=B6nig?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 25 May 2021 at 18:23, Peter Geis wrote: > > On Tue, May 25, 2021 at 11:55 AM Ard Biesheuvel wrote: > > > > On Tue, 25 May 2021 at 17:34, Peter Geis wrote: > > > > > > On Tue, May 25, 2021 at 9:57 AM Ard Biesheuvel wrot= e: > > > > > > > > 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 /pc= ie@f8000000 ranges: > > > > > >> >> [ 0.305248] rockchip-pcie f8000000.pcie: MEM 0x00fa= 000000..0x00fbdfffff -> > > > > > >> >> 0x00fa000000 > > > > > >> >> [ 0.305285] rockchip-pcie f8000000.pcie: IO 0x00fb= e00000..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-1= f] > > > > > >> >> [ 0.373751] pci_bus 0000:00: root bus resource [mem 0xfa= 000000-0xfbdfffff 64bit] > > > > > >> >> [ 0.373777] pci_bus 0000:00: root bus resource [io 0x00= 00-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 inval= id ([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 25= 6 (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 i= s 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 s= ize 0x00004000 64bit] > > > > > >> >> [ 0.393375] pci 0000:01:00.0: BAR 0: failed to assign [m= em 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 I= RQ 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 (ev= en though > > > > > >> > it's entirely below 4GB) might be a bit weird and tripping s= omething > > > > > >> > 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. cha= nging > > > > > >> > 0x83000000 to 0x82000000 in the PCIe node's "ranges" propert= y) to see > > > > > >> > if it makes any difference. Note that even if it helps, thou= gh, I > > > > > >> > don't know whether that's the correct fix or just a bodge ar= ound 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_regio= n() - > > > > > >> > > > > > >> if ((res->flags ^ r->flags) & type_mask) > > > > > >> continue; > > > > > >> > > > > > >> Though I am also not sure why the failure is only being report= ed 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-prefetchabl= e BAR. > > > > > > Such BARs can not be allocated in a prefetchable host bridge wi= ndow > > > > > > (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) ne= ed 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 Br= idge > > > > > 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 thou= gh it > > > > > > resides below 4 GB entirely. I suppose that the resource alloca= tion > > > > > > could be made more forgiving (and it was in the past, before co= mmit > > > > > > 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 qu= irk > > > > > somewhere to address this? > > > > > > > > > > > > > No. Just fix the DT. > > > > > > Good Morning, > > > > > > I believe Robin is correct that there is more to this. > > > While attempting to work out why dGPUs won't work with the rk356x > > > series PCIe controllers, Christian K=C3=B6nig from the amd-gpu driver > > > mailing list noticed the gpu was incorrectly allocated a 64bit > > > non-prefetchable BAR which should instead be a 32 non-prefetchable > > > BAR. > > > > > > > This is due to the translation. For some reason, lspci translates the > > BAR values to CPU addresses, but the PCI side addresses are within > > 32-bits. > > The kernel log reports the same thing: > [ 6.662141] pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x0fffffff > 64bit pref] > [ 6.662963] pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x0001ffff 64b= it] > > You are saying this is a display only issue? > Yes. What do the 'root bus resource' log lines say for these regions? Those should give you both the CPU address as well as the bus address. > > > > Are you sure the amdgpu driver can even deal with non-1:1 host bridges? > > I cannot answer this as I'm not an amdgpu dev. > > > > > > The ranges currently set are: > > > ranges =3D <0x81000000 0x0 0x00800000 0x3 0x00800000 0x0 0x00100000 > > > 0x82000000 0x0 0x00900000 0x3 0x00900000 0x0 0x3f700000>; > > > > > > > So you have two ranges here. > > The IO and PCI memory ranges. > > There is a third range, the configuration range, which is defined in > the reg block: > <0x3 0x00000000 0x0 0x800000> > All three are shared in the same 1GB window on the rk356x. > But the reg block is not a resource window, it is a configuration range to program the host bridge. > https://elixir.bootlin.com/linux/v5.13-rc3/source/Documentation/devicetre= e/bindings/pci/designware-pcie.txt#L12 > > > > > > but the final allocation was: > > > > > > lspci -v > > > 00:00.0 PCI bridge: Fuzhou Rockchip Electronics Co., Ltd Device 3566 > > > (rev 01) (prog-if 00 [Normal decode]) > > > Flags: bus master, fast devsel, latency 0, IRQ 96 > > > Bus: primary=3D00, secondary=3D01, subordinate=3Dff, sec-late= ncy=3D0 > > > I/O behind bridge: 00001000-00001fff [size=3D4K] > > > Memory behind bridge: 00900000-009fffff [size=3D1M] > > > Prefetchable memory behind bridge: > > > 0000000010000000-000000001fffffff [size=3D256M] > > > > But the host bridge/root port decodes two disjoint regions?? > > > > > Expansion ROM at 300a00000 [virtual] [disabled] [size=3D64K] > > > Capabilities: [40] Power Management version 3 > > > Capabilities: [50] MSI: Enable+ Count=3D1/32 Maskable- 64bit+ > > > Capabilities: [70] Express Root Port (Slot-), MSI 00 > > > Capabilities: [b0] MSI-X: Enable- Count=3D1 Masked- > > > Capabilities: [100] Advanced Error Reporting > > > Capabilities: [148] Secondary PCI Express > > > Capabilities: [160] L1 PM Substates > > > Capabilities: [170] Vendor Specific Information: ID=3D0002 Re= v=3D4 > > > Len=3D100 > > > Kernel driver in use: pcieport > > > > > > 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. > > > [AMD/ATI] Turks PRO [Radeon HD 7570] (prog-if 00 [VGA controller]) > > > Subsystem: Dell Turks PRO [Radeon HD 7570] > > > Flags: bus master, fast devsel, latency 0, IRQ 95 > > > Memory at 310000000 (64-bit, prefetchable) [size=3D256M] > > > Memory at 300900000 (64-bit, non-prefetchable) [size=3D128K] > > > I/O ports at 1000 [size=3D256] > > > Expansion ROM at 300920000 [disabled] [size=3D128K] > > > Capabilities: [50] Power Management version 3 > > > Capabilities: [58] Express Legacy Endpoint, MSI 00 > > > Capabilities: [a0] MSI: Enable- Count=3D1/1 Maskable- 64bit+ > > > Capabilities: [100] Vendor Specific Information: ID=3D0001 Re= v=3D1 > > > Len=3D010 > > > Capabilities: [150] Advanced Error Reporting > > > Kernel driver in use: radeon > > > > > > 01:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] Turks > > > HDMI Audio [Radeon HD 6500/6600 / 6700M Series] > > > Subsystem: Dell Turks HDMI Audio [Radeon HD 6500/6600 / 6700M= Series] > > > Flags: bus master, fast devsel, latency 0, IRQ 98 > > > Memory at 300940000 (64-bit, non-prefetchable) [size=3D16K] > > > Capabilities: [50] Power Management version 3 > > > Capabilities: [58] Express Legacy Endpoint, MSI 00 > > > Capabilities: [a0] MSI: Enable+ Count=3D1/1 Maskable- 64bit+ > > > Capabilities: [100] Vendor Specific Information: ID=3D0001 Re= v=3D1 > > > Len=3D010 > > > Capabilities: [150] Advanced Error Reporting > > > Kernel driver in use: snd_hda_intel > > > > > > This will obviously clobber registers during writes. > > > > I don't follow. Which writes will clobber which registers, and how is > > it obvious? > > Writing a 64 bit word into a 32 bit register will either clobber the > next higher 32 bit register. > Quoting Christian: > "When you program a 32bit BAR as 64bit you overwrite the register behind > the BAR address with the upper 32bits of the 64bit address value. > So even if the allocation fits into 32bits, the extra register write > will certainly put your device into a banana state." > > https://lists.freedesktop.org/archives/amd-gfx/2021-May/064232.html > I seriously doubt that this is what is going on here. lspci -x will give you the bare BAR values - I suspect that those are probably fine. > > > > > Also, if <0x82000000> (32 bit) is changed to <0x83000000> (64 bit), > > > most of the allocations for the dGPU fail due to no valid regions > > > available. > > > > > > > But wasn't the original problem that the resource window was 64-bit to > > begin with? Are you sure we are talking about the same problem here? > > The rk3399 in the original report has a 32MB memory window in the > upper end of the 4GB range. > The rk356x has a similar layout, or it can use a 1GB window available > at <0x3 0x00000000>. > Rockchip's default windows are defined as 64bit. > > The rk3399 doesn't have enough space to reasonably define two windows, > one 32bit, one 64bit, to work around an allocation bug. > These are the defined regions in the rk3399: > ranges =3D <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, > <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; > All you really need is a 32-bit non-prefetchable resource window: any BAR can be allocated from that. A 64-bit BAR can carry a 32-bit number (just add zeroes at the top), and a prefetchable BAR can happily live in a non-prefetchable window, with a theoretical performance impact if the OS actually does use different memory attributes for the prefetchable window (but I don't think Linux ever handles it this way) > > > > > > > > > > > > > > I am happy to put something together once I understand the prefer= red way > > > > > to go about it. > > > > > > > > > > Thanks, > > > > > Punit > > > > > > > > > > [...] > > > > > > > > > > > > > _______________________________________________ > > > > Linux-rockchip mailing list > > > > Linux-rockchip@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-rockchip