From patchwork Tue Apr 7 19:51:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 458772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DDB7F140213 for ; Wed, 8 Apr 2015 05:57:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Sdp4iYOP; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:48595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZcT-0001m7-4P for incoming@patchwork.ozlabs.org; Tue, 07 Apr 2015 15:57:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZXU-0001eQ-D6 for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:52:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfZXT-0002Gv-EM for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:52:00 -0400 Received: from mail-ob0-x22d.google.com ([2607:f8b0:4003:c01::22d]:36724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZXT-0002Gh-9u for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:51:59 -0400 Received: by obbeb7 with SMTP id eb7so32648940obb.3 for ; Tue, 07 Apr 2015 12:51:58 -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=LXDGBWt2qugxfyafF1H8vfLpH4Q03UywLPjIgss4Y0Q=; b=Sdp4iYOP51lCfHZDfC5VoH/JRTIh/95XJWzWjYR6RcnXryo6rKEmyaDK7VxEVOn87M rER841gvuq+SBMM6Fz4FMQI72WS3gZkcIyFYyBs5Gjli1gf4ubBprokK+CKZ8FyxK4os xm05zMLXb6T5ImmPS50dTAC/KVoxYeuQMNe4X9qhMm2eSaJhSf6O3pDxGiPVt2n92MbF moPm+M6I4ml38YXJep1a9FUN6SNgnGK2KW4xeViw9coU9Gpcq1e9Ut9Wrc/t5fGxOWvt bIYg5+DX3jaTKGOBlLkcZhus0Yjq2o9op6PyjAfQmfBuD+Q/F9jY4+7HfFQPesubJzUp o4kg== X-Received: by 10.182.87.74 with SMTP id v10mr27156148obz.50.1428436318679; Tue, 07 Apr 2015 12:51:58 -0700 (PDT) Received: from t430.minyard.home (pool-173-57-158-30.dllstx.fios.verizon.net. [173.57.158.30]) by mx.google.com with ESMTPSA id rt10sm7011352obb.7.2015.04.07.12.51.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2015 12:51:55 -0700 (PDT) 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 t37JprtY024694; Tue, 7 Apr 2015 14:51:53 -0500 Received: (from cminyard@localhost) by t430.minyard.home (8.14.7/8.14.7/Submit) id t37Jpr8f024693; Tue, 7 Apr 2015 14:51:53 -0500 From: minyard@acm.org To: qemu-devel@nongnu.org Date: Tue, 7 Apr 2015 14:51:41 -0500 Message-Id: <1428436304-24044-13-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1428436304-24044-1-git-send-email-minyard@acm.org> References: <1428436304-24044-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:4003:c01::22d Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 12/15] 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 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c index e62f744..ff379ce 100644 --- a/hw/ipmi/isa_ipmi.c +++ b/hw/ipmi/isa_ipmi.c @@ -27,6 +27,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 */ @@ -36,13 +37,52 @@ typedef struct ISAIPMIDevice { ISADevice dev; char *interface; + int intftype; uint32_t iobase; int32 isairq; uint8_t slave_addr; + uint8_t version; CharDriverState *chr; IPMIInterface *intf; } ISAIPMIDevice; +#ifdef TARGET_I386 +/* 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 ipmi_encode_smbios(void *opaque) +{ + ISAIPMIDevice *info = opaque; + 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 = info->version; + 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, + sizeof(smb38), true); +} +#endif + static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) { ISADevice *isadev = ISA_DEVICE(dev); @@ -50,6 +90,7 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) char typename[20]; Object *intfobj; IPMIInterface *intf; + IPMIInterfaceClass *intfk; Object *bmcobj; IPMIBmc *bmc; @@ -68,10 +109,13 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) TYPE_IPMI_INTERFACE_PREFIX "%s", ipmi->interface); intfobj = object_new(typename); intf = IPMI_INTERFACE(intfobj); + intfk = IPMI_INTERFACE_GET_CLASS(intf); bmc->intf = intf; intf->bmc = bmc; intf->io_base = ipmi->iobase; intf->slave_addr = ipmi->slave_addr; + ipmi->intftype = intfk->smbios_type; + ipmi->version = 0x20; /* Version 2.0 */ ipmi_interface_init(intf, errp); if (*errp) { return; @@ -103,6 +147,9 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) qdev_set_legacy_instance_id(dev, intf->io_base, intf->io_length); isa_register_ioport(isadev, &intf->io, intf->io_base); +#ifdef TARGET_I386 + smbios_register_device_table_handler(ipmi_encode_smbios, ipmi); +#endif } static void ipmi_isa_reset(DeviceState *qdev)