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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20170915' into staging 



ppc patch queue 2017-09-15

Here's the current batch of accumulated ppc patches.  These are all
pretty simple bugfixes or cleanups, no big new features here.

# gpg: Signature made Fri 15 Sep 2017 04:50:00 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.11-20170915:
  ppc/kvm: use kvm_vm_check_extension() in kvmppc_is_pr()
  spapr_events: use QTAILQ_FOREACH_SAFE() in spapr_clear_pending_events()
  spapr_cpu_core: cleaning up qdev_get_machine() calls
  spapr_pci: don't create 64-bit MMIO window if we don't need to
  spapr_pci: convert sprintf() to g_strdup_printf()
  spapr_cpu_core: fail gracefully with non-pseries machine types
  xics: fix several error leaks
  vfio, spapr: Fix levels calculation
  spapr_pci: handle FDT creation errors with _FDT()
  spapr_pci: use the common _FDT() helper
  spapr: fix CAS-generated reset
  ppc/xive: fix OV5_XIVE_EXPLOIT bits
  spapr: only update SDR1 once per-cpu during CAS
  spapr_pci: use g_strdup_printf()
  spapr_pci: drop useless check in spapr_populate_pci_child_dt()
  spapr_pci: drop useless check in spapr_phb_vfio_get_loc_code()
  hw/ppc/spapr.c: cleaning up qdev_get_machine() calls
  net: Add SunGEM device emulation as found on Apple UniNorth

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d28e29a9 70a0c19e

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CONFIG_PREP_PCI=y 
CONFIG_I82378=y

CONFIG_PC87312=y

CONFIG_MACIO=y

CONFIG_SUNGEM=y

CONFIG_PCSPK=y

CONFIG_CS4231A=y

CONFIG_CUDA=y

hw/intc/xics.c

+6 −6
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ static void icp_realize(DeviceState *dev, Error **errp) 


    obj = object_property_get_link(OBJECT(dev), ICP_PROP_XICS, &err);

    if (!obj) {

        error_setg(errp, "%s: required link '" ICP_PROP_XICS "' not found: %s",

                   __func__, error_get_pretty(err));

        error_propagate(errp, err);

        error_prepend(errp, "required link '" ICP_PROP_XICS "' not found: ");

        return;

    }
@@ -315,8 +315,8 @@ static void icp_realize(DeviceState *dev, Error **errp) 


    obj = object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err);

    if (!obj) {

        error_setg(errp, "%s: required link '" ICP_PROP_CPU "' not found: %s",

                   __func__, error_get_pretty(err));

        error_propagate(errp, err);

        error_prepend(errp, "required link '" ICP_PROP_CPU "' not found: ");

        return;

    }
@@ -641,8 +641,8 @@ static void ics_base_realize(DeviceState *dev, Error **errp) 


    obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err);

    if (!obj) {

        error_setg(errp, "%s: required link '" ICS_PROP_XICS "' not found: %s",

                   __func__, error_get_pretty(err));

        error_propagate(errp, err);

        error_prepend(errp, "required link '" ICS_PROP_XICS "' not found: ");

        return;

    }

    ics->xics = XICS_FABRIC(obj);

hw/net/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ common-obj-$(CONFIG_CADENCE) += cadence_gem.o 
common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o

common-obj-$(CONFIG_LANCE) += lance.o

common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o

common-obj-$(CONFIG_SUNGEM) += sungem.o



obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o

obj-$(CONFIG_COLDFIRE) += mcf_fec.o

hw/net/sungem.c

0 → 100644
+1447 −0

File added.

Preview size limit exceeded, changes collapsed.

hw/net/trace-events

+44 −0
Original line number Diff line number Diff line
@@ -278,3 +278,47 @@ spapr_vlan_h_send_logical_lan(uint64_t reg, uint64_t continue_token) "H_SEND_LOG 
spapr_vlan_h_send_logical_lan_rxbufs(uint32_t rx_bufs) "rxbufs = %"PRIu32

spapr_vlan_h_send_logical_lan_buf_desc(uint64_t buf) "   buf desc: 0x%"PRIx64

spapr_vlan_h_send_logical_lan_total(int nbufs, unsigned total_len) "%d buffers, total length 0x%x"



# hw/net/sungem.c

sungem_tx_checksum(uint16_t start, uint16_t off) "TX checksumming from byte %d, inserting at %d"

sungem_tx_checksum_oob(void) "TX checksum out of packet bounds"

sungem_tx_unfinished(void) "TX packet started without finishing the previous one"

sungem_tx_overflow(void) "TX packet queue overflow"

sungem_tx_finished(uint32_t size) "TX completing %"PRIu32 " bytes packet"

sungem_tx_kick(void) "TX Kick..."

sungem_tx_disabled(void) "TX not enabled"

sungem_tx_process(uint32_t comp, uint32_t kick, uint32_t size) "TX processing comp=%"PRIu32", kick=%"PRIu32" out of %"PRIu32

sungem_tx_desc(uint32_t comp, uint64_t control, uint64_t buffer) "TX desc %"PRIu32 ": 0x%"PRIx64" 0x%"PRIx64

sungem_tx_reset(void) "TX reset"

sungem_rx_mac_disabled(void) "Check RX MAC disabled"

sungem_rx_txdma_disabled(void) "Check RX TXDMA disabled"

sungem_rx_check(bool full, uint32_t kick, uint32_t done) "Check RX %d (kick=%"PRIu32", done=%"PRIu32")"

sungem_rx_mac_check(uint32_t mac0, uint32_t mac1, uint32_t mac2) "Word MAC: 0x%"PRIx32" 0x%"PRIx32" 0x%"PRIx32

sungem_rx_mac_multicast(void) "Multicast"

sungem_rx_mac_compare(uint32_t mac0, uint32_t mac1, uint32_t mac2) "Compare MAC to 0x%"PRIx32" 0x%"PRIx32" 0x%"PRIx32".."

sungem_rx_packet(size_t size) "RX got %zu bytes packet"

sungem_rx_disabled(void) "RX not enabled"

sungem_rx_bad_frame_size(size_t size) "RX bad frame size %zu, dropped"

sungem_rx_unmatched(void) "No match, dropped"

sungem_rx_process(uint32_t done, uint32_t kick, uint32_t size) "RX processing done=%"PRIu32", kick=%"PRIu32" out of %"PRIu32

sungem_rx_ringfull(void) "RX ring full"

sungem_rx_desc(uint64_t control, uint64_t buffer) "RX desc: 0x%"PRIx64" 0x%"PRIx64

sungem_rx_reset(void) "RX reset"

sungem_rx_kick(uint64_t val) "RXDMA_KICK written to %"PRIu64

sungem_reset(bool pci_reset) "Full reset (PCI:%d)"

sungem_mii_write(uint8_t phy_addr, uint8_t reg_addr, uint16_t val) "MII write addr 0x%x reg 0x%02x val 0x%04x"

sungem_mii_read(uint8_t phy_addr, uint8_t reg_addr, uint16_t val) "MII read addr 0x%x reg 0x%02x val 0x%04x"

sungem_mii_invalid_sof(uint32_t val) "MII op, invalid SOF field 0x%"PRIx32

sungem_mii_invalid_op(uint8_t op) "MII op, invalid op field 0x%x"

sungem_mmio_greg_write(uint64_t addr, uint64_t val) "MMIO greg write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_greg_read(uint64_t addr, uint64_t val) "MMIO greg read from 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_txdma_write(uint64_t addr, uint64_t val) "MMIO txdma write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_txdma_read(uint64_t addr, uint64_t val) "MMIO txdma read from 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_rxdma_write(uint64_t addr, uint64_t val) "MMIO rxdma write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_rxdma_read(uint64_t addr, uint64_t val) "MMIO rxdma read from 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_mac_write(uint64_t addr, uint64_t val) "MMIO mac write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_mac_read(uint64_t addr, uint64_t val) "MMIO mac read from 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_mif_write(uint64_t addr, uint64_t val) "MMIO mif write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_mif_read(uint64_t addr, uint64_t val) "MMIO mif read from 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_pcs_write(uint64_t addr, uint64_t val) "MMIO pcs write to 0x%"PRIx64" val=0x%"PRIx64

sungem_mmio_pcs_read(uint64_t addr, uint64_t val) "MMIO pcs read from 0x%"PRIx64" val=0x%"PRIx64