Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (c4888f9f) · Commits · 戴 / test

Documentation/powerpc/booting-without-of.txt

+273 −2

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ Table of Contents
		i) Freescale QUICC Engine module (QE)
		j) CFI or JEDEC memory-mapped NOR flash
		k) Global Utilities Block
		l) Xilinx IP cores

		VII - Specifying interrupt information for devices
		1) interrupts property
		@@ -851,12 +852,18 @@ address which can extend beyond that limit.
		/cpus/PowerPC,970FX@0
		/cpus/PowerPC,970FX@1
		(unit addresses do not require leading zeroes)
		- d-cache-line-size : one cell, L1 data cache line size in bytes
		- i-cache-line-size : one cell, L1 instruction cache line size in
		- d-cache-block-size : one cell, L1 data cache block size in bytes (*)
		- i-cache-block-size : one cell, L1 instruction cache block size in
		bytes
		- d-cache-size : one cell, size of L1 data cache in bytes
		- i-cache-size : one cell, size of L1 instruction cache in bytes

		(*) The cache "block" size is the size on which the cache management
		instructions operate. Historically, this document used the cache
		"line" size here which is incorrect. The kernel will prefer the cache
		block size and will fallback to cache line size for backward
		compatibility.

		Recommended properties:

		- timebase-frequency : a cell indicating the frequency of the
		@@ -870,6 +877,10 @@ address which can extend beyond that limit.
		for the above, the common code doesn't use that property, but
		you are welcome to re-use the pSeries or Maple one. A future
		kernel version might provide a common function for this.
		- d-cache-line-size : one cell, L1 data cache line size in bytes
		if different from the block size
		- i-cache-line-size : one cell, L1 instruction cache line size in
		bytes if different from the block size

		You are welcome to add any property you find relevant to your board,
		like some information about the mechanism used to soft-reset the
		@@ -2242,6 +2253,266 @@ platforms are moved over to use the flattened-device-tree model.
		available.
		For Axon: 0x0000012a

		l) Xilinx IP cores

		The Xilinx EDK toolchain ships with a set of IP cores (devices) for use
		in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range
		of standard device types (network, serial, etc.) and miscellanious
		devices (gpio, LCD, spi, etc). Also, since these devices are
		implemented within the fpga fabric every instance of the device can be
		synthesised with different options that change the behaviour.

		Each IP-core has a set of parameters which the FPGA designer can use to
		control how the core is synthesized. Historically, the EDK tool would
		extract the device parameters relevant to device drivers and copy them
		into an 'xparameters.h' in the form of #define symbols. This tells the
		device drivers how the IP cores are configured, but it requres the kernel
		to be recompiled every time the FPGA bitstream is resynthesized.

		The new approach is to export the parameters into the device tree and
		generate a new device tree each time the FPGA bitstream changes. The
		parameters which used to be exported as #defines will now become
		properties of the device node. In general, device nodes for IP-cores
		will take the following form:

		(name)@(base-address) {
		compatible = "xlnx,(ip-core-name)-(HW_VER)"
		[, (list of compatible devices), ...];
		reg = <(baseaddr) (size)>;
		interrupt-parent = <&interrupt-controller-phandle>;
		interrupts = < ... >;
		xlnx,(parameter1) = "(string-value)";
		xlnx,(parameter2) = <(int-value)>;
		};

		(ip-core-name): the name of the ip block (given after the BEGIN
		directive in system.mhs). Should be in lowercase
		and all underscores '_' converted to dashes '-'.
		(name): is derived from the "PARAMETER INSTANCE" value.
		(parameter#): C_* parameters from system.mhs. The C_ prefix is
		dropped from the parameter name, the name is converted
		to lowercase and all underscore '_' characters are
		converted to dashes '-'.
		(baseaddr): the C_BASEADDR parameter.
		(HW_VER): from the HW_VER parameter.
		(size): equals C_HIGHADDR - C_BASEADDR + 1

		Typically, the compatible list will include the exact IP core version
		followed by an older IP core version which implements the same
		interface or any other device with the same interface.

		'reg', 'interrupt-parent' and 'interrupts' are all optional properties.

		For example, the following block from system.mhs:

		BEGIN opb_uartlite
		PARAMETER INSTANCE = opb_uartlite_0
		PARAMETER HW_VER = 1.00.b
		PARAMETER C_BAUDRATE = 115200
		PARAMETER C_DATA_BITS = 8
		PARAMETER C_ODD_PARITY = 0
		PARAMETER C_USE_PARITY = 0
		PARAMETER C_CLK_FREQ = 50000000
		PARAMETER C_BASEADDR = 0xEC100000
		PARAMETER C_HIGHADDR = 0xEC10FFFF
		BUS_INTERFACE SOPB = opb_7
		PORT OPB_Clk = CLK_50MHz
		PORT Interrupt = opb_uartlite_0_Interrupt
		PORT RX = opb_uartlite_0_RX
		PORT TX = opb_uartlite_0_TX
		PORT OPB_Rst = sys_bus_reset_0
		END

		becomes the following device tree node:

		opb-uartlite-0@ec100000 {
		device_type = "serial";
		compatible = "xlnx,opb-uartlite-1.00.b";
		reg = <ec100000 10000>;
		interrupt-parent = <&opb-intc>;
		interrupts = <1 0>; // got this from the opb_intc parameters
		current-speed = <d#115200>; // standard serial device prop
		clock-frequency = <d#50000000>; // standard serial device prop
		xlnx,data-bits = <8>;
		xlnx,odd-parity = <0>;
		xlnx,use-parity = <0>;
		};

		Some IP cores actually implement 2 or more logical devices. In this case,
		the device should still describe the whole IP core with a single node
		and add a child node for each logical device. The ranges property can
		be used to translate from parent IP-core to the registers of each device.
		(Note: this makes the assumption that both logical devices have the same
		bus binding. If this is not true, then separate nodes should be used for
		each logical device). The 'cell-index' property can be used to enumerate
		logical devices within an IP core. For example, the following is the
		system.mhs entry for the dual ps2 controller found on the ml403 reference
		design.

		BEGIN opb_ps2_dual_ref
		PARAMETER INSTANCE = opb_ps2_dual_ref_0
		PARAMETER HW_VER = 1.00.a
		PARAMETER C_BASEADDR = 0xA9000000
		PARAMETER C_HIGHADDR = 0xA9001FFF
		BUS_INTERFACE SOPB = opb_v20_0
		PORT Sys_Intr1 = ps2_1_intr
		PORT Sys_Intr2 = ps2_2_intr
		PORT Clkin1 = ps2_clk_rx_1
		PORT Clkin2 = ps2_clk_rx_2
		PORT Clkpd1 = ps2_clk_tx_1
		PORT Clkpd2 = ps2_clk_tx_2
		PORT Rx1 = ps2_d_rx_1
		PORT Rx2 = ps2_d_rx_2
		PORT Txpd1 = ps2_d_tx_1
		PORT Txpd2 = ps2_d_tx_2
		END

		It would result in the following device tree nodes:

		opb_ps2_dual_ref_0@a9000000 {
		ranges = <0 a9000000 2000>;
		// If this device had extra parameters, then they would
		// go here.
		ps2@0 {
		compatible = "xlnx,opb-ps2-dual-ref-1.00.a";
		reg = <0 40>;
		interrupt-parent = <&opb-intc>;
		interrupts = <3 0>;
		cell-index = <0>;
		};
		ps2@1000 {
		compatible = "xlnx,opb-ps2-dual-ref-1.00.a";
		reg = <1000 40>;
		interrupt-parent = <&opb-intc>;
		interrupts = <3 0>;
		cell-index = <0>;
		};
		};

		Also, the system.mhs file defines bus attachments from the processor
		to the devices. The device tree structure should reflect the bus
		attachments. Again an example; this system.mhs fragment:

		BEGIN ppc405_virtex4
		PARAMETER INSTANCE = ppc405_0
		PARAMETER HW_VER = 1.01.a
		BUS_INTERFACE DPLB = plb_v34_0
		BUS_INTERFACE IPLB = plb_v34_0
		END

		BEGIN opb_intc
		PARAMETER INSTANCE = opb_intc_0
		PARAMETER HW_VER = 1.00.c
		PARAMETER C_BASEADDR = 0xD1000FC0
		PARAMETER C_HIGHADDR = 0xD1000FDF
		BUS_INTERFACE SOPB = opb_v20_0
		END

		BEGIN opb_uart16550
		PARAMETER INSTANCE = opb_uart16550_0
		PARAMETER HW_VER = 1.00.d
		PARAMETER C_BASEADDR = 0xa0000000
		PARAMETER C_HIGHADDR = 0xa0001FFF
		BUS_INTERFACE SOPB = opb_v20_0
		END

		BEGIN plb_v34
		PARAMETER INSTANCE = plb_v34_0
		PARAMETER HW_VER = 1.02.a
		END

		BEGIN plb_bram_if_cntlr
		PARAMETER INSTANCE = plb_bram_if_cntlr_0
		PARAMETER HW_VER = 1.00.b
		PARAMETER C_BASEADDR = 0xFFFF0000
		PARAMETER C_HIGHADDR = 0xFFFFFFFF
		BUS_INTERFACE SPLB = plb_v34_0
		END

		BEGIN plb2opb_bridge
		PARAMETER INSTANCE = plb2opb_bridge_0
		PARAMETER HW_VER = 1.01.a
		PARAMETER C_RNG0_BASEADDR = 0x20000000
		PARAMETER C_RNG0_HIGHADDR = 0x3FFFFFFF
		PARAMETER C_RNG1_BASEADDR = 0x60000000
		PARAMETER C_RNG1_HIGHADDR = 0x7FFFFFFF
		PARAMETER C_RNG2_BASEADDR = 0x80000000
		PARAMETER C_RNG2_HIGHADDR = 0xBFFFFFFF
		PARAMETER C_RNG3_BASEADDR = 0xC0000000
		PARAMETER C_RNG3_HIGHADDR = 0xDFFFFFFF
		BUS_INTERFACE SPLB = plb_v34_0
		BUS_INTERFACE MOPB = opb_v20_0
		END

		Gives this device tree (some properties removed for clarity):

		plb-v34-0 {
		#address-cells = <1>;
		#size-cells = <1>;
		device_type = "ibm,plb";
		ranges; // 1:1 translation

		plb-bram-if-cntrl-0@ffff0000 {
		reg = <ffff0000 10000>;
		}

		opb-v20-0 {
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <20000000 20000000 20000000
		60000000 60000000 20000000
		80000000 80000000 40000000
		c0000000 c0000000 20000000>;

		opb-uart16550-0@a0000000 {
		reg = <a00000000 2000>;
		};

		opb-intc-0@d1000fc0 {
		reg = <d1000fc0 20>;
		};
		};
		};

		That covers the general approach to binding xilinx IP cores into the
		device tree. The following are bindings for specific devices:

		i) Xilinx ML300 Framebuffer

		Simple framebuffer device from the ML300 reference design (also on the
		ML403 reference design as well as others).

		Optional properties:
		- resolution = <xres yres> : pixel resolution of framebuffer. Some
		implementations use a different resolution.
		Default is <d#640 d#480>
		- virt-resolution = <xvirt yvirt> : Size of framebuffer in memory.
		Default is <d#1024 d#480>.
		- rotate-display (empty) : rotate display 180 degrees.

		ii) Xilinx SystemACE

		The Xilinx SystemACE device is used to program FPGAs from an FPGA
		bitstream stored on a CF card. It can also be used as a generic CF
		interface device.

		Optional properties:
		- 8-bit (empty) : Set this property for SystemACE in 8 bit mode

		iii) Xilinx EMAC and Xilinx TEMAC

		Xilinx Ethernet devices. In addition to general xilinx properties
		listed above, nodes for these devices should include a phy-handle
		property, and may include other common network device properties
		like local-mac-address.

		iv) Xilinx Uartlite

		Xilinx uartlite devices are simple fixed speed serial ports.

		Requred properties:
		- current-speed : Baud rate of uartlite

		More devices will be defined as this spec matures.

		VII - Specifying interrupt information for devices

arch/powerpc/boot/dts/walnut.dts

+3 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,9 @@
		device_type = "network";
		compatible = "ibm,emac-405gp", "ibm,emac";
		interrupt-parent = <&UIC0>;
		interrupts = <9 4 f 4>;
		interrupts = <
		f 4 /* Ethernet */
		9 4 /* Ethernet Wake Up */>;
		local-mac-address = [000000000000]; /* Filled in by zImage */
		reg = <ef600800 70>;
		mal-device = <&MAL>;

arch/powerpc/boot/wrapper

+21 −22

Original line number	Diff line number	Diff line
		@@ -21,6 +21,14 @@
		# (default ./arch/powerpc/boot)
		# -W dir specify working directory for temporary files (default .)

		# Stop execution if any command fails
		set -e

		# Allow for verbose output
		if [ "$V" = 1 ]; then
		set -x
		fi

		# defaults
		kernel=
		ofile=zImage
		@@ -111,7 +119,7 @@ if [ -n "$dts" ]; then
		if [ -z "$dtb" ]; then
		dtb="$platform.dtb"
		fi
		dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts" \|\| exit 1
		dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts"
		fi

		if [ -z "$kernel" ]; then
		@@ -149,7 +157,6 @@ cuboot*)
		ps3)
		platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o"
		lds=$object/zImage.ps3.lds
		binary=y
		gzip=
		ext=bin
		objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
		@@ -233,7 +240,7 @@ entry=`${CROSS}objdump -f "$ofile" \| grep '^start address ' \| cut -d' ' -f3`

		if [ -n "$binary" ]; then
		mv "$ofile" "$ofile".elf
		${CROSS}objcopy -O binary "$ofile".elf "$ofile".bin
		${CROSS}objcopy -O binary "$ofile".elf "$ofile"
		fi

		# post-processing needed for some platforms
		@@ -246,9 +253,9 @@ coff)
		$object/hack-coff "$ofile"
		;;
		cuboot*)
		gzip -f -9 "$ofile".bin
		gzip -f -9 "$ofile"
		mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
		$uboot_version -d "$ofile".bin.gz "$ofile"
		$uboot_version -d "$ofile".gz "$ofile"
		;;
		treeboot*)
		mv "$ofile" "$ofile.elf"
		@@ -269,11 +276,11 @@ ps3)
		# then copied to offset 0x100. At runtime the bootwrapper program
		# copies the 0x100 bytes at __system_reset_kernel to addr 0x100.

		system_reset_overlay=0x`${CROSS}nm "$ofile".elf \
		system_reset_overlay=0x`${CROSS}nm "$ofile" \
		\| grep ' __system_reset_overlay$' \
		\| cut -d' ' -f1`
		system_reset_overlay=`printf "%d" $system_reset_overlay`
		system_reset_kernel=0x`${CROSS}nm "$ofile".elf \
		system_reset_kernel=0x`${CROSS}nm "$ofile" \
		\| grep ' __system_reset_kernel$' \
		\| cut -d' ' -f1`
		system_reset_kernel=`printf "%d" $system_reset_kernel`
		@@ -282,23 +289,15 @@ ps3)

		rm -f "$object/otheros.bld"

		msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
		skip=$overlay_dest seek=$system_reset_kernel \
		count=$overlay_size bs=1 2>&1)
		${CROSS}objcopy -O binary "$ofile" "$ofile.bin"

		if [ $? -ne "0" ]; then
		echo $msg
		exit 1
		fi
		dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
		skip=$overlay_dest seek=$system_reset_kernel \
		count=$overlay_size bs=1

		msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
		dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
		skip=$system_reset_overlay seek=$overlay_dest \
		count=$overlay_size bs=1 2>&1)

		if [ $? -ne "0" ]; then
		echo $msg
		exit 2
		fi
		count=$overlay_size bs=1

		gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
		;;

arch/powerpc/configs/pasemi_defconfig

+188 −120

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/ppc64_defconfig

+181 −66

File changed.

Preview size limit exceeded, changes collapsed.

Admin message