From nobody Thu Apr 25 20:24:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486940122990828.8736203637939; Sun, 12 Feb 2017 14:55:22 -0800 (PST) Received: from localhost ([::1]:53707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cd33B-0005nV-Q6 for importer@patchew.org; Sun, 12 Feb 2017 17:55:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cd2yo-00031Q-G7 for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cd2yl-00030Q-FC for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:50 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34442) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cd2yl-000304-8b for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:47 -0500 Received: by mail-wr0-f193.google.com with SMTP id 89so21778952wrr.1 for ; Sun, 12 Feb 2017 14:50:45 -0800 (PST) Received: from thl530.multi.box (pD9575B07.dip0.t-ipconnect.de. [217.87.91.7]) by smtp.gmail.com with ESMTPSA id 61sm11464447wrs.29.2017.02.12.14.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Feb 2017 14:50:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ntru7rnGd8Mk4nzS8ARk454xlq42cuFtHVMoXix85Tw=; b=i7gm8VN8AOtIpIsQ3mBHgng71pGDEN5bbnCYYZmvbkvC4485D4Qr61o6pVeg2cdrT1 i1f6R6MsX+JTFCHRNb5ovkGGpPZ5E6w1bsTAmWvwnymbv4f9LzKkGeY3wUjd3ufuCzaj FYL31UyK4HvZ00rnD5A1oESqH9fell/c37jQBTY1CjFxhAsROb6G1FIfkrTdJG63ucak 8RWF9PeFqTLpma5ciFwDWcRSjcDdZfeSWQymn+FaC2ZXhEDyT1sBxOttnC4+i06cOIMe JZEC3Oj27z9+0olZG9fRpXKZFoHe/LWJkmAF4cgfdNp9PXZcMsJcSqmRdvRF1HUR18ca 5fmg== X-Gm-Message-State: AMke39kJh47AdddRTMcGKACSBcg+wGc+kndDXupv9Ic8JtjZ5bIT3m5zoXt4S58vzqyYGA== X-Received: by 10.223.170.195 with SMTP id i3mr19066781wrc.123.1486939844615; Sun, 12 Feb 2017 14:50:44 -0800 (PST) From: Thomas Huth To: qemu-devel@nongnu.org Date: Sun, 12 Feb 2017 23:50:34 +0100 Message-Id: <1486939835-3452-2-git-send-email-huth@tuxfamily.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486939835-3452-1-git-send-email-huth@tuxfamily.org> References: <1486939835-3452-1-git-send-email-huth@tuxfamily.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.193 Subject: [Qemu-devel] [PATCH 1/2] hw/m68k: QOMify the ColdFire interrupt controller 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: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use type_init() and friends to adapt the ColdFire interrupt controller to the latest QEMU device conventions. Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier --- hw/m68k/mcf_intc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index cf58132..8198afa 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -9,10 +9,16 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/sysbus.h" #include "hw/m68k/mcf.h" #include "exec/address-spaces.h" =20 +#define TYPE_MCF_INTC "mcf-intc" +#define MCF_INTC(obj) OBJECT_CHECK(mcf_intc_state, (obj), TYPE_MCF_INTC) + typedef struct { + SysBusDevice parent_obj; + MemoryRegion iomem; uint64_t ipr; uint64_t imr; @@ -138,8 +144,10 @@ static void mcf_intc_set_irq(void *opaque, int irq, in= t level) mcf_intc_update(s); } =20 -static void mcf_intc_reset(mcf_intc_state *s) +static void mcf_intc_reset(DeviceState *dev) { + mcf_intc_state *s =3D MCF_INTC(dev); + s->imr =3D ~0ull; s->ipr =3D 0; s->ifr =3D 0; @@ -154,17 +162,49 @@ static const MemoryRegionOps mcf_intc_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 +static void mcf_intc_instance_init(Object *obj) +{ + mcf_intc_state *s =3D MCF_INTC(obj); + + memory_region_init_io(&s->iomem, obj, &mcf_intc_ops, s, "mcf", 0x100); +} + +static void mcf_intc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->reset =3D mcf_intc_reset; +} + +static const TypeInfo mcf_intc_gate_info =3D { + .name =3D TYPE_MCF_INTC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(mcf_intc_state), + .instance_init =3D mcf_intc_instance_init, + .class_init =3D mcf_intc_class_init, +}; + +static void mcf_intc_register_types(void) +{ + type_register_static(&mcf_intc_gate_info); +} + +type_init(mcf_intc_register_types) + qemu_irq *mcf_intc_init(MemoryRegion *sysmem, hwaddr base, M68kCPU *cpu) { + DeviceState *dev; mcf_intc_state *s; =20 - s =3D g_malloc0(sizeof(mcf_intc_state)); + dev =3D qdev_create(NULL, TYPE_MCF_INTC); + qdev_init_nofail(dev); + + s =3D MCF_INTC(dev); s->cpu =3D cpu; - mcf_intc_reset(s); =20 - memory_region_init_io(&s->iomem, NULL, &mcf_intc_ops, s, "mcf", 0x100); memory_region_add_subregion(sysmem, base, &s->iomem); =20 return qemu_allocate_irqs(mcf_intc_set_irq, s, 64); --=20 2.7.4 From nobody Thu Apr 25 20:24:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486939944182228.8466766227956; Sun, 12 Feb 2017 14:52:24 -0800 (PST) Received: from localhost ([::1]:53696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cd30I-0003eQ-Vx for importer@patchew.org; Sun, 12 Feb 2017 17:52:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cd2yp-00031V-Lx for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cd2ym-00030f-Bk for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:51 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cd2ym-00030A-5S for qemu-devel@nongnu.org; Sun, 12 Feb 2017 17:50:48 -0500 Received: by mail-wm0-f67.google.com with SMTP id u63so16382589wmu.2 for ; Sun, 12 Feb 2017 14:50:46 -0800 (PST) Received: from thl530.multi.box (pD9575B07.dip0.t-ipconnect.de. [217.87.91.7]) by smtp.gmail.com with ESMTPSA id 61sm11464447wrs.29.2017.02.12.14.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Feb 2017 14:50:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iyri7RNcR1kvIfjhqjU+m0F8oIxmKQqKEqsa393+bvI=; b=D/qf4g0G/5uPuaGox/Fa8tljguOWV52HvRtPZopRXzxhpJMBCXZ+Sp4ucUygxL3vEV C6J14+gI4G/vL/njUaVcyd3YIz6TJ2LV1BavolznyyhYOl3xlATgzyJJNtMN9OD8cWdJ 4Rc/UEZpRfyRv1wtuWJd1EbXJmIvRg9FRV08ySc9xOWxOStuAsoDSZqg90oyRr7UWJQh b7SDsezzVMrVOHioSG4M6K0rdwryv+HDi9UflMqGeu5GN1Pnye5kH57kaFZlXLbfaV5P VQx/ZtmpHza1dC5OXl62/0ZJfqBwES8MemhfMJkyVQi968kUsPNR1gzmH4H0v+WWl6KR VBxw== X-Gm-Message-State: AMke39m8cT6OEG1EaQf+Oa1ivPCJw1ZsTxUGj81xylBC+VB5B+r+7PYvO2YAbmkdHdEWJw== X-Received: by 10.28.139.74 with SMTP id n71mr17112575wmd.139.1486939845190; Sun, 12 Feb 2017 14:50:45 -0800 (PST) From: Thomas Huth To: qemu-devel@nongnu.org Date: Sun, 12 Feb 2017 23:50:35 +0100 Message-Id: <1486939835-3452-3-git-send-email-huth@tuxfamily.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486939835-3452-1-git-send-email-huth@tuxfamily.org> References: <1486939835-3452-1-git-send-email-huth@tuxfamily.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.67 Subject: [Qemu-devel] [PATCH 2/2] MAINTAINERS: Add odd fixer the ColdFire boards 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: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" I did some work with real ColdFire boards in the past, and after QOMifying most of the ColdFire devices recently, too, I feel confident that I could at least take care of odd fixes for these boards. Signed-off-by: Thomas Huth --- MAINTAINERS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7afbada..4fb2ed0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -561,7 +561,8 @@ F: hw/lm32/milkymist.c M68K Machines ------------- an5206 -S: Orphan +M: Thomas Huth +S: Odd Fixes F: hw/m68k/an5206.c F: hw/m68k/mcf5206.c =20 @@ -570,11 +571,13 @@ S: Orphan F: hw/m68k/dummy_m68k.c =20 mcf5208 -S: Orphan +M: Thomas Huth +S: Odd Fixes F: hw/m68k/mcf5208.c F: hw/m68k/mcf_intc.c F: hw/char/mcf_uart.c F: hw/net/mcf_fec.c +F: include/hw/m68k/mcf*.h =20 MicroBlaze Machines ------------------- --=20 2.7.4