From patchwork Mon May 23 17:40: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: 9132207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9396607D5 for ; Mon, 23 May 2016 17:45:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D41FD2822B for ; Mon, 23 May 2016 17:45:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8E3B28246; Mon, 23 May 2016 17:45:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 087422822B for ; Mon, 23 May 2016 17:45:23 +0000 (UTC) Received: from localhost ([::1]:49603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tus-0004w9-6R for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 May 2016 13:45:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tqK-00017j-Ju for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4tqD-0001qK-Dq for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:39 -0400 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]:35711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4tqD-0001q4-3X for qemu-devel@nongnu.org; Mon, 23 May 2016 13:40:33 -0400 Received: by mail-pa0-x244.google.com with SMTP id rw9so18659628pab.2 for ; Mon, 23 May 2016 10:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=++hgr2wy8tKHpj0LoOyPA9TyJWMAItbJYXJ6CoYCnwg=; b=tobJw6jHczBeSOHcoQf1CPcy6qoccDD3BHWLpOudmbq1f9dXU5jH2FLu2qOPATzhN7 i4CquoO5JmVCzeSamE+cb1chmI0RI+OAj4Nv/p/T0nFPaV163rHTBLJCEGXlK8lulZnJ KhWCuLGszeUgHCS57HqViZGwiBMMZvsWWZFyFWj/ie8E9JbOOfD/dwoe5GKGCuhRynTc ntkEQaLiuPRapsjwAQOE4Vr4rtBd7W8sQh6j0BtrCWexj6cvwp2Y7ZBwlKnvsOzkKZAE F0IkavpbqUHNJNGZ1qGUfLmp7piVLDqc9gVprR19nrl4YQngOI8ut2Od32MoMScJ39z4 INWA== 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:subject:date:message-id :in-reply-to:references; bh=++hgr2wy8tKHpj0LoOyPA9TyJWMAItbJYXJ6CoYCnwg=; b=hxQ/Aj4Kp/V5zjdSDkCPzpg/39MRgF51J20CT0D7YFOBKSIGW6OKQNe+apYekMkpOq mmqxNKlrqJ3uLNwvMkFWjkujePuVy5aZIJx03LkVkwVtiDfA8R0F6sCvWcnRhNqSGMpC epXTBTzMVxlV2Z9MGihn6+81etu9xVC1YnRSeRkQv4hdizWLrKr4VXArQ1UDN+xpIOYX 4kQkkvvabuiyW8cS5SPDAc0Ysa1AwhG7YOzuCp+IuBzdlqb3zK3mQOUzKd1m9B0AmDOf IhSbjxTOeKnmH6elDeoLkb3/p4xR7XUXqYaAf6QnNLLFA1wIbAZc6CpbZcd6SPJVaT5l BIRw== X-Gm-Message-State: ALyK8tIZFMjhtfGRxGNRuf03DcsvTLOFtIIaAFiwuV0kIrZBZZcRSyHQQA2QI2aQxvnapw== X-Received: by 10.66.122.100 with SMTP id lr4mr17392pab.99.1464025232047; Mon, 23 May 2016 10:40:32 -0700 (PDT) Received: from serve.minyard.net ([108.19.215.157]) by smtp.gmail.com with ESMTPSA id l67sm15315337pfi.10.2016.05.23.10.40.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2016 10:40:30 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 46EDA1D7E; Mon, 23 May 2016 12:40:26 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 0EE86300540; Mon, 23 May 2016 12:40:23 -0500 (CDT) From: minyard@acm.org To: Igor Mammedov , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org, minyard@acm.org, cminyard@mvista.com Date: Mon, 23 May 2016 12:40:15 -0500 Message-Id: <1464025217-24054-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464025217-24054-1-git-send-email-minyard@acm.org> References: <1464025217-24054-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::244 Subject: [Qemu-devel] [PATCH v6 4/6] ipmi: Add SMBIOS table entry 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Corey Minyard Add an IPMI table entry to the SMBIOS. Signed-off-by: Corey Minyard Acked-by: Michael S. Tsirkin --- Makefile.objs | 2 +- hw/Makefile.objs | 2 + hw/smbios/Makefile.objs | 1 + hw/smbios/smbios.c | 2 + hw/smbios/smbios_type_38.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ hw/stubs/Makefile.objs | 1 + hw/stubs/smbios_type_38.c | 14 ++++++ include/hw/smbios/ipmi.h | 15 ++++++ 8 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 hw/smbios/smbios_type_38.c create mode 100644 hw/stubs/Makefile.objs create mode 100644 hw/stubs/smbios_type_38.c create mode 100644 include/hw/smbios/ipmi.h diff --git a/Makefile.objs b/Makefile.objs index 8f705f6..fe4a47f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,6 +1,6 @@ ####################################################################### # Common libraries for tools and emulators -stub-obj-y = stubs/ crypto/ +stub-obj-y = stubs/ crypto/ hw/ util-obj-y = util/ qobject/ qapi/ util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4a07ed4..83a979b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -36,3 +36,5 @@ devices-dirs-$(CONFIG_SMBIOS) += smbios/ devices-dirs-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) + +stub-obj-y += stubs/ diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs index f69a92f..c3d3753 100644 --- a/hw/smbios/Makefile.objs +++ b/hw/smbios/Makefile.objs @@ -1 +1,2 @@ common-obj-$(CONFIG_SMBIOS) += smbios.o +common-obj-$(call land,$(CONFIG_SMBIOS),$(CONFIG_IPMI)) += smbios_type_38.o diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 5dc3e43..74c7102 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -25,6 +25,7 @@ #include "hw/loader.h" #include "exec/cpu-common.h" #include "smbios_build.h" +#include "hw/smbios/ipmi.h" /* legacy structures and constants for <= 2.0 machines */ struct smbios_header { @@ -848,6 +849,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, } smbios_build_type_32_table(); + smbios_build_type_38_table(); smbios_build_type_127_table(); smbios_validate_table(); diff --git a/hw/smbios/smbios_type_38.c b/hw/smbios/smbios_type_38.c new file mode 100644 index 0000000..e9cd824 --- /dev/null +++ b/hw/smbios/smbios_type_38.c @@ -0,0 +1,114 @@ +/* + * IPMI SMBIOS 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/smbios/ipmi.h" +#include "hw/smbios/smbios.h" +#include "qemu/error-report.h" +#include "smbios_build.h" + +/* SMBIOS type 38 - IPMI */ +struct smbios_type_38 { + struct smbios_structure_header header; + uint8_t interface_type; + uint8_t ipmi_spec_revision; + uint8_t i2c_slave_address; + uint8_t nv_storage_device_address; + uint64_t base_address; + uint8_t base_address_modifier; + uint8_t interrupt_number; +} QEMU_PACKED; + +static void smbios_build_one_type_38(IPMIFwInfo *info) +{ + uint64_t baseaddr = info->base_address; + SMBIOS_BUILD_TABLE_PRE(38, 0x3000, true); + + t->interface_type = info->interface_type; + t->ipmi_spec_revision = ((info->ipmi_spec_major_revision << 4) + | info->ipmi_spec_minor_revision); + t->i2c_slave_address = info->i2c_slave_address; + t->nv_storage_device_address = 0; + + /* or 1 to set it to I/O space */ + switch (info->memspace) { + case IPMI_MEMSPACE_IO: + baseaddr |= 1; + break; + case IPMI_MEMSPACE_MEM32: + case IPMI_MEMSPACE_MEM64: + break; + case IPMI_MEMSPACE_SMBUS: + baseaddr <<= 1; + break; + } + + t->base_address = cpu_to_le64(baseaddr); + + t->base_address_modifier = 0; + if (info->irq_type == IPMI_LEVEL_IRQ) { + t->base_address_modifier |= 1; + } + switch (info->register_spacing) { + case 1: + break; + case 4: + t->base_address_modifier |= 1 << 6; + break; + case 16: + t->base_address_modifier |= 2 << 6; + break; + default: + error_report("IPMI register spacing %d is not compatible with" + " SMBIOS, ignoring this entry.", info->register_spacing); + return; + } + t->interrupt_number = info->interrupt_number; + + SMBIOS_BUILD_TABLE_POST; +} + +static void smbios_add_ipmi_devices(BusState *bus) +{ + BusChild *kid; + + QTAILQ_FOREACH(kid, &bus->children, sibling) { + DeviceState *dev = kid->child; + Object *obj = object_dynamic_cast(OBJECT(dev), TYPE_IPMI_INTERFACE); + BusState *childbus; + + if (obj) { + IPMIInterface *ii; + IPMIInterfaceClass *iic; + IPMIFwInfo info; + + ii = IPMI_INTERFACE(obj); + iic = IPMI_INTERFACE_GET_CLASS(obj); + memset(&info, 0, sizeof(info)); + iic->get_fwinfo(ii, &info); + smbios_build_one_type_38(&info); + continue; + } + + QLIST_FOREACH(childbus, &dev->child_bus, sibling) { + smbios_add_ipmi_devices(childbus); + } + } +} + +void smbios_build_type_38_table(void) +{ + BusState *bus; + + bus = sysbus_get_default(); + if (bus) { + smbios_add_ipmi_devices(bus); + } +} diff --git a/hw/stubs/Makefile.objs b/hw/stubs/Makefile.objs new file mode 100644 index 0000000..60047e6 --- /dev/null +++ b/hw/stubs/Makefile.objs @@ -0,0 +1 @@ +stub-obj-$(CONFIG_SMBIOS) += smbios_type_38.o diff --git a/hw/stubs/smbios_type_38.c b/hw/stubs/smbios_type_38.c new file mode 100644 index 0000000..ad669a4 --- /dev/null +++ b/hw/stubs/smbios_type_38.c @@ -0,0 +1,14 @@ +/* + * IPMI SMBIOS 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/smbios/ipmi.h" + +void smbios_build_type_38_table(void) +{ +} diff --git a/include/hw/smbios/ipmi.h b/include/hw/smbios/ipmi.h new file mode 100644 index 0000000..fd53c96 --- /dev/null +++ b/include/hw/smbios/ipmi.h @@ -0,0 +1,15 @@ +/* + * IPMI SMBIOS 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. + */ + +#ifndef QEMU_SMBIOS_IPMI_H +#define QEMU_SMBIOS_IPMI_H + +void smbios_build_type_38_table(void); + +#endif /* QEMU_SMBIOS_IPMI_H */