From nobody Mon Feb 9 10:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591975110; cv=none; d=zohomail.com; s=zohoarc; b=Hx3sLx3whyw6ZsTojS7cYEfGYQ024SUl3e9SOYP4imYFaDWuFnUUFTWgBc6MqhoXBWdLJYxMZDl6yfRAyfIeQ3hw6Sytm4qdxx7lMMtwESOaQNmiHmeoLP1YEI74QIirmk4VhkE/j3VMbvYoYYyKGxcH13SnPF3lvWSRvzRDWoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591975110; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mpMbTsm6mehy6ISo1LlFq8k67fPnsrK8nRjA546c8Mw=; b=IIpqzh/uvjy81KhPH0JYQDAoedWlKZLGVUvRiAojPBKCMLH+Gqzt+HiLWcA9uoevMW4WJ7awtD3pCdDbJNXa6Wm4h1XInvyNJ0LGoZGRAqaCGgd1jq2g1985lgUpo4wYfwt08LpzrpD/976Xa0O+ZeyFVYZ2gbVH8Y3Poyo17NU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591975110520995.7008947699876; Fri, 12 Jun 2020 08:18:30 -0700 (PDT) Received: from localhost ([::1]:52234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjlRr-0004zv-79 for importer@patchew.org; Fri, 12 Jun 2020 11:18:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjl3S-0001PO-Rr for qemu-devel@nongnu.org; Fri, 12 Jun 2020 10:53:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57120 helo=us-smtp-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 1jjl3Q-0001fv-VA for qemu-devel@nongnu.org; Fri, 12 Jun 2020 10:53:14 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-Xx4QqlyTOnKrf6Rd1cL4cw-1; Fri, 12 Jun 2020 10:53:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id a4so3987681wrp.5 for ; Fri, 12 Jun 2020 07:53:01 -0700 (PDT) Received: from redhat.com (bzq-79-178-18-124.red.bezeqint.net. [79.178.18.124]) by smtp.gmail.com with ESMTPSA id h27sm12294814wrb.18.2020.06.12.07.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 07:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591973592; 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=mpMbTsm6mehy6ISo1LlFq8k67fPnsrK8nRjA546c8Mw=; b=YGd6U0FA36KHrmzNmroz8bK3ILxnidepYa67GFJR5UQvwJxju7ZlLUjQW5w3T9p7Q5J6c4 G8AOS34ciKf5mAvrJ39qCPtskpyLHoHgtRpLLwskILvnSDR9zZUAP57sWt8SvukakhF5bz o6OQMvX/153Cs9orp6aPjS/yb1FKf+c= X-MC-Unique: Xx4QqlyTOnKrf6Rd1cL4cw-1 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=mpMbTsm6mehy6ISo1LlFq8k67fPnsrK8nRjA546c8Mw=; b=RrUYxo7eTnOP7inY/6dTvspy2XH+ZLRl51mzoI6Xt2gjFMkgoLKXz9VxUDc37LIaH0 eSFanLw2HIYC/kLmSlg6rhfYmXy7dgrRAoze0q6Y/GJXe1wiCqE7AeLFh1ZIZeeAs/FE NUdOQL5Ogy6HauzuVDHbb/B1Kt+1vgyx2l56fECqpHwewnon3jBqtY2Kxe9UcsB5d3FA JLSGjsZUcYQpQ7VHNU4zjBYxAdJQ5sPPMdpfqn203QOax5OHkH5nYdPPaRR4gRxh5YAE QJefhiHQdMNxDPpcNkvNzI9e+0AcKR07Q7mbo4v6NBJYsLv3KG7m1rngD25dmsgiyQDl RHqw== X-Gm-Message-State: AOAM530e0fUk1sL6ywmX+AGOcHUL34frTFD/mjRAFLP2vBOQSI9BnVzb WvyfMCN4b0MQQW8mWRfxp6gkl2Oek0ShuxoZA4YDSGIQn1JQAV2ReGHoRx10pjRUXU/jUnTaFJB tLJqrzE360PKzvko= X-Received: by 2002:adf:ed49:: with SMTP id u9mr15156118wro.414.1591973580856; Fri, 12 Jun 2020 07:53:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7+/EmDs+esUL55nYkNA2YVXft42CQkYXR+sgSma7tjR34v7bHmuj5fEugK3MYizzds3BhdA== X-Received: by 2002:adf:ed49:: with SMTP id u9mr15156092wro.414.1591973580663; Fri, 12 Jun 2020 07:53:00 -0700 (PDT) Date: Fri, 12 Jun 2020 10:52:58 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 53/58] acpi: madt: skip pci override on pci-less systems. Message-ID: <20200612141917.9446-54-mst@redhat.com> References: <20200612141917.9446-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200612141917.9446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/12 08:07:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Eduardo Habkost , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Needed for microvm. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200520132003.9492-8-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-common.h | 3 ++- hw/i386/acpi-build.c | 2 +- hw/i386/acpi-common.c | 26 +++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index c30e461f18..9cac18dddf 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -9,6 +9,7 @@ #define ACPI_BUILD_IOAPIC_ID 0x0 =20 void acpi_build_madt(GArray *table_data, BIOSLinker *linker, - X86MachineState *x86ms, AcpiDeviceIf *adev); + X86MachineState *x86ms, AcpiDeviceIf *adev, + bool has_pci); =20 #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 26c0c8aefa..473cbdfffd 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2588,7 +2588,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) =20 acpi_add_table(table_offsets, tables_blob); acpi_build_madt(tables_blob, tables->linker, x86ms, - ACPI_DEVICE_IF(pcms->acpi_dev)); + ACPI_DEVICE_IF(pcms->acpi_dev), true); =20 vmgenid_dev =3D find_vmgenid_dev(); if (vmgenid_dev) { diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 5caca16a0b..ab9b00581a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -72,7 +72,8 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, } =20 void acpi_build_madt(GArray *table_data, BIOSLinker *linker, - X86MachineState *x86ms, AcpiDeviceIf *adev) + X86MachineState *x86ms, AcpiDeviceIf *adev, + bool has_pci) { MachineClass *mc =3D MACHINE_GET_CLASS(x86ms); const CPUArchIdList *apic_ids =3D mc->possible_cpu_arch_ids(MACHINE(x8= 6ms)); @@ -111,18 +112,21 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *= linker, intsrcovr->gsi =3D cpu_to_le32(2); intsrcovr->flags =3D cpu_to_le16(0); /* conforms to bus specifica= tions */ } - for (i =3D 1; i < 16; i++) { + + if (has_pci) { + for (i =3D 1; i < 16; i++) { #define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11)) - if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) { - /* No need for a INT source override structure. */ - continue; + if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) { + /* No need for a INT source override structure. */ + continue; + } + intsrcovr =3D acpi_data_push(table_data, sizeof *intsrcovr); + intsrcovr->type =3D ACPI_APIC_XRUPT_OVERRIDE; + intsrcovr->length =3D sizeof(*intsrcovr); + intsrcovr->source =3D i; + intsrcovr->gsi =3D cpu_to_le32(i); + intsrcovr->flags =3D cpu_to_le16(0xd); /* active high, level = triggered */ } - intsrcovr =3D acpi_data_push(table_data, sizeof *intsrcovr); - intsrcovr->type =3D ACPI_APIC_XRUPT_OVERRIDE; - intsrcovr->length =3D sizeof(*intsrcovr); - intsrcovr->source =3D i; - intsrcovr->gsi =3D cpu_to_le32(i); - intsrcovr->flags =3D cpu_to_le16(0xd); /* active high, level trig= gered */ } =20 if (x2apic_mode) { --=20 MST