From patchwork Tue Sep 8 12:10:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 274274 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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 863EEC433E2 for ; Tue, 8 Sep 2020 12:25:09 +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 204D8221F0 for ; Tue, 8 Sep 2020 12:25:09 +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="Yc5B8ADL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 204D8221F0 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]:42174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFcgO-0005N4-45 for qemu-devel@archiver.kernel.org; Tue, 08 Sep 2020 08:25:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFcTW-0001lq-CS for qemu-devel@nongnu.org; Tue, 08 Sep 2020 08:11:50 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30491 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 1kFcT0-0005iQ-Qz for qemu-devel@nongnu.org; Tue, 08 Sep 2020 08:11:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599567078; 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; bh=zOAENY3Xkyfv6TJ9i8uk0PyEiJmhbMa5sHpPRXJH5Pk=; b=Yc5B8ADLAWiKd/q/LdinsUSy4HW2t9DiDzjBWqpsYGXPLfFbgXpZ+ZGw0XrzjV1hVw2xX5 Nak6OO5bpDynDl4h+xMaxJrUuB34fuxEJPz3YAtf+iYJG6BH7f1RHCuU3wqVDQxXSq2F5G 7LopHABk/2XFD6DpSVkLPRhv/y16Qtg= 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-318-y01QzgjKMhmPoz1Kjkjtog-1; Tue, 08 Sep 2020 08:11:04 -0400 X-MC-Unique: y01QzgjKMhmPoz1Kjkjtog-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03A2280EF9E; Tue, 8 Sep 2020 12:11:03 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79B1B60C84; Tue, 8 Sep 2020 12:10:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6AEEA17538; Tue, 8 Sep 2020 14:10:50 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v7 00/21] microvm: add acpi support Date: Tue, 8 Sep 2020 14:10:29 +0200 Message-Id: <20200908121050.1162-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 01:08:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" I know that not supporting ACPI in microvm is intentional. If you still don't want ACPI this is perfectly fine, you can use the usual -no-acpi switch to toggle ACPI support. These are the advantages you are going to loose then: (1) virtio-mmio device discovery without command line hacks (tweaking the command line is a problem when not using direct kernel boot). (2) Better IO-APIC support, we can use IRQ lines 16-23. (3) ACPI power button (aka powerdown request) works. (4) machine poweroff (aka S5 state) works. Together with seabios patches for virtio-mmio support this allows to boot standard fedora images (cloud, coreos, workstation live) with the microvm machine type. git branch for testing (including updated seabios): https://git.kraxel.org/cgit/qemu/log/?h=sirius/microvm changes in v2: * some acpi cleanups are an separate patch series now. * switched to hw reduced acpi & generic event device. * misc fixes here and there. changes in v3: * depeds on "[PATCH v6 00/16] acpi: i386 tweaks" series. * renamed qboot to qboot.bin * updated seabios to master branch snapshot. - this version boots fine with rtc=off * generic event device tweaks (Igor's comments). * make SMP work. * add RfC patches to turn off acpi by default for microvm. * misc fixes here and there. changes in v4: * rebase to latest master - this also depends on the pending seabios update * drop some patches which got cherry-picked. * wire up cpu hotplug (also does coldplug cpu init). * add microvm acpi test case. * dropped RfC patches to turn off acpi by default for microvm. * misc fixes here and there. changes in v5: * rebase to latest master (seabios dependency is merged meanwhile) * fix DSDT version (mst). * add comments referencing the ACPI spec for easier review (mst). changes in v6: * rebase to latest master, adapt to meson build system. * pick up some review tags. * misc fixes here and there. changes in v7: * rebase to latest master, adapt to x86 cpu hotplug changes. * meson tweaks for firmware binaries. * pick up some review tags. take care, Gerd Gerd Hoffmann (21): microvm: name qboot binary qboot.rom seabios: add microvm config, update build rules seabios: add bios-microvm.bin binary acpi: ged: add control regs acpi: ged: add x86 device variant. acpi: move acpi_dsdt_add_power_button() to ged microvm: make virtio irq base runtime configurable microvm/acpi: add minimal acpi support microvm/acpi: add acpi_dsdt_add_virtio() for x86 microvm/acpi: use GSI 16-23 for virtio microvm/acpi: use seabios with acpi=on microvm/acpi: disable virtio-mmio cmdline hack x86: constify x86_machine_is_*_enabled x86: move acpi_dev from pc/microvm x86: move cpu hotplug from pc to x86 microvm: wire up hotplug tests/acpi: allow microvm test data updates. tests/acpi: allow override blkdev tests/acpi: add microvm test tests/acpi: update expected data files for microvm microvm: enable ramfb hw/i386/acpi-microvm.h | 8 + include/hw/acpi/generic_event_device.h | 17 ++ include/hw/i386/microvm.h | 10 +- include/hw/i386/pc.h | 1 - include/hw/i386/x86.h | 15 +- hw/acpi/generic_event_device.c | 52 +++++ hw/arm/virt-acpi-build.c | 8 - hw/i386/acpi-build.c | 2 +- hw/i386/acpi-microvm.c | 240 ++++++++++++++++++++ hw/i386/generic_event_device_x86.c | 36 +++ hw/i386/microvm.c | 108 ++++++++- hw/i386/pc.c | 297 ++----------------------- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/i386/x86.c | 275 ++++++++++++++++++++++- tests/qtest/bios-tables-test.c | 21 +- hw/i386/Kconfig | 1 + hw/i386/meson.build | 3 +- pc-bios/bios-microvm.bin | Bin 65536 -> 131072 bytes pc-bios/meson.build | 1 + pc-bios/qboot.rom | Bin 0 -> 65536 bytes roms/Makefile | 11 +- roms/config.seabios-microvm | 26 +++ tests/data/acpi/microvm/APIC | Bin 0 -> 70 bytes tests/data/acpi/microvm/DSDT | Bin 0 -> 365 bytes tests/data/acpi/microvm/FACP | Bin 0 -> 268 bytes 26 files changed, 823 insertions(+), 313 deletions(-) create mode 100644 hw/i386/acpi-microvm.h create mode 100644 hw/i386/acpi-microvm.c create mode 100644 hw/i386/generic_event_device_x86.c create mode 100644 pc-bios/qboot.rom create mode 100644 roms/config.seabios-microvm create mode 100644 tests/data/acpi/microvm/APIC create mode 100644 tests/data/acpi/microvm/DSDT create mode 100644 tests/data/acpi/microvm/FACP -- 2.27.0