Commit 3be4f4d7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160408' into staging 



ppc patch queue for 2016-04-08

Just a single bugfix for spapr in this batch, but I want to make sure
it gets in for 2.6.

# gpg: Signature made Fri 08 Apr 2016 06:02:45 BST using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160408:
  spapr: Fix ibm,lrdr-capacity

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 24790aef a110655a

hw/ppc/spapr_rtas.c

+5 −2
Original line number Diff line number Diff line
@@ -684,6 +684,9 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, 
    int i;

    uint32_t lrdr_capacity[5];

    MachineState *machine = MACHINE(qdev_get_machine());

    sPAPRMachineState *spapr = SPAPR_MACHINE(machine);

    uint64_t max_hotplug_addr = spapr->hotplug_memory.base +

                                memory_region_size(&spapr->hotplug_memory.mr);



    ret = fdt_add_mem_rsv(fdt, rtas_addr, rtas_size);

    if (ret < 0) {
@@ -733,8 +736,8 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, 


    }



    lrdr_capacity[0] = cpu_to_be32(((uint64_t)machine->maxram_size) >> 32);

    lrdr_capacity[1] = cpu_to_be32(machine->maxram_size & 0xffffffff);

    lrdr_capacity[0] = cpu_to_be32(max_hotplug_addr >> 32);

    lrdr_capacity[1] = cpu_to_be32(max_hotplug_addr & 0xffffffff);

    lrdr_capacity[2] = 0;

    lrdr_capacity[3] = cpu_to_be32(SPAPR_MEMORY_BLOCK_SIZE);

    lrdr_capacity[4] = cpu_to_be32(max_cpus/smp_threads);