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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20190204' into staging 



ppc patch queue 2019-02-04

Here's the next batch of ppc target and spapr related changes.
Highlights are:
 * A number of endianness handling cleanups from Mark Cave-Ayland
 * Updated Mac VGA driver
 * Updated SLOF image
 * Some XIVE cleanups and small fixes
 * ppc4xx cleanups and fixes from BALATON Zoltan

There are a few chances not technically in the ppc target code:
 * Several MAINTAINERS updates
 * Fixes for unmapping of hugepages on power hosts

The latter is included because it's primarily of interest for ppc KVM setups.

# gpg: Signature made Mon 04 Feb 2019 07:52:26 GMT
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-4.0-20190204: (37 commits)
  mmap-alloc: fix hugetlbfs misaligned length in ppc64
  mmap-alloc: unfold qemu_ram_mmap()
  hw/ppc: Don't include m48t59.h if it is not necessary
  spapr_pci: Fix endianness in assigned-addresses property
  target/ppc: remove various HOST_WORDS_BIGENDIAN hacks in int_helper.c
  target/ppc: remove ROTRu32 and ROTRu64 macros from int_helper.c
  target/ppc: simplify VEXT_SIGNED macro in int_helper.c
  target/ppc: eliminate use of EL_IDX macros from int_helper.c
  target/ppc: eliminate use of HI_IDX and LO_IDX macros from int_helper.c
  target/ppc: rework vmul{e,o}{s,u}{b,h,w} instructions to use Vsr* macros
  target/ppc: rework vmrg{l,h}{b,h,w} instructions to use Vsr* macros
  hw/ppc/spapr: Add support for "-vga cirrus"
  QemuMacDrivers: update qemu_vga.ndrv to 90c488d built from submodule
  MAINTAINERS: add myself as maintainer for Mac Old World and New World machines
  spapr: Drop unused parameters from fdt building helper
  MAINTAINERS: Merge the two e500 sections
  MAINTAINERS: XIVE is an interrupt controller, not a machine
  hw/ppc: Move ppc40x_*reset() functions from ppc405_uc.c to ppc.c
  ppc: remove the interrupt presenters from under PowerPCCPU
  target/ppc: implement complete set of Vsr* macros
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3fc0af1 53adb9d4

MAINTAINERS

+15 −20
Original line number Diff line number Diff line
@@ -960,9 +960,10 @@ e500 
M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/e500.[hc]

F: hw/ppc/e500plat.c

F: hw/ppc/e500*

F: hw/gpio/mpc8xxx.c

F: hw/net/fsl_etsec/

F: hw/pci-host/ppce500.c

F: include/hw/ppc/ppc_e500.h

F: include/hw/pci-host/ppce500.h

F: pc-bios/u-boot.e500
@@ -975,7 +976,8 @@ F: hw/ppc/mpc8544ds.c 
F: hw/ppc/mpc8544_guts.c



New World (mac99)

M: David Gibson <david@gibson.dropbear.id.au>

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

R: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/mac_newworld.c
@@ -993,7 +995,8 @@ F: include/hw/input/adb* 
F: pc-bios/qemu_vga.ndrv



Old World (g3beige)

M: David Gibson <david@gibson.dropbear.id.au>

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

R: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/mac_oldworld.c
@@ -1041,14 +1044,6 @@ F: tests/libqos/*spapr* 
F: tests/rtas*

F: tests/libqos/rtas*



XIVE

M: David Gibson <david@gibson.dropbear.id.au>

M: Cédric Le Goater <clg@kaod.org>

L: qemu-ppc@nongnu.org

S: Supported

F: hw/*/*xive*

F: include/hw/*/*xive*



virtex_ml507

M: Edgar E. Iglesias <edgar.iglesias@gmail.com>

L: qemu-ppc@nongnu.org
@@ -1327,14 +1322,6 @@ F: hw/i2c/ppc4xx_i2c.c 
F: include/hw/ppc/ppc4xx.h

F: include/hw/i2c/ppc4xx_i2c.h



ppce500

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/e500*

F: hw/pci-host/ppce500.c

F: hw/net/fsl_etsec/



Character devices

M: Marc-André Lureau <marcandre.lureau@redhat.com>

R: Paolo Bonzini <pbonzini@redhat.com>
@@ -1648,6 +1635,14 @@ F: tests/libqos/fw_cfg.c 
F: tests/fw_cfg-test.c

T: git https://github.com/philmd/qemu.git fw_cfg-next



XIVE

M: David Gibson <david@gibson.dropbear.id.au>

M: Cédric Le Goater <clg@kaod.org>

L: qemu-ppc@nongnu.org

S: Supported

F: hw/*/*xive*

F: include/hw/*/*xive*



Subsystems

----------

Audio

exec.c

+2 −2
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ static void *file_ram_alloc(RAMBlock *block, 
    if (mem_prealloc) {

        os_mem_prealloc(fd, area, memory, smp_cpus, errp);

        if (errp && *errp) {

            qemu_ram_munmap(area, memory);

            qemu_ram_munmap(fd, area, memory);

            return NULL;

        }

    }
@@ -2394,7 +2394,7 @@ static void reclaim_ramblock(RAMBlock *block) 
        xen_invalidate_map_cache_entry(block->host);

#ifndef _WIN32

    } else if (block->fd >= 0) {

        qemu_ram_munmap(block->host, block->max_length);

        qemu_ram_munmap(block->fd, block->host, block->max_length);

        close(block->fd);

#endif

    } else {

hw/i2c/smbus_eeprom.c

+129 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/smbus.h"
@@ -162,3 +164,130 @@ void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, 
        smbus_eeprom_init_one(smbus, 0x50 + i, eeprom_buf + (i * 256));

    }

}



/* Generate SDRAM SPD EEPROM data describing a module of type and size */

uint8_t *spd_data_generate(enum sdram_type type, ram_addr_t ram_size,

                           Error **errp)

{

    uint8_t *spd;

    uint8_t nbanks;

    uint16_t density;

    uint32_t size;

    int min_log2, max_log2, sz_log2;

    int i;



    switch (type) {

    case SDR:

        min_log2 = 2;

        max_log2 = 9;

        break;

    case DDR:

        min_log2 = 5;

        max_log2 = 12;

        break;

    case DDR2:

        min_log2 = 7;

        max_log2 = 14;

        break;

    default:

        g_assert_not_reached();

    }

    size = ram_size >> 20; /* work in terms of megabytes */

    if (size < 4) {

        error_setg(errp, "SDRAM size is too small");

        return NULL;

    }

    sz_log2 = 31 - clz32(size);

    size = 1U << sz_log2;

    if (ram_size > size * MiB) {

        error_setg(errp, "SDRAM size 0x"RAM_ADDR_FMT" is not a power of 2, "

                   "truncating to %u MB", ram_size, size);

    }

    if (sz_log2 < min_log2) {

        error_setg(errp,

                   "Memory size is too small for SDRAM type, adjusting type");

        if (size >= 32) {

            type = DDR;

            min_log2 = 5;

            max_log2 = 12;

        } else {

            type = SDR;

            min_log2 = 2;

            max_log2 = 9;

        }

    }



    nbanks = 1;

    while (sz_log2 > max_log2 && nbanks < 8) {

        sz_log2--;

        nbanks++;

    }



    if (size > (1ULL << sz_log2) * nbanks) {

        error_setg(errp, "Memory size is too big for SDRAM, truncating");

    }



    /* split to 2 banks if possible to avoid a bug in MIPS Malta firmware */

    if (nbanks == 1 && sz_log2 > min_log2) {

        sz_log2--;

        nbanks++;

    }



    density = 1ULL << (sz_log2 - 2);

    switch (type) {

    case DDR2:

        density = (density & 0xe0) | (density >> 8 & 0x1f);

        break;

    case DDR:

        density = (density & 0xf8) | (density >> 8 & 0x07);

        break;

    case SDR:

    default:

        density &= 0xff;

        break;

    }



    spd = g_malloc0(256);

    spd[0] = 128;   /* data bytes in EEPROM */

    spd[1] = 8;     /* log2 size of EEPROM */

    spd[2] = type;

    spd[3] = 13;    /* row address bits */

    spd[4] = 10;    /* column address bits */

    spd[5] = (type == DDR2 ? nbanks - 1 : nbanks);

    spd[6] = 64;    /* module data width */

                    /* reserved / data width high */

    spd[8] = 4;     /* interface voltage level */

    spd[9] = 0x25;  /* highest CAS latency */

    spd[10] = 1;    /* access time */

                    /* DIMM configuration 0 = non-ECC */

    spd[12] = 0x82; /* refresh requirements */

    spd[13] = 8;    /* primary SDRAM width */

                    /* ECC SDRAM width */

    spd[15] = (type == DDR2 ? 0 : 1); /* reserved / delay for random col rd */

    spd[16] = 12;   /* burst lengths supported */

    spd[17] = 4;    /* banks per SDRAM device */

    spd[18] = 12;   /* ~CAS latencies supported */

    spd[19] = (type == DDR2 ? 0 : 1); /* reserved / ~CS latencies supported */

    spd[20] = 2;    /* DIMM type / ~WE latencies */

                    /* module features */

                    /* memory chip features */

    spd[23] = 0x12; /* clock cycle time @ medium CAS latency */

                    /* data access time */

                    /* clock cycle time @ short CAS latency */

                    /* data access time */

    spd[27] = 20;   /* min. row precharge time */

    spd[28] = 15;   /* min. row active row delay */

    spd[29] = 20;   /* min. ~RAS to ~CAS delay */

    spd[30] = 45;   /* min. active to precharge time */

    spd[31] = density;

    spd[32] = 20;   /* addr/cmd setup time */

    spd[33] = 8;    /* addr/cmd hold time */

    spd[34] = 20;   /* data input setup time */

    spd[35] = 8;    /* data input hold time */



    /* checksum */

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

        spd[63] += spd[i];

    }

    return spd;

}

hw/intc/spapr_xive.c

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "monitor/monitor.h"

#include "hw/ppc/fdt.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_cpu_core.h"

#include "hw/ppc/spapr_xive.h"

#include "hw/ppc/xive.h"

#include "hw/ppc/xive_regs.h"
@@ -390,6 +391,13 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, 
    g_assert_not_reached();

}



static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs)

{

    PowerPCCPU *cpu = POWERPC_CPU(cs);



    return spapr_cpu_state(cpu)->tctx;

}



static const VMStateDescription vmstate_spapr_xive_end = {

    .name = TYPE_SPAPR_XIVE "/end",

    .version_id = 1,
@@ -454,6 +462,7 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data) 
    xrc->write_end = spapr_xive_write_end;

    xrc->get_nvt = spapr_xive_get_nvt;

    xrc->write_nvt = spapr_xive_write_nvt;

    xrc->get_tctx = spapr_xive_get_tctx;

}



static const TypeInfo spapr_xive_info = {

hw/intc/xics_spapr.c

+6 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "trace.h"

#include "qemu/timer.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_cpu_core.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "hw/ppc/fdt.h"
@@ -45,7 +46,7 @@ static target_ulong h_cppr(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
{

    target_ulong cppr = args[0];



    icp_set_cppr(cpu->icp, cppr);

    icp_set_cppr(spapr_cpu_state(cpu)->icp, cppr);

    return H_SUCCESS;

}
@@ -66,7 +67,7 @@ static target_ulong h_ipi(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
static target_ulong h_xirr(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                           target_ulong opcode, target_ulong *args)

{

    uint32_t xirr = icp_accept(cpu->icp);

    uint32_t xirr = icp_accept(spapr_cpu_state(cpu)->icp);



    args[0] = xirr;

    return H_SUCCESS;
@@ -75,7 +76,7 @@ static target_ulong h_xirr(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                             target_ulong opcode, target_ulong *args)

{

    uint32_t xirr = icp_accept(cpu->icp);

    uint32_t xirr = icp_accept(spapr_cpu_state(cpu)->icp);



    args[0] = xirr;

    args[1] = cpu_get_host_ticks();
@@ -87,7 +88,7 @@ static target_ulong h_eoi(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
{

    target_ulong xirr = args[0];



    icp_eoi(cpu->icp, xirr);

    icp_eoi(spapr_cpu_state(cpu)->icp, xirr);

    return H_SUCCESS;

}
@@ -95,7 +96,7 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
                            target_ulong opcode, target_ulong *args)

{

    uint32_t mfrr;

    uint32_t xirr = icp_ipoll(cpu->icp, &mfrr);

    uint32_t xirr = icp_ipoll(spapr_cpu_state(cpu)->icp, &mfrr);



    args[0] = xirr;

    args[1] = mfrr;