Commit 6d4e1892 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf 

* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf: (40 commits)
  pseries: Increase default NVRAM size
  target-ppc: Don't use hwaddr to represent hardware state
  PPC: e500: pci: Export slot2irq calculation
  PPC: E500plat: Make a lot of PCI slots available
  PPC: E500: Move PCI slot information into params
  PPC: E500: Generate dt pci irq map dynamically
  PPC: E500: PCI: Make IRQ calculation more generic
  PPC: E500: PCI: Make first slot qdev settable
  openpic: Accelerate pending irq search
  openpic: fix minor coding style issues
  MSI-X: Fix endianness
  PPC: e500: Declare pci bridge as bridge
  PPC: e500: Add MSI support
  openpic: add Shared MSI support
  openpic: make brr1 model specific
  openpic: convert to qdev
  openpic: remove irq_out
  openpic: rename openpic_t to OpenPICState
  openpic: convert simple reg operations to builtin bitops
  openpic: remove unused type variable
  ...
parents 659f807c a64ae610

hw/msix.c

+2 −4
Original line number Diff line number Diff line
@@ -180,8 +180,7 @@ static void msix_table_mmio_write(void *opaque, hwaddr addr, 
static const MemoryRegionOps msix_table_mmio_ops = {

    .read = msix_table_mmio_read,

    .write = msix_table_mmio_write,

    /* TODO: MSIX should be LITTLE_ENDIAN. */

    .endianness = DEVICE_NATIVE_ENDIAN,

    .endianness = DEVICE_LITTLE_ENDIAN,

    .valid = {

        .min_access_size = 4,

        .max_access_size = 4,
@@ -198,8 +197,7 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr, 


static const MemoryRegionOps msix_pba_mmio_ops = {

    .read = msix_pba_mmio_read,

    /* TODO: MSIX should be LITTLE_ENDIAN. */

    .endianness = DEVICE_NATIVE_ENDIAN,

    .endianness = DEVICE_LITTLE_ENDIAN,

    .valid = {

        .min_access_size = 4,

        .max_access_size = 4,

hw/openpic.c

+486 −911

File changed.

Preview size limit exceeded, changes collapsed.

hw/openpic.h

+3 −4
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ enum { 
    OPENPIC_OUTPUT_NB,

};



qemu_irq *openpic_init (MemoryRegion **pmem, int nb_cpus,

                        qemu_irq **irqs, qemu_irq irq_out);

qemu_irq *mpic_init (MemoryRegion *address_space, hwaddr base,

                     int nb_cpus, qemu_irq **irqs, qemu_irq irq_out);

#define OPENPIC_MODEL_RAVEN       0

#define OPENPIC_MODEL_FSL_MPIC_20 1



#endif /* __OPENPIC_H__ */

hw/ppc/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y += ppc_newworld.o 
obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o

obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o

obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o spapr_iommu.o

obj-$(CONFIG_PSERIES) += spapr_events.o

obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o

# PowerPC 4xx boards

obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o

obj-y += ppc440_bamboo.o

hw/ppc/e500-ccsr.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#ifndef E500_CCSR_H

#define E500_CCSR_H



#include "../sysbus.h"



typedef struct PPCE500CCSRState {

    /*< private >*/

    SysBusDevice parent;

    /*< public >*/



    MemoryRegion ccsr_space;

} PPCE500CCSRState;



#define TYPE_CCSR "e500-ccsr"

#define CCSR(obj) OBJECT_CHECK(PPCE500CCSRState, (obj), TYPE_CCSR)



#endif /* E500_CCSR_H */