Skip to contentSkip to conversation

ppc/p4080: infrastructure patches

PATCH Superseded Kumar Gala 4 participants 20 messages Sep 18, 2009 – Sep 23, 2009 Char and misc drivers

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

cover ppc/p4080: infrastructure patches

This patch series includes the underpinings for the p4080 support. Its mostly focussed on the differenes in cpu/mpc85xx code between a PQ3/85xx platform and the p4080/CoreNet platforms.

author
#1 lore raw

PATCH 1/7 ppc/p4080: Add p4080 platform immap definitions

The p4080 SoC has a significant amount of commonality with the 85xx/PQ3 platform. We reuse the 85xx immap and just add new definitions for local access and global utils. The global utils is now broken into global utils, clocking and run control/power management.

The offsets from CCSR for a number of blocks have also changed. We introduce the CONFIG_FSL_CORENET define to distinquish the PQ3 style of platform from the new p4080 platform. We don't use QoirQ as there are products (like p2020) that are PQ3 based platforms but have the QoirQ name.

---
 include/asm-ppc/fsl_lbc.h    |    4 +
 include/asm-ppc/immap_85xx.h |  408 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 392 insertions(+), 20 deletions(-)
include/asm-ppc/fsl_lbc.h +4 -0
index 08d31e1..5723de6 100644
@@ -317,6 +317,10 @@
 #define LCRR_CLKDIV_2			0x00000002
 #define LCRR_CLKDIV_4			0x00000004
 #define LCRR_CLKDIV_8			0x00000008
+#elif defined(CONFIG_FSL_CORENET)
+#define LCRR_CLKDIV_8			0x00000002
+#define LCRR_CLKDIV_16			0x00000004
+#define LCRR_CLKDIV_32			0x00000008
 #else
 #define LCRR_CLKDIV_4			0x00000002
 #define LCRR_CLKDIV_8			0x00000004
include/asm-ppc/immap_85xx.h +388 -20

449 lines not on this page · raw message

Signature · 1 line
1.6.0.6
author
#2 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

On CoreNet based platforms the LAW address is split between an high & low register and we no longer shift the address. Also, the target IDs on CoreNet platforms have been completely re-assigned.

Additionally, added a new find_law() API to which LAW an address hits in. This is need for the CoreNet style boot release code since it will need to determine what the target ID should be set to for boot window translation.

---
 drivers/misc/fsl_law.c    |   99 ++++++++++++++++++++++++++++++++++++++++++++-
 include/asm-ppc/fsl_law.h |   29 +++++++++++++
 2 files changed, 127 insertions(+), 1 deletions(-)
drivers/misc/fsl_law.c +98 -1
index aa877c6..fba16ed 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -48,6 +48,24 @@ DECLARE_GLOBAL_DATA_PTR;
 
 void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 {
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+	base = &(ccm->lawbarh0);
+	lawbarh = base + idx * 4;
+	lawbarl = lawbarh + 1;
+	lawar = lawbarl + 1;
+
+	gd->used_laws |= (1 << idx);
+
+	out_be32(lawar, 0);
+	out_be32(lawbarh, ((u64)addr >> 32));
+	out_be32(lawbarl, addr & 0xffffffff);
+	out_be32(lawar, LAWAR_EN | ((u32)id << 20) | (u32)sz);
+#else
 	volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
 	volatile u32 *lawbar = base + 8 * idx;
 	volatile u32 *lawar = base + 8 * idx + 2;
@@ -57,6 +75,7 @@ void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 	out_be32(lawar, 0);
 	out_be32(lawbar, addr >> 12);
 	out_be32(lawar, LAWAR_EN | ((u32)id << 20) | (u32)sz);
+#endif
 
 	/* Read back so that we sync the writes */
 	in_be32(lawar);
@@ -96,6 +115,23 @@ int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 
 void disable_law(u8 idx)
 {
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+	base = &(ccm->lawbarh0);
+	lawbarh = base + idx * 4;
+	lawbarl = lawbarh + 1;
+	lawar = lawbarl + 1;
+
+	gd->used_laws &= ~(1 << idx);
+
+	out_be32(lawar, 0);
+	out_be32(lawbarh, 0);
+	out_be32(lawbarl, 0);
+#else
 	volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
 	volatile u32 *lawbar = base + 8 * idx;
 	volatile u32 *lawar = base + 8 * idx + 2;
@@ -104,10 +140,65 @@ void disable_law(u8 idx)
 
 	out_be32(lawar, 0);
 	out_be32(lawbar, 0);
+#endif
 
 	return;
 }
 
+#ifdef CONFIG_FSL_CORENET
+#define GET_LAW_ADDR ((u64)in_be32(lawbarh) << 32) | in_be32(lawbarl)
+#else
+#define GET_LAW_ADDR ((u64)in_be32(lawbar) << 12)
+#endif
+
+struct law_entry find_law(phys_addr_t addr)
+{
+	struct law_entry entry;
+	int i;
+
+	entry.index = -1;
+	entry.addr = 0;
+	entry.size = 0;
+	entry.trgt_id = 0;
+
+	for(i = 0; i < FSL_HW_NUM_LAWS; i++) {
+
+		u64 upper;
+		u32 temp;
+#ifdef CONFIG_FSL_CORENET
+		volatile ccsr_local_t *ccm;
+		volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+		ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+		base = &(ccm->lawbarh0);
+		lawbarh = base + i * 4;
+		lawbarl = lawbarh + 1;
+		lawar = lawbarl + 1;
+#else
+		volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
+		volatile u32 *lawbar = base + 8 * i;
+		volatile u32 *lawar = base + 8 * i + 2;
+#endif
+		temp = in_be32(lawar);
+
+		if (!(temp & LAWAR_EN))
+			continue;
+
+		entry.addr = GET_LAW_ADDR;
+		entry.size = temp & 0x3f;
+		entry.trgt_id = (temp >> 20) & 0xff;
+
+		upper = entry.addr + (2ull << entry.size);
+		if ((addr >= entry.addr) && (addr < upper)) {
+			entry.index = i;
+			break;
+		}
+	}
+
+	return entry;
+}
+
 void print_laws(void)
 {
 	volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
@@ -173,7 +264,13 @@ void init_laws(void)
 {
 	int i;
 
+#if FSL_HW_NUM_LAWS < 32
 	gd->used_laws = ~((1 << FSL_HW_NUM_LAWS) - 1);
+#elif FSL_HW_NUM_LAWS == 32
+	gd->used_laws = 0;
+#else
+#error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes
+#endif
 
 	for (i = 0; i < num_law_entries; i++) {
 		if (law_table[i].index == -1)
include/asm-ppc/fsl_law.h +29 -0
index e06a1a6..d80b30b 100644
@@ -1,3 +1,11 @@
+/*
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * Version 2 as published by the Free Software Foundation.
+ */
+
 #ifndef _FSL_LAW_H_
 #define _FSL_LAW_H_
 
@@ -36,6 +44,25 @@ enum law_size {
 	LAW_SIZE_32G,
 };
 
+#ifdef CONFIG_FSL_CORENET
+enum law_trgt_if {
+	LAW_TRGT_IF_PCIE_1 = 0x00,
+	LAW_TRGT_IF_PCIE_2 = 0x01,
+	LAW_TRGT_IF_PCIE_3 = 0x02,
+	LAW_TRGT_IF_RIO_1 = 0x08,
+	LAW_TRGT_IF_RIO_2 = 0x09,
+
+	LAW_TRGT_IF_DDR_1 = 0x10,
+	LAW_TRGT_IF_DDR_2 = 0x11,	/* 2nd controller */
+	LAW_TRGT_IF_DDR_INTRLV = 0x14,
+
+	LAW_TRGT_IF_BMAN = 0x18,
+	LAW_TRGT_IF_DCSR = 0x1d,
+	LAW_TRGT_IF_LBC = 0x1f,
+	LAW_TRGT_IF_QMAN = 0x3c,
+};
+#define LAW_TRGT_IF_DDR		LAW_TRGT_IF_DDR_1
+#else
 enum law_trgt_if {
 	LAW_TRGT_IF_PCI = 0x00,
 	LAW_TRGT_IF_PCI_2 = 0x01,
@@ -64,6 +91,7 @@ enum law_trgt_if {
 #if defined(CONFIG_MPC8572) || defined(CONFIG_P2020)
 #define LAW_TRGT_IF_PCIE_3	LAW_TRGT_IF_PCI
 #endif
+#endif /* CONFIG_FSL_CORENET */
 
 struct law_entry {
 	int index;
@@ -76,6 +104,7 @@ extern void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if
 extern int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id);
 extern int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id);
 extern int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id);
+extern struct law_entry find_law(phys_addr_t addr);
 extern void disable_law(u8 idx);
 extern void init_laws(void);
 extern void print_laws(void);
Signature · 1 line
1.6.0.6
author
#3 lore raw

PATCH 3/7 ppc/p4080: CoreNet platfrom style CCSRBAR setting

On CoreNet based platforms the CCSRBAR address is split between an high & low register and we no longer shift the address.

---
 cpu/mpc85xx/cpu_init_early.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
cpu/mpc85xx/cpu_init_early.c +27 -0
index 7886f86..bb31709 100644
@@ -54,6 +54,9 @@ void cpu_init_early_f(void)
 		u32 temp;
 		volatile u32 *ccsr_virt =
 			(volatile u32 *)(CONFIG_SYS_CCSRBAR + 0x1000);
+#ifdef CONFIG_FSL_CORENET
+		volatile ccsr_local_t *ccm;
+#endif
 
 		mas0 = MAS0_TLBSEL(0) | MAS0_ESEL(1);
 		/* mas1 is the same as above */
@@ -64,9 +67,33 @@ void cpu_init_early_f(void)
 
 		write_tlb(mas0, mas1, mas2, mas3, mas7);
 
+#ifdef CONFIG_FSL_CORENET
+		/*
+		 * We can't call set_law() because we haven't moved
+		 * CCSR yet.
+		 */
+		ccm = (void *)ccsr_virt;
+
+		out_be32(&ccm->lawbarh0, (u64)CONFIG_SYS_CCSRBAR_PHYS >> 32);
+		out_be32(&ccm->lawbarl0, (u32)CONFIG_SYS_CCSRBAR_PHYS);
+		out_be32(&ccm->lawar0, LAWAR_EN | (0x1e << 20) | LAW_SIZE_4K);
+
+		in_be32((u32 *)(ccsr_virt + 0));
+		in_be32((u32 *)(ccsr_virt + 1));
+		isync();
+
+		ccm = (void *)CONFIG_SYS_CCSRBAR;
+		/* Now use the temporary LAW to move CCSR */
+		out_be32(&ccm->ccsrbarh, (u64)CONFIG_SYS_CCSRBAR_PHYS >> 32);
+		out_be32(&ccm->ccsrbarl, (u32)CONFIG_SYS_CCSRBAR_PHYS);
+		out_be32(&ccm->ccsrar, CCSRAR_C);
+		temp = in_be32(&ccm->ccsrar);
+		disable_law(0);
+#else
 		temp = in_be32(ccsr_virt);
 		out_be32(ccsr_virt, CONFIG_SYS_CCSRBAR_PHYS >> 12);
 		temp = in_be32((volatile u32 *)CONFIG_SYS_CCSRBAR);
+#endif
 	}
 #endif
 
Signature · 1 line
1.6.0.6
author
#4 lore raw

PATCH 4/7 ppc/p4080: CoreNet platfrom style secondary core release

The CoreNet platform style of bringing secondary cores out of reset is a bit different that the PQ3 style. Mostly the registers that we use to setup boot translation, enable time bases, and boot release the cores have moved around.

---
 cpu/mpc85xx/mp.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 1 deletions(-)
cpu/mpc85xx/mp.c +67 -1
index fa65bed..b474218 100644
@@ -26,6 +26,7 @@
 #include <lmb.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
+#include <asm/fsl_law.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -135,6 +136,66 @@ ulong get_spin_addr(void)
 	return addr;
 }
 
+#ifdef CONFIG_FSL_CORENET
+static void corenet_mp_up(unsigned long bootpg)
+{
+	u32 up, cpu_up_mask, whoami;
+	u32 *table = (u32 *)get_spin_addr();
+	volatile ccsr_gur_t *gur;
+	volatile ccsr_local_t *ccm;
+	volatile ccsr_rcpm_t *rcpm;
+	volatile ccsr_pic_t *pic;
+	int timeout = 10;
+	u32 nr_cpus;
+	struct law_entry e;
+
+	gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+	rcpm = (void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
+	pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
+
+	nr_cpus = ((in_be32(&pic->frr) >> 8) & 0xff) + 1;
+
+	whoami = in_be32(&pic->whoami);
+	cpu_up_mask = 1 << whoami;
+	out_be32(&ccm->bstrl, bootpg);
+
+	e = find_law(bootpg);
+	out_be32(&ccm->bstrar, LAWAR_EN | e.trgt_id << 20 | LAWAR_SIZE_4K);
+
+	/* disable time base@the platform */
+	out_be32(&rcpm->ctbenrl, cpu_up_mask);
+
+	/* release the hounds */
+	up = ((1 << nr_cpus) - 1);
+	out_be32(&gur->brrl, up);
+
+	/* wait for everyone */
+	while (timeout) {
+		int i;
+		for (i = 0; i < nr_cpus; i++) {
+			if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
+				cpu_up_mask |= (1 << i);
+		};
+
+		if ((cpu_up_mask & up) == up)
+			break;
+
+		udelay(100);
+		timeout--;
+	}
+
+	if (timeout == 0)
+		printf("CPU up timeout. CPU up mask is %x should be %x\n",
+			cpu_up_mask, up);
+
+	/* enable time base@the platform */
+	out_be32(&rcpm->ctbenrl, 0);
+	mtspr(SPRN_TBWU, 0);
+	mtspr(SPRN_TBWL, 0);
+	out_be32(&rcpm->ctbenrl, (1 << nr_cpus) - 1);
+}
+#else
 static void pq3_mp_up(unsigned long bootpg)
 {
 	u32 up, cpu_up_mask, whoami;
@@ -196,6 +257,7 @@ static void pq3_mp_up(unsigned long bootpg)
 	devdisr &= ~(MPC85xx_DEVDISR_TB0 | MPC85xx_DEVDISR_TB1);
 	out_be32(&gur->devdisr, devdisr);
 }
+#endif
 
 void cpu_mp_lmb_reserve(struct lmb *lmb)
 {
@@ -217,7 +279,7 @@ void setup_mp(void)
 	if (i != -1) {
 		/* map reset page to bootpg so we can copy code there */
 		disable_tlb(i);
-	
+
 		set_tlb(1, 0xfffff000, bootpg, /* tlb, epn, rpn */
 			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, /* perms, wimge */
 			0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */
@@ -234,7 +296,11 @@ void setup_mp(void)
 			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I, /* perms, wimge */
 			0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */
 
+#ifdef CONFIG_FSL_CORENET
+		corenet_mp_up(bootpg);
+#else
 		pq3_mp_up(bootpg);
+#endif
 	} else {
 		puts("WARNING: No reset page TLB. "
 			"Skipping secondary core setup\n");
Signature · 1 line
1.6.0.6
author
#5 lore raw

PATCH 5/7 ppc/p4080: Add various p4080 related defines (and p4040)

There are various locations that we have chip specific info:

* Makefile for which ddr code to build
* Added p4080 & p4040 to cpu_type_list and SVR list
* Added number of LAWs for p4080
* Set CONFIG_MAX_CPUS to 8 for p4080

---
 cpu/mpc85xx/Makefile        |    1 +
 cpu/mpc8xxx/cpu.c           |    4 ++++
 drivers/misc/fsl_law.c      |    2 ++
 include/asm-ppc/config.h    |    6 ++++--
 include/asm-ppc/processor.h |    4 ++++
 5 files changed, 15 insertions(+), 2 deletions(-)
cpu/mpc85xx/Makefile +1 -0
index 3ef00e8..56de7eb 100644
@@ -53,6 +53,7 @@ COBJS-$(CONFIG_P1011)	+= ddr-gen3.o
 COBJS-$(CONFIG_P1020)	+= ddr-gen3.o
 COBJS-$(CONFIG_P2010)	+= ddr-gen3.o
 COBJS-$(CONFIG_P2020)	+= ddr-gen3.o
+COBJS-$(CONFIG_PPC_P4080)	+= ddr-gen3.o
 
 COBJS-$(CONFIG_CPM2)	+= ether_fcc.o
 COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
cpu/mpc8xxx/cpu.c +4 -0
index 00791e1..d191263 100644
@@ -72,6 +72,10 @@ struct cpu_type cpu_type_list [] = {
 	CPU_TYPE_ENTRY(P2010, P2010_E, 1),
 	CPU_TYPE_ENTRY(P2020, P2020, 2),
 	CPU_TYPE_ENTRY(P2020, P2020_E, 2),
+	CPU_TYPE_ENTRY(P4040, P4040, 4),
+	CPU_TYPE_ENTRY(P4040, P4040_E, 4),
+	CPU_TYPE_ENTRY(P4080, P4080, 8),
+	CPU_TYPE_ENTRY(P4080, P4080_E, 8),
 #elif defined(CONFIG_MPC86xx)
 	CPU_TYPE_ENTRY(8610, 8610, 1),
 	CPU_TYPE_ENTRY(8641, 8641, 2),
drivers/misc/fsl_law.c +2 -0
index fba16ed..626bab2 100644
@@ -42,6 +42,8 @@ DECLARE_GLOBAL_DATA_PTR;
       defined(CONFIG_P1011) || defined(CONFIG_P1020) || \
       defined(CONFIG_P2010) || defined(CONFIG_P2020)
 #define FSL_HW_NUM_LAWS 12
+#elif defined(CONFIG_PPC_P4080)
+#define FSL_HW_NUM_LAWS 32
 #else
 #error FSL_HW_NUM_LAWS not defined for this platform
 #endif
include/asm-ppc/config.h +4 -2
index 5670d06..e35b0b7 100644
@@ -40,9 +40,11 @@
 
 #if defined(CONFIG_MPC8572) || defined(CONFIG_P1020) || \
 	defined(CONFIG_P2020) || defined(CONFIG_MPC8641)
-#define CONFIG_MAX_CPUS        2
+#define CONFIG_MAX_CPUS		2
+#elif defined(CONFIG_PPC_P4080)
+#define CONFIG_MAX_CPUS		8
 #else
-#define CONFIG_MAX_CPUS        1
+#define CONFIG_MAX_CPUS		1
 #endif
 
 #endif /* _ASM_CONFIG_H_ */
include/asm-ppc/processor.h +4 -0
index 3764a5a..d009957 100644
@@ -1031,6 +1031,10 @@
 #define SVR_P2010_E	0x80EB00
 #define SVR_P2020	0x80E200
 #define SVR_P2020_E	0x80EA00
+#define SVR_P4040	0x820100
+#define SVR_P4040_E	0x820900
+#define SVR_P4080	0x820000
+#define SVR_P4080_E	0x820800
 
 #define SVR_8610	0x80A000
 #define SVR_8641	0x809000
Signature · 1 line
1.6.0.6
author
#6 lore raw

PATCH 6/7 ppc/p4080: Handle timebase enabling and frequency reporting

On CoreNet style platforms the timebase frequency is the bus frequency defined by 16 (on PQ3 it is divide by 8). Also on the CoreNet platforms the core not longer controls the enabling of the timebase. We now need to enable the boot core's timebase via CCSR register writes.

---
 cpu/mpc85xx/cpu.c      |    4 ++++
 cpu/mpc85xx/cpu_init.c |   12 ++++++++++++
 cpu/mpc85xx/fdt.c      |    7 ++++++-
 3 files changed, 22 insertions(+), 1 deletions(-)
cpu/mpc85xx/cpu.c +4 -0
index bdd9ee4..25c0416 100644
@@ -184,7 +184,11 @@ int do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
  */
 unsigned long get_tbclk (void)
 {
+#ifdef CONFIG_FSL_CORENET
+	return (gd->bus_clk + 8) / 16;
+#else
 	return (gd->bus_clk + 4UL)/8UL;
+#endif
 }
 
 
cpu/mpc85xx/cpu_init.c +12 -0
index a6d1e99..428b461 100644
@@ -229,6 +229,18 @@ void cpu_init_f (void)
 #if defined(CONFIG_FSL_DMA)
 	dma_init();
 #endif
+#ifdef CONFIG_FSL_CORENET
+	{
+		volatile ccsr_rcpm_t *rcpm =
+			(void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
+		volatile ccsr_pic_t *pic =
+			(void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
+		u32 whoami = in_be32(&pic->whoami);
+
+		/* Enable the timebase register for this core */
+		out_be32(&rcpm->ctbenrl, (1 << whoami));
+	}
+#endif
 }
 
 
cpu/mpc85xx/fdt.c +6 -1
index 723f473..ff5824b 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Freescale Semiconductor, Inc.
+ * Copyright 2007-2009 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, [email protected].
@@ -286,8 +286,13 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 
 	fdt_add_enet_stashing(blob);
 
+#ifdef CONFIG_FSL_CORENET
+	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
+		"timebase-frequency", bd->bi_busfreq / 16, 1);
+#else
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"timebase-frequency", bd->bi_busfreq / 8, 1);
+#endif
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"bus-frequency", bd->bi_busfreq, 1);
 	get_sys_info(&sysinfo);
Signature · 1 line
1.6.0.6
author
#7 lore raw

PATCH 7/7 ppc/p4080: Determine various chip frequencies on CoreNet platforms

The means to determine the core, bus, and DDR frequencies are completely new on CoreNet style platforms. Additionally on p4080 we can have different frequencies for FMAN and PME IP blocks. We need to keep track of the FMAN & PME frequencies since they are used for time stamping capabilities inside each block.

---
 cpu/mpc85xx/cpu.c   |   29 +++++++++++++++++
 cpu/mpc85xx/speed.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 include/e500.h      |    6 +++
 3 files changed, 120 insertions(+), 0 deletions(-)
cpu/mpc85xx/cpu.c +29 -0
index 25c0416..1c0f2b2 100644
@@ -46,11 +46,20 @@ int checkcpu (void)
 	char buf1[32], buf2[32];
 #ifdef CONFIG_DDR_CLK_FREQ
 	volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+#ifdef CONFIG_FSL_CORENET
+	u32 ddr_sync = ((gur->rcwsr[5]) & FSL_CORENET_RCWSR5_DDR_SYNC)
+		>> FSL_CORENET_RCWSR5_DDR_SYNC_SHIFT;
+#else
 	u32 ddr_ratio = ((gur->porpllsr) & MPC85xx_PORPLLSR_DDR_RATIO)
 		>> MPC85xx_PORPLLSR_DDR_RATIO_SHIFT;
+#endif
+#else
+#ifdef CONFIG_FSL_CORENET
+	u32 ddr_sync = 0;
 #else
 	u32 ddr_ratio = 0;
 #endif
+#endif
 	int i;
 
 	svr = get_svr();
@@ -111,6 +120,16 @@ int checkcpu (void)
 	}
 	printf("\n       CCB:%-4s MHz,\n", strmhz(buf1, sysinfo.freqSystemBus));
 
+#ifdef CONFIG_FSL_CORENET
+	if (ddr_sync == 1)
+		printf("       DDR:%-4s MHz (%s MT/s data rate) (Synchronous), ",
+			strmhz(buf1, sysinfo.freqDDRBus/2),
+			strmhz(buf2, sysinfo.freqDDRBus));
+	else
+		printf("       DDR:%-4s MHz (%s MT/s data rate) (Asynchronous), ",
+			strmhz(buf1, sysinfo.freqDDRBus/2),
+			strmhz(buf2, sysinfo.freqDDRBus));
+#else
 	switch (ddr_ratio) {
 	case 0x0:
 		printf("       DDR:%-4s MHz (%s MT/s data rate), ",
@@ -128,6 +147,7 @@ int checkcpu (void)
 			strmhz(buf2, sysinfo.freqDDRBus));
 		break;
 	}
+#endif
 
 	if (sysinfo.freqLocalBus > LCRR_CLKDIV)
 		printf("LBC:%-4s MHz\n", strmhz(buf1, sysinfo.freqLocalBus));
@@ -143,6 +163,15 @@ int checkcpu (void)
 	printf("       QE:%-4s MHz\n", strmhz(buf1, sysinfo.freqQE));
 #endif
 
+#ifdef CONFIG_SYS_DPAA_FMAN
+	for (i = 0; i < CONFIG_SYS_NUM_FMAN; i++)
+		printf("       FMAN%d: %s MHz\n", i, strmhz(buf1, sysinfo.freqFMan[i]));
+#endif
+
+#ifdef CONFIG_SYS_DPAA_PME
+	printf("       PME:   %s MHz\n", strmhz(buf1, sysinfo.freqPME));
+#endif
+
 	puts("L1:    D-cache 32 kB enabled\n       I-cache 32 kB enabled\n");
 
 	return 0;
cpu/mpc85xx/speed.c +85 -0

102 lines not on this page · raw message

include/e500.h +6 -0
index f8c8266..e1708b9 100644
@@ -15,6 +15,12 @@ typedef struct
   unsigned long freqDDRBus;
   unsigned long freqLocalBus;
   unsigned long freqQE;
+#ifdef CONFIG_SYS_DPAA_FMAN
+  unsigned long freqFMan[CONFIG_SYS_NUM_FMAN];
+#endif
+#ifdef CONFIG_SYS_DPAA_PME
+  unsigned long freqPME;
+#endif
 } MPC85xx_SYS_INFO;
 
 #endif  /* _ASMLANGUAGE */
Signature · 1 line
1.6.0.6
#8 lore raw

PATCH 6/7 ppc/p4080: Handle timebase enabling and frequency reporting

In reply to Kumar Gala
Quoted 26 lines · Kumar Gala

On CoreNet style platforms the timebase frequency is the bus frequency defined by 16 (on PQ3 it is divide by 8). Also on the CoreNet platforms the core not longer controls the enabling of the timebase. We now need to enable the boot core's timebase via CCSR register writes.

---
 cpu/mpc85xx/cpu.c      |    4 ++++
 cpu/mpc85xx/cpu_init.c |   12 ++++++++++++
 cpu/mpc85xx/fdt.c      |    7 ++++++-
 3 files changed, 22 insertions(+), 1 deletions(-)
cpu/mpc85xx/cpu.c +4 -0
index bdd9ee4..25c0416 100644
@@ -184,7 +184,11 @@ int do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
  */
 unsigned long get_tbclk (void)
 {
+#ifdef CONFIG_FSL_CORENET
+	return (gd->bus_clk + 8) / 16;
+#else
 	return (gd->bus_clk + 4UL)/8UL;
+#endif
 }

[snip]

cpu/mpc85xx/cpu.c

Quoted 7 lines
cpu/mpc85xx/cpu.c +5 -0
+#ifdef CONFIG_FSL_CORENET
+	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
+		"timebase-frequency", bd->bi_busfreq / 16, 1);
+#else
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"timebase-frequency", bd->bi_busfreq / 8, 1);
+#endif

We could just use get_tbclk() here and not have to maintain the knowledge in two places.

-Scott

#9 lore raw

PATCH 6/7 ppc/p4080: Handle timebase enabling and frequency reporting

In reply to Kumar Gala

Dear Kumar Gala,

Quoted 39 lines · In message <[email protected]> you…

On CoreNet style platforms the timebase frequency is the bus frequency defined by 16 (on PQ3 it is divide by 8). Also on the CoreNet platforms the core not longer controls the enabling of the timebase. We now need to enable the boot core's timebase via CCSR register writes.

---
 cpu/mpc85xx/cpu.c      |    4 ++++
 cpu/mpc85xx/cpu_init.c |   12 ++++++++++++
 cpu/mpc85xx/fdt.c      |    7 ++++++-
 3 files changed, 22 insertions(+), 1 deletions(-)
cpu/mpc85xx/cpu.c +4 -0
index bdd9ee4..25c0416 100644
@@ -184,7 +184,11 @@ int do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
  */
 unsigned long get_tbclk (void)
 {
+#ifdef CONFIG_FSL_CORENET
+	return (gd->bus_clk + 8) / 16;
+#else
 	return (gd->bus_clk + 4UL)/8UL;
+#endif
 }
 
 
cpu/mpc85xx/cpu_init.c +3 -0
index a6d1e99..428b461 100644
@@ -229,6 +229,18 @@ void cpu_init_f (void)
 #if defined(CONFIG_FSL_DMA)
 	dma_init();
 #endif
+#ifdef CONFIG_FSL_CORENET
+	{
+		volatile ccsr_rcpm_t *rcpm =

cpu/mpc85xx/cpu_init.c void cpu_init_f (void) · line 244

Quoted 10 lines
cpu/mpc85xx/cpu_init.c +9 -0
+			(void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
+		volatile ccsr_pic_t *pic =
+			(void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
+		u32 whoami = in_be32(&pic->whoami);
+
+		/* Enable the timebase register for this core */
+		out_be32(&rcpm->ctbenrl, (1 << whoami));
+	}
+#endif
 }

Please do not declare variables right in the middle of the code. Consider moving this into a separate function if needed.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In the future, you're going to get computers as prizes  in  breakfast
cereals.  You'll  throw  them out because your house will be littered
with them.                                             - Robert Lucky
#10 lore raw

PATCH 4/7 ppc/p4080: CoreNet platfrom style secondary core release

In reply to Kumar Gala

Dear Kumar Gala,

Quoted 90 lines · In message <[email protected]> you…

The CoreNet platform style of bringing secondary cores out of reset is a bit different that the PQ3 style. Mostly the registers that we use to setup boot translation, enable time bases, and boot release the cores have moved around.

---
 cpu/mpc85xx/mp.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 1 deletions(-)
cpu/mpc85xx/mp.c +61 -0
index fa65bed..b474218 100644
@@ -26,6 +26,7 @@
 #include <lmb.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
+#include <asm/fsl_law.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -135,6 +136,66 @@ ulong get_spin_addr(void)
 	return addr;
 }
 
+#ifdef CONFIG_FSL_CORENET
+static void corenet_mp_up(unsigned long bootpg)
+{
+	u32 up, cpu_up_mask, whoami;
+	u32 *table = (u32 *)get_spin_addr();
+	volatile ccsr_gur_t *gur;
+	volatile ccsr_local_t *ccm;
+	volatile ccsr_rcpm_t *rcpm;
+	volatile ccsr_pic_t *pic;
+	int timeout = 10;
+	u32 nr_cpus;
+	struct law_entry e;
+
+	gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+	rcpm = (void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
+	pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
+
+	nr_cpus = ((in_be32(&pic->frr) >> 8) & 0xff) + 1;
+
+	whoami = in_be32(&pic->whoami);
+	cpu_up_mask = 1 << whoami;
+	out_be32(&ccm->bstrl, bootpg);
+
+	e = find_law(bootpg);
+	out_be32(&ccm->bstrar, LAWAR_EN | e.trgt_id << 20 | LAWAR_SIZE_4K);
+
+	/* disable time base at the platform */
+	out_be32(&rcpm->ctbenrl, cpu_up_mask);
+
+	/* release the hounds */
+	up = ((1 << nr_cpus) - 1);
+	out_be32(&gur->brrl, up);
+
+	/* wait for everyone */
+	while (timeout) {
+		int i;
+		for (i = 0; i < nr_cpus; i++) {
+			if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
+				cpu_up_mask |= (1 << i);
+		};
+
+		if ((cpu_up_mask & up) == up)
+			break;
+
+		udelay(100);
+		timeout--;
+	}
+
+	if (timeout == 0)
+		printf("CPU up timeout. CPU up mask is %x should be %x\n",
+			cpu_up_mask, up);
+
+	/* enable time base at the platform */
+	out_be32(&rcpm->ctbenrl, 0);
+	mtspr(SPRN_TBWU, 0);
+	mtspr(SPRN_TBWL, 0);
+	out_be32(&rcpm->ctbenrl, (1 << nr_cpus) - 1);
+}
+#else
 static void pq3_mp_up(unsigned long bootpg)
 {
 	u32 up, cpu_up_mask, whoami;

cpu/mpc85xx/mp.c static void pq3_mp_up(unsigned long bootpg) · line 260

Quoted 4 lines
cpu/mpc85xx/mp.c +1 -0
@@ -196,6 +257,7 @@ static void pq3_mp_up(unsigned long bootpg)
 	devdisr &= ~(MPC85xx_DEVDISR_TB0 | MPC85xx_DEVDISR_TB1);
 	out_be32(&gur->devdisr, devdisr);
 }
+#endif

This is becoming a terrible mess of #ifdef's. Would it not make sense to move the new code into separate files?

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Pull the wool over your own eyes!"                - J.R. "Bob" Dobbs
author
#11 lore raw

PATCH 4/7 ppc/p4080: CoreNet platfrom style secondary core release

Quoted 96 lines · Wolfgang Denk

Dear Kumar Gala,

In message <[email protected]

Quoted 93 lines

you wrote:
The CoreNet platform style of bringing secondary cores out of reset is
a bit different that the PQ3 style. Mostly the registers that we use to setup boot translation, enable time bases, and boot release the cores
have moved around.

---
cpu/mpc85xx/mp.c | 68 ++++++++++++++++++++++++++++++++++++++++++++
+++++++++-

1 files changed, 67 insertions(+), 1 deletions(-)
cpu/mpc85xx/mp.c +61 -0
index fa65bed..b474218 100644
@@ -26,6 +26,7 @@
 #include <lmb.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
+#include <asm/fsl_law.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -135,6 +136,66 @@ ulong get_spin_addr(void)
 	return addr;
 }
 
+#ifdef CONFIG_FSL_CORENET
+static void corenet_mp_up(unsigned long bootpg)
+{
+	u32 up, cpu_up_mask, whoami;
+	u32 *table = (u32 *)get_spin_addr();
+	volatile ccsr_gur_t *gur;
+	volatile ccsr_local_t *ccm;
+	volatile ccsr_rcpm_t *rcpm;
+	volatile ccsr_pic_t *pic;
+	int timeout = 10;
+	u32 nr_cpus;
+	struct law_entry e;
+
+	gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+	rcpm = (void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
+	pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
+
+	nr_cpus = ((in_be32(&pic->frr) >> 8) & 0xff) + 1;
+
+	whoami = in_be32(&pic->whoami);
+	cpu_up_mask = 1 << whoami;
+	out_be32(&ccm->bstrl, bootpg);
+
+	e = find_law(bootpg);
+	out_be32(&ccm->bstrar, LAWAR_EN | e.trgt_id << 20 | LAWAR_SIZE_4K);
+
+	/* disable time base at the platform */
+	out_be32(&rcpm->ctbenrl, cpu_up_mask);
+
+	/* release the hounds */
+	up = ((1 << nr_cpus) - 1);
+	out_be32(&gur->brrl, up);
+
+	/* wait for everyone */
+	while (timeout) {
+		int i;
+		for (i = 0; i < nr_cpus; i++) {
+			if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
+				cpu_up_mask |= (1 << i);
+		};
+
+		if ((cpu_up_mask & up) == up)
+			break;
+
+		udelay(100);
+		timeout--;
+	}
+
+	if (timeout == 0)
+		printf("CPU up timeout. CPU up mask is %x should be %x\n",
+			cpu_up_mask, up);
+
+	/* enable time base at the platform */
+	out_be32(&rcpm->ctbenrl, 0);
+	mtspr(SPRN_TBWU, 0);
+	mtspr(SPRN_TBWL, 0);
+	out_be32(&rcpm->ctbenrl, (1 << nr_cpus) - 1);
+}
+#else
 static void pq3_mp_up(unsigned long bootpg)
 {
 	u32 up, cpu_up_mask, whoami;
Quoted 8 lines

cpu/mpc85xx/mp.c static void pq3_mp_up(unsigned long bootpg) · line 260

Quoted 5 lines
cpu/mpc85xx/mp.c +1 -0
@@ -196,6 +257,7 @@ static void pq3_mp_up(unsigned long bootpg)
 	devdisr &= ~(MPC85xx_DEVDISR_TB0 | MPC85xx_DEVDISR_TB1);
 	out_be32(&gur->devdisr, devdisr);
 }
+#endif

This is becoming a terrible mess of #ifdef's. Would it not make sense to move the new code into separate files?

Is this a general comment or specific to this patch?

In general I would say no. In this specific case we only have two #ifdef's. I can remove the one at the call site by naming the functions the same thing if desired.

- k

- k

#12 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

In reply to Kumar Gala

drivers/misc/fsl_law.c DECLARE_GLOBAL_DATA_PTR; · line 53

Quoted 5 lines · Kumar Gala

void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id) {

drivers/misc/fsl_law.c +3 -0
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;

We don't really need the volatile...

drivers/misc/fsl_law.c DECLARE_GLOBAL_DATA_PTR; · line 57

Quoted 9 lines

void disable_law(u8 idx)
{

drivers/misc/fsl_law.c +7 -0
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+	base = &(ccm->lawbarh0);

Use in_be32(). Likewise in find_law.

Quoted 14 lines
drivers/misc/fsl_law.c +14 -0
+struct law_entry find_law(phys_addr_t addr)
+{
+	struct law_entry entry;
+	int i;
+
+	entry.index = -1;
+	entry.addr = 0;
+	entry.size = 0;
+	entry.trgt_id = 0;
+
+	for(i = 0; i < FSL_HW_NUM_LAWS; i++) {
+
+		u64 upper;
+		u32 temp;

drivers/misc/fsl_law.c void disable_law(u8 idx) · line 177

Quoted 10 lines
drivers/misc/fsl_law.c +10 -0
+#ifdef CONFIG_FSL_CORENET
+		volatile ccsr_local_t *ccm;
+		volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+		ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+		base = &(ccm->lawbarh0);
+		lawbarh = base + i * 4;
+		lawbarl = lawbarh + 1;
+		lawar = lawbarl + 1;

So the consequence of not using an array in the reg struct, is that we don't use the reg struct. :-(

-Scott

#13 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

Quoted 3 lines · Scott Wood
Quoted 1 line

+ base = &(ccm->lawbarh0);

Use in_be32(). Likewise in find_law.

Grr, ignore me. I just had my brain baked by an ISO9000 presentation.

-Scott

#14 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

Quoted 10 lines · Scott Wood
Quoted 4 lines · Scott Wood
Quoted 2 lines

+ base = &(ccm->lawbarh0);

Use in_be32(). Likewise in find_law.

Grr, ignore me. I just had my brain baked by an ISO9000 presentation.

You should always just go home after those things. Let someone else drive, though :)

Ben

author
#15 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

In reply to Scott Wood
Quoted 5 lines · Scott Wood
Quoted 5 lines
drivers/misc/fsl_law.c +5 -0
+#ifdef CONFIG_FSL_CORENET
+		volatile ccsr_local_t *ccm;
+		volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+		ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
Quoted 8 lines

drivers/misc/fsl_law.c void disable_law(u8 idx) · line 177

Quoted 5 lines
drivers/misc/fsl_law.c +5 -0
+
+		base = &(ccm->lawbarh0);
+		lawbarh = base + i * 4;
+		lawbarl = lawbarh + 1;
+		lawar = lawbarl + 1;

So the consequence of not using an array in the reg struct, is that we don't use the reg struct. :-(

Maybe I'll get motivated and rework the code to have this as an array. (The thought did cross my mind about how it would have been nicer if there was an array. :)

I think the reason we didn't have an array on PQ3 was the # kept growing. However I'm pretty sure 32 will be the max # for a while on CoreNet platforms.

- k

#16 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

In reply to Kumar Gala

Dear Kumar Gala,

Quoted 41 lines · In message <[email protected]> you…

On CoreNet based platforms the LAW address is split between an high & low register and we no longer shift the address. Also, the target IDs on CoreNet platforms have been completely re-assigned.

Additionally, added a new find_law() API to which LAW an address hits in. This is need for the CoreNet style boot release code since it will need to determine what the target ID should be set to for boot window translation.

---
 drivers/misc/fsl_law.c    |   99 ++++++++++++++++++++++++++++++++++++++++++++-
 include/asm-ppc/fsl_law.h |   29 +++++++++++++
 2 files changed, 127 insertions(+), 1 deletions(-)
drivers/misc/fsl_law.c +12 -1
index aa877c6..fba16ed 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -48,6 +48,24 @@ DECLARE_GLOBAL_DATA_PTR;
 
 void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 {
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+	base = &(ccm->lawbarh0);
+	lawbarh = base + idx * 4;
+	lawbarl = lawbarh + 1;
+	lawar = lawbarl + 1;
+

drivers/misc/fsl_law.c DECLARE_GLOBAL_DATA_PTR; · line 71

Quoted 10 lines
drivers/misc/fsl_law.c +7 -0
+	gd->used_laws |= (1 << idx);
+
+	out_be32(lawar, 0);
+	out_be32(lawbarh, ((u64)addr >> 32));
+	out_be32(lawbarl, addr & 0xffffffff);
+	out_be32(lawar, LAWAR_EN | ((u32)id << 20) | (u32)sz);
+#else
 	volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
 	volatile u32 *lawbar = base + 8 * idx;
 	volatile u32 *lawar = base + 8 * idx + 2;

This is ugly. Now we have code and variable declarations intermixed. Please don't. Especially not when it's the same variables.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There comes to all races an ultimate crisis which  you  have  yet  to
face  ....  One  day  our  minds became so powerful we dared think of
ourselves as gods.
	-- Sargon, "Return to Tomorrow", stardate 4768.3
author
#17 lore raw

PATCH 2/7 ppc/p4080: Add support for CoreNet style platform LAWs

Quoted 55 lines · Wolfgang Denk

Dear Kumar Gala,

In message <[email protected]

Quoted 52 lines

you wrote:
On CoreNet based platforms the LAW address is split between an high & low register and we no longer shift the address. Also, the target IDs
on CoreNet platforms have been completely re-assigned.

Additionally, added a new find_law() API to which LAW an address hits in.
This is need for the CoreNet style boot release code since it will need
to determine what the target ID should be set to for boot window translation.

---
drivers/misc/fsl_law.c | 99 +++++++++++++++++++++++++++++++++++
+++++++++-
include/asm-ppc/fsl_law.h | 29 +++++++++++++

2 files changed, 127 insertions(+), 1 deletions(-)
drivers/misc/fsl_law.c +1 -1
index aa877c6..fba16ed 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
 *
 * (C) Copyright 2000
 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -48,6 +48,24 @@ DECLARE_GLOBAL_DATA_PTR;
 

void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
{

drivers/misc/fsl_law.c +16 -0
+#ifdef CONFIG_FSL_CORENET
+	volatile ccsr_local_t *ccm;
+	volatile u32 *base, *lawbarh, *lawbarl, *lawar;
+
+	ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR);
+
+	base = &(ccm->lawbarh0);
+	lawbarh = base + idx * 4;
+	lawbarl = lawbarh + 1;
+	lawar = lawbarl + 1;
+
+	gd->used_laws |= (1 << idx);
+
+	out_be32(lawar, 0);
+	out_be32(lawbarh, ((u64)addr >> 32));
+	out_be32(lawbarl, addr & 0xffffffff);
Quoted 8 lines
Quoted 5 lines
drivers/misc/fsl_law.c +2 -0
+	out_be32(lawar, LAWAR_EN | ((u32)id << 20) | (u32)sz);
+#else
	volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08);
	volatile u32 *lawbar = base + 8 * idx;
	volatile u32 *lawar = base + 8 * idx + 2;

This is ugly. Now we have code and variable declarations intermixed. Please don't. Especially not when it's the same variables.

Will fix this in a subsequent patch.

- k

#18 lore raw

PATCH 1/7 ppc/p4080: Add p4080 platform immap definitions

In reply to Kumar Gala
Quoted 13 lines · Kumar Gala
include/asm-ppc/immap_85xx.h +13 -0
+	u32	lawbarh0;	/* 0xc00 - LAW0 base address register high */
+	u32	lawbarl0;	/* 0xc04 - LAW0 base address register low */
+	u32	lawar0;		/* 0xc08 - LAW0 attributes register */
+	u8	res4[4];
+	u32	lawbarh1;	/* 0xc10 - LAW1 base address register high */
+	u32	lawbarl1;	/* 0xc14 - LAW1 base address register low */
+	u32	lawar1;		/* 0xc18 - LAW1 attributes register */
+	u8	res5[4];
+	u32	lawbarh2;	/* 0xc20 - LAW2 base address register high */
+	u32	lawbarl2;	/* 0xc24 - LAW2 base address register low */
+	u32	lawar2;		/* 0xc28 - LAW2 attributes register */
+	u8	res6[4];
+	u32	lawbarh3;	/* 0xc30 - LAW3 base address register high */

include/asm-ppc/immap_85xx.h line 55

Quoted 10 lines
include/asm-ppc/immap_85xx.h +10 -0
+	u32	lawbarl3;	/* 0xc34 - LAW3 base address register low */
+	u32	lawar3;		/* 0xc38 - LAW3 attributes register */
+	u8	res7[4];
+	u32	lawbarh4;	/* 0xc40 - LAW4 base address register high */
+	u32	lawbarl4;	/* 0xc44 - LAW4 base address register low */
+	u32	lawar4;		/* 0xc48 - LAW4 attributes register */
+	u8	res8[4];
+	u32	lawbarh5;	/* 0xc50 - LAW5 base address register high */
+	u32	lawbarl5;	/* 0xc54 - LAW5 base address register low */
+	u32	lawar5;		/* 0xc58 - LAW5 attributes register */

Can we use an array for this? Likewise many other parts.

Quoted 11 lines
include/asm-ppc/immap_85xx.h +11 -0
+	char	res7[12];
+	uint	powmgtcsr;	/* 0xe0080 - Power management status and control register */
+	char	res8[12];
+	uint	coredisru;	/* 0xe0090 - uppper portion for support of 64 cores */
+	uint	coredisrl;	/* 0xe0094 - lower portion for support of 64 cores */
+	char	res9[8];
+	uint	pvr;		/* 0xe00a0 - Processor version register */
+	uint	svr;		/* 0xe00a4 - System version register */
+	char	res10[8];
+	uint	rstcr;		/* 0xe00b0 - Reset control register */
+	uint	rstrqpblsr;	/* 0xe00b4 - Reset request preboot loader status register */

include/asm-ppc/immap_85xx.h typedef struct par_io { · line 1749

Quoted 10 lines
include/asm-ppc/immap_85xx.h +10 -0
+	char	res11[8];
+	uint	rstrqmr1;	/* 0xe00c0 - Reset request mask register */
+	char	res12[4];	/* Reserved: RSTRQMR2 */
+	uint	rstrqsr1;	/* 0xe00c8 - Reset request status register */
+	char	res13[4];	/* Reserved: RSTRQSR2 */
+	char	res14[4];	/* Reserved: RSTRQWDTMRU */
+	uint	rstrqwdtmrl;	/* 0xe00d4 - Reset request WDT mask register */
+	char	res15[4];	/* Reserved: RSTRQWDTSRU */
+	uint	rstrqwdtsrl;	/* 0xe00dc - Reset request WDT status register */
+	char	res16[4];	/* Reserved: BRRU max total of  2 for up to 64 cores */

If those fields have a name, why not use the name instead of "res13" etc?

If all these fields are 32 bit, why are the reserved fields char[4] rather than u32? It's very visually distracting.

For that matter, s/uint/u32/.

Quoted 25 lines
include/asm-ppc/immap_85xx.h +24 -1
-#define CONFIG_SYS_MPC85xx_GUTS_OFFSET	(0xE0000)
+#ifdef CONFIG_FSL_CORENET
+#define CONFIG_SYS_FSL_CORENET_CCM_OFFSET	(0x0000)
+#define CONFIG_SYS_MPC85xx_DDR_OFFSET		(0x8000)
+#define CONFIG_SYS_MPC85xx_DDR2_OFFSET		(0x9000)
+#define CONFIG_SYS_FSL_CORENET_CLK_OFFSET	(0xE1000)
+#define CONFIG_SYS_FSL_CORENET_RCPM_OFFSET	(0xE2000)
+#define CONFIG_SYS_MPC85xx_DMA_OFFSET		(0x100000)
+#define CONFIG_SYS_MPC85xx_ESPI_OFFSET		(0x110000)
+#define CONFIG_SYS_MPC85xx_ESDHC_OFFSET		(0x114000)
+#define CONFIG_SYS_MPC85xx_LBC_OFFSET		(0x124000)
+#define CONFIG_SYS_MPC85xx_GPIO_OFFSET		(0x130000)
+#define CONFIG_SYS_MPC85xx_QMAN_OFFSET		(0x318000)
+#define CONFIG_SYS_MPC85xx_BMAN_OFFSET		(0x31a000)
+#else
+#define CONFIG_SYS_MPC85xx_ECM_OFFSET		(0x0000)
+#define CONFIG_SYS_MPC85xx_DDR_OFFSET		(0x2000)
+#define CONFIG_SYS_MPC85xx_LBC_OFFSET		(0x5000)
+#define CONFIG_SYS_MPC85xx_DDR2_OFFSET		(0x6000)
+#define CONFIG_SYS_MPC85xx_ESPI_OFFSET		(0x7000)
+#define CONFIG_SYS_MPC85xx_PCIX_OFFSET		(0x8000)
+#define CONFIG_SYS_MPC85xx_PCIX2_OFFSET		(0x9000)
+#define CONFIG_SYS_MPC85xx_GPIO_OFFSET		(0xF000)
+#define CONFIG_SYS_MPC85xx_SATA1_OFFSET		(0x18000)
+#define CONFIG_SYS_MPC85xx_SATA2_OFFSET		(0x19000)

include/asm-ppc/immap_85xx.h typedef struct ccsr_gur { · line 2028

Quoted 10 lines
include/asm-ppc/immap_85xx.h +10 -0
+#define CONFIG_SYS_MPC85xx_L2_OFFSET		(0x20000)
+#define CONFIG_SYS_MPC85xx_DMA_OFFSET		(0x21000)
+#define CONFIG_SYS_MPC85xx_ESDHC_OFFSET		(0x2e000)
+#define CONFIG_SYS_MPC85xx_SERDES2_OFFSET	(0xE3100)
+#define CONFIG_SYS_MPC85xx_SERDES1_OFFSET	(0xE3000)
+#define CONFIG_SYS_MPC85xx_CPM_OFFSET		(0x80000)
+#endif
+
+#define CONFIG_SYS_MPC85xx_PIC_OFFSET		(0x40000)
+#define CONFIG_SYS_MPC85xx_GUTS_OFFSET		(0xE0000)

Unnecessary parens.

-Scott

author
#19 lore raw

PATCH 1/7 ppc/p4080: Add p4080 platform immap definitions

Quoted 18 lines · Scott Wood
Quoted 17 lines · Kumar Gala
include/asm-ppc/immap_85xx.h +17 -0
+	u32	lawbarh0;	/* 0xc00 - LAW0 base address register high */
+	u32	lawbarl0;	/* 0xc04 - LAW0 base address register low */
+	u32	lawar0;		/* 0xc08 - LAW0 attributes register */
+	u8	res4[4];
+	u32	lawbarh1;	/* 0xc10 - LAW1 base address register high */
+	u32	lawbarl1;	/* 0xc14 - LAW1 base address register low */
+	u32	lawar1;		/* 0xc18 - LAW1 attributes register */
+	u8	res5[4];
+	u32	lawbarh2;	/* 0xc20 - LAW2 base address register high */
+	u32	lawbarl2;	/* 0xc24 - LAW2 base address register low */
+	u32	lawar2;		/* 0xc28 - LAW2 attributes register */
+	u8	res6[4];
+	u32	lawbarh3;	/* 0xc30 - LAW3 base address register high */
+	u32	lawbarl3;	/* 0xc34 - LAW3 base address register low */
+	u32	lawar3;		/* 0xc38 - LAW3 attributes register */
+	u8	res7[4];
+	u32	lawbarh4;	/* 0xc40 - LAW4 base address register high */
Quoted 8 lines

include/asm-ppc/immap_85xx.h line 55

Quoted 6 lines
include/asm-ppc/immap_85xx.h +6 -0
+	u32	lawbarl4;	/* 0xc44 - LAW4 base address register low */
+	u32	lawar4;		/* 0xc48 - LAW4 attributes register */
+	u8	res8[4];
+	u32	lawbarh5;	/* 0xc50 - LAW5 base address register high */
+	u32	lawbarl5;	/* 0xc54 - LAW5 base address register low */
+	u32	lawar5;		/* 0xc58 - LAW5 attributes register */

Can we use an array for this? Likewise many other parts.

we could, but we didn't do this on PQ3 and I've got some other code that depends on lawbar{h,l}0.

Quoted 21 lines
Quoted 21 lines
(quoted diff) +2 -0
+	char	res7[12];
+	uint	powmgtcsr;	/* 0xe0080 - Power management status and control  

register */

(quoted diff) +2 -0
+	char	res8[12];
+	uint	coredisru;	/* 0xe0090 - uppper portion for support of 64  

cores */

(quoted diff) +1 -0
+	uint	coredisrl;	/* 0xe0094 - lower portion for support of 64  

cores */

include/asm-ppc/immap_85xx.h +6 -0
+	char	res9[8];
+	uint	pvr;		/* 0xe00a0 - Processor version register */
+	uint	svr;		/* 0xe00a4 - System version register */
+	char	res10[8];
+	uint	rstcr;		/* 0xe00b0 - Reset control register */
+	uint	rstrqpblsr;	/* 0xe00b4 - Reset request preboot loader status  

register */

include/asm-ppc/immap_85xx.h +6 -0
+	char	res11[8];
+	uint	rstrqmr1;	/* 0xe00c0 - Reset request mask register */
+	char	res12[4];	/* Reserved: RSTRQMR2 */
+	uint	rstrqsr1;	/* 0xe00c8 - Reset request status register */
+	char	res13[4];	/* Reserved: RSTRQSR2 */
+	char	res14[4];	/* Reserved: RSTRQWDTMRU */
Quoted 8 lines
Quoted 5 lines
include/asm-ppc/immap_85xx.h +4 -0
+	uint	rstrqwdtmrl;	/* 0xe00d4 - Reset request WDT mask register */
+	char	res15[4];	/* Reserved: RSTRQWDTSRU */
+	uint	rstrqwdtsrl;	/* 0xe00dc - Reset request WDT status register */
+	char	res16[4];	/* Reserved: BRRU max total of  2 for up to 64  

cores */

If those fields have a name, why not use the name instead of "res13" etc?

For right now I'm leaving this alone. These registers are architected but we just dont implement them in p4080. To catch any issues I'll stick with it as is for now.

Quoted 2 lines

If all these fields are 32 bit, why are the reserved fields char[4] rather than u32? It's very visually distracting.

I'll change char -> u8. However I'm not making u8[4] -> u32. For historically reasons we used u8 since we autogen'd these in the past. I'm sticking with u8 for reserved fields.

Quoted 1 line

For that matter, s/uint/u32/.

I'll make this change.

Quoted 30 lines
Quoted 30 lines
include/asm-ppc/immap_85xx.h +28 -1
-#define CONFIG_SYS_MPC85xx_GUTS_OFFSET	(0xE0000)
+#ifdef CONFIG_FSL_CORENET
+#define CONFIG_SYS_FSL_CORENET_CCM_OFFSET	(0x0000)
+#define CONFIG_SYS_MPC85xx_DDR_OFFSET		(0x8000)
+#define CONFIG_SYS_MPC85xx_DDR2_OFFSET		(0x9000)
+#define CONFIG_SYS_FSL_CORENET_CLK_OFFSET	(0xE1000)
+#define CONFIG_SYS_FSL_CORENET_RCPM_OFFSET	(0xE2000)
+#define CONFIG_SYS_MPC85xx_DMA_OFFSET		(0x100000)
+#define CONFIG_SYS_MPC85xx_ESPI_OFFSET		(0x110000)
+#define CONFIG_SYS_MPC85xx_ESDHC_OFFSET		(0x114000)
+#define CONFIG_SYS_MPC85xx_LBC_OFFSET		(0x124000)
+#define CONFIG_SYS_MPC85xx_GPIO_OFFSET		(0x130000)
+#define CONFIG_SYS_MPC85xx_QMAN_OFFSET		(0x318000)
+#define CONFIG_SYS_MPC85xx_BMAN_OFFSET		(0x31a000)
+#else
+#define CONFIG_SYS_MPC85xx_ECM_OFFSET		(0x0000)
+#define CONFIG_SYS_MPC85xx_DDR_OFFSET		(0x2000)
+#define CONFIG_SYS_MPC85xx_LBC_OFFSET		(0x5000)
+#define CONFIG_SYS_MPC85xx_DDR2_OFFSET		(0x6000)
+#define CONFIG_SYS_MPC85xx_ESPI_OFFSET		(0x7000)
+#define CONFIG_SYS_MPC85xx_PCIX_OFFSET		(0x8000)
+#define CONFIG_SYS_MPC85xx_PCIX2_OFFSET		(0x9000)
+#define CONFIG_SYS_MPC85xx_GPIO_OFFSET		(0xF000)
+#define CONFIG_SYS_MPC85xx_SATA1_OFFSET		(0x18000)
+#define CONFIG_SYS_MPC85xx_SATA2_OFFSET		(0x19000)
+#define CONFIG_SYS_MPC85xx_L2_OFFSET		(0x20000)
+#define CONFIG_SYS_MPC85xx_DMA_OFFSET		(0x21000)
+#define CONFIG_SYS_MPC85xx_ESDHC_OFFSET		(0x2e000)
+#define CONFIG_SYS_MPC85xx_SERDES2_OFFSET	(0xE3100)
Quoted 8 lines

include/asm-ppc/immap_85xx.h typedef struct ccsr_gur { · line 2028

Quoted 6 lines
include/asm-ppc/immap_85xx.h +6 -0
+#define CONFIG_SYS_MPC85xx_SERDES1_OFFSET	(0xE3000)
+#define CONFIG_SYS_MPC85xx_CPM_OFFSET		(0x80000)
+#endif
+
+#define CONFIG_SYS_MPC85xx_PIC_OFFSET		(0x40000)
+#define CONFIG_SYS_MPC85xx_GUTS_OFFSET		(0xE0000)

Unnecessary parens.

will fix.

- k