[kvm-commits] [PATCH] kvm: qemu: ppc: Add PCI controller to Bamboo platform

Sun, 04 May 2008 04:51:17 -0700 

From: Hollis Blanchard <[EMAIL PROTECTED]>

Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>

diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c
index 5cec729..eb91688 100644
--- a/qemu/hw/ppc440.c
+++ b/qemu/hw/ppc440.c
@@ -8,17 +8,32 @@
  *
  */
 
+
+#include "hw.h"
+#include "hw/isa.h"
 #include "ppc440.h"
 
+#define PPC440EP_PCI_CONFIG 0xeec00000
+#define PPC440EP_PCI_INTACK 0xeed00000
+#define PPC440EP_PCI_SPECIAL 0xeed00000
+#define PPC440EP_PCI_REGS 0xef400000
+#define PPC440EP_PCI_IO 0xe8000000
+#define PPC440EP_PCI_IOLEN 0x10000
+#define PPC440EP_PCI_MEM 0xa0000000
+#define PPC440EP_PCI_MEMLEN 0x20000000
+
+
 void ppc440ep_init(CPUState *env,
                target_phys_addr_t ram_bases[2],
                target_phys_addr_t ram_sizes[2],
                qemu_irq **picp,
+               ppc4xx_pci_t **pcip,
                int do_init)
 {
        ppc4xx_mmio_t *mmio;
        qemu_irq *pic, *irqs;
        ram_addr_t offset;
+       ppc4xx_pci_t *pci;
        int i;
 
        ppc_dcr_init(env, NULL, NULL);
@@ -45,6 +60,18 @@ void ppc440ep_init(CPUState *env,
        for (i = 0; i < 2; i++)
                offset += ram_sizes[i];
 
+       /* PCI */
+       pci = ppc4xx_pci_init(env, pic,
+                             PPC440EP_PCI_CONFIG,
+                             PPC440EP_PCI_INTACK,
+                             PPC440EP_PCI_SPECIAL,
+                             PPC440EP_PCI_REGS);
+       if (!pci)
+               printf("couldn't create PCI controller!\n");
+       *pcip = pci;
+
+       isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN);
+
        /* serial ports on page 126 of 440EP user manual */
        if (serial_hds[0]) {
                printf("Initializing first serial port\n");
diff --git a/qemu/hw/ppc440.h b/qemu/hw/ppc440.h
index 3a979d5..087af19 100644
--- a/qemu/hw/ppc440.h
+++ b/qemu/hw/ppc440.h
@@ -24,6 +24,7 @@ void ppc440ep_init(CPUState *env,
                target_phys_addr_t ram_bases[2],
                target_phys_addr_t ram_sizes[2],
                qemu_irq **picp,
+               ppc4xx_pci_t **pcip,
                int do_init);
 
 #endif
diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c
index 24a7a35..57505a5 100644
--- a/qemu/hw/ppc440_bamboo.c
+++ b/qemu/hw/ppc440_bamboo.c
@@ -9,6 +9,11 @@
  */
 
 #include "config.h"
+#include "qemu-common.h"
+#include "net.h"
+#include "hw.h"
+#include "pci.h"
+#include "sysemu.h"
 #include "ppc440.h"
 #include "qemu-kvm.h"
 #include "device_tree.h"
@@ -26,7 +31,9 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
 {
        char *buf=NULL;
        target_phys_addr_t ram_bases[4], ram_sizes[4];
+       NICInfo *nd;
        qemu_irq *pic;
+       ppc4xx_pci_t *pci;
        CPUState *env;
        target_ulong ep=0;
        target_ulong la=0;
@@ -77,7 +84,7 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
 
        /* call init */
        printf("Calling function ppc440_init\n");
-       ppc440ep_init(env, ram_bases, ram_sizes, &pic,1);
+       ppc440ep_init(env, ram_bases, ram_sizes, &pic, &pci, 1);
        printf("Done calling ppc440_init\n");
 
        /* Register mem */
@@ -168,6 +175,25 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
                env->nip = ep;
        }
 
+       if (pci) {
+               int unit_id = 0;
+
+               /* Add virtio block devices. */
+               while ((i = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
+                       virtio_blk_init(pci->bus, 0x1AF4, 0x1001,
+                               drives_table[i].bdrv);
+                       unit_id++;
+               }
+
+               /* Register network interfaces. */
+               for (i = 0; i < nb_nics; i++) {
+                       nd = &nd_table[i];
+                       if (!nd->model)
+                               nd->model = "virtio";
+                       pci_nic_init(pci->bus, nd, -1);
+               }
+       }
+
        printf("%s: DONE\n", __func__);
 }
 
diff --git a/qemu/pc-bios/bamboo.dtb b/qemu/pc-bios/bamboo.dtb
dissimilarity index 97%
index e02fa8e..81f971c 100644
--- a/qemu/pc-bios/bamboo.dtb
+++ b/qemu/pc-bios/bamboo.dtb
@@ -1,2 +1,3 @@
-Ð
þí
-g8ø(þí¾ïoÀ
amcc,bamboo
!amcc,bamboo,aliases7/plb/opb/[EMAIL 
PROTECTED]/plb/opb/[EMAIL 
PROTECTED]@0GcpuPowerPC,[EMAIL PROTECTED] 
Π
ž€«€¸ÇnativeÙmemoryGmemory
S   
interrupt-controller0!ibm,uic-440epibm,uicçüÀ
  
Ùsdr!ibm,sdr-440epcpr!ibm,cpr-440ep

plb%!ibm,plb-440epibm,plb-440gpibm,plb4
 
 WòTsdram 
!ibm,sdram-440epibm,sdram-405gpdma!ibm,dma-440epibm,dma-440gp'opb$!ibm,opb-440epibm,opb-440gpibm,opb
  €€€€'[EMAIL 
PROTECTED],ebc-440epibm,ebc-440gpibm,[EMAIL PROTECTED]'[EMAIL 
PROTECTED]>ÂL'[EMAIL 
PROTECTED]>L'[EMAIL 
PROTECTED],iic-440epibm,iic-440gpibm,iicSï`L'[EMAIL
 PROTECTED]
 
2c$!ibm,iic-440epibm,iic-440gpibm,iicSï`L'[EMAIL
 PROTECTED]'!ibm,zmii-440epibm,zmii-440gpibm,zmiiSï`
chosen]/plb/opb/[EMAIL PROTECTED]     
#address-cells#size-cellsmodelcompatibledcr-parentserial0serial1device_typeregclock-frequencytimebase-frequencyi-cache-line-sized-cache-line-sizei-cache-sized-cache-sizedcr-controllerdcr-access-methodlinux,phandleinterrupt-controllercell-indexdcr-reg#interrupt-cellsrangesinterruptsvirtual-regcurrent-speedinterrupt-parentlinux,stdout-path
\ No newline at end of file
+Ð
þí[8
+¸(þí¾ï£
+€
amcc,bamboo!amcc,bamboo,[EMAIL PROTECTED],[EMAIL 
PROTECTED] Π
ž€«€¸ÇnativeÙmemoryGmemory
S  
interrupt-controller0!ibm,uic-440epibm,uicçüÀ
  
Ùsdr!ibm,sdr-440epcpr!ibm,cpr-440ep

plb%!ibm,plb-440epibm,plb-440gpibm,plb4
 WòTsdram 
!ibm,sdram-440epibm,sdram-405gp
 
dma!ibm,dma-440epibm,dma-440gp'opb$!ibm,opb-440epibm,opb-440gpibm,opb
  €€€€'[EMAIL 
PROTECTED],ebc-440epibm,ebc-440gpibm,[EMAIL PROTECTED]'[EMAIL 
PROTECTED]>ÂL'[EMAIL 
PROTECTED]>L'[EMAIL 
PROTECTED],iic-440epibm,iic-440gpibm,iicSï`L'[EMAIL
 PROTECTED],iic-440epibm,iic-440gpibm,i
 icSï`L'[EMAIL 
PROTECTED]'!ibm,zmii-440epibm,zmii-440gpibm,zmiiSï`
[EMAIL PROTECTED],plb440ep-pciibm,[EMAIL PROTECTED]@8 
   
èeB€pøpƒ
 chosen‘/plb/opb/[EMAIL 
PROTECTED]        
#address-cells#size-cellsmodelcompatibledcr-parentserial0serial1device_typeregclock-frequencytimebase-frequencyi-cache-line-sized-cache-line-sizei-cache-sized-cache-sizedcr-controllerdcr-access-methodlinux,phandleinterrupt-controllercell-indexdcr-reg#interrupt-cellsrangesinterruptsvirtual-regcurrent-speedinterrupt-parentprimarydma-rangesinterrupt-map-maskinterrupt-maplinux,stdout-path
\ No newline at end of file
diff --git a/qemu/pc-bios/bamboo.dts b/qemu/pc-bios/bamboo.dts
index e9e3479..655442c 100644
--- a/qemu/pc-bios/bamboo.dts
+++ b/qemu/pc-bios/bamboo.dts
@@ -187,6 +187,45 @@
 
                };
 
+               PCI0: [EMAIL PROTECTED] {
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
+                       primary;
+                       reg = <0 eec00000 8     /* Config space access */
+                              0 eed00000 4     /* IACK */
+                              0 eed00000 4     /* Special cycle */
+                              0 ef400000 40>;  /* Internal registers */
+
+                       /* Outbound ranges, one memory and one IO,
+                        * later cannot be changed. Chip supports a second
+                        * IO range but we don't use it for now
+                        */
+                       ranges = <02000000 0 a0000000 0 a0000000 0 20000000
+                                 01000000 0 00000000 0 e8000000 0 00010000>;
+
+                       /* Inbound 2GB range starting at 0 */
+                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                       /* Bamboo has all 4 IRQ pins tied together per slot */
+                       interrupt-map-mask = <f800 0 0 0>;
+                       interrupt-map = <
+                               /* IDSEL 1 */
+                               0800 0 0 0 &UIC0 1c 8
+
+                               /* IDSEL 2 */
+                               1000 0 0 0 &UIC0 1b 8
+
+                               /* IDSEL 3 */
+                               1800 0 0 0 &UIC0 1a 8
+
+                               /* IDSEL 4 */
+                               2000 0 0 0 &UIC0 19 8
+                       >;
+               };
+
        };
 
        chosen {


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to