From patchwork Thu Nov 12 19:02:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 56468 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp599081lbb; Thu, 12 Nov 2015 11:11:53 -0800 (PST) X-Received: by 10.129.89.193 with SMTP id n184mr18065533ywb.346.1447355513824; Thu, 12 Nov 2015 11:11:53 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g75si1184285ywb.333.2015.11.12.11.11.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 12 Nov 2015 11:11:53 -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; dkim=fail header.i=@gmail.com Received: from localhost ([::1]:49295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwxHk-0001Sk-U4 for patch@linaro.org; Thu, 12 Nov 2015 14:11:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwxCo-0000nC-J8 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:06:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwxCk-0005zX-Ig for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:06:46 -0500 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:32896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwxCk-0005zR-3b for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:06:42 -0500 Received: by pabfh17 with SMTP id fh17so73294360pab.0 for ; Thu, 12 Nov 2015 11:06:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4fVkptGKZ/uo7Upo67wYG8uXt/IfEWNDPDDlq5swfW4=; b=OiBLruwHpB6V+dq+TqZ8ioyE4R763n6v9lX5uvsvRqsQ6LUo517kpUShIGCYz/kN5U Lvonp1ne1LoZcNN7yk1DkOaeD6Jfwqz0giuPJGoBh3ERoprPR5rPMm6ikV8P44RQAunl spIULgONkJ9cQ1gdK8Rpwn1KmyjcxHI4erUnPGMjAnpoKMyhVuv/trUsLaAUXSmYbGDW 32jpPZ4IZKoWb5C4vDxyCcAoN5E+ARh1mtati6FHXqLgfBUtNbwgRZ3Yed7ZzPJN+LPD r8JdOBhQXsArsGSHjmOdnJby15dyCpgT6h8L5s0hs4btDq2owR5cBSGqoFiTkW2vYZfZ 40sg== X-Received: by 10.66.181.234 with SMTP id dz10mr25369748pac.51.1447355201444; Thu, 12 Nov 2015 11:06:41 -0800 (PST) Received: from t430.minyard.home (pool-173-57-176-17.dllstx.fios.verizon.net. [173.57.176.17]) by smtp.gmail.com with ESMTPSA id rx10sm16154920pab.21.2015.11.12.11.06.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 11:06:40 -0800 (PST) Received: from t430.minyard.home (t430.minyard.home [127.0.0.1]) by t430.minyard.home (8.14.7/8.14.7) with ESMTP id tACJ2jmI019761; Thu, 12 Nov 2015 13:02:45 -0600 Received: (from cminyard@localhost) by t430.minyard.home (8.14.7/8.14.7/Submit) id tACJ2j31019760; Thu, 12 Nov 2015 13:02:45 -0600 From: minyard@acm.org To: qemu-devel@nongnu.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov Date: Thu, 12 Nov 2015 13:02:31 -0600 Message-Id: <1447354953-18893-16-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1447354953-18893-1-git-send-email-minyard@acm.org> References: <1447354953-18893-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a Cc: Corey Minyard Subject: [Qemu-devel] [PATCH v4 15/17] 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_ssdt to add an SSDT 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 | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/noipmi.c | 14 ++++++ hw/i386/acpi-build.c | 4 ++ include/hw/acpi/ipmi.h | 16 +++++++ 5 files changed, 152 insertions(+) create mode 100644 hw/acpi/ipmi.c create mode 100644 hw/acpi/noipmi.c create mode 100644 include/hw/acpi/ipmi.h -- 1.8.3.1 diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 7d3230c..f35ecfc 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -5,3 +5,5 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.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..0f2d06b --- /dev/null +++ b/hw/acpi/ipmi.c @@ -0,0 +1,116 @@ +/* + * 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/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 *ssdt, 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_append(method, aml_return(aml_int(info->interface_type))); + aml_append(dev, method); + method = aml_method("_SRV", 0); + aml_append(method, aml_return(aml_int(version))); + aml_append(dev, method); + + aml_append(scope, dev); + + aml_append(ssdt, scope); +} + +void acpi_add_ipmi(Aml *ssdt) +{ + IPMIFwInfo *info = ipmi_first_fwinfo(); + + while (info) { + ipmi_encode_one_acpi(ssdt, 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 95e0c65..039368f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -59,6 +59,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 @@ -1345,6 +1347,8 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(ssdt, sb_scope); } + acpi_add_ipmi(ssdt); + /* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals(table_data, ssdt->buf->data, ssdt->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 */