Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp918532lfm; Tue, 7 Jul 2020 06:04:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNoCCUBelhUW8NRqJF3JJaDX8fTsVHqtkR9/2ROm7jIf8CpMpQR9OUS5kvrXEUcCMDbyIG X-Received: by 2002:a25:d652:: with SMTP id n79mr94447357ybg.406.1594127066651; Tue, 07 Jul 2020 06:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594127066; cv=none; d=google.com; s=arc-20160816; b=J1NhRXoWRqEvUZOW5Q1SlWW6FgG62wr8ekueCaEoWWUEW3+/1AykNtf9l2jnC4J8sq +zTBbJs6+wkUBRq5Pgf3UJprlhRco2DqLgZkzgiWAZQdPln8b4h8gPs0aqnfGGxCQ0dx rhb0fZVJtdvVpjS5fPZm75E14yGR8ELIR0mQ/BwMhJKR3M7sdFRsXKw+0S+vBctshrDO 4RB634wib2IGpyBnzTcvuFFm3CEVfjZm2TT9gd3Q9XLP849eRPm7SQnmSUsHTjbZdXGq NO/VjY9alWPdtSAUXj4GjHlhgNqQgpy4q0xRxCkKkzSSZSuXgSVQH7AtYewwmvb9FT+w lGgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=7aCyFFwJnH/XozvLc6135xcBscIKe0axRy0qDQOA4eY=; b=f/STYt5LjbghB6sQdKpHsbqbug9H/zTee3CIuRN9s6CdDSAQzQBjpETwb0nv9sJAdv hI02dN9xtKB7++PpyIXG/YSTqTSz0Rd376au06mr6W4vj3hvkLfZB7BaAFIThSpyirw0 HazmBy2w0jrmQ9p46hOCpU3XKGwzRFcEMKP+AZ8k+FF2JAv9xxn30HJYjvnverBWpgnd KltE4c7F5XZHuvh7YGI6bYbgewjksLoK5IogkJeOARYFpLZi6aSHShDZ2D1S5mK/bdP3 CzFbXeD9317Z62gSm39JkgZNJBKuMGwyrlBlhciSXdPAPPEiJmWnxAHA2sm3GSnTXZ4t 0pWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ChES7vMu; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 144si22900536ybn.444.2020.07.07.06.04.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 06:04:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ChES7vMu; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnGs-0005vW-1z for alex.bennee@linaro.org; Tue, 07 Jul 2020 09:04:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsn7o-0008LK-8Z for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:55:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40490 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 1jsn7l-0004tX-04 for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:55:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594126500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=7aCyFFwJnH/XozvLc6135xcBscIKe0axRy0qDQOA4eY=; b=ChES7vMu7N0yOQ6GuroPXTQab4enyKLRWReRnv0VKgqAesMSujcr59zaKxXlPW2dPzzX2G LILHR330xNthoTDSrU2yT2cdvdUFPgr09Ic3DojCNr2ueDaZvJiCUY8Qys8LlomJTZHftt u4lIjnkDeNaS4PeO982RUWUx+CXK1rU= 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-395-SDNSg32jN12L6PUZ9_Xm5A-1; Tue, 07 Jul 2020 08:54:55 -0400 X-MC-Unique: SDNSg32jN12L6PUZ9_Xm5A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30EF919324A7; Tue, 7 Jul 2020 12:54:33 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D12978465; Tue, 7 Jul 2020 12:54:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 522BC31F5E; Tue, 7 Jul 2020 14:53:57 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Date: Tue, 7 Jul 2020 14:53:45 +0200 Message-Id: <20200707125356.32450-10-kraxel@redhat.com> In-Reply-To: <20200707125356.32450-1-kraxel@redhat.com> References: <20200707125356.32450-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 00:46:09 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=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@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 , Marcel Apfelbaum , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: jeR5UJW0Nl+j Makes x86 linux kernel find virtio-mmio devices automatically. Signed-off-by: Gerd Hoffmann Reviewed-by: Sergio Lopez Reviewed-by: Igor Mammedov --- hw/i386/acpi-microvm.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c index 6c4178caefee..d44d7b0cb234 100644 --- a/hw/i386/acpi-microvm.c +++ b/hw/i386/acpi-microvm.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "exec/memory.h" @@ -32,10 +33,60 @@ #include "hw/boards.h" #include "hw/i386/fw_cfg.h" #include "hw/i386/microvm.h" +#include "hw/virtio/virtio-mmio.h" #include "acpi-common.h" #include "acpi-microvm.h" +static void acpi_dsdt_add_virtio(Aml *scope, + MicrovmMachineState *mms) +{ + gchar *separator; + long int index; + BusState *bus; + BusChild *kid; + + bus = sysbus_get_default(); + QTAILQ_FOREACH(kid, &bus->children, sibling) { + DeviceState *dev = kid->child; + Object *obj = object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MMIO); + + if (obj) { + VirtIOMMIOProxy *mmio = VIRTIO_MMIO(obj); + VirtioBusState *mmio_virtio_bus = &mmio->bus; + BusState *mmio_bus = &mmio_virtio_bus->parent_obj; + + if (QTAILQ_EMPTY(&mmio_bus->children)) { + continue; + } + separator = g_strrstr(mmio_bus->name, "."); + if (!separator) { + continue; + } + if (qemu_strtol(separator + 1, NULL, 10, &index) != 0) { + continue; + } + + uint32_t irq = mms->virtio_irq_base + index; + hwaddr base = VIRTIO_MMIO_BASE + index * 512; + hwaddr size = 512; + + Aml *dev = aml_device("VR%02u", (unsigned)index); + aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0005"))); + aml_append(dev, aml_name_decl("_UID", aml_int(index))); + aml_append(dev, aml_name_decl("_CCA", aml_int(1))); + + Aml *crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(base, size, AML_READ_WRITE)); + aml_append(crs, + aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH, + AML_EXCLUSIVE, &irq, 1)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); + } + } +} + static void build_dsdt_microvm(GArray *table_data, BIOSLinker *linker, MicrovmMachineState *mms) @@ -60,6 +111,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker, build_ged_aml(sb_scope, GED_DEVICE, HOTPLUG_HANDLER(mms->acpi_dev), GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE); acpi_dsdt_add_power_button(sb_scope); + acpi_dsdt_add_virtio(sb_scope, mms); aml_append(dsdt, sb_scope); scope = aml_scope("\\"); -- 2.18.4