From patchwork Tue Apr 7 19:51:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 458764 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 05E7D140213 for ; Wed, 8 Apr 2015 05:52:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=VtxnxT+C; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:48556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZY5-0002pl-4u for incoming@patchwork.ozlabs.org; Tue, 07 Apr 2015 15:52:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZXR-0001ZQ-03 for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:51:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfZXO-0002D6-My for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:51:56 -0400 Received: from mail-ob0-x229.google.com ([2607:f8b0:4003:c01::229]:33471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfZXO-0002Cn-Cf for qemu-devel@nongnu.org; Tue, 07 Apr 2015 15:51:54 -0400 Received: by oblw8 with SMTP id w8so56380479obl.0 for ; Tue, 07 Apr 2015 12:51:53 -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=JpuuG4Z9nYo6SVTs/NcrXE7NYE2EfdnwEki66zW96HU=; b=VtxnxT+CfSBAknepu485NaS+E08843Iu8Cd8HEvVQKdlgAyRyDniQLiENg2hiOaKpv NZFAHgGWpp4VH604ceSOIWN7Y19KFRfutBq1kVxqkk3jQdxqcLaQZt98LhZbtDhNeQ7G MH6ySSiaFr9FYa3PQYRh74fXxyiP1yoHFalZ+9M0FXb3C+K417Xod1A6Xx7nJN1BSzcG LndPN52j/YltWQTPE6uc8lAqJRcyqmrn+huwBz8NL3Mqk/dDp8KeKubqeHE8mUznX9ZE axeMgMq603J7t9K0+EllM1M31FytBPKz5Mmv5BY5Rt9WdYgFbgzdge2PFu6Oprg1gdYq POAQ== X-Received: by 10.182.125.130 with SMTP id mq2mr27519893obb.52.1428436313932; Tue, 07 Apr 2015 12:51:53 -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 nu6sm6983468obc.27.2015.04.07.12.51.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2015 12:51:51 -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 t37JpolJ024651; Tue, 7 Apr 2015 14:51:50 -0500 Received: (from cminyard@localhost) by t430.minyard.home (8.14.7/8.14.7/Submit) id t37JpoKl024650; Tue, 7 Apr 2015 14:51:50 -0500 From: minyard@acm.org To: qemu-devel@nongnu.org Date: Tue, 7 Apr 2015 14:51:31 -0500 Message-Id: <1428436304-24044-3-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::229 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 02/15] 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 | 144 +++++++++++++++++++++++++++++++++++++ include/hw/nvram/fw_cfg.h | 11 ++- 5 files changed, 157 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 ab1a552..1c3153b 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -9,6 +9,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 82bafcc..6b57430 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -9,6 +9,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..bc03a14 100644 --- a/hw/ipmi/Makefile.objs +++ b/hw/ipmi/Makefile.objs @@ -1 +1,2 @@ common-obj-$(CONFIG_IPMI) += ipmi.o +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..1c1ab8d --- /dev/null +++ b/hw/ipmi/isa_ipmi.c @@ -0,0 +1,144 @@ +/* + * 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; + int32 isairq; + uint8_t slave_addr; + CharDriverState *chr; + IPMIInterface *intf; +} ISAIPMIDevice; + +static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) +{ + ISADevice *isadev = ISA_DEVICE(dev); + ISAIPMIDevice *ipmi = ISA_IPMI(dev); + char typename[20]; + Object *intfobj; + IPMIInterface *intf; + Object *bmcobj; + IPMIBmc *bmc; + + if (!ipmi->interface) { + ipmi->interface = g_strdup("kcs"); + } + + if (ipmi->chr) { + bmcobj = object_new(TYPE_IPMI_BMC_EXTERN); + } else { + bmcobj = object_new(TYPE_IPMI_BMC_SIMULATOR); + } + bmc = IPMI_BMC(bmcobj); + bmc->chr = ipmi->chr; + snprintf(typename, sizeof(typename), + TYPE_IPMI_INTERFACE_PREFIX "%s", ipmi->interface); + intfobj = object_new(typename); + intf = IPMI_INTERFACE(intfobj); + bmc->intf = intf; + intf->bmc = bmc; + intf->io_base = ipmi->iobase; + intf->slave_addr = ipmi->slave_addr; + ipmi_interface_init(intf, errp); + if (*errp) { + return; + } + ipmi_bmc_init(bmc, errp); + if (*errp) { + return; + } + + /* These may be set by the interface. */ + ipmi->iobase = intf->io_base; + ipmi->slave_addr = intf->slave_addr; + + if (ipmi->isairq > 0) { + isa_init_irq(isadev, &intf->irq, ipmi->isairq); + intf->use_irq = 1; + } + + ipmi->intf = intf; + object_property_add_child(OBJECT(isadev), "intf", OBJECT(intf), errp); + if (*errp) { + return; + } + object_property_add_child(OBJECT(isadev), "bmc", OBJECT(bmc), errp); + if (*errp) { + return; + } + + qdev_set_legacy_instance_id(dev, intf->io_base, intf->io_length); + + isa_register_ioport(isadev, &intf->io, intf->io_base); +} + +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_UINT32("iobase", ISAIPMIDevice, iobase, 0), + DEFINE_PROP_INT32("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); + dc->realize = ipmi_isa_realizefn; + 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 6d8a8ac..cac3a34 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -38,7 +38,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