Skip to contentSkip to conversation

powerpc/85xx: Add TWR-P10xx board support

PATCH Superseded Xie Xiaobo 2 participants 2 messages Apr 11, 2013 PowerPC

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Xie Xiaobo

author
#0 lore raw

PATCH 1/1 powerpc/85xx: Add TWR-P10xx board support

TWR-P1025 Specification:
-----------------------
Memory subsystem:
512MB DDR3 (on board DDR)
64Mbyte 16bit NOR flash
One microSD Card slot

Ethernet:
eTSEC1: Connected to Atheros AR8035 GETH PHY
eTSEC3: Connected to Atheros AR8035 GETH PHY

UART:
Two UARTs are routed to the FDTI dual USB to RS232 convertor

USB: Two USB2.0 Type A ports

I2C:
AT24C01B 1K Board EEPROM (8 bit address)

QUICC Engine:
Connected to DP83849i PHY supply two 10/100M ethernet ports QE UART for RS485 or RS232

PCIE:
One mini-PCIE slot

---
 arch/powerpc/include/asm/immap_85xx.h |   2 +
 board/freescale/p1_twr/Makefile       |  52 +++
 board/freescale/p1_twr/ddr.c          |  71 ++++
 board/freescale/p1_twr/law.c          |  32 ++
 board/freescale/p1_twr/p1_twr.c       | 333 ++++++++++++++++
 board/freescale/p1_twr/tlb.c          |  92 +++++
 boards.cfg                            |   2 +
 include/configs/p1_twr.h              | 694 ++++++++++++++++++++++++++++++++++
 8 files changed, 1278 insertions(+)
 create mode 100644 board/freescale/p1_twr/Makefile
 create mode 100644 board/freescale/p1_twr/ddr.c
 create mode 100644 board/freescale/p1_twr/law.c
 create mode 100644 board/freescale/p1_twr/p1_twr.c
 create mode 100644 board/freescale/p1_twr/tlb.c
 create mode 100644 include/configs/p1_twr.h
arch/powerpc/include/asm/immap_85xx.h +2 -0
index 296b549..1730827 100644
@@ -2164,6 +2164,8 @@ typedef struct ccsr_gur {
 	u32	porbmsr;	/* POR boot mode status */
 #define MPC85xx_PORBMSR_HA		0x00070000
 #define MPC85xx_PORBMSR_HA_SHIFT	16
+#define MPC85xx_PORBMSR_ROMLOC		0x0f000000
+#define MPC85xx_PORBMSR_ROMLOC_SHIFT	24
 	u32	porimpscr;	/* POR I/O impedance status & control */
 	u32	pordevsr;	/* POR I/O device status regsiter */
 #if defined(CONFIG_P1017) || defined(CONFIG_P1023)
board/freescale/p1_twr/Makefile new file +52 -0

52 lines not on this page · raw message

board/freescale/p1_twr/ddr.c new file +71 -0

71 lines not on this page · raw message

board/freescale/p1_twr/law.c new file +32 -0
new file mode 100644
index 0000000..cfefbb0
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/fsl_law.h>
+#include <asm/mmu.h>
+
+struct law_entry law_table[] = {
+	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
+	SET_LAW(CONFIG_SYS_SSD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC)
+};
+
+int num_law_entries = ARRAY_SIZE(law_table);
board/freescale/p1_twr/p1_twr.c new file +333 -0

333 lines not on this page · raw message

board/freescale/p1_twr/tlb.c new file +92 -0

92 lines not on this page · raw message

boards.cfg +2 -0
index 35f38f3..fab6f67 100644
@@ -798,6 +798,8 @@ P1025RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb_pc        freesca
 P1025RDB_NAND                powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,NAND
 P1025RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SDCARD
 P1025RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SPIFLASH
+TWR-P1025                    powerpc     mpc85xx     p1_twr	         freescale      -           p1_twr:TWR_P1025
+TWR-P1025_36BIT              powerpc     mpc85xx     p1_twr	         freescale      -           p1_twr:TWR_P1025,36BIT
 P2010RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB
 P2010RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT
 P2010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT,SDCARD
include/configs/p1_twr.h new file +694 -0

694 lines not on this page · raw message

Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 powerpc/85xx: Add TWR-P10xx board support

board/freescale/p1_twr/p1_twr.c line 167

Quoted 11 lines · Xie Xiaobo
board/freescale/p1_twr/p1_twr.c new file +3 -0
+int checkboard(void)
+{
+	ccsr_gur_t *gur = (void __iomem  

*)(CONFIG_SYS_MPC85xx_GUTS_ADDR);

board/freescale/p1_twr/p1_twr.c new file +7 -0
+	u8 boot_status;
+
+	printf("Board: %s\n", CONFIG_BOARDNAME);
+
+#ifdef CONFIG_PHYS_64BIT
+	puts("(36-bit addrmap) ");
+#endif

Is there really a need for supporting both 32-bit and 36-bit address maps here? How much RAM does the board have, and is it pluggable or soldered? If it's pluggable, you really should use SPD...

board/freescale/p1_twr/p1_twr.c line 177

Quoted 9 lines
board/freescale/p1_twr/p1_twr.c new file +9 -0
+	boot_status = ((gur->porbmsr) & MPC85xx_PORBMSR_ROMLOC)
+			>> MPC85xx_PORBMSR_ROMLOC_SHIFT;
+	puts("rom_loc: ");
+	if (boot_status == 0x0F || boot_status == 0x0E)
+		puts("nor flash");
+	else if (boot_status == 0x07)
+		puts("sd");
+	else
+		puts("unknow");

unknown

Quoted 22 lines
board/freescale/p1_twr/p1_twr.c new file +18 -0
+int board_early_init_r(void)
+{
+	const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
+	const u8 flash_esel = find_tlb_idx((void *)flashbase, 1);
+
+	/*
+	 * Remap Boot flash region to caching-inhibited
+	 * so that flash can be erased properly.
+	 */
+
+	/* Flush d-cache and invalidate i-cache of any FLASH data */
+	flush_dcache();
+	invalidate_icache();
+
+	/* invalidate existing TLB entry for flash */
+	disable_tlb(flash_esel);
+
+	set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS, /* tlb, epn,  

rpn */

(quoted diff) +1 -0
+		MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,/* perms, wimge  

*/

(quoted diff) +1 -0
+		0, flash_esel, BOOKE_PAGESZ_64M, 1);/* ts, esel, tsize,  
Quoted 1 line

iprot */

You should be done executing from flash here, so remove SX. The guarded bit won't prevent speculative instruction fetches.

Quoted 5 lines
board/freescale/p1_twr/p1_twr.c new file +5 -0
+#if defined(CONFIG_TWR_P1025)
+static void fdt_board_fixup_etsec(void *blob)
+{
+	int node;
+

board/freescale/p1_twr/p1_twr.c line 306

Quoted 10 lines
board/freescale/p1_twr/p1_twr.c new file +10 -0
+	/* In TWR-P1025 board, the eTSEC2 don't
+	 * be used, remove the node from dt blob.
+	 */
+	node = fdt_path_offset(blob, "/soc/ethernet at b1000");
+	if (node >= 0)
+		fdt_del_node(blob, node);
+
+	return;
+}
+#endif

Why is it in the dts (and not disabled) in the first place? Do you not have a separate dts for twr_p1025?

Quoted 54 lines
board/freescale/p1_twr/tlb.c new file +34 -0
+struct fsl_e_tlb_entry tlb_table[] = {
+	/* TLB 0 - for temp stack in cache */
+	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
+			CONFIG_SYS_INIT_RAM_ADDR_PHYS,
+			MAS3_SX|MAS3_SW|MAS3_SR, 0,
+			0, 0, BOOKE_PAGESZ_4K, 0),
+	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
+			CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
+			MAS3_SX|MAS3_SW|MAS3_SR, 0,
+			0, 0, BOOKE_PAGESZ_4K, 0),
+	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
+			CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
+			MAS3_SX|MAS3_SW|MAS3_SR, 0,
+			0, 0, BOOKE_PAGESZ_4K, 0),
+	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
+			CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
+			MAS3_SX|MAS3_SW|MAS3_SR, 0,
+			0, 0, BOOKE_PAGESZ_4K, 0),
+
+	/* TLB 1 */
+	/* *I*** - Covers boot page */
+	SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000,
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I,
+			0, 0, BOOKE_PAGESZ_4K, 1),
+
+	/* *I*G* - CCSRBAR */
+	SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+			0, 1, BOOKE_PAGESZ_1M, 1),
+
+#ifndef CONFIG_NAND_SPL
+	/* W**G* - Flash, localbus */
+	/* This will be changed to *I*G* after relocation to RAM. */
+	SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE,  

CONFIG_SYS_FLASH_BASE_PHYS,

board/freescale/p1_twr/tlb.c new file +12 -0
+			MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
+			0, 2, BOOKE_PAGESZ_64M, 1),
+
+	/* W**G* - Flash, localbus */
+	/* This will be changed to *I*G* after relocation to RAM. */
+	SET_TLB_ENTRY(1, CONFIG_SYS_SSD_BASE, CONFIG_SYS_SSD_BASE_PHYS,
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+			0, 5, BOOKE_PAGESZ_1M, 1),
+
+#ifdef CONFIG_PCI
+	/* *I*G* - PCI memory 1.5G */
+	SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT,  

CONFIG_SYS_PCIE1_MEM_PHYS,

board/freescale/p1_twr/tlb.c new file +5 -0
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+			0, 3, BOOKE_PAGESZ_1G, 1),
+
+	/* *I*G* - PCI I/O effective: 192K  */
+	SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_IO_VIRT,  

CONFIG_SYS_PCIE1_IO_PHYS,

board/freescale/p1_twr/tlb.c line 79

Quoted 3 lines
board/freescale/p1_twr/tlb.c new file +3 -0
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+			0, 4, BOOKE_PAGESZ_256K, 1),
+#endif

As above, don't put MAS3_SX on I/O TLB entries.

Quoted 12 lines
boards.cfg +0 -0
index 35f38f3..fab6f67 100644
@@ -798,6 +798,8 @@ P1025RDB_36BIT               powerpc      

mpc85xx p1_p2_rdb_pc freesca
P1025RDB_NAND powerpc mpc85xx
p1_p2_rdb_pc freescale -
p1_p2_rdb_pc:P1025RDB,NAND
P1025RDB_SDCARD powerpc mpc85xx
p1_p2_rdb_pc freescale -
p1_p2_rdb_pc:P1025RDB,SDCARD

Quoted 8 lines

P1025RDB_SPIFLASH powerpc mpc85xx
p1_p2_rdb_pc freescale -
p1_p2_rdb_pc:P1025RDB,SPIFLASH
+TWR-P1025 powerpc mpc85xx
p1_twr freescale - p1_twr:TWR_P1025
+TWR-P1025_36BIT powerpc mpc85xx
p1_twr freescale -
p1_twr:TWR_P1025,36BIT

Fix column alignment

Quoted 1 line

+#undef CONFIG_CLOCKS_IN_MHZ

When was this defined in the first place?

Quoted 7 lines
boards.cfg +6 -0
+
+/*
+ * Memory map
+ *
+ * 0x0000_0000 0x1fff_ffff	DDR	Up to 512MB cacheable
+ * 0x8000_0000 0xdfff_ffff	PCI Express Mem	1.5G non-cacheable(PCIe  

* 3)

Quoted 8 lines

+ * 0xffc0_0000 0xffc3_ffff PCI IO range 256k non-cacheable
+ *
+ * Localbus cacheable (TBD)
+ * 0xXXXX_XXXX 0xXXXX_XXXX SRAM YZ M Cacheable
+ *
+ * Localbus non-cacheable
+ * 0xec00_0000 0xefff_ffff FLASH Up to 64M non-cacheable
+ * 0xff90_0000 0xff97_ffff L2 SDRAM(REV.) 512K cacheable(optional)

L2 SRAM, not L2 SDRAM. Move it to the cacheable section (or remove the cacheable/non-cacheable split), and remove the nonsense "SRAM YZ M" entry and the TBD.

Quoted 3 lines

+ * 0xffd0_0000 0xffd0_3fff L1 for stack 16K Cacheable TLB0
+ * 0xffe0_0000 0xffef_ffff CCSR 1M non-cacheable
+ */

[snip]

Quoted 1 line

+#define CONFIG_SYS_SSD_BASE 0xe0000000

This isn't mentioned in the address space comment above.

Quoted 1 line

+#define CONFIG_SYS_SSD_BASE_PHYS CONFIG_SYS_SSD_BASE

What about 36-bit?

Quoted 2 lines

+#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB
for Mon */

Only 256 KiB? We tend to exceed that, and it's easier to reserve 512 KiB now than to change it later when people want to turn on more features.

How large is the U-Boot binary now?

Quoted 6 lines

+#define CONFIG_EXTRA_ENV_SETTINGS \
+"netdev=eth0\0" \
+"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \
+"loadaddr=1000000\0" \
+"bootfile=uImage\0" \
+"dtbfile=twr-p1025_32b.dtb\0" \

Shouldn't "_32b" depend on whether this is a 36-bit U-boot?

Quoted 9 lines

+"consoledev=ttyS0\0" \
+"ramdiskaddr=2000000\0" \
+"ramdiskfile=rootfs.ext2.gz.uboot\0" \
+"fdtaddr=c00000\0" \
+"bdev=sda1\0" \
+"jffs2nor=mtdblock3\0" \
+"norbootaddr=ef080000\0" \
+"norfdtaddr=ef040000\0" \
+"jffs2nand=mtdblock9\0" \

Use mtdparts if you want to specify partition information here.

Quoted 8 lines

+#define CONFIG_NFSBOOTCOMMAND \
+"setenv bootargs root=/dev/nfs rw " \
+"nfsroot=$serverip:$rootpath " \
+"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
+"console=$consoledev,$baudrate $othbootargs;" \
+"tftp $loadaddr $bootfile;" \
+"tftp $fdtaddr $fdtfile;" \
+"bootm $loadaddr - $fdtaddr"

Use && rather than ; so that we don't attempt to boot if tftp fails.

-Scott