From patchwork Mon Jun 27 13:22:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 920852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5RDdiKi019888 for ; Mon, 27 Jun 2011 13:39:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760040Ab1F0NYe (ORCPT ); Mon, 27 Jun 2011 09:24:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38789 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759976Ab1F0NWQ (ORCPT ); Mon, 27 Jun 2011 09:22:16 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5RDMDOC030998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Jun 2011 09:22:13 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p5RDMC6t024596; Mon, 27 Jun 2011 09:22:12 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 070B5B064B; Mon, 27 Jun 2011 16:22:10 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [RFC v2 20/20] cirrus: simplify linear framebuffer access functions Date: Mon, 27 Jun 2011 16:22:07 +0300 Message-Id: <1309180927-19003-21-git-send-email-avi@redhat.com> In-Reply-To: <1309180927-19003-1-git-send-email-avi@redhat.com> References: <1309180927-19003-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 27 Jun 2011 13:39:48 +0000 (UTC) Make use of the memory API's ability to satisfy multi-byte accesses via multiple single-byte accesses. Signed-off-by: Avi Kivity --- hw/cirrus_vga.c | 78 +++++++----------------------------------------------- 1 files changed, 10 insertions(+), 68 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 1036eb2..88cb274 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2249,9 +2249,10 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) * ***************************************/ -static uint32_t cirrus_linear_readb(void *opaque, target_phys_addr_t addr) +static uint64_t cirrus_linear_read(MemoryRegion *mr, target_phys_addr_t addr, + unsigned size) { - CirrusVGAState *s = opaque; + CirrusVGAState *s = container_of(mr, CirrusVGAState, cirrus_linear_io); uint32_t ret; addr &= s->cirrus_addr_mask; @@ -2277,30 +2278,10 @@ static uint32_t cirrus_linear_readb(void *opaque, target_phys_addr_t addr) return ret; } -static uint32_t cirrus_linear_readw(void *opaque, target_phys_addr_t addr) -{ - uint32_t v; - - v = cirrus_linear_readb(opaque, addr); - v |= cirrus_linear_readb(opaque, addr + 1) << 8; - return v; -} - -static uint32_t cirrus_linear_readl(void *opaque, target_phys_addr_t addr) -{ - uint32_t v; - - v = cirrus_linear_readb(opaque, addr); - v |= cirrus_linear_readb(opaque, addr + 1) << 8; - v |= cirrus_linear_readb(opaque, addr + 2) << 16; - v |= cirrus_linear_readb(opaque, addr + 3) << 24; - return v; -} - -static void cirrus_linear_writeb(void *opaque, target_phys_addr_t addr, - uint32_t val) +static void cirrus_linear_write(MemoryRegion *mr, target_phys_addr_t addr, + uint64_t val, unsigned size) { - CirrusVGAState *s = opaque; + CirrusVGAState *s = container_of(mr, CirrusVGAState, cirrus_linear_io); unsigned mode; addr &= s->cirrus_addr_mask; @@ -2338,49 +2319,6 @@ static void cirrus_linear_writeb(void *opaque, target_phys_addr_t addr, } } -static void cirrus_linear_writew(void *opaque, target_phys_addr_t addr, - uint32_t val) -{ - cirrus_linear_writeb(opaque, addr, val & 0xff); - cirrus_linear_writeb(opaque, addr + 1, (val >> 8) & 0xff); -} - -static void cirrus_linear_writel(void *opaque, target_phys_addr_t addr, - uint32_t val) -{ - cirrus_linear_writeb(opaque, addr, val & 0xff); - cirrus_linear_writeb(opaque, addr + 1, (val >> 8) & 0xff); - cirrus_linear_writeb(opaque, addr + 2, (val >> 16) & 0xff); - cirrus_linear_writeb(opaque, addr + 3, (val >> 24) & 0xff); -} - - -static uint64_t cirrus_linear_read(MemoryRegion *mr, target_phys_addr_t addr, - unsigned size) -{ - CirrusVGAState *s = container_of(mr, CirrusVGAState, cirrus_linear_io); - - switch (size) { - case 1: return cirrus_linear_readb(s, addr); - case 2: return cirrus_linear_readw(s, addr); - case 4: return cirrus_linear_readl(s, addr); - default: abort(); - } -} - -static void cirrus_linear_write(MemoryRegion *mr, target_phys_addr_t addr, - uint64_t data, unsigned size) -{ - CirrusVGAState *s = container_of(mr, CirrusVGAState, cirrus_linear_io); - - switch (size) { - case 1: return cirrus_linear_writeb(s, addr, data); - case 2: return cirrus_linear_writew(s, addr, data); - case 4: return cirrus_linear_writel(s, addr, data); - default: abort(); - } -} - /*************************************** * * system to screen memory access @@ -2862,6 +2800,10 @@ static MemoryRegionOps cirrus_linear_io_ops = { .read = cirrus_linear_read, .write = cirrus_linear_write, .endianness = DEVICE_LITTLE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, }; static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)