From patchwork Wed May 29 22:08:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 247408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A9D4E2C02A7 for ; Thu, 30 May 2013 08:11:39 +1000 (EST) Received: from localhost ([::1]:50415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhoan-0006XS-QS for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 18:11:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYL-0002vX-Fo for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhoYF-0004Wv-A4 for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:05 -0400 Received: from vms173023pub.verizon.net ([206.46.173.23]:37477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYF-0004Sz-61 for qemu-devel@nongnu.org; Wed, 29 May 2013 18:08:59 -0400 Received: from wf-rch.minyard.home ([unknown] [173.74.121.95]) by vms173023.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MNK0051YYUBPC10@vms173023.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 29 May 2013 17:08:38 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 3424E1F90A; Wed, 29 May 2013 17:08:28 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id B845B7FDA7; Wed, 29 May 2013 17:08:29 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 29 May 2013 17:08:16 -0500 Message-id: <1369865296-19584-21-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1369865296-19584-1-git-send-email-minyard@acm.org> References: <1369865296-19584-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.23 Cc: Corey Minyard , openipmi-developer@lists.sourceforge.net Subject: [Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Corey Minyard Add an IPMI table entry to the SMBIOS. Signed-off-by: Corey Minyard --- hw/ipmi/isa_ipmi.c | 23 +++++++++++++++++++++++ include/hw/i386/smbios.h | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c index 92afb88..706cc2c 100644 --- a/hw/ipmi/isa_ipmi.c +++ b/hw/ipmi/isa_ipmi.c @@ -29,6 +29,7 @@ #include "qemu/timer.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" +#include "hw/i386/smbios.h" #include "ipmi.h" /* This is the type the user specifies on the -device command line */ @@ -162,6 +163,27 @@ ipmi_encode_acpi(ISAIPMIDevice *info) acpi_append_to_table("DSDT", ipmitable, rc, &err); } +static void ipmi_encode_smbios(ISAIPMIDevice *info) +{ + struct smbios_type_38 smb38; + + smb38.header.type = 38; + smb38.header.length = sizeof(smb38); + smb38.header.handle = cpu_to_le16(0x3000); + smb38.interface_type = info->intftype; + smb38.ipmi_spec_revision = 0x20; + smb38.i2c_slave_address = info->slave_addr; + smb38.nv_storage_device_address = 0; + + /* or 1 to set it to I/O space */ + smb38.base_address = cpu_to_le64(info->iobase | 1); + + /* 1-byte boundaries, addr bit0=0, level triggered irq */ + smb38.base_address_modifier = 1; + smb38.interrupt_number = info->isairq; + smbios_table_entry_add((struct smbios_structure_header *) &smb38); +} + static int ipmi_isa_initfn(ISADevice *dev) { ISAIPMIDevice *isa = ISA_IPMI(dev); @@ -233,6 +255,7 @@ static int ipmi_isa_initfn(ISADevice *dev) isa_register_ioport(dev, &intf->io, intf->io_base); ipmi_encode_acpi(isa); + ipmi_encode_smbios(isa); return 0; } diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index d92fa88..fb79d5a 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -156,6 +156,18 @@ struct smbios_type_32 { uint8_t boot_status; } QEMU_PACKED; +/* 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; + /* SMBIOS type 127 -- End-of-table */ struct smbios_type_127 { struct smbios_structure_header header;