From patchwork Wed May 29 22:08:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 247413 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 A183A2C0603 for ; Thu, 30 May 2013 08:14:18 +1000 (EST) Received: from localhost ([::1]:59504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhodM-0002xL-QP for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 18:14:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYL-0002vC-7b for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhoYE-0004Uw-JE for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:05 -0400 Received: from vms173025pub.verizon.net ([206.46.173.25]:41905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYE-0004T0-DP for qemu-devel@nongnu.org; Wed, 29 May 2013 18:08:58 -0400 Received: from wf-rch.minyard.home ([unknown] [173.74.121.95]) by vms173025.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MNK00C8KYUBRB40@vms173025.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 29 May 2013 17:08:41 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id D8DB01F8FA; Wed, 29 May 2013 17:08:25 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 7737B7FD97; Wed, 29 May 2013 17:08:26 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 29 May 2013 17:08:03 -0500 Message-id: <1369865296-19584-8-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.25 Cc: Corey Minyard , openipmi-developer@lists.sourceforge.net Subject: [Qemu-devel] [PATCH 07/20] ipmi: Add a PC ISA type structure 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 This provides the base infrastructure to tie IPMI low-level interfaces into a PC ISA bus. Signed-off-by: Corey Minyard --- default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/ipmi/Makefile.objs | 1 + hw/ipmi/isa_ipmi.c | 150 ++++++++++++++++++++++++++++++++++++ include/hw/nvram/fw_cfg.h | 11 ++- 5 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 hw/ipmi/isa_ipmi.c diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 84542ab..b06317d 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -11,6 +11,7 @@ CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_VMMOUSE=y CONFIG_IPMI=y +CONFIG_ISA_IPMI=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index d580dc0..9ef28e4 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -11,6 +11,7 @@ CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_VMMOUSE=y CONFIG_IPMI=y +CONFIG_ISA_IPMI=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs index 65bde11..3494b70 100644 --- a/hw/ipmi/Makefile.objs +++ b/hw/ipmi/Makefile.objs @@ -1 +1,2 @@ common-obj-$(CONFIG_IPMI) += ipmi.o +common-obj-$(CONFIG_ISA_IPMI) += isa_ipmi.o diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c new file mode 100644 index 0000000..616a357 --- /dev/null +++ b/hw/ipmi/isa_ipmi.c @@ -0,0 +1,150 @@ +/* + * QEMU ISA IPMI emulation + * + * Copyright (c) 2012 Corey Minyard, MontaVista Software, LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" +#include "qemu/timer.h" +#include "sysemu/char.h" +#include "sysemu/sysemu.h" +#include "ipmi.h" + +/* This is the type the user specifies on the -device command line */ +#define TYPE_ISA_IPMI "isa-ipmi" +#define ISA_IPMI(obj) OBJECT_CHECK(ISAIPMIDevice, (obj), \ + TYPE_ISA_IPMI) +typedef struct ISAIPMIDevice { + ISADevice dev; + char *interface; + uint32_t iobase; + uint32_t isairq; + uint8_t slave_addr; + CharDriverState *chr; + IPMIInterface *intf; +} ISAIPMIDevice; + +static int ipmi_isa_initfn(ISADevice *dev) +{ + ISAIPMIDevice *isa = ISA_IPMI(dev); + char typename[20]; + Object *intfobj; + IPMIInterface *intf; + Object *bmcobj; + IPMIBmc *bmc; + int rc; + Error *errp = NULL; + + if (!isa->interface) { + isa->interface = g_strdup("kcs"); + } + + if (isa->chr) { + bmcobj = object_new(TYPE_IPMI_BMC_EXTERN); + } else { + bmcobj = object_new(TYPE_IPMI_BMC_SIMULATOR); + } + bmc = IPMI_BMC(bmcobj); + bmc->chr = isa->chr; + snprintf(typename, sizeof(typename), + TYPE_IPMI_INTERFACE_PREFIX "%s", isa->interface); + intfobj = object_new(typename); + intf = IPMI_INTERFACE(intfobj); + bmc->intf = intf; + intf->bmc = bmc; + intf->io_base = isa->iobase; + intf->slave_addr = isa->slave_addr; + rc = ipmi_interface_init(intf); + if (rc) { + return rc; + } + rc = ipmi_bmc_init(bmc); + if (rc) { + return rc; + } + + /* These may be set by the interface. */ + isa->iobase = intf->io_base; + isa->slave_addr = intf->slave_addr; + + if (isa->isairq != 0) { + isa_init_irq(dev, &intf->irq, isa->isairq); + intf->use_irq = 1; + } + + isa->intf = intf; + object_property_add_child(OBJECT(isa), "intf", OBJECT(intf), &errp); + if (error_is_set(&errp)) { + fprintf(stderr, "%s\n", error_get_pretty(errp)); + return 1; + } + object_property_add_child(OBJECT(isa), "bmc", OBJECT(bmc), &errp); + if (error_is_set(&errp)) { + fprintf(stderr, "%s\n", error_get_pretty(errp)); + return 1; + } + + qdev_set_legacy_instance_id(&dev->qdev, intf->io_base, intf->io_length); + + isa_register_ioport(dev, &intf->io, intf->io_base); + + return 0; +} + +static void ipmi_isa_reset(DeviceState *qdev) +{ + ISAIPMIDevice *isa = ISA_IPMI(qdev); + + ipmi_interface_reset(isa->intf); +} + +static Property ipmi_isa_properties[] = { + DEFINE_PROP_STRING("interface", ISAIPMIDevice, interface), + DEFINE_PROP_HEX32("iobase", ISAIPMIDevice, iobase, 0), + DEFINE_PROP_UINT32("irq", ISAIPMIDevice, isairq, 5), + DEFINE_PROP_UINT8("slave_addr", ISAIPMIDevice, slave_addr, 0), + DEFINE_PROP_CHR("chardev", ISAIPMIDevice, chr), + DEFINE_PROP_END_OF_LIST(), +}; + +static void ipmi_isa_class_initfn(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = ipmi_isa_initfn; + dc->reset = ipmi_isa_reset; + dc->props = ipmi_isa_properties; +} + +static const TypeInfo ipmi_isa_info = { + .name = TYPE_ISA_IPMI, + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(ISAIPMIDevice), + .class_init = ipmi_isa_class_initfn, +}; + +static void ipmi_register_types(void) +{ + type_register_static(&ipmi_isa_info); +} + +type_init(ipmi_register_types) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 3e4a334..fe2ba1f 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -37,7 +37,16 @@ #define FW_CFG_FILE_FIRST 0x20 #define FW_CFG_FILE_SLOTS 0x10 -#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) + +#define FW_CFG_IPMI_INTERFACE 0x30 +#define FW_CFG_IPMI_BASE_ADDR 0x31 +#define FW_CFG_IPMI_REG_SPACE 0x32 +#define FW_CFG_IPMI_REG_SPACING 0x33 +#define FW_CFG_IPMI_SLAVE_ADDR 0x34 +#define FW_CFG_IPMI_IRQ 0x35 +#define FW_CFG_IPMI_VERSION 0x36 + +#define FW_CFG_MAX_ENTRY (FW_CFG_IPMI_VERSION + 1) #define FW_CFG_WRITE_CHANNEL 0x4000 #define FW_CFG_ARCH_LOCAL 0x8000