From patchwork Tue Nov 22 16:32:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 127131 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 8ED4CB70C0 for ; Wed, 23 Nov 2011 04:08:07 +1100 (EST) Received: from localhost ([::1]:34368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RStHp-0005yD-IM for incoming@patchwork.ozlabs.org; Tue, 22 Nov 2011 11:33:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RStGo-0002vN-7G for qemu-devel@nongnu.org; Tue, 22 Nov 2011 11:32:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RStGj-0003zc-Vo for qemu-devel@nongnu.org; Tue, 22 Nov 2011 11:32:30 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:64312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RStGj-0003vt-OY for qemu-devel@nongnu.org; Tue, 22 Nov 2011 11:32:25 -0500 Received: by mail-ww0-f53.google.com with SMTP id 27so556451wwf.10 for ; Tue, 22 Nov 2011 08:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=4T39h/Z1/fuWsOTx5HOOl2SPPErpDTg0IB7ALSqSyq8=; b=c1vytmsI6wTvAB+smmtryPOl1Bo4Z6V5JcakoDgNz1YoD3GNu/Tn0ScrYUQ2q52tZD EiRDenbNJK7D/hvIlb99lFFLrtBT2MeW9D8kh4jkDhHD4vap/hg3vFfYAFIPfOP1wnOh 6rs9sho6snSc2Xs63N6zk03TXMiFGp+koS3lI= Received: by 10.227.209.66 with SMTP id gf2mr832785wbb.20.1321979545149; Tue, 22 Nov 2011 08:32:25 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id z3sm5677843wid.11.2011.11.22.08.32.23 (version=SSLv3 cipher=OTHER); Tue, 22 Nov 2011 08:32:24 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 22 Nov 2011 17:32:07 +0100 Message-Id: <1321979527-23921-12-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1321979527-23921-1-git-send-email-benoit.canet@gmail.com> References: <1321979527-23921-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH v2 11/11] bonito: convert cop to memory API 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: Benoît Canet --- hw/bonito.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/hw/bonito.c b/hw/bonito.c index 8972f55..a92675c 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -205,6 +205,7 @@ typedef struct PCIBonitoState MemoryRegion iomem_pciconf; MemoryRegion iomem_spciconf; MemoryRegion iomem_ldma; + MemoryRegion iomem_cop; target_phys_addr_t bonito_pciio_start; target_phys_addr_t bonito_pciio_length; @@ -214,10 +215,6 @@ typedef struct PCIBonitoState target_phys_addr_t bonito_localio_length; int bonito_localio_handle; - target_phys_addr_t bonito_cop_start; - target_phys_addr_t bonito_cop_length; - int bonito_cop_handle; - } PCIBonitoState; PCIBonitoState * bonito_state; @@ -372,7 +369,8 @@ static const MemoryRegionOps bonito_ldma_ops = { }, }; -static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr) +static uint64_t bonito_cop_readl(void *opaque, target_phys_addr_t addr, + unsigned size) { uint32_t val; PCIBonitoState *s = opaque; @@ -383,23 +381,21 @@ static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr) } static void bonito_cop_writel(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { PCIBonitoState *s = opaque; ((uint32_t *)(&s->boncop))[addr/sizeof(uint32_t)] = val & 0xffffffff; } -static CPUWriteMemoryFunc * const bonito_cop_write[] = { - NULL, - NULL, - bonito_cop_writel, -}; - -static CPUReadMemoryFunc * const bonito_cop_read[] = { - NULL, - NULL, - bonito_cop_readl, +static const MemoryRegionOps bonito_cop_ops = { + .read = bonito_cop_readl, + .write = bonito_cop_writel, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, }; static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t addr) @@ -710,14 +706,12 @@ static int bonito_initfn(PCIDevice *dev) sysbus_init_mmio_region(sysbus, &s->iomem_ldma); sysbus_mmio_map(sysbus, 3, 0xbfe00200); - s->bonito_cop_handle = cpu_register_io_memory(bonito_cop_read, - bonito_cop_write, s, - DEVICE_NATIVE_ENDIAN); - s->bonito_cop_start = 0xbfe00300; - s->bonito_cop_length = 0x100; - cpu_register_physical_memory(s->bonito_cop_start, s->bonito_cop_length, - s->bonito_cop_handle); + memory_region_init_io(&s->iomem_cop, &bonito_cop_ops, s, + "cop", 0x100); + sysbus_init_mmio_region(sysbus, &s->iomem_cop); + sysbus_mmio_map(sysbus, 4, 0xbfe00300); + /* end */ /* Map PCI IO Space 0x1fd0 0000 - 0x1fd1 0000 */ s->bonito_pciio_start = BONITO_PCIIO_BASE; s->bonito_pciio_length = BONITO_PCIIO_SIZE;