From patchwork Wed Feb 24 18:59:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 62826 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2611476lbl; Wed, 24 Feb 2016 12:01:23 -0800 (PST) X-Received: by 10.140.179.216 with SMTP id z207mr55195051qhz.70.1456344083310; Wed, 24 Feb 2016 12:01:23 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j201si4250044qhc.131.2016.02.24.12.01.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 Feb 2016 12:01:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=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+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:38030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYfcg-0001kn-Oi for patch@linaro.org; Wed, 24 Feb 2016 15:01:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYfbi-0000x9-P6 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:00:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYfbd-0003z5-TB for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:00:22 -0500 Received: from vms173013pub.verizon.net ([206.46.173.13]:65355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYfbd-0003z0-Md for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:00:17 -0500 Received: from vz-proxy-l002.mx.aol.com ([64.236.82.153]) by vms173013.mailsrvcs.net (Oracle Communications Messaging Server 7.0.5.32.0 64bit (built Jul 16 2014)) with ESMTPA id <0O3200MHUFEX7320@vms173013.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 24 Feb 2016 12:59:26 -0600 (CST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=btqxfxui c=1 sm=1 tr=0 a=FJ1kTJ0/xm5uTekQe8vMdQ==:117 a=jFJIQSaiL_oA:10 a=fk1lIlRQAAAA:8 a=JuXsub-sbGdDBprtsWIA:9 a=jj3aF0Tsi_ZUs9z6:21 a=VjvsnTPMuetdUdoD:21 Received: by 173.57.176.17 with SMTP id 6b05e42d; Wed, 24 Feb 2016 18:59:26 GMT Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 49137794; Wed, 24 Feb 2016 12:59:20 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 1A625302BDA; Wed, 24 Feb 2016 12:59:18 -0600 (CST) From: minyard@acm.org To: Igor Mammedov , "Michael S. Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Date: Wed, 24 Feb 2016 12:59:15 -0600 Message-id: <1456340356-17147-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-reply-to: <1456340356-17147-1-git-send-email-minyard@acm.org> References: <1456340356-17147-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.13 Cc: Corey Minyard , minyard@acm.org Subject: [Qemu-devel] [PATCH 4/5] acpi: Add IPMI table entries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Corey Minyard Use the new ACPI table construction tools to create an ACPI entry for IPMI. This adds a function called from build_dsdt to add an DSDT entry for IPMI if IPMI is compiled in and has registered firmware. It also adds a dummy function if IPMI is not compiled in. This conforms to section "C3-2 Locating IPMI System Interfaces in ACPI Name Space" in the IPMI 2.0 specification. Signed-off-by: Corey Minyard --- hw/acpi/Makefile.objs | 2 + hw/acpi/ipmi.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/noipmi.c | 14 ++++++ hw/i386/acpi-build.c | 4 ++ include/hw/acpi/ipmi.h | 16 +++++++ 5 files changed, 153 insertions(+) create mode 100644 hw/acpi/ipmi.c create mode 100644 hw/acpi/noipmi.c create mode 100644 include/hw/acpi/ipmi.h -- 2.5.0 diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index f3ade9a..c44b24e 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -6,3 +6,5 @@ common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o common-obj-$(CONFIG_ACPI) += acpi_interface.o common-obj-$(CONFIG_ACPI) += bios-linker-loader.o common-obj-$(CONFIG_ACPI) += aml-build.o +common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o +common-obj-$(call land,$(CONFIG_ACPI),$(call lnot,$(CONFIG_IPMI))) += noipmi.o diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c new file mode 100644 index 0000000..731f4ad --- /dev/null +++ b/hw/acpi/ipmi.c @@ -0,0 +1,117 @@ +/* + * IPMI ACPI firmware handling + * + * Copyright (c) 2015 Corey Minyard, MontaVista Software, LLC + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/ipmi/ipmi.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/ipmi.h" + +static Aml *aml_ipmi_crs(IPMIFwInfo *info) +{ + Aml *crs = aml_resource_template(); + uint8_t regspacing = info->register_spacing; + + /* + * The base address is fixed and cannot change. That may be different + * if someone does PCI, but we aren't there yet. + */ + switch (info->memspace) { + case IPMI_MEMSPACE_IO: + aml_append(crs, aml_io(AML_DECODE16, info->base_address, + info->base_address + info->register_length - 1, + regspacing, info->register_length)); + break; + case IPMI_MEMSPACE_MEM32: + aml_append(crs, + aml_dword_memory(AML_POS_DECODE, + AML_MIN_FIXED, AML_MAX_FIXED, + AML_NON_CACHEABLE, AML_READ_WRITE, + 0xffffffff, + info->base_address, + info->base_address + info->register_length - 1, + regspacing, info->register_length)); + break; + case IPMI_MEMSPACE_MEM64: + aml_append(crs, + aml_qword_memory(AML_POS_DECODE, + AML_MIN_FIXED, AML_MAX_FIXED, + AML_NON_CACHEABLE, AML_READ_WRITE, + 0xffffffffffffffffULL, + info->base_address, + info->base_address + info->register_length - 1, + regspacing, info->register_length)); + break; + case IPMI_MEMSPACE_SMBUS: + aml_append(crs, aml_return(aml_int(info->base_address))); + break; + default: + abort(); + } + + if (info->interrupt_number) { + aml_append(crs, aml_irq_no_flags(info->interrupt_number)); + } + + return crs; +} + +static void +ipmi_encode_one_acpi(Aml *table, IPMIFwInfo *info) +{ + Aml *scope, *dev, *method; + uint16_t version = ((info->ipmi_spec_major_revision << 8) + | (info->ipmi_spec_minor_revision << 4)); + + /* + * The ACPI parent is a little bit of a pain. It could be in + * different places depending on the device. It could be an SMBus, + * it could be ISA, it could be PCI, etc. Only the device really + * knows, so it has to pass it in. + */ + if (!info->acpi_parent) { + ipmi_debug("device %s not compatible with ACPI, no parent given.", + info->interface_name); + return; + } + + scope = aml_scope("%s", info->acpi_parent); + + dev = aml_device("MI0"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("IPI0001"))); + aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s", + info->interface_name))); + aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid))); + aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info))); + + /* + * The spec seems to require these to be methods. All the examples + * show them this way and it doesn't seem to work if they are not. + */ + method = aml_method("_IFT", 0, AML_NOTSERIALIZED); + aml_append(method, aml_return(aml_int(info->interface_type))); + aml_append(dev, method); + method = aml_method("_SRV", 0, AML_NOTSERIALIZED); + aml_append(method, aml_return(aml_int(version))); + aml_append(dev, method); + + aml_append(scope, dev); + + aml_append(table, scope); +} + +void acpi_add_ipmi(Aml *table) +{ + IPMIFwInfo *info = ipmi_first_fwinfo(); + + while (info) { + ipmi_encode_one_acpi(table, info); + info = ipmi_next_fwinfo(info); + } +} diff --git a/hw/acpi/noipmi.c b/hw/acpi/noipmi.c new file mode 100644 index 0000000..4aae336 --- /dev/null +++ b/hw/acpi/noipmi.c @@ -0,0 +1,14 @@ +/* + * IPMI ACPI firmware handling + * + * Copyright (c) 2015 Corey Minyard, MontaVista Software, LLC + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "hw/acpi/ipmi.h" + +void acpi_add_ipmi(Aml *ssdt) +{ +} diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4554eb8..ca3d2a0 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -58,6 +58,8 @@ #include "qapi/qmp/qint.h" #include "qom/qom-qobject.h" +#include "hw/acpi/ipmi.h" + /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows * a little bit, there should be plenty of free space since the DSDT @@ -2283,6 +2285,8 @@ build_dsdt(GArray *table_data, GArray *linker, aml_append(dsdt, sb_scope); } + acpi_add_ipmi(dsdt); + /* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len); build_header(linker, table_data, diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h new file mode 100644 index 0000000..313ce37 --- /dev/null +++ b/include/hw/acpi/ipmi.h @@ -0,0 +1,16 @@ +/* + * QEMU IPMI ACPI handling + * + * Copyright (c) 2015 Corey Minyard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef HW_ACPI_IPMI_H +#define HW_ACPI_IPMI_H + +#include "hw/acpi/aml-build.h" + +void acpi_add_ipmi(Aml *ssdt); + +#endif /* HW_ACPI_IPMI_H */