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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 6EB25C433E2 for ; Thu, 17 Sep 2020 06:02:36 +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 DEF18208DB for ; Thu, 17 Sep 2020 06:02:35 +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="IFgH5PXC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DEF18208DB 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]:35930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIn06-0004qU-VK for qemu-devel@archiver.kernel.org; Thu, 17 Sep 2020 02:02:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kImzI-0004Nx-7z for qemu-devel@nongnu.org; Thu, 17 Sep 2020 02:01:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kImzF-0000RW-Nt for qemu-devel@nongnu.org; Thu, 17 Sep 2020 02:01:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600322500; 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=fCGL/nEcce+Yr1hqYuzW4S4LCUePOkKzZ40ZIBLWADc=; b=IFgH5PXCM4wLJBzCCjJRbosENB43Nwyrz31ZIDgzJcPf4gykSaLxD3pHxyM7gU8awCKMiT cd5DNlGasz1Zj1wBiRVTVq1d8qqNkfTPfHmP50ush5kRXWPxyQBoF49A8MTwh9rnGMLHuq 5m9+mEFZsgqx4D6jMjvXaJ43AI2R5yw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-fq5R9nY8NuO12Hx5xatxSQ-1; Thu, 17 Sep 2020 02:01:36 -0400 X-MC-Unique: fq5R9nY8NuO12Hx5xatxSQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 677E310082E8; Thu, 17 Sep 2020 06:01:35 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CDA776E16; Thu, 17 Sep 2020 06:01:25 +0000 (UTC) Date: Thu, 17 Sep 2020 08:01:23 +0200 From: Igor Mammedov To: Julia Suvorova Subject: Re: [RFC PATCH v2 3/4] hw/i386/acpi-build: Turn off support of PCIe native hot-plug and SHPC in _OSC Message-ID: <20200917080123.29b7e838@redhat.com> In-Reply-To: References: <20200818215227.181654-1-jusual@redhat.com> <20200818215227.181654-4-jusual@redhat.com> <20200821141339.00f2076c@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/17 02:01:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Gerd Hoffmann , QEMU Developers , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 16 Sep 2020 21:14:36 +0200 Julia Suvorova wrote: > On Wed, Sep 16, 2020 at 8:03 PM Julia Suvorova wrote: > > > > On Fri, Aug 21, 2020 at 2:13 PM Igor Mammedov wrote: > > > > > > On Tue, 18 Aug 2020 23:52:26 +0200 > > > Julia Suvorova wrote: > > > > > > > Other methods may be used if the system is capable of this and the _OSC bit > > > > is set. Disable them explicitly to force ACPI PCI hot-plug use. The older > > > > versions will still use PCIe native. > > > > > > > > Signed-off-by: Julia Suvorova > > > > --- > > > > hw/i386/acpi-build.h | 11 +++++++++++ > > > > hw/i386/acpi-build.c | 21 +++++++++++++++------ > > > > 2 files changed, 26 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h > > > > index 74df5fc612..6f94312c39 100644 > > > > --- a/hw/i386/acpi-build.h > > > > +++ b/hw/i386/acpi-build.h > > > > @@ -5,6 +5,17 @@ > > > > > > > > extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; > > > > > > > > +/* PCI Firmware Specification 3.2, Table 4-5 */ > > > > +typedef enum { > > > > + ACPI_OSC_NATIVE_HP_EN = 0, > > > > + ACPI_OSC_SHPC_EN = 1, > > > > + ACPI_OSC_PME_EN = 2, > > > > + ACPI_OSC_AER_EN = 3, > > > > + ACPI_OSC_PCIE_CAP_EN = 4, > > > > + ACPI_OSC_LTR_EN = 5, > > > > + ACPI_OSC_ALLONES_INVALID = 6, > > > > +} AcpiOSCField; > > > > + > > > > void acpi_setup(void); > > > > > > > > #endif > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > > > index f3cd52bd06..c5f4802b8c 100644 > > > > --- a/hw/i386/acpi-build.c > > > > +++ b/hw/i386/acpi-build.c > > > > @@ -1411,7 +1411,7 @@ static void build_i386_pci_hotplug(Aml *table, uint64_t pcihp_addr) > > > > aml_append(table, scope); > > > > } > > > > > > > > -static Aml *build_q35_osc_method(void) > > > > +static Aml *build_q35_osc_method(AcpiPmInfo *pm) > > > > { > > > > Aml *if_ctx; > > > > Aml *if_ctx2; > > > > @@ -1419,6 +1419,7 @@ static Aml *build_q35_osc_method(void) > > > > Aml *method; > > > > Aml *a_cwd1 = aml_name("CDW1"); > > > > Aml *a_ctrl = aml_local(0); > > > > + unsigned osc_ctrl; > > > > > > > > method = aml_method("_OSC", 4, AML_NOTSERIALIZED); > > > > aml_append(method, aml_create_dword_field(aml_arg(3), aml_int(0), "CDW1")); > > > > @@ -1430,11 +1431,19 @@ static Aml *build_q35_osc_method(void) > > > > > > > > aml_append(if_ctx, aml_store(aml_name("CDW3"), a_ctrl)); > > > > > > > > + /* Always allow native PME, AER (depend on PCIE Capability Control) */ > > > > + osc_ctrl = BIT(ACPI_OSC_PME_EN) | BIT(ACPI_OSC_AER_EN) | > > > > + BIT(ACPI_OSC_PCIE_CAP_EN); > > > > + > > > > /* > > > > - * Always allow native PME, AER (no dependencies) > > > > - * Allow SHPC (PCI bridges can have SHPC controller) > > > > + * Guests seem to generally prefer native hot-plug control. > > > > + * Enable it only when we do not use ACPI hot-plug. > > > > */ > > > > - aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl)); > > > > + if (!pm->pcihp_bridge_en) { > > > > + osc_ctrl |= BIT(ACPI_OSC_NATIVE_HP_EN) | BIT(ACPI_OSC_SHPC_EN); > > > > + } > > > > > > ACPI hotplug works only for coldplugged bridges, and native one is used > > > on hotplugged ones. > > > Wouldn't that break SHPC/Native hotplug on hotplugged PCI/PCI-E bridge? > > Wait, what configuration are you talking about exactly? Currently on piix4, we have ACPI and native hotplug working simultaneously the former works on cold-plugged bridges and if you hotplug another bridge, that one will use native method. With above hunk it probably will break. > > > > > + aml_append(if_ctx, aml_and(a_ctrl, aml_int(osc_ctrl), a_ctrl)); > > > > > > > > if_ctx2 = aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1)))); > > > > /* Unknown revision */ > > > > @@ -1514,7 +1523,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > > 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, build_q35_osc_method()); > > > > + aml_append(dev, build_q35_osc_method(pm)); > > > > aml_append(sb_scope, dev); > > > > aml_append(dsdt, sb_scope); > > > > > > > > @@ -1590,7 +1599,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > > if (pci_bus_is_express(bus)) { > > > > aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"))); > > > > aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); > > > > - aml_append(dev, build_q35_osc_method()); > > > > + aml_append(dev, build_q35_osc_method(pm)); > > > > } else { > > > > aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03"))); > > > > } > > > >