From patchwork Thu Dec 23 17:19:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 76534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 317DFB6F07 for ; Fri, 24 Dec 2010 04:35:40 +1100 (EST) Received: from localhost ([127.0.0.1]:47553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVp4e-0008Ez-3W for incoming@patchwork.ozlabs.org; Thu, 23 Dec 2010 12:35:32 -0500 Received: from [140.186.70.92] (port=39995 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVopm-0005Df-VM for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVopl-0003dy-2F for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:10 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:41349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVopk-0003bQ-P5 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:09 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PVopa-0001Oj-AJ for qemu-devel@nongnu.org; Thu, 23 Dec 2010 17:19:58 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 23 Dec 2010 17:19:57 +0000 Message-Id: <1293124798-5335-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1293124798-5335-1-git-send-email-peter.maydell@linaro.org> References: <1293124798-5335-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 7/8] pl080: Implement save/restore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Maydell --- hw/pl080.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 3 deletions(-) diff --git a/hw/pl080.c b/hw/pl080.c index 1a3e06c..901f04a 100644 --- a/hw/pl080.c +++ b/hw/pl080.c @@ -52,6 +52,43 @@ typedef struct { qemu_irq irq; } pl080_state; +static const VMStateDescription vmstate_pl080_channel = { + .name = "pl080_channel", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(src, pl080_channel), + VMSTATE_UINT32(dest, pl080_channel), + VMSTATE_UINT32(lli, pl080_channel), + VMSTATE_UINT32(ctrl, pl080_channel), + VMSTATE_UINT32(conf, pl080_channel), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_pl080 = { + .name = "pl080", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(tc_int, pl080_state), + VMSTATE_UINT8(tc_mask, pl080_state), + VMSTATE_UINT8(err_int, pl080_state), + VMSTATE_UINT8(err_mask, pl080_state), + VMSTATE_UINT32(conf, pl080_state), + VMSTATE_UINT32(sync, pl080_state), + VMSTATE_UINT32(req_single, pl080_state), + VMSTATE_UINT32(req_burst, pl080_state), + VMSTATE_UINT8(tc_int, pl080_state), + VMSTATE_UINT8(tc_int, pl080_state), + VMSTATE_UINT8(tc_int, pl080_state), + VMSTATE_STRUCT_ARRAY(chan, pl080_state, PL080_MAX_CHANNELS, + 1, vmstate_pl080_channel, pl080_channel), + VMSTATE_INT32(running, pl080_state), + VMSTATE_END_OF_LIST() + } +}; + static const unsigned char pl080_id[] = { 0x80, 0x10, 0x04, 0x0a, 0x0d, 0xf0, 0x05, 0xb1 }; @@ -330,7 +367,6 @@ static int pl08x_init(SysBusDevice *dev, int nchannels) sysbus_init_mmio(dev, 0x1000, iomemtype); sysbus_init_irq(dev, &s->irq); s->nchannels = nchannels; - /* ??? Save/restore. */ return 0; } @@ -344,12 +380,28 @@ static int pl081_init(SysBusDevice *dev) return pl08x_init(dev, 2); } +static SysBusDeviceInfo pl080_info = { + .init = pl080_init, + .qdev.name = "pl080", + .qdev.size = sizeof(pl080_state), + .qdev.vmsd = &vmstate_pl080, + .qdev.no_user = 1, +}; + +static SysBusDeviceInfo pl081_info = { + .init = pl081_init, + .qdev.name = "pl081", + .qdev.size = sizeof(pl080_state), + .qdev.vmsd = &vmstate_pl080, + .qdev.no_user = 1, +}; + /* The PL080 and PL081 are the same except for the number of channels they implement (8 and 2 respectively). */ static void pl080_register_devices(void) { - sysbus_register_dev("pl080", sizeof(pl080_state), pl080_init); - sysbus_register_dev("pl081", sizeof(pl080_state), pl081_init); + sysbus_register_withprop(&pl080_info); + sysbus_register_withprop(&pl081_info); } device_init(pl080_register_devices)