pseries: Move XICS initialization before cpu initialization

[qemu.git] / hw / spapr_pci.h

diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
index e307ac80350b43d4934ec91846ccbe6e70cf2b79..8bd8a663c5c8e450502e0f06e9b33f2aee36c1d6 100644 (file)
--- a/hw/spapr_pci.h
+++ b/hw/spapr_pci.h
@@ -23,8 +23,8 @@
 #if !defined(__HW_SPAPR_PCI_H__)
 #define __HW_SPAPR_PCI_H__
 
 #if !defined(__HW_SPAPR_PCI_H__)
 #define __HW_SPAPR_PCI_H__
 

-#include "hw/pci.h"
-#include "hw/pci_host.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"

 #include "hw/xics.h"
 
 #define SPAPR_MSIX_MAX_DEVS 32
 #include "hw/xics.h"
 
 #define SPAPR_MSIX_MAX_DEVS 32


@@ -37,8 +37,8 @@
 typedef struct sPAPRPHBState {
     PCIHostState parent_obj;
 
 typedef struct sPAPRPHBState {
     PCIHostState parent_obj;
 

+    int32_t index;

     uint64_t buid;
     uint64_t buid;

-    char *busname;

     char *dtbusname;
 
     MemoryRegion memspace, iospace;
     char *dtbusname;
 
     MemoryRegion memspace, iospace;


@@ -64,18 +64,24 @@ typedef struct sPAPRPHBState {
     QLIST_ENTRY(sPAPRPHBState) list;
 } sPAPRPHBState;
 
     QLIST_ENTRY(sPAPRPHBState) list;
 } sPAPRPHBState;
 

+#define SPAPR_PCI_BASE_BUID          0x800000020000000ULL
+
+#define SPAPR_PCI_WINDOW_BASE        0x10000000000ULL
+#define SPAPR_PCI_WINDOW_SPACING     0x1000000000ULL
+#define SPAPR_PCI_MMIO_WIN_OFF       0xA0000000
+#define SPAPR_PCI_MMIO_WIN_SIZE      0x20000000
+#define SPAPR_PCI_IO_WIN_OFF         0x80000000
+#define SPAPR_PCI_IO_WIN_SIZE        0x10000
+#define SPAPR_PCI_MSI_WIN_OFF        0x90000000
+
+#define SPAPR_PCI_MEM_WIN_BUS_OFFSET 0x80000000ULL
+

 static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)
 {
     return xics_get_qirq(spapr->icp, phb->lsi_table[pin].irq);
 }
 
 static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)
 {
     return xics_get_qirq(spapr->icp, phb->lsi_table[pin].irq);
 }
 

-#define SPAPR_PCI_MEM_WIN_BUS_OFFSET 0x80000000ULL
-#define SPAPR_PCI_IO_WIN_SIZE        0x10000
-
-void spapr_create_phb(sPAPREnvironment *spapr,
-                      const char *busname, uint64_t buid,
-                      uint64_t mem_win_addr, uint64_t mem_win_size,
-                      uint64_t io_win_addr, uint64_t msi_win_addr);
+PCIHostState *spapr_create_phb(sPAPREnvironment *spapr, int index);

 
 int spapr_populate_pci_dt(sPAPRPHBState *phb,
                           uint32_t xics_phandle,
 
 int spapr_populate_pci_dt(sPAPRPHBState *phb,
                           uint32_t xics_phandle,