Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp312515pxb; Thu, 19 Nov 2020 01:39:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPUXua/FsXPJDTqXn3Syb8i/wPXgydg+Vmmy8WTJvXj2UWDZyvFgobykDXTImFjcnvi9PZ X-Received: by 2002:a17:906:b759:: with SMTP id fx25mr9768076ejb.347.1605778782807; Thu, 19 Nov 2020 01:39:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605778782; cv=none; d=google.com; s=arc-20160816; b=gmk1M0aynPcDb9zVbCqRypVRBdxZPYryVGwXTW7O6jz13ZA93mdGacHbXWPeQiZ0PE qoluAHLSRAtSt0TbLW6uSYshkDHSrpcfVmjeTwlcp02DZ2WhqhKQYmM+ejKS2vcYwPnd GunzDCOB5/Lc2x6wRMIs0BbokpNZvHtnM1nZgEw/Or8ldOdfLXv+GklvjziMz+4yUtgs YBlDbWaXtVqmmJyfpv2klrWbaBaC/KrjZOFZpqtfl1tACuRqcgvLsOcypFLlNS+cIpxK TYw9tS+4ksl30gIG8UZ8EQTos/p7vFPLojIbWi0W8iyJO1OYYDeTIM6xFStxTdLV/+XW s0kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=SheJgRNRD9Sq1nP2DDnbBCRjveaoAB02vuGHNXu2SnU=; b=U7kJnraQjWvV+yxu4OqT6HB/oQ4TBrYpdVgtrOl7msDSVmcxkcHZODxemf4II8DY6Z 2wM1FVIbrd9gofSCrsmAUlk9bBOlVYTImnqQD3uKHIWw1Ht7epqIwcLevEel0iwdsGTb cqKSzyyEqbqbuhDhKIGXNK6bYfARAPQLhk4PLp71ETWwZI7SU8Wttw/QnQVTCFFBhHxm C8HcMONRdaPZ4TUNHqVQHiTvTIqPbrdYikx2Q8bZ9GisvAfbasFh6X/5cZhei3spx9Vj XAnBisVpFCnF9QXh/Ci+KATkwbKLcee4huoB5q1Pv83IgQQBh7iM0adhpGNUX+bO6oK9 k4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=JAmUvpRb; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mb18si5212582ejb.284.2020.11.19.01.39.19; Thu, 19 Nov 2020 01:39:42 -0800 (PST) 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=@ffwll.ch header.s=google header.b=JAmUvpRb; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727007AbgKSJhY (ORCPT + 99 others); Thu, 19 Nov 2020 04:37:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727000AbgKSJhY (ORCPT ); Thu, 19 Nov 2020 04:37:24 -0500 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CD98C0613CF for ; Thu, 19 Nov 2020 01:37:22 -0800 (PST) Received: by mail-ot1-x343.google.com with SMTP id 79so4669188otc.7 for ; Thu, 19 Nov 2020 01:37:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SheJgRNRD9Sq1nP2DDnbBCRjveaoAB02vuGHNXu2SnU=; b=JAmUvpRbZJVPvjlvlfBZe5Ik9ruKX/hwur4AO2A4OHWNSo7K9dXIqOBeWktsSV7XZZ XOs2qx0+HdiROUgQsbKDVaCAZViMsYuXqLcMLZfVT2Pcc5jRidtq4+d4lcP5p9AiUzuy ZdZXllU1SWxs+0EKUxy8BK3Nor23eippJi0+E= 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=SheJgRNRD9Sq1nP2DDnbBCRjveaoAB02vuGHNXu2SnU=; b=JH4olKU59+K2DLorHMLh7YvqG/1cc2JKqZwrEsjV59oBeKR8v+B+z0q0SfXfTbBkgh TlWaxcAkl2BKQJM5YTVTlwkURtcyGSEK7kuyjzbQkVMl4KbrAlOQMqtnzUU8R5F5og42 TwZGHOFopL2P8/ywNt5beZk9qpdQ7YFABVdEqw/i0WuB27BpkZs/gfHr3jtWpvOwdF8t RAroLJ8nz3JRcGMlSENx/umOQyUF25uA94VXmz43dp4YsLp4DKrVWYgzXadQwJUt8iAQ irPNS5gtbuZ9zHmWjEekkiFW6vXeksvqX1YlfRl7Fxh2aSjM6LTQumOsnveJAp3XKUW9 LYGg== X-Gm-Message-State: AOAM5308J2gS2aQ3OqpsBcli8FAvMVv6uU2ELE5oMaCAj0qIEvs0+fKS FZpI5RXIwADOv5AJBkQ+ZF0U4tP+t9Zn37WazBjSHQ== X-Received: by 2002:a9d:3b4:: with SMTP id f49mr10016116otf.188.1605778641829; Thu, 19 Nov 2020 01:37:21 -0800 (PST) MIME-Version: 1.0 References: <20201118231433.GA83593@bjorn-Precision-5520> In-Reply-To: <20201118231433.GA83593@bjorn-Precision-5520> From: Daniel Vetter Date: Thu, 19 Nov 2020 10:37:10 +0100 Message-ID: Subject: Re: [PATCH] x86/gpu: add JSL stolen memory support To: Bjorn Helgaas Cc: Joonas Lahtinen , Tejas Upadhyay , Linux PCI , Linux Kernel Mailing List , X86 ML , Borislav Petkov , Lucas De Marchi , Matthew D Roper , hariom.pandey@intel.com, Jani Nikula , Rodrigo Vivi , David Airlie Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 19, 2020 at 12:14 AM Bjorn Helgaas wrote: > > On Wed, Nov 18, 2020 at 10:57:26PM +0100, Daniel Vetter wrote: > > On Wed, Nov 18, 2020 at 5:02 PM Bjorn Helgaas wrote: > > > On Fri, Nov 06, 2020 at 10:39:16AM +0100, Daniel Vetter wrote: > > > > On Thu, Nov 5, 2020 at 3:17 PM Bjorn Helgaas wrote: > > > > > On Thu, Nov 05, 2020 at 11:46:06AM +0200, Joonas Lahtinen wrote: > > > > > > Quoting Bjorn Helgaas (2020-11-04 19:35:56) > > > > > > > [+cc Jani, Joonas, Rodrigo, David, Daniel] > > > > > > > > > > > > > > On Wed, Nov 04, 2020 at 05:35:06PM +0530, Tejas Upadhyay wrote: > > > > > > > > JSL re-uses the same stolen memory as ICL and EHL. > > > > > > > > > > > > > > > > Cc: Lucas De Marchi > > > > > > > > Cc: Matt Roper > > > > > > > > Signed-off-by: Tejas Upadhyay > > > > > > > > > > > > > > I don't plan to do anything with this since previous similar patches > > > > > > > have gone through some other tree, so this is just kibitzing. > > > > > > > > > > > > > > But the fact that we have this long list of Intel devices [1] that > > > > > > > constantly needs updates [2] is a hint that something is wrong. > > > > > > > > > > > > We add an entry for every new integrated graphics platform. Once the > > > > > > platform is added, there have not been changes lately. > > > > > > > > > > > > > IIUC the general idea is that we need to discover Intel gfx memory by > > > > > > > looking at device-dependent config space and add it to the E820 map. > > > > > > > Apparently the quirks discover this via PCI config registers like > > > > > > > I830_ESMRAMC, I845_ESMRAMC, etc, and tell the driver about it via the > > > > > > > global "intel_graphics_stolen_res"? > > > > > > > > > > > > We discover what is called the graphics data stolen memory. It is regular > > > > > > system memory range that is not CPU accessible. It is accessible by the > > > > > > integrated graphics only. > > > > > > > > > > > > See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/arch/x86/kernel/early-quirks.c?h=v5.10-rc2&id=814c5f1f52a4beb3710317022acd6ad34fc0b6b9 > > > > > > > > > > > > > That's not the way this should work. There should some generic, non > > > > > > > device-dependent PCI or ACPI method to discover the memory used, or at > > > > > > > least some way to do it in the driver instead of early arch code. > > > > > > > > > > > > It's used by the early BIOS/UEFI code to set up initial framebuffer. > > > > > > Even if i915 driver is never loaded, the memory ranges still need to > > > > > > be fixed. They source of the problem is that the OEM BIOS which are > > > > > > not under our control get the programming wrong. > > > > > > > > > > > > We used to detect the memory region size again at i915 initialization > > > > > > but wanted to eliminate the code duplication and resulting subtle bugs > > > > > > that caused. Conclusion back then was that storing the struct resource > > > > > > in memory is the best trade-off. > > > > > > > > > > > > > How is this *supposed* to work? Is there something we can do in E820 > > > > > > > or other resource management that would make this easier? > > > > > > > > > > > > The code was added around Haswell (HSW) device generation to mitigate > > > > > > bugs in BIOS. It is traditionally hard to get all OEMs to fix their > > > > > > BIOS when things work for Windows. It's only later years when some > > > > > > laptop models are intended to be sold with Linux. > > > > > > > > > > > > The alternative would be to get all the OEM to fix their BIOS for Linux, > > > > > > but that is not very realistic given past experiences. So it seems > > > > > > a better choice to to add new line per platform generation to make > > > > > > sure the users can boot to Linux. > > > > > > > > > > How does Windows do this? Do they have to add similar code for each > > > > > new platform? > > > > > > > > Windows is chicken and doesn't move any mmio bar around on its own. > > > > Except if the bios explicitly told it somehow (e.g. for the 64bit bar > > > > stuff amd recently announced for windows, that linux supports since > > > > years by moving the bar). So except if you want to preemptively > > > > disable the pci code that does this anytime there's an intel gpu, this > > > > is what we have to do. > > > > > > I think Windows *does* move BARs (they use the more generic > > > terminology of "rebalancing PNP resources") in some cases [3,4]. Of > > > course, I'm pretty sure Windows will only assign PCI resources inside > > > the windows advertised in the host bridge _CRS. > > > > > > Linux *used* to ignore that host bridge _CRS and could set BARs to > > > addresses that appeared available but were in fact used by the > > > platform somehow. But Linux has been paying attention to host bridge > > > _CRS for a long time now, so it should also only assign resources > > > inside those windows. > > > > If this behaviour is newer than the addition of these quirks then yeah > > they're probably not needed anymore, and we can move all this back > > into the driver. Do you have the commit when pci core started > > observing _CRS on the host bridge? > > I think the most relevant commit is this: > > 2010-02-23 7bc5e3f2be32 ("x86/PCI: use host bridge _CRS info by default on 2008 and newer machines") > > but the earliest quirk I found is over three years later: > > 2013-07-26 814c5f1f52a4 ("x86: add early quirk for reserving Intel graphics stolen memory v5") > > So there must be something else going on. 814c5f1f52a4 mentions a > couple bug reports. The dmesg from 66726 [5] shows that we *are* > observing the host bridge _CRS, but Linux just used the BIOS > configuration without changing anything: > > BIOS-e820: [mem 0x000000007f49_f000-0x000000007f5f_ffff] usable > BIOS-e820: [mem 0x00000000fec0_0000-0x00000000fec0_0fff] reserved > PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug > ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff]) > pci_bus 0000:00: root bus resource [mem 0x7f70_0000-0xffff_ffff] > pci 0000:00:1c.0: PCI bridge to [bus 01] > pci 0000:00:1c.0: bridge window [io 0x1000-0x1fff] > pci 0000:00:1c.0: bridge window [mem 0xfe90_0000-0xfe9f_ffff] > pci 0000:00:1c.0: bridge window [mem 0x7f70_0000-0x7f8f_ffff 64bit pref] > pci 0000:01:00.0: [1814:3090] type 00 class 0x028000 > pci 0000:01:00.0: reg 10: [mem 0xfe90_0000-0xfe90_ffff] > [drm:i915_stolen_to_physical] *ERROR* conflict detected with stolen region: [0x7f80_0000 - 0x8000_0000] > > So the BIOS programmed the 00:1c.0 bridge prefetchable window to > [mem 0x7f70_0000-0x7f8f_ffff], and i915 thinks that's a conflict. > > On this system, there are no PCI BARs in that range. 01:00.0 looks > like a Ralink RT3090 Wireless 802.11n device that only has a > non-prefetchable BAR at [mem 0xfe90_0000-0xfe90_ffff]. > > I don't know the details of the conflict. IIUC, Joonas said the > stolen memory is accessible only by the integrated graphics, not by > the CPU. The bridge window is CPU accessible, of course, and the > [mem 0x7f70_0000-0x7f8f_ffff] range contains the addresses the CPU > uses for programmed I/O to BARs below the bridge. > > The graphics accesses sound like they would be DMA in the *bus* > address space, which is frequently, but not always, identical to the > CPU address space. So apparently on some platforms the conflict is harmless because the BIOS puts BARs and stuff over it from boot-up, and things work: 0b6d24c01932 ("drm/i915: Don't complain about stolen conflicts on gen3") But we also had conflict reports on other machines. GPU does all its access with CPU address space (after the iommu, which is entirely integrated). So I'm not sure whether we've seen something go boom or whether reserving that resource was just precaution in eaba1b8f3379 ("drm/i915: Verify that our stolen memory doesn't conflict"), it's all a bit way back in history. So really not sure what to do here or what the risks are. -Daniel > > > > So I'm missing what the real problem is. Joonas mentioned BIOS bugs > > > above, but I don't know what that means. > > > > > > Here's what I can figure out so far, tell me if I'm in the weeds: > > > > > > - The intel_graphics_stolen() early quirk: > > > 1) Initializes global struct resource intel_graphics_stolen_res > > > 2) Adds the region to E820 map as E820_TYPE_RESERVED > > > > > > - i915_driver_hw_probe() uses intel_graphics_stolen_res, but this > > > happens after the PCI core is initialized, so early quirks > > > wouldn't be required for this use. > > > > > > - So I guess the E820 map update is what requires the early quirk? > > > But I don't know exactly what depends on this update. > > > > > > I haven't found the connection to the early BIOS/UEFI code and the > > > initial framebuffer yet. > > > > > > > And given that this 64bit mmio bar support in windows still requires > > > > an explicit bios upgrade for the explicit opt in I don't think this > > > > will change anytime soon. > > > > > > > > We have a similar ugly problem with kvm, since you can't use these > > > > ranges freely (they're very special in hw), and the kvm maintainers > > > > are equally annoyed that they have to keep supporting RRMR to block > > > > that range, just because of intel integrated graphics. Apparently > > > > windows is again totally fine with this. > > > > -Daniel > > > > > > > > > > > > > > > > > > > > > --- > > > > > > > > arch/x86/kernel/early-quirks.c | 1 + > > > > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > > > > > > > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c > > > > > > > > index a4b5af03dcc1..534cc3f78c6b 100644 > > > > > > > > --- a/arch/x86/kernel/early-quirks.c > > > > > > > > +++ b/arch/x86/kernel/early-quirks.c > > > > > > > > @@ -549,6 +549,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { > > > > > > > > INTEL_CNL_IDS(&gen9_early_ops), > > > > > > > > INTEL_ICL_11_IDS(&gen11_early_ops), > > > > > > > > INTEL_EHL_IDS(&gen11_early_ops), > > > > > > > > + INTEL_JSL_IDS(&gen11_early_ops), > > > > > > > > INTEL_TGL_12_IDS(&gen11_early_ops), > > > > > > > > INTEL_RKL_IDS(&gen11_early_ops), > > > > > > > > }; > > > > > > > > > > > > > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/x86/kernel/early-quirks.c?h=v5.10-rc2#n518 > > > > > > > > > > > > > > [2] > > > > > > > May 2020 efbee021ad02 ("x86/gpu: add RKL stolen memory support") > > > > > > > Jul 2019 6b2436aeb945 ("x86/gpu: add TGL stolen memory support") > > > > > > > Mar 2019 d53fef0be4a5 ("x86/gpu: add ElkhartLake to gen11 early quirks") > > > > > > > May 2018 db0c8d8b031d ("x86/gpu: reserve ICL's graphics stolen memory") > > > > > > > Dec 2017 33aa69ed8aac ("x86/gpu: add CFL to early quirks") > > > > > > > Jul 2017 2e1e9d48939e ("x86/gpu: CNL uses the same GMS values as SKL") > > > > > > > Jan 2017 bc384c77e3bb ("x86/gpu: GLK uses the same GMS values as SKL") > > > > > > > Oct 2015 00ce5c8a66fb ("drm/i915/kbl: Kabylake uses the same GMS values as Skylake") > > > > > > > Mar 2015 31d4dcf705c3 ("drm/i915/bxt: Broxton uses the same GMS values as Skylake") > > > > > > > ... > > > > > > [3] https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/stopping-a-device-to-rebalance-resources > > > [4] http://download.microsoft.com/download/5/b/9/5b97017b-e28a-4bae-ba48-174cf47d23cd/cpa070_wh06.ppt ("PCI Express In Depth For Windows Vista and Beyond") > > [5] https://bugs.freedesktop.org/show_bug.cgi?id=66726 -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch