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=-11.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 9D846C433E0 for ; Thu, 30 Jul 2020 16:02:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 65B03206F5 for ; Thu, 30 Jul 2020 16:02:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Z/JSI/vs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65B03206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1B0J-0005q7-FG for qemu-devel@archiver.kernel.org; Thu, 30 Jul 2020 12:01:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1Axv-0003lG-Kf for qemu-devel@nongnu.org; Thu, 30 Jul 2020 11:59:31 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50544 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1Axt-0005Uj-Ax for qemu-devel@nongnu.org; Thu, 30 Jul 2020 11:59:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596124768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EHy459NRfjsyOu8s435MZbetWGRYF2vqJ7PlxyraEmk=; b=Z/JSI/vsL39HtKGmEXJLNIPnz8HP9B/OxFcA/ty5fzRp2AHMY9zvIs2v+9+2zU2lyHuCmn g/myQqxJv4G3efoHLXWfPRRh4OVIpxo7gDF76eOt7rxUx/pZ7SBKkZIrp+aBSJ1ciyym4T zZM+xs/m/6ZNVYHqgYFSPhYK6wJNrH8= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-FG5e6y16NY6S1HRHgqY4ZA-1; Thu, 30 Jul 2020 11:59:23 -0400 X-MC-Unique: FG5e6y16NY6S1HRHgqY4ZA-1 Received: by mail-wr1-f72.google.com with SMTP id t12so8163165wrp.0 for ; Thu, 30 Jul 2020 08:59:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=bOrbd3fBpyjtD0O8aD2U6d3OHMfG1J5Sqp3kzMTCwbs=; b=bWM+cik5a1VnDoNSuyyplEMZqlxoOAvYa2BMnCp1yf7E5tMYXbU5PLFY+CIeVnP1na ItNJCGdXIXQFxa3H2GaEeXrZti8DHuSlajWFtnHkrn2H2deC5lPFONRjaRbwQows/mhn NbI9V9eTnI6NOdfOs+w24/Pg5YeHGQy0SSrMli/dkMIpKFP2/KhB+zHhPjuPHMzLMKhT uES/phtz8iqjYTd53IL0By0MHRAD8tabQ3DeXG4rBGSki31R4WvTJeBsTXasRnyt/FkO vtXBhZfYtkf4Af4WG6lr9LjKniuvVXVEgyao32PRnbZofw24A41b4aJUdlxrfcDFWovA gOYA== X-Gm-Message-State: AOAM532S/qAMzgDtOPjeZcObPPNsgLe3i/D1PjznEkI/tb/t4sxK6+Wh BBjaMMuTD1wKBh36zmRuNY7VVqK2IPXWeo/z6+5oghqQ43IOPtVIT+rIyhPjeOAqMSaf6YiFlJQ lT1+lFUw0S1tFuus= X-Received: by 2002:a05:6000:124c:: with SMTP id j12mr3497929wrx.83.1596124761936; Thu, 30 Jul 2020 08:59:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAr3sW9dUloN8vpHnYxk2brltdMRaudl/gNj3ZJIP/5j1wE5Y4zTt2eFbrMdq/rBwdSf54Qw== X-Received: by 2002:a05:6000:124c:: with SMTP id j12mr3497896wrx.83.1596124761563; Thu, 30 Jul 2020 08:59:21 -0700 (PDT) Received: from redhat.com (bzq-79-179-105-63.red.bezeqint.net. [79.179.105.63]) by smtp.gmail.com with ESMTPSA id g188sm11180778wma.5.2020.07.30.08.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 08:59:20 -0700 (PDT) Date: Thu, 30 Jul 2020 11:59:18 -0400 From: "Michael S. Tsirkin" To: vit9696 Subject: Re: OVMF and PCI0 UID Message-ID: <20200730115902-mutt-send-email-mst@kernel.org> References: <56E4DCD4-DBA1-4A41-8568-1CBBB37ED320@protonmail.com> <829eba8a-d9a7-a335-6b85-91e64462e64b@redhat.com> <20200721025745-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:41:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , mhaeuser@posteo.de, Laszlo Ersek , qemu devel list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Thanks, I sent the patches on the list now! On Wed, Jul 22, 2020 at 01:53:23PM +0000, vit9696 via wrote: > Hello, > > We can confirm that the suggested change to zero UIDs resolves the problem. It > will be great if you could handle the rest as you see fit. Thank you! > > Best regards, > Vitaly > > > В вт, июля 21, 2020 в 12:24, vit9696 пишет: > > Thank you, we will provide an update whether this solves the problem. > > Besides, this is not the only case where UIDs are wrong for the PCI bus. > In hw/arm/virt-acpi-build.c there is the following code: > > Aml *dev = aml_device("%s", "PCI0"); > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A08"))); > aml_append(dev, aml_name_decl("_CID", aml_string("PNP0A03"))); > aml_append(dev, aml_name_decl("_SEG", aml_int(0))); > aml_append(dev, aml_name_decl("_BBN", aml_int(0))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > aml_append(dev, aml_name_decl("_UID", aml_string("PCI0"))); > aml_append(dev, aml_name_decl("_STR", aml_unicode("PCIe 0 Device"))); > aml_append(dev, aml_name_decl("_CCA", aml_int(1))); > > https://github.com/qemu/qemu/blob/2c1fb4d/hw/arm/virt-acpi-build.c# > L168-L175 > > It makes UID on ARM builds a string, which is certainly not expected. We do > not have ARM test setups, but I hope this can be useful too. > > Best wishes, > Vitaly > > > 21 июля 2020 г., в 09:58, Michael S. Tsirkin написал > (а): > > > On Mon, Jul 20, 2020 at 11:25:58PM +0200, Laszlo Ersek wrote: > > Hi Vitaly, > > adding Igor, Michael, Marcel, and qemu-devel. > > On 07/20/20 11:06, vit9696 wrote: > > Hello, > > I discovered an issue with inconsistent QEMU/OVMF device paths, > and > while I am unsure whether directing this e-mail is appropriate > to you, > I believe that you likely have the contacts you could forward > this > e-mail to. > > macOS uses ACPI UIDs to build the DevicePath for NVRAM boot > options, > while OVMF firmware gets them via an internal channel through > QEMU. > Due to a bug in QEMU (or OVMF) currently UEFI firmware and ACPI > have > different values, and this makes the underlying operating > system > unable to report its boot option. > > The particular node in question is the primary PciRoot (PCI0 in > ACPI), > which for some reason gets assigned 1 in ACPI UID and 0 in the > DevicePath. To me this looks like a bug here: > https://github.com/qemu/qemu/blob/8f06f22/hw/i386/acpi-build.c# > L1511-L1515 > Which does not correspond to the primary PCI identifier here: > https://github.com/qemu/qemu/blob/5a79d10/hw/pci/pci.c# > L160-L162 > > Reference with the device paths, OVMF startup logs, and ACPI > table > dumps (SysReport): > https://github.com/acidanthera/bugtracker/issues/1050 > > Would you be able to forward this to the right people or > perhaps keep > an eye on the issue itself? > > > I think you are right. > > In UEFI v2.8, section "10.4.2 Rules with ACPI _HID and _UID" ends > with > the paragraph, > > Root PCI bridges will use the plug and play ID of PNP0A03, This > will > be stored in the ACPI Device Path _HID field, or in the Expanded > ACPI Device Path _CID field to match the ACPI name space. The > _UID > in the ACPI Device Path structure must match the _UID in the > ACPI > name space. > > (See especially the last sentence.) > > Considering *extra* root bridges / root buses (with bus number > > 0), > QEMU's ACPI generator actually does the right thing; since QEMU > commit > c96d9286a6d7 ("i386/acpi-build: more traditional _UID and _HID for > PXB > root buses", 2015-06-11). > > However, the _UID values for root bridge zero (on both i440fx and > q35) > have always been "wrong" (from UEFI perspective), going back in > QEMU to > commit 74523b850189 ("i386: add ACPI table files from seabios", > 2013-10-14). > > Even in SeaBIOS, these _UID values have always been 1; see commit > a4d357638c57 ("Port rombios32 code from bochs-bios.", 2008-03-08) > for > i440fx, and commit ecbe3fd61511 ("seabios: q35: add dsdt", > 2012-12-01) > for q35. > > Does the following patch work for you? (I can see you proposed the > same > in > issuecomment-660734139>) > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index b7bcbbbb2a35..7a5a8b3521b0 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1496,9 +1496,9 @@ build_dsdt(GArray *table_data, BIOSLinker > *linker, > sb_scope = aml_scope("_SB"); > dev = aml_device("PCI0"); > aml_append(dev, aml_name_decl("_HID", aml_eisaid > ("PNP0A03"))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > - aml_append(dev, aml_name_decl("_UID", aml_int(1))); > + aml_append(dev, aml_name_decl("_UID", aml_int(0))); > aml_append(sb_scope, dev); > aml_append(dsdt, sb_scope); > > build_hpet_aml(dsdt); > @@ -1511,9 +1511,9 @@ build_dsdt(GArray *table_data, BIOSLinker > *linker, > dev = aml_device("PCI0"); > aml_append(dev, aml_name_decl("_HID", aml_eisaid > ("PNP0A08"))); > aml_append(dev, aml_name_decl("_CID", aml_eisaid > ("PNP0A03"))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > - aml_append(dev, aml_name_decl("_UID", aml_int(1))); > + aml_append(dev, aml_name_decl("_UID", aml_int(0))); > aml_append(dev, build_q35_osc_method()); > aml_append(sb_scope, dev); > aml_append(dsdt, sb_scope); > > > If it does, I suggest submitting the above patch to qemu-devel, and > /or > filing a bug for upstream QEMU at >. > > > Or even just reporting whether the above helps you, we can > take it from there. > > > (Note: I didn't even compile the above change.) > > Thanks > Laszlo > > > > >