From patchwork Thu Aug 11 23:07:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A21D7B6F64 for ; Fri, 12 Aug 2011 09:08:30 +1000 (EST) Received: from localhost ([::1]:41724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMO-0005t3-Tx for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 19:08:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreMC-0005nT-0F for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QreM8-0004hn-4R for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:07 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:59464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QreM7-0004hi-VD for qemu-devel@nongnu.org; Thu, 11 Aug 2011 19:08:04 -0400 Received: by qyk31 with SMTP id 31so1610068qyk.4 for ; Thu, 11 Aug 2011 16:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=/igEyMyvsOnyiSM58+KjSbPqAhzcG5ropq3a4Ujmi7E=; b=ijSrBE38nYj963DKXeCJbF6E/7+rUU91DZgQqu5xIcchpZyJJAtMiJQohuwOu9etTU 1xlbzwsA0fRKwOSIFFsYR/8NQLNFtzPqgTOkBSGsRtKFd//vaIF5trkSbK+7Snxif4W9 7+Tu1AjgDOCxuPJVyThMhEv2qm7XT9TwSVHqk= Received: by 10.229.168.130 with SMTP id u2mr172700qcy.75.1313104083409; Thu, 11 Aug 2011 16:08:03 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id r3sm1904723qct.3.2011.08.11.16.08.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 16:08:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 16:07:13 -0700 Message-Id: <1313104041-1641-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313104041-1641-1-git-send-email-rth@twiddle.net> References: <1313104041-1641-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.180 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 1/9] serial: Convert serial_mm_init to MemoryRegion. 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 Signed-off-by: Richard Henderson --- hw/serial.c | 145 +++++++++++++---------------------------------------------- 1 files changed, 31 insertions(+), 114 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 466de21..1fb9e9c 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -28,6 +28,7 @@ #include "pc.h" #include "qemu-timer.h" #include "sysemu.h" +#include "exec-memory.h" //#define DEBUG_SERIAL @@ -153,11 +154,11 @@ struct SerialState { int poll_msl; struct QEMUTimer *modem_status_poll; + MemoryRegion io; }; typedef struct ISASerialState { ISADevice dev; - MemoryRegion io; uint32_t index; uint32_t iobase; uint32_t isairq; @@ -786,8 +787,8 @@ static int serial_isa_initfn(ISADevice *dev) serial_init_core(s); qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3); - memory_region_init_io(&isa->io, &serial_io_ops, s, "serial", 8); - isa_register_ioport(dev, &isa->io, isa->iobase); + memory_region_init_io(&s->io, &serial_io_ops, s, "serial", 8); + isa_register_ioport(dev, &s->io, isa->iobase); return 0; } @@ -821,115 +822,37 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase, } /* Memory mapped interface */ -static uint32_t serial_mm_readb(void *opaque, target_phys_addr_t addr) -{ - SerialState *s = opaque; - - return serial_ioport_read(s, addr >> s->it_shift) & 0xFF; -} - -static void serial_mm_writeb(void *opaque, target_phys_addr_t addr, - uint32_t value) -{ - SerialState *s = opaque; - - serial_ioport_write(s, addr >> s->it_shift, value & 0xFF); -} - -static uint32_t serial_mm_readw_be(void *opaque, target_phys_addr_t addr) -{ - SerialState *s = opaque; - uint32_t val; - - val = serial_ioport_read(s, addr >> s->it_shift) & 0xFFFF; - val = bswap16(val); - return val; -} - -static uint32_t serial_mm_readw_le(void *opaque, target_phys_addr_t addr) -{ - SerialState *s = opaque; - uint32_t val; - - val = serial_ioport_read(s, addr >> s->it_shift) & 0xFFFF; - return val; -} - -static void serial_mm_writew_be(void *opaque, target_phys_addr_t addr, - uint32_t value) -{ - SerialState *s = opaque; - - value = bswap16(value); - serial_ioport_write(s, addr >> s->it_shift, value & 0xFFFF); -} - -static void serial_mm_writew_le(void *opaque, target_phys_addr_t addr, - uint32_t value) -{ - SerialState *s = opaque; - - serial_ioport_write(s, addr >> s->it_shift, value & 0xFFFF); -} - -static uint32_t serial_mm_readl_be(void *opaque, target_phys_addr_t addr) -{ - SerialState *s = opaque; - uint32_t val; - - val = serial_ioport_read(s, addr >> s->it_shift); - val = bswap32(val); - return val; -} - -static uint32_t serial_mm_readl_le(void *opaque, target_phys_addr_t addr) -{ - SerialState *s = opaque; - uint32_t val; - - val = serial_ioport_read(s, addr >> s->it_shift); - return val; -} - -static void serial_mm_writel_be(void *opaque, target_phys_addr_t addr, - uint32_t value) +static uint64_t serial_mm_read(void *opaque, target_phys_addr_t addr, + unsigned size) { SerialState *s = opaque; - - value = bswap32(value); - serial_ioport_write(s, addr >> s->it_shift, value); + return serial_ioport_read(s, addr >> s->it_shift); } -static void serial_mm_writel_le(void *opaque, target_phys_addr_t addr, - uint32_t value) +static void serial_mm_write(void *opaque, target_phys_addr_t addr, + uint64_t value, unsigned size) { SerialState *s = opaque; - + value &= ~0u >> (32 - (size * 8)); serial_ioport_write(s, addr >> s->it_shift, value); } -static CPUReadMemoryFunc * const serial_mm_read_be[] = { - &serial_mm_readb, - &serial_mm_readw_be, - &serial_mm_readl_be, -}; - -static CPUWriteMemoryFunc * const serial_mm_write_be[] = { - &serial_mm_writeb, - &serial_mm_writew_be, - &serial_mm_writel_be, -}; - -static CPUReadMemoryFunc * const serial_mm_read_le[] = { - &serial_mm_readb, - &serial_mm_readw_le, - &serial_mm_readl_le, -}; - -static CPUWriteMemoryFunc * const serial_mm_write_le[] = { - &serial_mm_writeb, - &serial_mm_writew_le, - &serial_mm_writel_le, +static const MemoryRegionOps serial_mm_ops[3] = { + [DEVICE_NATIVE_ENDIAN] = { + .read = serial_mm_read, + .write = serial_mm_write, + .endianness = DEVICE_NATIVE_ENDIAN, + }, + [DEVICE_LITTLE_ENDIAN] = { + .read = serial_mm_read, + .write = serial_mm_write, + .endianness = DEVICE_NATIVE_ENDIAN, + }, + [DEVICE_BIG_ENDIAN] = { + .read = serial_mm_read, + .write = serial_mm_write, + .endianness = DEVICE_BIG_ENDIAN, + }, }; SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, @@ -938,7 +861,7 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, int be) { SerialState *s; - int s_io_memory; + enum device_endian end; s = qemu_mallocz(sizeof(SerialState)); @@ -950,17 +873,11 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, serial_init_core(s); vmstate_register(NULL, base, &vmstate_serial, s); + end = (be ? DEVICE_BIG_ENDIAN : DEVICE_LITTLE_ENDIAN); + memory_region_init_io(&s->io, &serial_mm_ops[end], s, + "serial", 8 << it_shift); if (ioregister) { - if (be) { - s_io_memory = cpu_register_io_memory(serial_mm_read_be, - serial_mm_write_be, s, - DEVICE_NATIVE_ENDIAN); - } else { - s_io_memory = cpu_register_io_memory(serial_mm_read_le, - serial_mm_write_le, s, - DEVICE_NATIVE_ENDIAN); - } - cpu_register_physical_memory(base, 8 << it_shift, s_io_memory); + memory_region_add_subregion(get_system_memory(), base, &s->io); } serial_update_msl(s); return s;