From patchwork Mon Jul 26 21:43:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12400845 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=-14.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 DCB21C4338F for ; Mon, 26 Jul 2021 21:44:15 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9A00D60F90 for ; Mon, 26 Jul 2021 21:44:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9A00D60F90 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:Cc:To: From:Date: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=p5MbZzfPji+pOET+RMgiMAZlpw0fcQO92gwebjZVJ4o=; b=lXLGwrp123++6c VRvJPSOvgv1L7eJOdFZnbgubMiQR65spduVbp1umEswMjGh7iN68GFrOXmNzo5L/RCVESdyfKuh7l jVvYulzSpXrhojI/4ECvLZaRMeRumDXU1RpZdHOuF13JMAaF2dEb6LF1eS7ClS/iLygSzvemG0fXX zlqX5ozkJweiovikkp0VWXrixta+IWvubsmmroygbko1fvVL8Yb9XS9eAafryWLmZVyUGm93Qja/X lNg2mBZuqFLb5lu0I1euZCm5LmXeBZ1mZdj5EUrv0c9gEA4TDMXORgszeOoo3dfAOoYhuMs64r6Hz i6gCqQY0J0JAAoBT56cg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m88O6-00CVsS-U8; Mon, 26 Jul 2021 21:43:50 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m88O3-00CVs6-MI for linux-riscv@lists.infradead.org; Mon, 26 Jul 2021 21:43:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4E5260F94; Mon, 26 Jul 2021 21:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627335827; bh=dBX7fIHWCiOh57pPoZiCCdXb5SlCraznstvQ/Ghyeyk=; h=Date:From:To:Cc:Subject:From; b=BGxbg+DkR9D1cy3KQhuXS5YzIIzwWDlpwvuudr9Nnj65VZHe5NxXX/rB98+XUf1y7 ABdnFs5TWlxBHlqAy5NMV5xi/a5JrGgESy96kDBNXB11Ea620/9t3SuD2AdTAA4SNJ ccctpJ63SGBfdmsS+4AAK92Sjh1xOXZkTLMzVFV7Kzna/QjXua8f2QRi8lLDm5Qyhf NRVE3aUYn+fBGGzXAxBBNYmIrmEYk3GPxa82THGXisiQQNBXXluEDKeD9BzNhu5auw fVnNnYPrTguCBtp4otVvyLNZtpS1eb2ahXtRqcBYT24Qg+KhvIIR5AQB8e49mxdh7i 3Ok+urmkpYDwA== Date: Mon, 26 Jul 2021 16:43:45 -0500 From: Bjorn Helgaas To: Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Yoshinori Sato , Rich Felker , "David S. Miller" Cc: linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org Subject: [helgaas@kernel.org: Re: aarch64 efi boot failures with qemu 6.0+] Message-ID: <20210726214345.GA645499@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210726_144347_814300_8EC8C290 X-CRM114-Status: GOOD ( 42.54 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Just FYI. Guenter tripped over a problem with an I/O BAR set to zero. I think your arches allow that (at least they "#define PCIBIOS_MIN_IO 0"), and some drivers don't handle such BARs. More details below. Note that I didn't actually cc you on the thread, mostly because I forgot but partly to avoid exploding the cc list with people who probably don't care. If you want to respond directly to the thread, you can use this: https://lore.kernel.org/qemu-devel/20210724185234.GA2265457@roeck-us.net/ ----- Forwarded message from Bjorn Helgaas ----- Date: Mon, 26 Jul 2021 16:16:29 -0500 From: Bjorn Helgaas To: Ard Biesheuvel Cc: Philippe Mathieu-Daudé , Bjorn Helgaas , Jiahui Cen , "Michael S. Tsirkin" , Ard Biesheuvel , qemu-devel@nongnu.org, Igor Mammedov , Guenter Roeck Subject: Re: aarch64 efi boot failures with qemu 6.0+ Message-ID: <20210726211628.GA640636@bjorn-Precision-5520> On Mon, Jul 26, 2021 at 06:00:57PM +0200, Ard Biesheuvel wrote: > (cc Bjorn) > > On Mon, 26 Jul 2021 at 11:08, Philippe Mathieu-Daudé wrote: > > On 7/26/21 12:56 AM, Guenter Roeck wrote: > > > On 7/25/21 3:14 PM, Michael S. Tsirkin wrote: > > >> On Sat, Jul 24, 2021 at 11:52:34AM -0700, Guenter Roeck wrote: > > >>> Hi all, > > >>> > > >>> starting with qemu v6.0, some of my aarch64 efi boot tests no longer > > >>> work. Analysis shows that PCI devices with IO ports do not instantiate > > >>> in qemu v6.0 (or v6.1-rc0) when booting through efi. The problem affects > > >>> (at least) ne2k_pci, tulip, dc390, and am53c974. The problem only > > >>> affects > > >>> aarch64, not x86/x86_64. > > >>> > > >>> I bisected the problem to commit 0cf8882fd0 ("acpi/gpex: Inform os to > > >>> keep firmware resource map"). Since this commit, PCI device BAR > > >>> allocation has changed. Taking tulip as example, the kernel reports > > >>> the following PCI bar assignments when running qemu v5.2. > > >>> > > >>> [ 3.921801] pci 0000:00:01.0: [1011:0019] type 00 class 0x020000 > > >>> [ 3.922207] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x007f] > > >>> [ 3.922505] pci 0000:00:01.0: reg 0x14: [mem 0x10000000-0x1000007f] > > IIUC, these lines are read back from the BARs > > > >>> [ 3.927111] pci 0000:00:01.0: BAR 0: assigned [io 0x1000-0x107f] > > >>> [ 3.927455] pci 0000:00:01.0: BAR 1: assigned [mem > > >>> 0x10000000-0x1000007f] > > >>> > > ... and this is the assignment created by the kernel. > > > >>> With qemu v6.0, the assignment is reported as follows. > > >>> > > >>> [ 3.922887] pci 0000:00:01.0: [1011:0019] type 00 class 0x020000 > > >>> [ 3.923278] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x007f] > > >>> [ 3.923451] pci 0000:00:01.0: reg 0x14: [mem 0x10000000-0x1000007f] > > The problem here is that Linux, for legacy reasons, does not support > I/O ports <= 0x1000 on PCI, so the I/O assignment created by EFI is > rejected. > > This might make sense on x86, where legacy I/O ports may exist, but on > other architectures, this makes no sense. I guess this is the "#define PCIBIOS_MIN_IO 0x1000" in arm64/include/asm/pci.h. From a PCI point of view, I'm not opposed to changing that to 0, as it is on csky, riscv, sh, sparc, um. But it's really an arch question, so the arm64 folks would have to weigh in. But I don't think that would fix this. PCIBIOS_MIN_IO is mainly used when we assign or reassign resources to a BAR, and if firmware tells us to preserve the assignments done by firmware, Linux shouldn't be doing any assignment or reassignment. Linux received 00:01.0 BAR 0 as [io 0x0000-0x007f], and Guenter didn't report any reassignment, so I assume Linux saw the DSM_PCI_PRESERVE_BOOT_CONFIG [1] and didn't change anything. Could this be due to drivers assuming that an I/O BAR of 0 is invalid? I see that at least ne2k_pci_init_one() [2] seems to assume that. And tulip_init_one() [3] and pci_esp_probe_one() (am53c974.c, [4]) use pci_iomap() [5], which fails if the resource starts at 0. So pci_iomap() is probably already broken on the arches above that allow I/O BARs to be zero. Maybe pci_iomap() should only fail on "!start" for *memory* BARs, e.g., [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/acpi/pci_root.c?id=v5.13#n915 [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/8390/ne2k-pci.c?id=v5.13#n247 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/dec/tulip/tulip_core.c?id=v5.13#n1418 [4] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/am53c974.c?id=v5.13#n431 [5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/lib/pci_iomap.c?id=v5.13#n37 > > >>> and the controller does not instantiate. The problem disapears after > > >>> reverting commit 0cf8882fd0. > > >>> > > >>> Attached is a summary of test runs with various devices and qemu v5.2 > > >>> as well as qemu v6.0, and the command line I use for efi boots. > > >>> > > >>> Did commit 0cf8882fd0 introduce a bug, do I now need need some different > > >>> command line to instantiate PCI devices with io ports, or are such > > >>> devices > > >>> simply no longer supported if the system is booted with efi support ? > > >>> > > >>> Thanks, > > >>> Guenter > > >> > > >> > > >> So that commit basically just says don't ignore what efi did. > > >> > > >> The issue's thus likely efi. > > >> > > > > > > I don't see the problem with efi boots on x86 and x86_64. > > > Any idea why that might be the case ? > > > > > > Thanks, > > > Guenter > > > > > >> Cc the maintainer. Philippe can you comment pls? > > > > I'll have a look. Cc'ing Ard for EDK2/Aarch64. > > So a potential workaround would be to use a different I/O resource > window for ArmVirtPkg, that starts at 0x1000. But I would prefer to > fix Linux instead. > > > > >> > > >>> --- > > >>> Command line (tulip network interface): > > >>> > > >>> CMDLINE="root=/dev/vda console=ttyAMA0" > > >>> ROOTFS="rootfs.ext2" > > >>> > > >>> qemu-system-aarch64 -M virt -kernel arch/arm64/boot/Image -no-reboot \ > > >>> -m 512 -cpu cortex-a57 -no-reboot \ > > >>> -device tulip,netdev=net0 -netdev user,id=net0 \ > > >>> -bios QEMU_EFI-aarch64.fd \ > > >>> -snapshot \ > > >>> -device virtio-blk-device,drive=d0 \ > > >>> -drive file=${ROOTFS},if=none,id=d0,format=raw \ > > >>> -nographic -serial stdio -monitor none \ > > >>> --append "${CMDLINE}" > > >>> > > >>> --- > > >>> Boot tests with various devices known to work in qemu v5.2. > > >>> > > >>> v5.2 v6.0 v6.0 > > >>> efi non-efi efi > > >>> e1000 pass pass pass > > >>> e1000-82544gc pass pass pass > > >>> e1000-82545em pass pass pass > > >>> e1000e pass pass pass > > >>> i82550 pass pass pass > > >>> i82557a pass pass pass > > >>> i82557b pass pass pass > > >>> i82557c pass pass pass > > >>> i82558a pass pass pass > > >>> i82559b pass pass pass > > >>> i82559c pass pass pass > > >>> i82559er pass pass pass > > >>> i82562 pass pass pass > > >>> i82801 pass pass pass > > >>> ne2k_pci pass pass fail <-- > > >>> pcnet pass pass pass > > >>> rtl8139 pass pass pass > > >>> tulip pass pass fail <-- > > >>> usb-net pass pass pass > > >>> virtio-net-device > > >>> pass pass pass > > >>> virtio-net-pci pass pass pass > > >>> virtio-net-pci-non-transitional > > >>> pass pass pass > > >>> > > >>> usb-xhci pass pass pass > > >>> usb-ehci pass pass pass > > >>> usb-ohci pass pass pass > > >>> usb-uas-xhci pass pass pass > > >>> virtio pass pass pass > > >>> virtio-blk-pci pass pass pass > > >>> virtio-blk-device > > >>> pass pass pass > > >>> nvme pass pass pass > > >>> sdhci pass pass pass > > >>> dc390 pass pass fail <-- > > >>> am53c974 pass pass fail <-- > > >>> lsi53c895ai pass pass pass > > >>> mptsas1068 pass pass pass > > >>> lsi53c810 pass pass pass > > >>> megasas pass pass pass > > >>> megasas-gen2 pass pass pass > > >>> virtio-scsi-device > > >>> pass pass pass > > >>> virtio-scsi-pci pass pass pass > > >> > > > > > > ----- End forwarded message ----- diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c index 2d3eb1cb73b8..77455e702a3e 100644 --- a/lib/pci_iomap.c +++ b/lib/pci_iomap.c @@ -34,7 +34,9 @@ void __iomem *pci_iomap_range(struct pci_dev *dev, resource_size_t len = pci_resource_len(dev, bar); unsigned long flags = pci_resource_flags(dev, bar); - if (len <= offset || !start) + if (flags & IORESOURCE_MEM && !start) + return NULL; + if (len <= offset) return NULL; len -= offset; start += offset;