From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:a111:0:0:0:0:0 with SMTP id o17-v6csp2036349wro; Sun, 4 Nov 2018 17:52:25 -0800 (PST) X-Google-Smtp-Source: AJdET5c/qxMkMyw0g80+E3O/dCVrOozuSF/8D72LAzGGxXD7ZuIaFeMdK63GnJZUmvomy47bN4Ab X-Received: by 2002:a37:65c5:: with SMTP id z188mr18240660qkb.306.1541382745714; Sun, 04 Nov 2018 17:52:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541382745; cv=none; d=google.com; s=arc-20160816; b=1Cjqhr6ekC4uCBiDhXqh3/DPEmvhafDkleLVSU2K9ZAxf1E0eMi1ZSn3y4adfh7oKe pN7Si8Iq3r7781ahDdGSGkkoyUiYMuMXb0zVy3ET0/yHB/Pzb9wkNsDE+7Xammm2sV3c 0TO8EkthioS7YWiAKyUgmMjfSLIqYAtGANG5uwHaMKVHRd5MfMBbOuqAgKaSEpU2Yhgs s/WP9W3gYa8b0KuTggF2yH9VjhHmVI78DrxQpYnlcBF7IR1ECh45Tw041S2b0gsdexj9 yZjwwZ4ncS48tRYIxY8SAiwD3bTR9cPYM7LDGr5JCh3YeN1t6SERpfjkLA8kTw4ttuqw Nj1g== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=ImQHWqQJodej0c9XFuFsPgJo354/0ZdZHDF6xrGHa88=; b=tjim1m2q234qNWA4bL5wKtxmRm1M7uibL1N05wVshF1V8uuO6X1ZkDreepaq6PMF0n KkSxm1PS5Arf2JEA/6KpVFcipx72muJF2wjWzVcat7z+noPNDOBUCDPkO3hdgKp+1n3Q RJTVrYh00ovgMkr7m7IctZEhILoaE9H1WhMscoR/GNAxaw9RbSwnloHIX27c0AyLzQK7 LM+OYccPv3rFxBMjdjnG7dGe/g+5qQp7XpU16H7ErOUBAvIFbED5omlyA5MEwW4oXNYy cgEKiDJl1hbRChw0JSpRscP9qMgeb9m7EgmxsgxNG+2O18/gM1d58hKxtVd4gMsH0A4M w9sw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z59si2644807qtd.264.2018.11.04.17.52.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 04 Nov 2018 17:52:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([::1]:60903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJU41-00085w-5t for alex.bennee@linaro.org; Sun, 04 Nov 2018 20:52:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTvc-0000rX-GE for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTvW-0003ia-N8 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:44 -0500 Received: from mga18.intel.com ([134.134.136.126]:8015) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJTvT-0003UX-5N; Sun, 04 Nov 2018 20:43:36 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 17:43:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,466,1534834800"; d="scan'208";a="277074510" Received: from emurphy1-mobl1.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.26.250]) by fmsmga005.fm.intel.com with ESMTP; 04 Nov 2018 17:43:20 -0800 From: Samuel Ortiz To: qemu-devel@nongnu.org Date: Mon, 5 Nov 2018 02:40:43 +0100 Message-Id: <20181105014047.26447-21-sameo@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH v5 20/24] hw: acpi: Define ACPI tables builder interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: j3MYt3uEtWn/ In order to decouple ACPI APIs from specific machine types, we are creating an ACPI builder interface that each ACPI platform can choose to implement. This way, a new machine type can re-use the high level ACPI APIs and define some custom table build methods, without having to duplicate most of the existing implementation only to add small variations to it. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Samuel Ortiz --- include/hw/acpi/builder.h | 100 ++++++++++++++++++++++++++++++++++++++ hw/acpi/builder.c | 97 ++++++++++++++++++++++++++++++++++++ hw/acpi/Makefile.objs | 1 + 3 files changed, 198 insertions(+) create mode 100644 include/hw/acpi/builder.h create mode 100644 hw/acpi/builder.c diff --git a/include/hw/acpi/builder.h b/include/hw/acpi/builder.h new file mode 100644 index 0000000000..a63b88ffe9 --- /dev/null +++ b/include/hw/acpi/builder.h @@ -0,0 +1,100 @@ +/* + * + * Copyright (c) 2018 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef ACPI_BUILDER_H +#define ACPI_BUILDER_H + +#include "qemu/osdep.h" +#include "hw/acpi/bios-linker-loader.h" +#include "qom/object.h" + +#define TYPE_ACPI_BUILDER "acpi-builder" + +#define ACPI_BUILDER_METHODS(klass) \ + OBJECT_CLASS_CHECK(AcpiBuilderMethods, (klass), TYPE_ACPI_BUILDER) +#define ACPI_BUILDER_GET_METHODS(obj) \ + OBJECT_GET_CLASS(AcpiBuilderMethods, (obj), TYPE_ACPI_BUILDER) +#define ACPI_BUILDER(obj) \ + INTERFACE_CHECK(AcpiBuilder, (obj), TYPE_ACPI_BUILDER) + +typedef struct AcpiConfiguration AcpiConfiguration; +typedef struct AcpiBuildState AcpiBuildState; +typedef struct AcpiMcfgInfo AcpiMcfgInfo; + +typedef struct AcpiBuilder { + /* */ + Object Parent; +} AcpiBuilder; + +/** + * AcpiBuildMethods: + * + * Interface to be implemented by a machine type that needs to provide + * custom ACPI tables build method. + * + * @parent: Opaque parent interface. + * @rsdp: ACPI RSDP (Root System Description Pointer) table build callback. + * @madt: ACPI MADT (Multiple APIC Description Table) table build callback. + * @mcfg: ACPI MCFG table build callback. + * @srat: ACPI SRAT (System/Static Resource Affinity Table) + * table build callback. + * @slit: ACPI SLIT (System Locality System Information Table) + * table build callback. + * @configuration: ACPI configuration getter. + * This is used to query the machine instance for its + * AcpiConfiguration pointer. + */ +typedef struct AcpiBuilderMethods { + /* */ + InterfaceClass parent; + + /* */ + void (*rsdp)(GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset); + void (*madt)(GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf); + void (*mcfg)(GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info); + void (*srat)(GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf); + void (*slit)(GArray *table_data, BIOSLinker *linker); + + AcpiConfiguration *(*configuration)(AcpiBuilder *builder); +} AcpiBuilderMethods; + +void acpi_builder_rsdp(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset); + +void acpi_builder_madt(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf); + +void acpi_builder_mcfg(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info); + +void acpi_builder_srat(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf); + +void acpi_builder_slit(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker); + +AcpiConfiguration *acpi_builder_configuration(AcpiBuilder *builder); + +#endif diff --git a/hw/acpi/builder.c b/hw/acpi/builder.c new file mode 100644 index 0000000000..c29a614793 --- /dev/null +++ b/hw/acpi/builder.c @@ -0,0 +1,97 @@ +/* + * + * Copyright (c) 2018 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qom/object.h" +#include "hw/acpi/builder.h" + +void acpi_builder_rsdp(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->rsdp) { + abm->rsdp(table_data, linker, rsdt_tbl_offset); + } +} + +void acpi_builder_madt(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->madt) { + abm->madt(table_data, linker, ms, conf); + } +} + +void acpi_builder_mcfg(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->mcfg) { + abm->mcfg(table_data, linker, info); + } +} + +void acpi_builder_srat(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->srat) { + abm->srat(table_data, linker, machine, conf); + } +} + +void acpi_builder_slit(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->slit) { + abm->slit(table_data, linker); + } +} + +AcpiConfiguration *acpi_builder_configuration(AcpiBuilder *builder) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + if (abm && abm->configuration) { + return abm->configuration(builder); + } + return NULL; +} + +static const TypeInfo acpi_builder_info = { + .name = TYPE_ACPI_BUILDER, + .parent = TYPE_INTERFACE, + .class_size = sizeof(AcpiBuilderMethods), +}; + +static void acpi_builder_register_type(void) +{ + type_register_static(&acpi_builder_info); +} + +type_init(acpi_builder_register_type) diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 11c35bcb44..2f383adc6f 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o +common-obj-y += builder.o common-obj-$(CONFIG_IPMI) += ipmi.o common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: [PATCH v5 20/24] hw: acpi: Define ACPI tables builder interface Date: Mon, 5 Nov 2018 02:40:43 +0100 Message-ID: <20181105014047.26447-21-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gJTvM-0004Yr-65 for xen-devel@lists.xenproject.org; Mon, 05 Nov 2018 01:43:28 +0000 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org SW4gb3JkZXIgdG8gZGVjb3VwbGUgQUNQSSBBUElzIGZyb20gc3BlY2lmaWMgbWFjaGluZSB0eXBl cywgd2UgYXJlCmNyZWF0aW5nIGFuIEFDUEkgYnVpbGRlciBpbnRlcmZhY2UgdGhhdCBlYWNoIEFD UEkgcGxhdGZvcm0gY2FuIGNob29zZSB0bwppbXBsZW1lbnQuClRoaXMgd2F5LCBhIG5ldyBtYWNo aW5lIHR5cGUgY2FuIHJlLXVzZSB0aGUgaGlnaCBsZXZlbCBBQ1BJIEFQSXMgYW5kCmRlZmluZSBz b21lIGN1c3RvbSB0YWJsZSBidWlsZCBtZXRob2RzLCB3aXRob3V0IGhhdmluZyB0byBkdXBsaWNh dGUgbW9zdApvZiB0aGUgZXhpc3RpbmcgaW1wbGVtZW50YXRpb24gb25seSB0byBhZGQgc21hbGwg dmFyaWF0aW9ucyB0byBpdC4KClJldmlld2VkLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8 cGhpbG1kQHJlZGhhdC5jb20+ClRlc3RlZC1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBo aWxtZEByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYW11ZWwgT3J0aXogPHNhbWVvQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBpbmNsdWRlL2h3L2FjcGkvYnVpbGRlci5oIHwgMTAwICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBody9hY3BpL2J1aWxkZXIuYyAgICAgICAg IHwgIDk3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaHcvYWNwaS9NYWtl ZmlsZS5vYmpzICAgICB8ICAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDE5OCBpbnNlcnRpb25zKCsp CiBjcmVhdGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9ody9hY3BpL2J1aWxkZXIuaAogY3JlYXRlIG1v ZGUgMTAwNjQ0IGh3L2FjcGkvYnVpbGRlci5jCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9hY3Bp L2J1aWxkZXIuaCBiL2luY2x1ZGUvaHcvYWNwaS9idWlsZGVyLmgKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMC4uYTYzYjg4ZmZlOQotLS0gL2Rldi9udWxsCisrKyBiL2luY2x1 ZGUvaHcvYWNwaS9idWlsZGVyLmgKQEAgLTAsMCArMSwxMDAgQEAKKy8qCisgKgorICogQ29weXJp Z2h0IChjKSAyMDE4IEludGVsIENvcnBvcmF0aW9uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQKKyAq IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGlj IExpY2Vuc2UsCisgKiB2ZXJzaW9uIDIgb3IgbGF0ZXIsIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLgorICoKKyAqIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRl ZCBpbiB0aGUgaG9wZSBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0IFdJVEhPVVQKKyAqIEFOWSBXQVJS QU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mIE1FUkNIQU5UQUJJTElU WSBvcgorICogRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvcgorICogbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGFsb25nIHdpdGgKKyAqIHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3 LmdudS5vcmcvbGljZW5zZXMvPi4KKyAqLworCisjaWZuZGVmIEFDUElfQlVJTERFUl9ICisjZGVm aW5lIEFDUElfQlVJTERFUl9ICisKKyNpbmNsdWRlICJxZW11L29zZGVwLmgiCisjaW5jbHVkZSAi aHcvYWNwaS9iaW9zLWxpbmtlci1sb2FkZXIuaCIKKyNpbmNsdWRlICJxb20vb2JqZWN0LmgiCisK KyNkZWZpbmUgVFlQRV9BQ1BJX0JVSUxERVIgImFjcGktYnVpbGRlciIKKworI2RlZmluZSBBQ1BJ X0JVSUxERVJfTUVUSE9EUyhrbGFzcykgXAorICAgICBPQkpFQ1RfQ0xBU1NfQ0hFQ0soQWNwaUJ1 aWxkZXJNZXRob2RzLCAoa2xhc3MpLCBUWVBFX0FDUElfQlVJTERFUikKKyNkZWZpbmUgQUNQSV9C VUlMREVSX0dFVF9NRVRIT0RTKG9iaikgXAorICAgICBPQkpFQ1RfR0VUX0NMQVNTKEFjcGlCdWls ZGVyTWV0aG9kcywgKG9iaiksIFRZUEVfQUNQSV9CVUlMREVSKQorI2RlZmluZSBBQ1BJX0JVSUxE RVIob2JqKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgSU5U RVJGQUNFX0NIRUNLKEFjcGlCdWlsZGVyLCAob2JqKSwgVFlQRV9BQ1BJX0JVSUxERVIpCisKK3R5 cGVkZWYgc3RydWN0IEFjcGlDb25maWd1cmF0aW9uIEFjcGlDb25maWd1cmF0aW9uOwordHlwZWRl ZiBzdHJ1Y3QgQWNwaUJ1aWxkU3RhdGUgQWNwaUJ1aWxkU3RhdGU7Cit0eXBlZGVmIHN0cnVjdCBB Y3BpTWNmZ0luZm8gQWNwaU1jZmdJbmZvOworCit0eXBlZGVmIHN0cnVjdCBBY3BpQnVpbGRlciB7 CisgICAgLyogPHByaXZhdGU+ICovCisgICAgT2JqZWN0IFBhcmVudDsKK30gQWNwaUJ1aWxkZXI7 CisKKy8qKgorICogQWNwaUJ1aWxkTWV0aG9kczoKKyAqCisgKiBJbnRlcmZhY2UgdG8gYmUgaW1w bGVtZW50ZWQgYnkgYSBtYWNoaW5lIHR5cGUgdGhhdCBuZWVkcyB0byBwcm92aWRlCisgKiBjdXN0 b20gQUNQSSB0YWJsZXMgYnVpbGQgbWV0aG9kLgorICoKKyAqIEBwYXJlbnQ6IE9wYXF1ZSBwYXJl bnQgaW50ZXJmYWNlLgorICogQHJzZHA6IEFDUEkgUlNEUCAoUm9vdCBTeXN0ZW0gRGVzY3JpcHRp b24gUG9pbnRlcikgdGFibGUgYnVpbGQgY2FsbGJhY2suCisgKiBAbWFkdDogQUNQSSBNQURUIChN dWx0aXBsZSBBUElDIERlc2NyaXB0aW9uIFRhYmxlKSB0YWJsZSBidWlsZCBjYWxsYmFjay4KKyAq IEBtY2ZnOiBBQ1BJIE1DRkcgdGFibGUgYnVpbGQgY2FsbGJhY2suCisgKiBAc3JhdDogQUNQSSBT UkFUIChTeXN0ZW0vU3RhdGljIFJlc291cmNlIEFmZmluaXR5IFRhYmxlKQorICogICAgICAgIHRh YmxlIGJ1aWxkIGNhbGxiYWNrLgorICogQHNsaXQ6IEFDUEkgU0xJVCAoU3lzdGVtIExvY2FsaXR5 IFN5c3RlbSBJbmZvcm1hdGlvbiBUYWJsZSkKKyAqICAgICAgICB0YWJsZSBidWlsZCBjYWxsYmFj ay4KKyAqIEBjb25maWd1cmF0aW9uOiBBQ1BJIGNvbmZpZ3VyYXRpb24gZ2V0dGVyLgorICogICAg ICAgICAgICAgICAgIFRoaXMgaXMgdXNlZCB0byBxdWVyeSB0aGUgbWFjaGluZSBpbnN0YW5jZSBm b3IgaXRzCisgKiAgICAgICAgICAgICAgICAgQWNwaUNvbmZpZ3VyYXRpb24gcG9pbnRlci4KKyAq LwordHlwZWRlZiBzdHJ1Y3QgQWNwaUJ1aWxkZXJNZXRob2RzIHsKKyAgICAvKiA8cHJpdmF0ZT4g Ki8KKyAgICBJbnRlcmZhY2VDbGFzcyBwYXJlbnQ7CisKKyAgICAvKiA8cHVibGljPiAqLworICAg IHZvaWQgKCpyc2RwKShHQXJyYXkgKnRhYmxlX2RhdGEsIEJJT1NMaW5rZXIgKmxpbmtlciwKKyAg ICAgICAgICAgICAgICAgdW5zaWduZWQgcnNkdF90Ymxfb2Zmc2V0KTsKKyAgICB2b2lkICgqbWFk dCkoR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5rZXIsCisgICAgICAgICAgICAg ICAgIE1hY2hpbmVTdGF0ZSAqbXMsIEFjcGlDb25maWd1cmF0aW9uICpjb25mKTsKKyAgICB2b2lk ICgqbWNmZykoR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5rZXIsCisgICAgICAg ICAgICAgICAgIEFjcGlNY2ZnSW5mbyAqaW5mbyk7CisgICAgdm9pZCAoKnNyYXQpKEdBcnJheSAq dGFibGVfZGF0YSwgQklPU0xpbmtlciAqbGlua2VyLAorICAgICAgICAgICAgICAgICBNYWNoaW5l U3RhdGUgKm1hY2hpbmUsIEFjcGlDb25maWd1cmF0aW9uICpjb25mKTsKKyAgICB2b2lkICgqc2xp dCkoR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5rZXIpOworCisgICAgQWNwaUNv bmZpZ3VyYXRpb24gKigqY29uZmlndXJhdGlvbikoQWNwaUJ1aWxkZXIgKmJ1aWxkZXIpOworfSBB Y3BpQnVpbGRlck1ldGhvZHM7CisKK3ZvaWQgYWNwaV9idWlsZGVyX3JzZHAoQWNwaUJ1aWxkZXIg KmJ1aWxkZXIsCisgICAgICAgICAgICAgICAgICAgICAgIEdBcnJheSAqdGFibGVfZGF0YSwgQklP U0xpbmtlciAqbGlua2VyLAorICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCByc2R0X3Ri bF9vZmZzZXQpOworCit2b2lkIGFjcGlfYnVpbGRlcl9tYWR0KEFjcGlCdWlsZGVyICpidWlsZGVy LAorICAgICAgICAgICAgICAgICAgICAgICBHQXJyYXkgKnRhYmxlX2RhdGEsIEJJT1NMaW5rZXIg KmxpbmtlciwKKyAgICAgICAgICAgICAgICAgICAgICAgTWFjaGluZVN0YXRlICptcywgQWNwaUNv bmZpZ3VyYXRpb24gKmNvbmYpOworCit2b2lkIGFjcGlfYnVpbGRlcl9tY2ZnKEFjcGlCdWlsZGVy ICpidWlsZGVyLAorICAgICAgICAgICAgICAgICAgICAgICBHQXJyYXkgKnRhYmxlX2RhdGEsIEJJ T1NMaW5rZXIgKmxpbmtlciwKKyAgICAgICAgICAgICAgICAgICAgICAgQWNwaU1jZmdJbmZvICpp bmZvKTsKKwordm9pZCBhY3BpX2J1aWxkZXJfc3JhdChBY3BpQnVpbGRlciAqYnVpbGRlciwKKyAg ICAgICAgICAgICAgICAgICAgICAgR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5r ZXIsCisgICAgICAgICAgICAgICAgICAgICAgIE1hY2hpbmVTdGF0ZSAqbWFjaGluZSwgQWNwaUNv bmZpZ3VyYXRpb24gKmNvbmYpOworCit2b2lkIGFjcGlfYnVpbGRlcl9zbGl0KEFjcGlCdWlsZGVy ICpidWlsZGVyLAorICAgICAgICAgICAgICAgICAgICAgICBHQXJyYXkgKnRhYmxlX2RhdGEsIEJJ T1NMaW5rZXIgKmxpbmtlcik7CisKK0FjcGlDb25maWd1cmF0aW9uICphY3BpX2J1aWxkZXJfY29u ZmlndXJhdGlvbihBY3BpQnVpbGRlciAqYnVpbGRlcik7CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEv aHcvYWNwaS9idWlsZGVyLmMgYi9ody9hY3BpL2J1aWxkZXIuYwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwLi5jMjlhNjE0NzkzCi0tLSAvZGV2L251bGwKKysrIGIvaHcvYWNw aS9idWlsZGVyLmMKQEAgLTAsMCArMSw5NyBAQAorLyoKKyAqCisgKiBDb3B5cmlnaHQgKGMpIDIw MTggSW50ZWwgQ29ycG9yYXRpb24KKyAqCisgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdAorICogdW5kZXIgdGhl IHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSwK KyAqIHZlcnNpb24gMiBvciBsYXRlciwgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJl IEZvdW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBo b3BlIGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAorICogQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRBQklMSVRZIG9yCisgKiBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UgZm9yCisgKiBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYWxvbmcg d2l0aAorICogdGhpcyBwcm9ncmFtLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cuZ251Lm9yZy9s aWNlbnNlcy8+LgorICovCisKKyNpbmNsdWRlICJxZW11L29zZGVwLmgiCisjaW5jbHVkZSAicWVt dS9tb2R1bGUuaCIKKyNpbmNsdWRlICJxb20vb2JqZWN0LmgiCisjaW5jbHVkZSAiaHcvYWNwaS9i dWlsZGVyLmgiCisKK3ZvaWQgYWNwaV9idWlsZGVyX3JzZHAoQWNwaUJ1aWxkZXIgKmJ1aWxkZXIs CisgICAgICAgICAgICAgICAgICAgICAgIEdBcnJheSAqdGFibGVfZGF0YSwgQklPU0xpbmtlciAq bGlua2VyLAorICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCByc2R0X3RibF9vZmZzZXQp Cit7CisgICAgQWNwaUJ1aWxkZXJNZXRob2RzICphYm0gPSBBQ1BJX0JVSUxERVJfR0VUX01FVEhP RFMoYnVpbGRlcik7CisKKyAgICBpZiAoYWJtICYmIGFibS0+cnNkcCkgeworICAgICAgICBhYm0t PnJzZHAodGFibGVfZGF0YSwgbGlua2VyLCByc2R0X3RibF9vZmZzZXQpOworICAgIH0KK30KKwor dm9pZCBhY3BpX2J1aWxkZXJfbWFkdChBY3BpQnVpbGRlciAqYnVpbGRlciwKKyAgICAgICAgICAg ICAgICAgICAgICAgR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5rZXIsCisgICAg ICAgICAgICAgICAgICAgICAgIE1hY2hpbmVTdGF0ZSAqbXMsIEFjcGlDb25maWd1cmF0aW9uICpj b25mKQoreworICAgIEFjcGlCdWlsZGVyTWV0aG9kcyAqYWJtID0gQUNQSV9CVUlMREVSX0dFVF9N RVRIT0RTKGJ1aWxkZXIpOworCisgICAgaWYgKGFibSAmJiBhYm0tPm1hZHQpIHsKKyAgICAgICAg YWJtLT5tYWR0KHRhYmxlX2RhdGEsIGxpbmtlciwgbXMsIGNvbmYpOworICAgIH0KK30KKwordm9p ZCBhY3BpX2J1aWxkZXJfbWNmZyhBY3BpQnVpbGRlciAqYnVpbGRlciwKKyAgICAgICAgICAgICAg ICAgICAgICAgR0FycmF5ICp0YWJsZV9kYXRhLCBCSU9TTGlua2VyICpsaW5rZXIsCisgICAgICAg ICAgICAgICAgICAgICAgIEFjcGlNY2ZnSW5mbyAqaW5mbykKK3sKKyAgICBBY3BpQnVpbGRlck1l dGhvZHMgKmFibSA9IEFDUElfQlVJTERFUl9HRVRfTUVUSE9EUyhidWlsZGVyKTsKKworICAgIGlm IChhYm0gJiYgYWJtLT5tY2ZnKSB7CisgICAgICAgIGFibS0+bWNmZyh0YWJsZV9kYXRhLCBsaW5r ZXIsIGluZm8pOworICAgIH0KK30KKwordm9pZCBhY3BpX2J1aWxkZXJfc3JhdChBY3BpQnVpbGRl ciAqYnVpbGRlciwKKyAgICAgICAgICAgICAgICAgICAgICAgR0FycmF5ICp0YWJsZV9kYXRhLCBC SU9TTGlua2VyICpsaW5rZXIsCisgICAgICAgICAgICAgICAgICAgICAgIE1hY2hpbmVTdGF0ZSAq bWFjaGluZSwgQWNwaUNvbmZpZ3VyYXRpb24gKmNvbmYpCit7CisgICAgQWNwaUJ1aWxkZXJNZXRo b2RzICphYm0gPSBBQ1BJX0JVSUxERVJfR0VUX01FVEhPRFMoYnVpbGRlcik7CisKKyAgICBpZiAo YWJtICYmIGFibS0+c3JhdCkgeworICAgICAgICBhYm0tPnNyYXQodGFibGVfZGF0YSwgbGlua2Vy LCBtYWNoaW5lLCBjb25mKTsKKyAgICB9Cit9CisKK3ZvaWQgYWNwaV9idWlsZGVyX3NsaXQoQWNw aUJ1aWxkZXIgKmJ1aWxkZXIsCisgICAgICAgICAgICAgICAgICAgICAgIEdBcnJheSAqdGFibGVf ZGF0YSwgQklPU0xpbmtlciAqbGlua2VyKQoreworICAgIEFjcGlCdWlsZGVyTWV0aG9kcyAqYWJt ID0gQUNQSV9CVUlMREVSX0dFVF9NRVRIT0RTKGJ1aWxkZXIpOworCisgICAgaWYgKGFibSAmJiBh Ym0tPnNsaXQpIHsKKyAgICAgICAgYWJtLT5zbGl0KHRhYmxlX2RhdGEsIGxpbmtlcik7CisgICAg fQorfQorCitBY3BpQ29uZmlndXJhdGlvbiAqYWNwaV9idWlsZGVyX2NvbmZpZ3VyYXRpb24oQWNw aUJ1aWxkZXIgKmJ1aWxkZXIpCit7CisgICAgQWNwaUJ1aWxkZXJNZXRob2RzICphYm0gPSBBQ1BJ X0JVSUxERVJfR0VUX01FVEhPRFMoYnVpbGRlcik7CisgICAgaWYgKGFibSAmJiBhYm0tPmNvbmZp Z3VyYXRpb24pIHsKKyAgICAgICAgcmV0dXJuIGFibS0+Y29uZmlndXJhdGlvbihidWlsZGVyKTsK KyAgICB9CisgICAgcmV0dXJuIE5VTEw7Cit9CisKK3N0YXRpYyBjb25zdCBUeXBlSW5mbyBhY3Bp X2J1aWxkZXJfaW5mbyA9IHsKKyAgICAubmFtZSAgICAgICAgICA9IFRZUEVfQUNQSV9CVUlMREVS LAorICAgIC5wYXJlbnQgICAgICAgID0gVFlQRV9JTlRFUkZBQ0UsCisgICAgLmNsYXNzX3NpemUg ICAgPSBzaXplb2YoQWNwaUJ1aWxkZXJNZXRob2RzKSwKK307CisKK3N0YXRpYyB2b2lkIGFjcGlf YnVpbGRlcl9yZWdpc3Rlcl90eXBlKHZvaWQpCit7CisgICAgdHlwZV9yZWdpc3Rlcl9zdGF0aWMo JmFjcGlfYnVpbGRlcl9pbmZvKTsKK30KKwordHlwZV9pbml0KGFjcGlfYnVpbGRlcl9yZWdpc3Rl cl90eXBlKQpkaWZmIC0tZ2l0IGEvaHcvYWNwaS9NYWtlZmlsZS5vYmpzIGIvaHcvYWNwaS9NYWtl ZmlsZS5vYmpzCmluZGV4IDExYzM1YmNiNDQuLjJmMzgzYWRjNmYgMTAwNjQ0Ci0tLSBhL2h3L2Fj cGkvTWFrZWZpbGUub2JqcworKysgYi9ody9hY3BpL01ha2VmaWxlLm9ianMKQEAgLTExLDYgKzEx LDcgQEAgY29tbW9uLW9iai0kKGNhbGwgbG5vdCwkKENPTkZJR19BQ1BJX1g4NikpICs9IGFjcGkt c3R1Yi5vCiBjb21tb24tb2JqLXkgKz0gYWNwaV9pbnRlcmZhY2UubwogY29tbW9uLW9iai15ICs9 IGJpb3MtbGlua2VyLWxvYWRlci5vCiBjb21tb24tb2JqLXkgKz0gYW1sLWJ1aWxkLm8KK2NvbW1v bi1vYmoteSArPSBidWlsZGVyLm8KIAogY29tbW9uLW9iai0kKENPTkZJR19JUE1JKSArPSBpcG1p Lm8KIGNvbW1vbi1vYmotJChjYWxsIGxub3QsJChDT05GSUdfSVBNSSkpICs9IGlwbWktc3R1Yi5v Ci0tIAoyLjE5LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTvc-0000rX-GE for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTvW-0003ia-N8 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:43:44 -0500 From: Samuel Ortiz Date: Mon, 5 Nov 2018 02:40:43 +0100 Message-Id: <20181105014047.26447-21-sameo@linux.intel.com> In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 20/24] hw: acpi: Define ACPI tables builder interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost In order to decouple ACPI APIs from specific machine types, we are creating an ACPI builder interface that each ACPI platform can choose to implement. This way, a new machine type can re-use the high level ACPI APIs and define some custom table build methods, without having to duplicate most of the existing implementation only to add small variations to it. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Samuel Ortiz --- include/hw/acpi/builder.h | 100 ++++++++++++++++++++++++++++++++++++++ hw/acpi/builder.c | 97 ++++++++++++++++++++++++++++++++++++ hw/acpi/Makefile.objs | 1 + 3 files changed, 198 insertions(+) create mode 100644 include/hw/acpi/builder.h create mode 100644 hw/acpi/builder.c diff --git a/include/hw/acpi/builder.h b/include/hw/acpi/builder.h new file mode 100644 index 0000000000..a63b88ffe9 --- /dev/null +++ b/include/hw/acpi/builder.h @@ -0,0 +1,100 @@ +/* + * + * Copyright (c) 2018 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef ACPI_BUILDER_H +#define ACPI_BUILDER_H + +#include "qemu/osdep.h" +#include "hw/acpi/bios-linker-loader.h" +#include "qom/object.h" + +#define TYPE_ACPI_BUILDER "acpi-builder" + +#define ACPI_BUILDER_METHODS(klass) \ + OBJECT_CLASS_CHECK(AcpiBuilderMethods, (klass), TYPE_ACPI_BUILDER) +#define ACPI_BUILDER_GET_METHODS(obj) \ + OBJECT_GET_CLASS(AcpiBuilderMethods, (obj), TYPE_ACPI_BUILDER) +#define ACPI_BUILDER(obj) \ + INTERFACE_CHECK(AcpiBuilder, (obj), TYPE_ACPI_BUILDER) + +typedef struct AcpiConfiguration AcpiConfiguration; +typedef struct AcpiBuildState AcpiBuildState; +typedef struct AcpiMcfgInfo AcpiMcfgInfo; + +typedef struct AcpiBuilder { + /* */ + Object Parent; +} AcpiBuilder; + +/** + * AcpiBuildMethods: + * + * Interface to be implemented by a machine type that needs to provide + * custom ACPI tables build method. + * + * @parent: Opaque parent interface. + * @rsdp: ACPI RSDP (Root System Description Pointer) table build callback. + * @madt: ACPI MADT (Multiple APIC Description Table) table build callback. + * @mcfg: ACPI MCFG table build callback. + * @srat: ACPI SRAT (System/Static Resource Affinity Table) + * table build callback. + * @slit: ACPI SLIT (System Locality System Information Table) + * table build callback. + * @configuration: ACPI configuration getter. + * This is used to query the machine instance for its + * AcpiConfiguration pointer. + */ +typedef struct AcpiBuilderMethods { + /* */ + InterfaceClass parent; + + /* */ + void (*rsdp)(GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset); + void (*madt)(GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf); + void (*mcfg)(GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info); + void (*srat)(GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf); + void (*slit)(GArray *table_data, BIOSLinker *linker); + + AcpiConfiguration *(*configuration)(AcpiBuilder *builder); +} AcpiBuilderMethods; + +void acpi_builder_rsdp(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset); + +void acpi_builder_madt(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf); + +void acpi_builder_mcfg(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info); + +void acpi_builder_srat(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf); + +void acpi_builder_slit(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker); + +AcpiConfiguration *acpi_builder_configuration(AcpiBuilder *builder); + +#endif diff --git a/hw/acpi/builder.c b/hw/acpi/builder.c new file mode 100644 index 0000000000..c29a614793 --- /dev/null +++ b/hw/acpi/builder.c @@ -0,0 +1,97 @@ +/* + * + * Copyright (c) 2018 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qom/object.h" +#include "hw/acpi/builder.h" + +void acpi_builder_rsdp(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + unsigned rsdt_tbl_offset) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->rsdp) { + abm->rsdp(table_data, linker, rsdt_tbl_offset); + } +} + +void acpi_builder_madt(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *ms, AcpiConfiguration *conf) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->madt) { + abm->madt(table_data, linker, ms, conf); + } +} + +void acpi_builder_mcfg(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + AcpiMcfgInfo *info) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->mcfg) { + abm->mcfg(table_data, linker, info); + } +} + +void acpi_builder_srat(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker, + MachineState *machine, AcpiConfiguration *conf) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->srat) { + abm->srat(table_data, linker, machine, conf); + } +} + +void acpi_builder_slit(AcpiBuilder *builder, + GArray *table_data, BIOSLinker *linker) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + + if (abm && abm->slit) { + abm->slit(table_data, linker); + } +} + +AcpiConfiguration *acpi_builder_configuration(AcpiBuilder *builder) +{ + AcpiBuilderMethods *abm = ACPI_BUILDER_GET_METHODS(builder); + if (abm && abm->configuration) { + return abm->configuration(builder); + } + return NULL; +} + +static const TypeInfo acpi_builder_info = { + .name = TYPE_ACPI_BUILDER, + .parent = TYPE_INTERFACE, + .class_size = sizeof(AcpiBuilderMethods), +}; + +static void acpi_builder_register_type(void) +{ + type_register_static(&acpi_builder_info); +} + +type_init(acpi_builder_register_type) diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 11c35bcb44..2f383adc6f 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o common-obj-y += acpi_interface.o common-obj-y += bios-linker-loader.o common-obj-y += aml-build.o +common-obj-y += builder.o common-obj-$(CONFIG_IPMI) += ipmi.o common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o -- 2.19.1