From patchwork Thu Apr 7 14:13:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 8773341 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BA3369FBEA for ; Thu, 7 Apr 2016 14:13:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 889C920256 for ; Thu, 7 Apr 2016 14:13:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8ADBE2024F for ; Thu, 7 Apr 2016 14:13:36 +0000 (UTC) Received: from localhost ([::1]:50084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgh-0002hz-R7 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Apr 2016 10:13:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgR-0002fT-Ui for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoAgQ-0006cm-8s for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:19 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:36294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoAgP-0006cX-TL for qemu-devel@nongnu.org; Thu, 07 Apr 2016 10:13:18 -0400 Received: by mail-pa0-x241.google.com with SMTP id k3so3223210pav.3 for ; Thu, 07 Apr 2016 07:13:17 -0700 (PDT) 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=/2BB0dlQlotA5hSP1Ie9F4DPNJ/b0PUaUsg42RcCfLo=; b=lVQpAtuB0Eq7aBJhsXZ4olH79GyqZfXrOYtyjVhI/iLBLr6CcqyVj9fq7OU1SLzYEm 7Pk2QPxuvbOgEC/8n1qrWomw8SKCFRuE1RJp8dXq22nNCw7kqW8vrXj8wVHtkCayQlUn SvRG0zBgR8MynFDQgU+QoArkLOhm9EwmaLtepn8z6z4Qh/dyMDObhp0zQq50mUid8vhS 4TmI5M8rGG2cusHJQJlVM62wxgSlVq3gV+x68KgdAk8M0zVsgcl6rNe7WZ0HSQARZmGr Sp91R/RhGg5upp9g1GK8lRFy5RsWXLx9VSqR+A2wroYdS3R6fN7ZDjgc74zVp78RR4wN hTKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/2BB0dlQlotA5hSP1Ie9F4DPNJ/b0PUaUsg42RcCfLo=; b=Pgb4apUNkE+SeBGTIammk+2JGNG/3aFK8es+VywDfFJsPhsXM4dEtyPyZLNT2PMvHA 4UjiKQbxtMJSHK0RdrY7ly9rUzqBsMc17ZkUxjSVCHM73T/3QvV8j6G2IEHBgSnZX8i0 06PQGqw4jH4Zplg7IdYToQdlvr4bEto62IUzFsXivYkefJruHNR65DqXCzkGuA/1Vuw+ 4hwR+/Aizd2L5+Ao0cMQMj3Gw3OodNcB1R8alQrs0t2iHZRQVnHvicBQsuZj4ugTUBa5 wvTruhmkZNZZknnazn+c2vHHmuL8yQLpbguykcn3pjhWaGGLR1YhQEj4yPfzkmsTMoAf FSTQ== X-Gm-Message-State: AD7BkJIrs/SEzuaZU3ZN3+TQAACeJd+Uiq0SqIRFFyOHj8TnnjkT3b/N5ZvW/NdcKjccgA== X-Received: by 10.66.54.78 with SMTP id h14mr4978437pap.95.1460038397303; Thu, 07 Apr 2016 07:13:17 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id 16sm12656587pfk.28.2016.04.07.07.13.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 07:13:15 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:bdea:e997:eaba:4039]) by serve.minyard.net (Postfix) with ESMTPA id A60261E43; Thu, 7 Apr 2016 09:13:10 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id AD88330003E; Thu, 7 Apr 2016 09:13:08 -0500 (CDT) From: minyard@acm.org To: "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , qemu-devel@nongnu.org Date: Thu, 7 Apr 2016 09:13:02 -0500 Message-Id: <1460038383-5318-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460038383-5318-1-git-send-email-minyard@acm.org> References: <1460038383-5318-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::241 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH v6 5/6] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index faee86c..b8d5c84 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -6,3 +6,5 @@ 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 35180ef..17efa08 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 @@ -2354,6 +2356,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 */