From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hollis Blanchard Subject: Re: [kvm-ppc-devel] [PATCH 4 of 7] Add PPC 440EP bamboo board device tree source & binary into qemu Date: Fri, 14 Mar 2008 14:06:29 -0500 Message-ID: <1205521590.16133.24.camel@basalt> References: <60d8930ecedd292053f9.1205514551@thinkpad.austin.ibm.com> Reply-To: Hollis Blanchard Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel@lists.sourceforge.net, kvm-ppc-devel@lists.sourceforge.net To: Jerone Young Return-path: In-Reply-To: <60d8930ecedd292053f9.1205514551@thinkpad.austin.ibm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org There is no zImage, so those comments do not make sense. "Filled in by loader" would be more accurate. You left MAL0 and EMAC0 commented out; please remove them. You left PCI0 uncommented; please comment it out until qemu actually emulates the PCI controller. -- Hollis Blanchard IBM Linux Technology Center On Fri, 2008-03-14 at 12:09 -0500, Jerone Young wrote: > # HG changeset patch > # User Jerone Young > # Date 1205514170 18000 > # Branch merge > # Node ID 60d8930ecedd292053f9c5340c95704b20e10c65 > # Parent 8b68dc88abc897e7502e2c73ca1e40eb2084104f > Add PPC 440EP bamboo board device tree source & binary into qemu > > This patch places the bamboo device tree for the PPC 440EP bamboo board into the pc-bios directory of the qemu source. This also adds a rule into the pc-bios/Makefile to build device tree files. > > Signed-off-by: Jerone Young > > diff --git a/qemu/Makefile b/qemu/Makefile > --- a/qemu/Makefile > +++ b/qemu/Makefile > @@ -195,7 +195,8 @@ endif > mkdir -p "$(DESTDIR)$(datadir)" > for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ > video.x openbios-sparc32 pxe-ne2k_pci.bin \ > - pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin extboot.bin; \ > + pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin extboot.bin \ > + bamboo.dtb; \ > do \ > $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ > done > diff --git a/qemu/pc-bios/Makefile b/qemu/pc-bios/Makefile > --- a/qemu/pc-bios/Makefile > +++ b/qemu/pc-bios/Makefile > @@ -12,6 +12,9 @@ all: $(TARGETS) > %.o: %.S > $(CC) $(DEFINES) -c -o $@ $< > > +%.dtb: %.dts > + dtc -O dtb -I dts -o $@ $< > + > clean: > - rm -f $(TARGETS) *.o *~ > + rm -f $(TARGETS) *.o *~ *.dtb > > diff --git a/qemu/pc-bios/bamboo.dtb b/qemu/pc-bios/bamboo.dtb > new file mode 100644 > index 0000000000000000000000000000000000000000..c7b964a26657d9cc5f7d3c6d0d9873bdfa44b9e0 > GIT binary patch > literal 3175 > zc$~FXPm3Kz5U+XJup8Ozt|DSg#J8*x4{z8>e4Fe^AByb7!$O3dMEmvh&KolS?3uUj > zE(j}LbMXs^;6?BYc#n~S5;m0tLo`L4=+D` > z46qsjz%IaZKjZgJ?9XH0c>4IqGXU>fl;4NN=9%vW>`P`mAb8!_D7=dODoZ&ZO<6k4 > zb0G4~9=V!7GV?u_#H zcrh<~a`B*>3mDr;(6!w|nZ;`=&;9%}A@|=KjmN?J`(4{RPMo{1{d#eq;K=*@XhQG_ > z_94Od9sD)GDfRa~!K(dW#>?1$$ygO1icb7TCeMMbMJm!<9yc~>-ku{{C3(OlQpY%} > zgp~85@_C+BGEWjANv&SOz8O!`(LClp) zw+`L^@)6Cq45hVQv;0tI_$|a zzp3Gn=j$@} > z)xU22pp5u2C~A;f3wOU-JT$dv+NtTz*m6^xmW`jLel~`f@&%qKBRma?8sygR1!vvP > zSw|h4a=Qrap7nZ;zh>XoI+`17X621rJ39fD-8uV2hgxYlcsGr#&HuXx1bc6T_Y=h* > zkQ^*eFmo4pj{h^yr5>J3|ID*p+h_6gD9`vNuSwqS+$H*)N8Q5O$DOmxpr}C(f0Zu0 > zcn+UIFQ482gU`yp;j>Knh?H^vB#q;mRcKf#d-dP$DV47;f&<3eyXLy(r}ZsC3!@f- > z!|}4h-LsQpbROvD)&zBQz3E=Ed&}K>7fgQ@+H+Vl^p!Jv6dT9Tp06L7vErcb!zcRJ > z)4buyLp@${$7d5go|w72>TDVq$KN>LA+(Py+kUqLui(~wf4U}0 > zhjQ;rL!Guk?O!Q2`gB)o-OGKtS8Cm`Pj{u(k-K!3mm+KUpx*oHoHw4GdufY>p%i85 > zbCDz^Y?bkeFyk~2MFKoe3w--b69FNYe!-;3DyY2%=6eG|aTs&)adlh>kRk$} zAjPM1k?~`w;#5rWAxcEC&l#TyKZ!HptFRC*NUTjqT?6FOzLYd%oU24qQO)uY(8>I0 > zRLocwBK5xK6{s|EzlGvR&sV&+h@mcmWLbpI=SEz@VJxdTOSCzkOH~fPEQAP25L2Z> > f#wo+spSs3fM}Eo*?B%_#$nY+!FrO > diff --git a/qemu/pc-bios/bamboo.dts b/qemu/pc-bios/bamboo.dts > new file mode 100644 > --- /dev/null > +++ b/qemu/pc-bios/bamboo.dts > @@ -0,0 +1,301 @@ > +/* > + * Device Tree Source for AMCC Bamboo > + * > + * Copyright (c) 2006, 2007 IBM Corp. > + * Josh Boyer > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without > + * any warranty of any kind, whether express or implied. > + */ > + > +/ { > + #address-cells = <2>; > + #size-cells = <1>; > + model = "amcc,bamboo"; > + compatible = "amcc,bamboo"; > + dcr-parent = <&/cpus/cpu@0>; > + > + aliases { > + serial0 = &UART0; > + serial1 = &UART1; > + }; > + > + cpus { > + #address-cells = <1>; > + #size-cells = <0>; > + > + cpu@0 { > + device_type = "cpu"; > + model = "PowerPC,440EP"; > + reg = <0>; > + clock-frequency = <1fca0550>; > + timebase-frequency = <017d7840>; > + i-cache-line-size = <20>; > + d-cache-line-size = <20>; > + i-cache-size = <8000>; > + d-cache-size = <8000>; > + dcr-controller; > + dcr-access-method = "native"; > + }; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0 0 9000000>; > + }; > + > + UIC0: interrupt-controller0 { > + compatible = "ibm,uic-440ep","ibm,uic"; > + interrupt-controller; > + cell-index = <0>; > + dcr-reg = <0c0 009>; > + #address-cells = <0>; > + #size-cells = <0>; > + #interrupt-cells = <2>; > + }; > +/* > + UIC1: interrupt-controller1 { > + compatible = "ibm,uic-440ep","ibm,uic"; > + interrupt-controller; > + cell-index = <1>; > + dcr-reg = <0d0 009>; > + #address-cells = <0>; > + #size-cells = <0>; > + #interrupt-cells = <2>; > + interrupts = <1e 4 1f 4>; > + interrupt-parent = <&UIC0>; > + }; > +*/ > + > + SDR0: sdr { > + compatible = "ibm,sdr-440ep"; > + dcr-reg = <00e 002>; > + }; > + > + CPR0: cpr { > + compatible = "ibm,cpr-440ep"; > + dcr-reg = <00c 002>; > + }; > + > + plb { > + compatible = "ibm,plb-440ep", "ibm,plb-440gp", "ibm,plb4"; > + #address-cells = <2>; > + #size-cells = <1>; > + ranges; > + clock-frequency = <07f28154>; /* Filled in by zImage */ > + > + SDRAM0: sdram { > + compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; > + dcr-reg = <010 2>; > + }; > + > + DMA0: dma { > + compatible = "ibm,dma-440ep", "ibm,dma-440gp"; > + dcr-reg = <100 027>; > + }; > + > +/* > + MAL0: mcmal { > + compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; > + dcr-reg = <180 62>; > + num-tx-chans = <4>; > + num-rx-chans = <2>; > + interrupt-parent = <&MAL0>; > + interrupts = <0 1 2 3 4>; > + #interrupt-cells = <1>; > + #address-cells = <0>; > + #size-cells = <0>; > + interrupt-map = <0 &UIC0 a 4 > + 1 &UIC0 b 4 > + 2 &UIC1 0 4 > + 3 &UIC1 1 4 > + 4 &UIC1 2 4>; > + }; > +*/ > + POB0: opb { > + compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb"; > + #address-cells = <1>; > + #size-cells = <1>; > + /* Bamboo is oddball in the 44x world and doesn't use the ERPN > + * bits. > + */ > + ranges = <00000000 0 00000000 80000000 > + 80000000 0 80000000 80000000>; > + /* interrupt-parent = <&UIC1>; */ > + interrupts = <7 4>; > + clock-frequency = <0>; /* Filled in by zImage */ > + > + EBC0: ebc { > + compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; > + dcr-reg = <012 2>; > + #address-cells = <2>; > + #size-cells = <1>; > + clock-frequency = <>; /* Filled in by zImage */ > + interrupts = <5 1>; > + /* interrupt-parent = <&UIC1>; */ > + }; > + > + UART0: serial@ef600300 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = ; > + virtual-reg = ; > + clock-frequency = <00a8c000>; /* Filled in by zImage */ > + current-speed = <1c200>; > + interrupt-parent = <&UIC0>; > + interrupts = <0 4>; > + }; > + > + UART1: serial@ef600400 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = ; > + virtual-reg = ; > + clock-frequency = <00a8c000>; > + current-speed = <0>; > + interrupt-parent = <&UIC0>; > + interrupts = <1 4>; > + }; > +/* > + UART2: serial@ef600500 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = ; > + virtual-reg = ; > + clock-frequency = <0>; > + current-speed = <0>; > + interrupt-parent = <&UIC0>; > + interrupts = <3 4>; > + }; > + > + UART3: serial@ef600600 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = ; > + virtual-reg = ; > + clock-frequency = <0>; > + current-speed = <0>; > + interrupt-parent = <&UIC0>; > + interrupts = <4 4>; > + }; > + > +*/ > + IIC0: i2c@ef600700 { > + device_type = "i2c"; > + compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; > + reg = ; > + interrupt-parent = <&UIC0>; > + interrupts = <2 4>; > + }; > + > + IIC1: i2c@ef600800 { > + device_type = "i2c"; > + compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; > + reg = ; > + interrupt-parent = <&UIC0>; > + interrupts = <7 4>; > + }; > + > + ZMII0: emac-zmii@ef600d00 { > + device_type = "zmii-interface"; > + compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; > + reg = ; > + }; > + > +/* > + EMAC0: ethernet@ef600e00 { > + linux,network-index = <0>; > + device_type = "network"; > + compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; > + interrupt-parent = <&UIC1>; > + interrupts = <1c 4 1d 4>; > + reg = ; > + local-mac-address = [000000000000]; > + mal-device = <&MAL0>; > + mal-tx-channel = <0 1>; > + mal-rx-channel = <0>; > + cell-index = <0>; > + max-frame-size = <5dc>; > + rx-fifo-size = <1000>; > + tx-fifo-size = <800>; > + phy-mode = "rmii"; > + phy-map = <00000000>; > + zmii-device = <&ZMII0>; > + zmii-channel = <0>; > + }; > + > + EMAC1: ethernet@ef600f00 { > + linux,network-index = <1>; > + device_type = "network"; > + compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; > + interrupt-parent = <&UIC1>; > + interrupts = <1e 4 1f 4>; > + reg = ; > + local-mac-address = [000000000000]; > + mal-device = <&MAL0>; > + mal-tx-channel = <2 3>; > + mal-rx-channel = <1>; > + cell-index = <1>; > + max-frame-size = <5dc>; > + rx-fifo-size = <1000>; > + tx-fifo-size = <800>; > + phy-mode = "rmii"; > + phy-map = <00000000>; > + zmii-device = <&ZMII0>; > + zmii-channel = <1>; > + }; > + > + usb@ef601000 { > + compatible = "ohci-be"; > + reg = ; > + interrupts = <8 1 9 1>; > + interrupt-parent = < &UIC1 >; > + }; > +*/ > + }; > + > + PCI0: pci@ec000000 { > + 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 = ; > + 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 { > + linux,stdout-path = "/plb/opb/serial@ef600300"; > + }; > +}; > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > kvm-ppc-devel mailing list > kvm-ppc-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/