From patchwork Mon Sep 17 20:08:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Lavra X-Patchwork-Id: 184530 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 BEC302C007B for ; Tue, 18 Sep 2012 06:07:32 +1000 (EST) Received: from localhost ([::1]:34801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDhbO-0002fZ-Ov for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 16:07:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDhbI-0002fK-Ad for qemu-devel@nongnu.org; Mon, 17 Sep 2012 16:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDhbH-0007RV-4i for qemu-devel@nongnu.org; Mon, 17 Sep 2012 16:07:24 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:48705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDhbG-0007RQ-Ts for qemu-devel@nongnu.org; Mon, 17 Sep 2012 16:07:23 -0400 Received: by bkcji1 with SMTP id ji1so2288883bkc.4 for ; Mon, 17 Sep 2012 13:07:22 -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=ikVwgJB+2EwVnLi8wM5fFXd9f/DHfXngUynDs2Up3RE=; b=Hcbi3fjhYrb2pfBIhQROTNOs/5elAGwQ88+JnaFk5I/xVASvaiagvUdSOV6Rs1LEFN j0shNzoNZeSUZlqLTIjAJgTBMvGXP7f2oNigJmiXOILrTzilJrKWH0DDdzu076rXa3Lt 6N0hSdMaL3GqTZ9jZB9GAznLkAYmTytsWUaJAACjlmF+tMwA7ehZhfyEtCTXiB3+FePJ f3ZZizCcO00bJpMDoP85CAZE0Re6+vmcjv8P5ijvCsn9e5ZJ9BabcfMrivBxF3ZQqhhM 0cLLilHA7evHh3rHraH/yrKVLZSWI7EYz2vMs4dGiHTIf/WtkS2ggJawtATUYlq0XoIM tEUg== Received: by 10.204.4.154 with SMTP id 26mr4854149bkr.91.1347912442183; Mon, 17 Sep 2012 13:07:22 -0700 (PDT) Received: from [192.168.56.2] ([151.68.91.215]) by mx.google.com with ESMTPS id he8sm6520991bkc.3.2012.09.17.13.07.20 (version=SSLv3 cipher=OTHER); Mon, 17 Sep 2012 13:07:21 -0700 (PDT) Message-ID: <50578341.8010308@gmail.com> Date: Mon, 17 Sep 2012 22:08:33 +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: <505782AA.7090106@gmail.com> In-Reply-To: <505782AA.7090106@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 v2 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 --- Changes in v2: Use drive_get_next() instead of drive_get() to get a backing storage for each flash bank. hw/vexpress.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) MemoryRegion *vram = g_new(MemoryRegion, 1); @@ -410,8 +415,23 @@ 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"); + } + + 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"); + } sram_size = 0x2000000; memory_region_init_ram(sram, "vexpress.sram", sram_size); diff --git a/hw/vexpress.c b/hw/vexpress.c index 454c2bb..2ffeab1 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();