From patchwork Wed Sep 19 15:57:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Lavra X-Patchwork-Id: 185091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 882072C0084 for ; Thu, 20 Sep 2012 01:56:47 +1000 (EST) Received: from localhost ([::1]:45197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEMdp-0003Jb-O9 for incoming@patchwork.ozlabs.org; Wed, 19 Sep 2012 11:56:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEMda-0003IO-5y for qemu-devel@nongnu.org; Wed, 19 Sep 2012 11:56:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEMdR-0003fi-8m for qemu-devel@nongnu.org; Wed, 19 Sep 2012 11:56:30 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:49201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEMdR-0003fP-26 for qemu-devel@nongnu.org; Wed, 19 Sep 2012 11:56:21 -0400 Received: by bkcjg9 with SMTP id jg9so435951bkc.4 for ; Wed, 19 Sep 2012 08:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=tvdfxCvbsSlcfGJrkFHYBHpxZ1dibMEL01sTHhX75yY=; b=NnhsT5f98I7sOn30RzAGpR1zYTgxogT53/J6KnBxUMKD2+jRpT2AAhx8Wu8GBKNkD9 T7GNDlMZnTwiqCSr66G9Rgf2Viix/A9OrUkeMDq7fqwCITX1s7mQRuBVDzetiYDcWaIN d/HQ6oWnkG3MIbplBK9bLbv9l/Fk6Qa2bh56zVPbt9lsKXGx48kgeCC+2ekuWuoQNFfb evFropx32eRVnYFnFaCikvZEW6dEz2Oq0chVqc5BVpAWxHW/KSNTxEsQf3UGFDov3Z2f twBjlEr/PIVokxd41/1wPEZ+mubOcaDwYcJmiGkyekfnn0mMsY+TRyCTcRDb9Fe/NDom Lb4A== Received: by 10.204.147.1 with SMTP id j1mr1442464bkv.110.1348070180044; Wed, 19 Sep 2012 08:56:20 -0700 (PDT) Received: from [192.168.56.2] ([151.59.183.109]) by mx.google.com with ESMTPS id g12sm2367699bkt.7.2012.09.19.08.56.17 (version=SSLv3 cipher=OTHER); Wed, 19 Sep 2012 08:56:19 -0700 (PDT) Message-ID: <5059EB61.8000808@gmail.com> Date: Wed, 19 Sep 2012 17:57:21 +0200 From: Francesco Lavra User-Agent: Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <5059E96C.6040203@gmail.com> In-Reply-To: <5059E96C.6040203@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: Peter Maydell , paul@codesourcery.com Subject: [Qemu-devel] [PATCH v3 2/2] Versatile Express: Add modelling of NOR flash 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 This patch adds modelling of the two NOR flash banks found on the Versatile Express motherboard. Tested with U-Boot running on an emulated Versatile Express, with either A9 or A15 CoreTile. Signed-off-by: Francesco Lavra Reviewed-by: Peter Maydell --- Changes in v3: - When registering either flash bank as CFI device results in an error, terminate QEMU. Changes in v2: - Use drive_get_next() instead of drive_get() to get a backing storage for each flash bank. hw/vexpress.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/vexpress.c b/hw/vexpress.c index 454c2bb..3596d1e 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -29,8 +29,12 @@ #include "sysemu.h" #include "boards.h" #include "exec-memory.h" +#include "blockdev.h" +#include "flash.h" #define VEXPRESS_BOARD_ID 0x8e0 +#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) +#define VEXPRESS_FLASH_SECT_SIZE (256 * 1024) static struct arm_boot_info vexpress_binfo; @@ -355,6 +359,7 @@ static void vexpress_common_init(const VEDBoardInfo *daughterboard, qemu_irq pic[64]; uint32_t proc_id; uint32_t sys_id; + DriveInfo *dinfo; ram_addr_t vram_size, sram_size; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *vram = g_new(MemoryRegion, 1); @@ -410,8 +415,25 @@ static void vexpress_common_init(const VEDBoardInfo *daughterboard, sysbus_create_simple("pl111", map[VE_CLCD], pic[14]); - /* VE_NORFLASH0: not modelled */ - /* VE_NORFLASH1: not modelled */ + dinfo = drive_get_next(IF_PFLASH); + if (!pflash_cfi01_register(map[VE_NORFLASH0], NULL, "vexpress.flash0", + VEXPRESS_FLASH_SIZE, dinfo ? dinfo->bdrv : NULL, + VEXPRESS_FLASH_SECT_SIZE, + VEXPRESS_FLASH_SIZE / VEXPRESS_FLASH_SECT_SIZE, 4, + 0x00, 0x89, 0x00, 0x18, 0)) { + fprintf(stderr, "vexpress: error registering flash 0.\n"); + exit(1); + } + + dinfo = drive_get_next(IF_PFLASH); + if (!pflash_cfi01_register(map[VE_NORFLASH1], NULL, "vexpress.flash1", + VEXPRESS_FLASH_SIZE, dinfo ? dinfo->bdrv : NULL, + VEXPRESS_FLASH_SECT_SIZE, + VEXPRESS_FLASH_SIZE / VEXPRESS_FLASH_SECT_SIZE, 4, + 0x00, 0x89, 0x00, 0x18, 0)) { + fprintf(stderr, "vexpress: error registering flash 1.\n"); + exit(1); + } sram_size = 0x2000000; memory_region_init_ram(sram, "vexpress.sram", sram_size);