Commit 32f3bd6d authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

Merge branch 'ppc-for-upstream' of git://github.com/agraf/qemu 

* 'ppc-for-upstream' of git://github.com/agraf/qemu:
  PPC: spapr: iommu: rework traces
  spapr: add "stop-self" RTAS call required to support hot CPU unplug
  PPC: KVM: Compile fix for qemu_notify_event
  pseries: Add H_SET_MODE hcall to change guest exception endianness
  xics: move registration of global state to realize()
  spapr-pci: rework MSI/MSIX
  target-ppc: Use #define instead of opencoding SLB valid bit
  spapr-pci: fix config space access to support bridges
  target-ppc: fix bit extraction for FPBF and FPL
  ppc405_boards: Don't enforce presence of firmware for qtest
  ppc405_uc: Disable debug output
  ppc405_boards: Disable debug output
  ppc: virtex_ml507: QEMU_OPTION_dtb support for this machine.
  disas/ppc.c: Fix little endian disassembly
  target-ppc: POWER7 supports the MSR_LE bit
  target-ppc: USE LPCR_ILE to control exception endian on POWER7
  pseries: Fix stalls on hypervisor virtual console
  PPC: E500: Generate device tree on reset
parents 3207bf25 7e472264

disas/ppc.c

+2 −1
Original line number Diff line number Diff line
@@ -5157,7 +5157,8 @@ int 
print_insn_ppc (bfd_vma memaddr, struct disassemble_info *info)

{

  int dialect = (char *) info->private_data - (char *) 0;

  return print_insn_powerpc (memaddr, info, 1, dialect);

  return print_insn_powerpc (memaddr, info, info->endian == BFD_ENDIAN_BIG,

                             dialect);

}



/* Print a big endian PowerPC instruction.  */

hw/char/spapr_vty.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) 
        buf[n++] = dev->buf[dev->out++ % VTERM_BUFSIZE];

    }



    qemu_chr_accept_input(dev->chardev);



    return n;

}

hw/intc/xics.c

+11 −10
Original line number Diff line number Diff line
@@ -642,6 +642,17 @@ static void xics_realize(DeviceState *dev, Error **errp) 
    ICSState *ics = icp->ics;

    int i;



    /* Registration of global state belongs into realize */

    spapr_rtas_register("ibm,set-xive", rtas_set_xive);

    spapr_rtas_register("ibm,get-xive", rtas_get_xive);

    spapr_rtas_register("ibm,int-off", rtas_int_off);

    spapr_rtas_register("ibm,int-on", rtas_int_on);



    spapr_register_hypercall(H_CPPR, h_cppr);

    spapr_register_hypercall(H_IPI, h_ipi);

    spapr_register_hypercall(H_XIRR, h_xirr);

    spapr_register_hypercall(H_EOI, h_eoi);



    ics->nr_irqs = icp->nr_irqs;

    ics->offset = XICS_IRQ_BASE;

    ics->icp = icp;
@@ -678,16 +689,6 @@ static void xics_class_init(ObjectClass *oc, void *data) 
    dc->realize = xics_realize;

    dc->props = xics_properties;

    dc->reset = xics_reset;



    spapr_rtas_register("ibm,set-xive", rtas_set_xive);

    spapr_rtas_register("ibm,get-xive", rtas_get_xive);

    spapr_rtas_register("ibm,int-off", rtas_int_off);

    spapr_rtas_register("ibm,int-on", rtas_int_on);



    spapr_register_hypercall(H_CPPR, h_cppr);

    spapr_register_hypercall(H_IPI, h_ipi);

    spapr_register_hypercall(H_XIRR, h_xirr);

    spapr_register_hypercall(H_EOI, h_eoi);

}



static const TypeInfo xics_info = {

hw/ppc/e500.c

+43 −9
Original line number Diff line number Diff line
@@ -123,13 +123,14 @@ static void dt_serial_create(void *fdt, unsigned long long offset, 
    }

}



static int ppce500_load_device_tree(CPUPPCState *env,

                                    QEMUMachineInitArgs *args,

static int ppce500_load_device_tree(QEMUMachineInitArgs *args,

                                    PPCE500Params *params,

                                    hwaddr addr,

                                    hwaddr initrd_base,

                                    hwaddr initrd_size)

                                    hwaddr initrd_size,

                                    bool dry_run)

{

    CPUPPCState *env = first_cpu->env_ptr;

    int ret = -1;

    uint64_t mem_reg_property[] = { 0, cpu_to_be64(args->ram_size) };

    int fdt_size;
@@ -369,12 +370,10 @@ static int ppce500_load_device_tree(CPUPPCState *env, 
    }



done:

    if (!dry_run) {

        qemu_devtree_dumpdtb(fdt, fdt_size);

    ret = rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);

    if (ret < 0) {

        goto out;

        cpu_physical_memory_write(addr, fdt, fdt_size);

    }

    g_free(fdt);

    ret = fdt_size;



out:
@@ -383,6 +382,41 @@ out: 
    return ret;

}



typedef struct DeviceTreeParams {

    QEMUMachineInitArgs args;

    PPCE500Params params;

    hwaddr addr;

    hwaddr initrd_base;

    hwaddr initrd_size;

} DeviceTreeParams;



static void ppce500_reset_device_tree(void *opaque)

{

    DeviceTreeParams *p = opaque;

    ppce500_load_device_tree(&p->args, &p->params, p->addr, p->initrd_base,

                             p->initrd_size, false);

}



static int ppce500_prep_device_tree(QEMUMachineInitArgs *args,

                                    PPCE500Params *params,

                                    hwaddr addr,

                                    hwaddr initrd_base,

                                    hwaddr initrd_size)

{

    DeviceTreeParams *p = g_new(DeviceTreeParams, 1);

    p->args = *args;

    p->params = *params;

    p->addr = addr;

    p->initrd_base = initrd_base;

    p->initrd_size = initrd_size;



    qemu_register_reset(ppce500_reset_device_tree, p);



    /* Issue the device tree loader once, so that we get the size of the blob */

    return ppce500_load_device_tree(args, params, addr, initrd_base,

                                    initrd_size, true);

}



/* Create -kernel TLB entries for BookE.  */

static inline hwaddr booke206_page_size_to_tlb(uint64_t size)

{
@@ -746,7 +780,7 @@ void ppce500_init(QEMUMachineInitArgs *args, PPCE500Params *params) 
        struct boot_info *boot_info;

        int dt_size;



        dt_size = ppce500_load_device_tree(env, args, params, dt_base,

        dt_size = ppce500_prep_device_tree(args, params, dt_base,

                                           initrd_base, initrd_size);

        if (dt_size < 0) {

            fprintf(stderr, "couldn't load device tree\n");

hw/ppc/ppc405_boards.c

+22 −17
Original line number Diff line number Diff line
@@ -27,9 +27,11 @@ 
#include "hw/timer/m48t59.h"

#include "hw/block/flash.h"

#include "sysemu/sysemu.h"

#include "sysemu/qtest.h"

#include "block/block.h"

#include "hw/boards.h"

#include "qemu/log.h"

#include "qemu/error-report.h"

#include "hw/loader.h"

#include "sysemu/blockdev.h"

#include "exec/address-spaces.h"
@@ -42,7 +44,7 @@ 


#define USE_FLASH_BIOS



#define DEBUG_BOARD_INIT

//#define DEBUG_BOARD_INIT



/*****************************************************************************/

/* PPC405EP reference board (IBM) */
@@ -252,17 +254,20 @@ static void ref405ep_init(QEMUMachineInitArgs *args) 
        if (filename) {

            bios_size = load_image(filename, memory_region_get_ram_ptr(bios));

            g_free(filename);

        } else {

            bios_size = -1;

        }

            if (bios_size < 0 || bios_size > BIOS_SIZE) {

            fprintf(stderr, "qemu: could not load PowerPC bios '%s'\n",

                    bios_name);

                error_report("Could not load PowerPC BIOS '%s'", bios_name);

                exit(1);

            }

            bios_size = (bios_size + 0xfff) & ~0xfff;

        memory_region_set_readonly(bios, true);

            memory_region_add_subregion(sysmem, (uint32_t)(-bios_size), bios);

        } else if (!qtest_enabled() || kernel_filename != NULL) {

            error_report("Could not load PowerPC BIOS '%s'", bios_name);

            exit(1);

        } else {

            /* Avoid an uninitialized variable warning */

            bios_size = -1;

        }

        memory_region_set_readonly(bios, true);

    }

    /* Register FPGA */

#ifdef DEBUG_BOARD_INIT
@@ -353,9 +358,9 @@ static void ref405ep_init(QEMUMachineInitArgs *args) 
        bdloc = 0;

    }

#ifdef DEBUG_BOARD_INIT

    printf("bdloc " RAM_ADDR_FMT "\n", bdloc);

    printf("%s: Done\n", __func__);

#endif

    printf("bdloc " RAM_ADDR_FMT "\n", bdloc);

}



static QEMUMachine ref405ep_machine = {
@@ -569,17 +574,17 @@ static void taihu_405ep_init(QEMUMachineInitArgs *args) 
        if (filename) {

            bios_size = load_image(filename, memory_region_get_ram_ptr(bios));

            g_free(filename);

        } else {

            bios_size = -1;

        }

            if (bios_size < 0 || bios_size > BIOS_SIZE) {

            fprintf(stderr, "qemu: could not load PowerPC bios '%s'\n",

                    bios_name);

                error_report("Could not load PowerPC BIOS '%s'", bios_name);

                exit(1);

            }

            bios_size = (bios_size + 0xfff) & ~0xfff;

        memory_region_set_readonly(bios, true);

            memory_region_add_subregion(sysmem, (uint32_t)(-bios_size), bios);

        } else if (!qtest_enabled()) {

            error_report("Could not load PowerPC BIOS '%s'", bios_name);

            exit(1);

        }

        memory_region_set_readonly(bios, true);

    }

    /* Register Linux flash */

    dinfo = drive_get(IF_PFLASH, 0, fl_idx);