Commit 6f8fd253 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm 

* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  Versatile Express: Add modelling of NOR flash
  Versatile Express: Fix NOR flash 0 address and remove flash alias
  hw/armv7m_nvic: Correctly register GIC region when setting up NVIC
  pl190: fix read of VECTADDR
parents d885bdd4 3dc3e7dd

hw/armv7m_nvic.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ static int armv7m_nvic_init(SysBusDevice *dev) 
     */

    memory_region_init_alias(&s->gic_iomem_alias, "nvic-gic", &s->gic.iomem,

                             0x100, 0xc00);

    memory_region_add_subregion_overlap(&s->container, 0x100, &s->gic.iomem, 1);

    memory_region_add_subregion_overlap(&s->container, 0x100,

                                        &s->gic_iomem_alias, 1);

    /* Map the whole thing into system memory at the location required

     * by the v7M architecture.

     */

hw/pl190.c

+12 −6
Original line number Diff line number Diff line
@@ -117,12 +117,18 @@ static uint64_t pl190_read(void *opaque, target_phys_addr_t offset, 
        return s->protected;

    case 12: /* VECTADDR */

        /* Read vector address at the start of an ISR.  Increases the

           current priority level to that of the current interrupt.  */

        for (i = 0; i < s->priority; i++)

          {

            if ((s->level | s->soft_level) & s->prio_mask[i])

         * current priority level to that of the current interrupt.

         *

         * Since an enabled interrupt X at priority P causes prio_mask[Y]

         * to have bit X set for all Y > P, this loop will stop with

         * i == the priority of the highest priority set interrupt.

         */

        for (i = 0; i < s->priority; i++) {

            if ((s->level | s->soft_level) & s->prio_mask[i + 1]) {

                break;

            }

        }



        /* Reading this value with no pending interrupts is undefined.

           We return the default address.  */

        if (i == PL190_NUM_PRIO)

hw/vexpress.c

+26 −7
Original line number Diff line number Diff line
@@ -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;
@@ -62,7 +66,6 @@ enum { 
    VE_COMPACTFLASH,

    VE_CLCD,

    VE_NORFLASH0,

    VE_NORFLASH0ALIAS,

    VE_NORFLASH1,

    VE_SRAM,

    VE_VIDEORAM,
@@ -104,9 +107,8 @@ static target_phys_addr_t motherboard_legacy_map[] = { 
};



static target_phys_addr_t motherboard_aseries_map[] = {

    /* CS0: 0x00000000 .. 0x0c000000 */

    [VE_NORFLASH0] = 0x00000000,

    [VE_NORFLASH0ALIAS] = 0x08000000,

    /* CS0: 0x08000000 .. 0x0c000000 */

    [VE_NORFLASH0] = 0x08000000,

    /* CS4: 0x0c000000 .. 0x10000000 */

    [VE_NORFLASH1] = 0x0c000000,

    /* CS5: 0x10000000 .. 0x14000000 */
@@ -357,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);
@@ -412,9 +415,25 @@ static void vexpress_common_init(const VEDBoardInfo *daughterboard, 


    sysbus_create_simple("pl111", map[VE_CLCD], pic[14]);



    /* VE_NORFLASH0: not modelled */

    /* VE_NORFLASH0ALIAS: 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);