Commit bb2b0450 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging 



Patch queue for ppc - 2014-03-05

This pull request includes:

  - VSX emulation support
  - book3s pr/hv selection
  - some bug fixes
  - qdev stable numbering
  - eTSEC emulation

# gpg: Signature made Wed 05 Mar 2014 02:14:19 GMT using RSA key ID 03FEDC60
# gpg: Can't check signature: public key not found

* remotes/agraf/tags/signed-ppc-for-upstream: (130 commits)
  target-ppc: spapr: e500: fix to use cpu_dt_id
  target-ppc: add PowerPCCPU::cpu_dt_id
  target-ppc: Introduce hypervisor call H_GET_TCE
  target-ppc: Update ppc_hash64_store_hpte to support updating in-kernel htab
  target-ppc: Change the hpte store API
  target-ppc: Fix page table lookup with kvm enabled
  target-ppc: Fix htab_mask calculation
  target-ppc: Use Additional Temporary in stqcx Case
  target-ppc: Fix Compiler Warnings Due to 64-Bit Constants Declared as UL
  PPC: sPAPR: Only use getpagesize() when we run with kvm
  target-ppc/translate.c: Use ULL suffix for 64 bit constants
  spapr-vlan: flush queue whenever can_receive can go from false to true
  target-ppc: Altivec 2.07: Vector Permute and Exclusive OR
  target-ppc: Altivec 2.07: Vector SHA Sigma Instructions
  target-ppc: Altivec 2.07: AES Instructions
  target-ppc: Altivec 2.07: Binary Coded Decimal Instructions
  target-ppc: Altivec 2.07: Vector Polynomial Multiply Sum
  target-ppc: Altivec 2.07: Vector Gather Bits by Bytes
  target-ppc: Altivec 2.07: Doubleword Compares
  target-ppc: Altivec 2.07: vbpermq Instruction
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c3f8d28e 0f20ba62

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -47,4 +47,5 @@ CONFIG_E500=y 
CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

# For PReP

CONFIG_MC146818RTC=y

CONFIG_ETSEC=y

CONFIG_ISA_TESTDEV=y

hw/core/loader.c

+24 −6
Original line number Diff line number Diff line
@@ -284,12 +284,30 @@ static void *load_at(int fd, int offset, int size) 
#define SZ		64

#include "hw/elf_ops.h"



const char *load_elf_strerror(int error)

{

    switch (error) {

    case 0:

        return "No error";

    case ELF_LOAD_FAILED:

        return "Failed to load ELF";

    case ELF_LOAD_NOT_ELF:

        return "The image is not ELF";

    case ELF_LOAD_WRONG_ARCH:

        return "The image is from incompatible architecture";

    case ELF_LOAD_WRONG_ENDIAN:

        return "The image has incorrect endianness";

    default:

        return "Unknown error";

    }

}



/* return < 0 if error, otherwise the number of bytes loaded in memory */

int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),

             void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,

             uint64_t *highaddr, int big_endian, int elf_machine, int clear_lsb)

{

    int fd, data_order, target_data_order, must_swab, ret;

    int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED;

    uint8_t e_ident[EI_NIDENT];



    fd = open(filename, O_RDONLY | O_BINARY);
@@ -302,8 +320,10 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), 
    if (e_ident[0] != ELFMAG0 ||

        e_ident[1] != ELFMAG1 ||

        e_ident[2] != ELFMAG2 ||

        e_ident[3] != ELFMAG3)

        e_ident[3] != ELFMAG3) {

        ret = ELF_LOAD_NOT_ELF;

        goto fail;

    }

#ifdef HOST_WORDS_BIGENDIAN

    data_order = ELFDATA2MSB;

#else
@@ -317,6 +337,7 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), 
    }



    if (target_data_order != e_ident[EI_DATA]) {

        ret = ELF_LOAD_WRONG_ENDIAN;

        goto fail;

    }
@@ -329,12 +350,9 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), 
                         pentry, lowaddr, highaddr, elf_machine, clear_lsb);

    }



    close(fd);

    return ret;



 fail:

    close(fd);

    return -1;

    return ret;

}



static void bswap_uboot_header(uboot_image_header_t *hdr)

hw/core/qdev.c

+13 −7
Original line number Diff line number Diff line
@@ -440,27 +440,33 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id) 
static void qbus_realize(BusState *bus, DeviceState *parent, const char *name)

{

    const char *typename = object_get_typename(OBJECT(bus));

    BusClass *bc;

    char *buf;

    int i,len;

    int i, len, bus_id;



    bus->parent = parent;



    if (name) {

        bus->name = g_strdup(name);

    } else if (bus->parent && bus->parent->id) {

        /* parent device has id -> use it for bus name */

        /* parent device has id -> use it plus parent-bus-id for bus name */

        bus_id = bus->parent->num_child_bus;



        len = strlen(bus->parent->id) + 16;

        buf = g_malloc(len);

        snprintf(buf, len, "%s.%d", bus->parent->id, bus->parent->num_child_bus);

        snprintf(buf, len, "%s.%d", bus->parent->id, bus_id);

        bus->name = buf;

    } else {

        /* no id -> use lowercase bus type for bus name */

        /* no id -> use lowercase bus type plus global bus-id for bus name */

        bc = BUS_GET_CLASS(bus);

        bus_id = bc->automatic_ids++;



        len = strlen(typename) + 16;

        buf = g_malloc(len);

        len = snprintf(buf, len, "%s.%d", typename,

                       bus->parent ? bus->parent->num_child_bus : 0);

        for (i = 0; i < len; i++)

        len = snprintf(buf, len, "%s.%d", typename, bus_id);

        for (i = 0; i < len; i++) {

            buf[i] = qemu_tolower(buf[i]);

        }

        bus->name = buf;

    }

hw/i386/pc_piix.c

+7 −1
Original line number Diff line number Diff line
@@ -221,10 +221,16 @@ static void pc_init1(QEMUMachineInitArgs *args, 
    } else {

        for(i = 0; i < MAX_IDE_BUS; i++) {

            ISADevice *dev;

            char busname[] = "ide.0";

            dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],

                               ide_irq[i],

                               hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);

            idebus[i] = qdev_get_child_bus(DEVICE(dev), "ide.0");

            /*

             * The ide bus name is ide.0 for the first bus and ide.1 for the

             * second one.

             */

            busname[4] = '0' + i;

            idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);

        }

    }

hw/intc/openpic_kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) 


    encap.cap = KVM_CAP_IRQ_MPIC;

    encap.args[0] = opp->fd;

    encap.args[1] = cs->cpu_index;

    encap.args[1] = kvm_arch_vcpu_id(cs);



    return kvm_vcpu_ioctl(cs, KVM_ENABLE_CAP, &encap);

}