Commit 0f0b4386 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191004' into staging 



ppc patch queue 2019-10-04

Here's the next batch of ppc and spapr patches.  Includes:
  * Fist part of a large cleanup to irq infrastructure
  * Recreate the full FDT at CAS time, instead of making a difficult
    to follow set of updates.  This will help us move towards
    eliminating CAS reboots altogether
  * No longer provide RTAS blob to SLOF - SLOF can include it just as
    well itself, since guests will generally need to relocate it with
    a call to instantiate-rtas
  * A number of DFP fixes and cleanups from Mark Cave-Ayland
  * Assorted bugfixes
  * Several new small devices for powernv

# gpg: Signature made Fri 04 Oct 2019 10:35:57 BST
# 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.2-20191004: (53 commits)
  ppc/pnv: Remove the XICSFabric Interface from the POWER9 machine
  spapr: Eliminate SpaprIrq::init hook
  spapr: Add return value to spapr_irq_check()
  spapr: Use less cryptic representation of which irq backends are supported
  xive: Improve irq claim/free path
  spapr, xics, xive: Better use of assert()s on irq claim/free paths
  spapr: Handle freeing of multiple irqs in frontend only
  spapr: Remove unhelpful tracepoints from spapr_irq_free_xics()
  spapr: Eliminate SpaprIrq:get_nodename method
  spapr: Simplify spapr_qirq() handling
  spapr: Fix indexing of XICS irqs
  spapr: Eliminate nr_irqs parameter to SpaprIrq::init
  spapr: Clarify and fix handling of nr_irqs
  spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper
  spapr: Fold spapr_phb_lsi_qirq() into its single caller
  xics: Create sPAPR specific ICS subtype
  xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes
  xics: Eliminate reset hook
  xics: Rename misleading ics_simple_*() functions
  xics: Eliminate 'reject', 'resend' and 'eoi' class hooks
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9e5319ca 1aba8716

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1077,8 +1077,6 @@ F: hw/*/spapr* 
F: include/hw/*/spapr*

F: hw/*/xics*

F: include/hw/*/xics*

F: pc-bios/spapr-rtas/*

F: pc-bios/spapr-rtas.bin

F: pc-bios/slof.bin

F: docs/specs/ppc-spapr-hcalls.txt

F: docs/specs/ppc-spapr-hotplug.txt

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ qemu-nsis.bmp \ 
bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \

multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \

s390-ccw.img s390-netboot.img \

spapr-rtas.bin slof.bin skiboot.lid \

slof.bin skiboot.lid \

palcode-clipper \

u-boot.e500 u-boot-sam460-20100605.bin \

qemu_vga.ndrv \

configure

+1 −5
Original line number Diff line number Diff line
@@ -6166,9 +6166,6 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ 
        fi

    done

fi

if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" ; then

  roms="$roms spapr-rtas"

fi



# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900

if test "$cpu" = "s390x" ; then
@@ -7800,13 +7797,12 @@ fi 
DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qemu-iotests tests/vm"

DIRS="$DIRS tests/fp tests/qgraph"

DIRS="$DIRS docs docs/interop fsdev scsi"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"

DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"

DIRS="$DIRS roms/seabios roms/vgabios"

LINKS="Makefile"

LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile"

LINKS="$LINKS tests/tcg/Makefile.target tests/fp/Makefile"

LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"

LINKS="$LINKS pc-bios/spapr-rtas/Makefile"

LINKS="$LINKS pc-bios/s390-ccw/Makefile"

LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"

LINKS="$LINKS pc-bios/qemu-icon.bmp"

hw/char/spapr_vty.c

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include "cpu.h"

#include "migration/vmstate.h"

#include "chardev/char-fe.h"

#include "hw/irq.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_vio.h"

#include "hw/qdev-properties.h"
@@ -37,7 +36,7 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size) 


    if ((dev->in == dev->out) && size) {

        /* toggle line to simulate edge interrupt */

        qemu_irq_pulse(spapr_vio_qirq(&dev->sdev));

        spapr_vio_irq_pulse(&dev->sdev);

    }

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

        if (dev->in - dev->out >= VTERM_BUFSIZE) {

hw/intc/spapr_xive.c

+10 −16
Original line number Diff line number Diff line
@@ -528,12 +528,15 @@ static void spapr_xive_register_types(void) 


type_init(spapr_xive_register_types)



bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi)

int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **errp)

{

    XiveSource *xsrc = &xive->source;



    if (lisn >= xive->nr_irqs) {

        return false;

    assert(lisn < xive->nr_irqs);



    if (xive_eas_is_valid(&xive->eat[lisn])) {

        error_setg(errp, "IRQ %d is not free", lisn);

        return -EBUSY;

    }



    /*
@@ -545,26 +548,17 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi) 
    }



    if (kvm_irqchip_in_kernel()) {

        Error *local_err = NULL;



        kvmppc_xive_source_reset_one(xsrc, lisn, &local_err);

        if (local_err) {

            error_report_err(local_err);

            return false;

        }

        return kvmppc_xive_source_reset_one(xsrc, lisn, errp);

    }



    return true;

    return 0;

}



bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn)

void spapr_xive_irq_free(SpaprXive *xive, int lisn)

{

    if (lisn >= xive->nr_irqs) {

        return false;

    }

    assert(lisn < xive->nr_irqs);



    xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);

    return true;

}



/*