Commit 4178c782 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20161028' into staging 



target-arm queue:
 * Fix reset GPIO handling for spitz, tosa boards
 * virt: add 'pmu' property for configuring whether to expose the
   vPMU to the guest
 * char: cadence: correct reset value for baud rate registers
 * versatilepb: do not run if user asks for more than 256MB RAM
 * pxa2xx: Set value default values for CCCR and CKEN on PXA255
 * arm: cubieboard: Add support for initrd
 * i.MX: Fix GPIO ISR register write

# gpg: Signature made Fri 28 Oct 2016 15:56:56 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20161028:
  hw/arm/tosa: Fix reset handling
  hw/arm/spitz: Fix reset handling
  arm: virt: add PMU property to mach-virt machine type
  arm: Add an option to turn on/off vPMU support
  char: cadence: correct reset value for baud rate registers
  versatilepb: do not run if user asks for more than 256MB RAM
  hw/arm/pxa2xx: Set value default values for CCCR and CKEN on PXA255
  arm: cubieboard: Add support for initrd
  i.MX: Fix GPIO ISR register write

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5273a45e d26a10e2

hw/arm/cubieboard.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static void cubieboard_init(MachineState *machine) 
    cubieboard_binfo.ram_size = machine->ram_size;

    cubieboard_binfo.kernel_filename = machine->kernel_filename;

    cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;

    cubieboard_binfo.initrd_filename = machine->initrd_filename;

    arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);

}

hw/arm/pxa2xx.c

+3 −1
Original line number Diff line number Diff line
@@ -2267,7 +2267,9 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) 
                    qdev_get_gpio_in(s->pic, PXA2XX_PIC_LCD));



    s->cm_base = 0x41300000;

    s->cm_regs[CCCR >> 2] = 0x02000210;	/* 416.0 MHz */

    s->cm_regs[CCCR >> 2] = 0x00000121;         /* from datasheet */

    s->cm_regs[CKEN >> 2] = 0x00017def;         /* from datasheet */



    s->clkcfg = 0x00000009;		/* Turbo mode active */

    memory_region_init_io(&s->cm_iomem, NULL, &pxa2xx_cm_ops, s, "pxa2xx-cm", 0x1000);

    memory_region_add_subregion(address_space, s->cm_base, &s->cm_iomem);

hw/arm/spitz.c

+12 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "sysemu/block-backend.h"

#include "hw/sysbus.h"

#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"



#undef REG_FMT

#define REG_FMT			"0x%02lx"
@@ -844,9 +845,18 @@ static void spitz_lcd_hsync_handler(void *opaque, int line, int level) 
    spitz_hsync ^= 1;

}



static void spitz_reset(void *opaque, int line, int level)

{

    if (level) {

        qemu_system_reset_request();

    }

}



static void spitz_gpio_setup(PXA2xxState *cpu, int slots)

{

    qemu_irq lcd_hsync;

    qemu_irq reset;



    /*

     * Bad hack: We toggle the LCD hsync GPIO on every GPIO status

     * read to satisfy broken guests that poll-wait for hsync.
@@ -867,7 +877,8 @@ static void spitz_gpio_setup(PXA2xxState *cpu, int slots) 
    qemu_irq_raise(qdev_get_gpio_in(cpu->gpio, SPITZ_GPIO_BAT_COVER));



    /* Handle reset */

    qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_ON_RESET, cpu->reset);

    reset = qemu_allocate_irq(spitz_reset, cpu, 0);

    qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_ON_RESET, reset);



    /* PCMCIA signals: card's IRQ and Card-Detect */

    if (slots >= 1)

hw/arm/tosa.c

+11 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "sysemu/block-backend.h"

#include "hw/sysbus.h"

#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"



#define TOSA_RAM    0x04000000

#define TOSA_ROM	0x00800000
@@ -86,6 +87,12 @@ static void tosa_out_switch(void *opaque, int line, int level) 
    }

}



static void tosa_reset(void *opaque, int line, int level)

{

    if (level) {

        qemu_system_reset_request();

    }

}



static void tosa_gpio_setup(PXA2xxState *cpu,

                DeviceState *scp0,
@@ -93,13 +100,16 @@ static void tosa_gpio_setup(PXA2xxState *cpu, 
                TC6393xbState *tmio)

{

    qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);

    qemu_irq reset;



    /* MMC/SD host */

    pxa2xx_mmci_handlers(cpu->mmc,

                    qdev_get_gpio_in(scp0, TOSA_GPIO_SD_WP),

                    qemu_irq_invert(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_nSD_DETECT)));



    /* Handle reset */

    qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, cpu->reset);

    reset = qemu_allocate_irq(tosa_reset, cpu, 0);

    qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, reset);



    /* PCMCIA signals: card's IRQ and Card-Detect */

    pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[0],

hw/arm/versatilepb.c

+9 −0
Original line number Diff line number Diff line
@@ -198,6 +198,15 @@ static void versatile_init(MachineState *machine, int board_id) 
    int done_smc = 0;

    DriveInfo *dinfo;



    if (machine->ram_size > 0x10000000) {

        /* Device starting at address 0x10000000,

         * and memory cannot overlap with devices.

         * Refuse to run rather than behaving very confusingly.

         */

        error_report("versatilepb: memory size must not exceed 256MB");

        exit(1);

    }



    if (!machine->cpu_model) {

        machine->cpu_model = "arm926";

    }