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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' into staging 



ppc patch queue 2017-08-09

This series contains a number of bugfixes for ppc and related
machines, for the qemu-2.10.release.  Some are true regressions,
others are serious enough and non-invasive enough to fix that it's
worth putting in 2.10 this late.

# gpg: Signature made Wed 09 Aug 2017 07:31:33 BST
# gpg:                using RSA key 0x6C38CACA20D9B392
# 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:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.10-20170809:
  spapr: Fix bug in h_signal_sys_reset()
  spapr_drc: abort if object_property_add_child() fails
  target/ppc: Add stub implementation of the PSSCR
  target/ppc: Implement TIDR
  ppc: fix double-free in cpu_post_load()
  booke206: fix MAS update on tlb miss

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8a6be122 f57467e3

hw/ppc/spapr_drc.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type, 
    drc->owner = owner;

    prop_name = g_strdup_printf("dr-connector[%"PRIu32"]",

                                spapr_drc_index(drc));

    object_property_add_child(owner, prop_name, OBJECT(drc), NULL);

    object_property_add_child(owner, prop_name, OBJECT(drc), &error_abort);

    object_property_set_bool(OBJECT(drc), true, "realized", NULL);

    g_free(prop_name);

hw/ppc/spapr_hcall.c

+4 −5
Original line number Diff line number Diff line
@@ -1431,12 +1431,11 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *cpu, 


    } else {

        /* Unicast */

        CPU_FOREACH(cs) {

            if (cpu->cpu_dt_id == target) {

        cs = CPU(ppc_get_vcpu_by_dt_id(target));

        if (cs) {

            run_on_cpu(cs, spapr_do_system_reset_on_cpu, RUN_ON_CPU_NULL);

            return H_SUCCESS;

        }

        }

        return H_PARAMETER;

    }

}

target/ppc/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,7 @@ void ppc_compat_add_property(Object *obj, const char *name, 
#define SPR_TEXASR            (0x082)

#define SPR_TEXASRU           (0x083)

#define SPR_UCTRL             (0x088)

#define SPR_TIDR              (0x090)

#define SPR_MPC_CMPA          (0x090)

#define SPR_MPC_CMPB          (0x091)

#define SPR_MPC_CMPC          (0x092)
@@ -1770,6 +1771,7 @@ void ppc_compat_add_property(Object *obj, const char *name, 
#define SPR_IC                (0x350)

#define SPR_VTB               (0x351)

#define SPR_MMCRC             (0x353)

#define SPR_PSSCR             (0x357)

#define SPR_440_INV0          (0x370)

#define SPR_440_INV1          (0x371)

#define SPR_440_INV2          (0x372)

target/ppc/machine.c

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static int cpu_post_load(void *opaque, int version_id) 
        ppc_set_compat(cpu, cpu->compat_pvr, &local_err);

        if (local_err) {

            error_report_err(local_err);

            error_free(local_err);

            return -1;

        }

    } else

target/ppc/mmu_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, 
                    env->spr[SPR_40x_ESR] = 0x00000000;

                    break;

                case POWERPC_MMU_BOOKE206:

                    booke206_update_mas_tlb_miss(env, address, rw);

                    booke206_update_mas_tlb_miss(env, address, 2);

                    /* fall through */

                case POWERPC_MMU_BOOKE:

                    cs->exception_index = POWERPC_EXCP_ITLB;