APM821xx: Add CPU support
PATCH v7 1/2 APM821xx: Add CPU support
From: Tirumala Marri <[email protected]>
APM821XX is a new line of SoCs which are derivatives of PPC44X family of processors. This patch adds support of CPU, cache, tlb, 32k ocm, bootstraps, PLB and AHB bus.
---
V6:
* Correcting indentation.
V7:
* Ordering defined(APM821XX) in cpu_init.c .
--- arch/powerpc/cpu/ppc4xx/cpu.c | 19 ++++++++ arch/powerpc/cpu/ppc4xx/cpu_init.c | 5 +- arch/powerpc/cpu/ppc4xx/speed.c | 75 ++++++++++++++++++++++++++++++- arch/powerpc/cpu/ppc4xx/start.S | 11 +++-- arch/powerpc/include/asm/apm821xx.h | 72 +++++++++++++++++++++++++++++ arch/powerpc/include/asm/ppc4xx-ebc.h | 3 +- arch/powerpc/include/asm/ppc4xx-isram.h | 14 +++++- arch/powerpc/include/asm/ppc4xx-sdram.h | 12 +++--- arch/powerpc/include/asm/ppc4xx-uic.h | 5 +- arch/powerpc/include/asm/ppc4xx.h | 4 ++ arch/powerpc/include/asm/processor.h | 1 + 11 files changed, 202 insertions(+), 19 deletions(-)
arch/powerpc/cpu/ppc4xx/cpu.c +19 -0
@@ -250,6 +250,20 @@ static char *bootstrap_str[] = { };static char bootstrap_char[] = {'A' ,'B' ,'C' ,'D' ,'E' ,'G' ,'F' ,'H' };#endif +#if defined(CONFIG_APM821XX ) +#define SDR0_PINSTP_SHIFT 29 +static char *bootstrap_str[] = { +"RESERVED" , +"RESERVED" , +"RESERVED" , +"NAND (8 bits)" , +"NOR (8 bits)" , +"NOR (8 bits) w/PLL Bypassed" , +"I2C (Addr 0x54)" , +"I2C (Addr 0x52)" , +}; +static char bootstrap_char[] = {'A' ,'B' ,'C' ,'D' ,'E' ,'F' ,'G' ,'H' }; +#endif #if defined(SDR0_PINSTP_SHIFT )static int bootstrap_option (void )
@@ -590,6 +604,11 @@ int checkcpu (void)strcpy (addstr,"No Security support" );break ; +case PVR_APM821XX_RA : +puts ("APM821XX Rev. A" ); +strcpy (addstr,"Security support" ); +break ; +case PVR_VIRTEX5 :puts ("440x5 VIRTEX5" );break ;
arch/powerpc/cpu/ppc4xx/cpu_init.c +3 -2
@@ -237,7 +237,8 @@ cpu_init_f (void)reconfigure_pll (CONFIG_SYS_PLL_RECONFIG ); -#if (defined(CONFIG_405EP ) || defined (CONFIG_405EX )) && !defined(CONFIG_SYS_4xx_GPIO_TABLE) +#if (defined(CONFIG_405EP ) || defined (CONFIG_405EX )) && \ + !defined(CONFIG_APM821XX ) &&!defined(CONFIG_SYS_4xx_GPIO_TABLE)/* * GPIO0 setup (select GPIO or alternate function) */
@@ -393,7 +394,7 @@ cpu_init_f (void)#if defined(CONFIG_405EX ) || \ defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM821XX )/* * Set PLB4 arbiter (Segment 0 and 1) to 4 deep pipeline read */
arch/powerpc/cpu/ppc4xx/speed.c +74 -1
93 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/start.S +7 -4
@@ -703,7 +703,8 @@ _start: defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460SX) mtdcr L2_CACHE_CFG,r0 /* Ensure L2 Cache is off */ -#elif defined(CONFIG_460EX) || defined(CONFIG_460GT) +#elif defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ + defined(CONFIG_APM821XX) lis r1, 0x0000 ori r1,r1,0x0008 /* Set L2_CACHE_CFG[RDBW]=1 */ mtdcr L2_CACHE_CFG,r1
@@ -731,7 +732,8 @@ _start: lis r1, 0x8003 ori r1,r1, 0x0980 /* fourth 64k */ mtdcr ISRAM0_SB3CR,r1 -#elif defined(CONFIG_440SPE) || defined(CONFIG_460EX) || defined(CONFIG_460GT) +#elif defined(CONFIG_440SPE) || defined(CONFIG_460EX) || \ + defined(CONFIG_460GT) || defined(CONFIG_APM821XX) lis r1,0x0000 /* BAS = X_0000_0000 */ ori r1,r1,0x0984 /* first 64k */ mtdcr ISRAM0_SB0CR,r1
@@ -744,7 +746,8 @@ _start: lis r1, 0x0003 ori r1,r1, 0x0984 /* fourth 64k */ mtdcr ISRAM0_SB3CR,r1 -#if defined(CONFIG_460EX) || defined(CONFIG_460GT) +#if defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ + defined(CONFIG_APM821XX) lis r2,0x7fff ori r2,r2,0xffff mfdcr r1,ISRAM1_DPC
@@ -755,7 +758,7 @@ _start: mtdcr ISRAM1_PMEG,r1 lis r1,0x0004 /* BAS = 4_0004_0000 */ - ori r1,r1,0x0984 /* 64k */ + ori r1,r1,ISRAM1_SIZE /* ocm size */ mtdcr ISRAM1_SB0CR,r1 #endif #elif defined(CONFIG_460SX)
arch/powerpc/include/asm/apm821xx.h new file +72 -0
72 lines not on this page · raw message
arch/powerpc/include/asm/ppc4xx-ebc.h +2 -1
@@ -69,7 +69,8 @@#define EBC_NUM_BANKS 6#endif -#if defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) +#if defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ + defined(CONFIG_APM821XX )#define EBC_NUM_BANKS 3#endif
arch/powerpc/include/asm/ppc4xx-isram.h +11 -3
@@ -25,7 +25,8 @@/* * Internal SRAM */ -#if defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) +#if defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ + defined(CONFIG_APM821XX )#define ISRAM0_DCR_BASE 0x380#else #define ISRAM0_DCR_BASE 0x020
@@ -42,7 +43,8 @@#define ISRAM0_REVID (ISRAM0_DCR_BASE+0x09)/* SRAM bus revision id reg */ #define ISRAM0_DPC (ISRAM0_DCR_BASE+0x0a)/* SRAM data parity check reg */ -#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) +#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ + defined(CONFIG_APM821XX )#define ISRAM1_DCR_BASE 0x0B0#define ISRAM1_SB0CR (ISRAM1_DCR_BASE+0x00)/* SRAM1 bank config 0*/ #define ISRAM1_BEAR (ISRAM1_DCR_BASE+0x04)/* SRAM1 bus error addr reg */
@@ -54,13 +56,19 @@#define ISRAM1_DPC (ISRAM1_DCR_BASE+0x0a)/* SRAM1 data parity check reg */ #endif /* CONFIG_460EX || CONFIG_460GT */ +#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) +#define ISRAM1_SIZE 0x0984/* OCM size 64k */ +#elif defined(CONFIG_APM821XX ) +#define ISRAM1_SIZE 0x0784/* OCM size 32k */ +#endif +/* * L2 Cache */ #if defined (CONFIG_440GX ) || \ defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM821XX )#define L2_CACHE_BASE 0x030#define L2_CACHE_CFG (L2_CACHE_BASE+0x00)/* L2 Cache Config */ #define L2_CACHE_CMD (L2_CACHE_BASE+0x01)/* L2 Cache Command */
arch/powerpc/include/asm/ppc4xx-sdram.h +6 -6
@@ -292,7 +292,7 @@*/ #if defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM821XX )#define SDRAM_RXBAS_SDBA_MASK 0xFFE00000/* Base address */ #define SDRAM_RXBAS_SDBA_ENCODE (n) ((u32)(((phys_size_t)(n) >> 2) & 0xFFE00000))#define SDRAM_RXBAS_SDBA_DECODE (n) ((((phys_size_t)(n)) & 0xFFE00000) << 2)
@@ -365,7 +365,7 @@/* * Memory controller registers */ -#ifdef CONFIG_405EX +#if defined(CONFIG_405EX ) || defined(CONFIG_APM821XX )#define SDRAM_BESR 0x00/* PLB bus error status (read/clear) */ #define SDRAM_BESRT 0x01/* PLB bus error status (test/set) */ #define SDRAM_BEARL 0x02/* PLB bus error address low */
@@ -375,9 +375,9 @@#define SDRAM_PLBOPT 0x08/* PLB slave options */ #define SDRAM_PUABA 0x09/* PLB upper address base */ #define SDRAM_MCSTAT 0x1F/* memory controller status */ -#else /* CONFIG_405EX */ +#else /* CONFIG_405EX || CONFIG_APM821XX */ #define SDRAM_MCSTAT 0x14/* memory controller status */ -#endif /* CONFIG_405EX */ +#endif /* CONFIG_405EX || CONFIG_APM821XX */ #define SDRAM_MCOPT1 0x20/* memory controller options 1 */ #define SDRAM_MCOPT2 0x21/* memory controller options 2 */ #define SDRAM_MODT0 0x22/* on die termination for bank 0 */
@@ -423,12 +423,12 @@#define SDRAM_MEMODE 0x89/* memory extended mode */ #define SDRAM_ECCES 0x98/* ECC error status */ #define SDRAM_CID 0xA4/* core ID */ -#ifndef CONFIG_405EX +#if !defined(CONFIG_405EX ) && !defined(CONFIG_APM821XX )#define SDRAM_RID 0xA8/* revision ID */ #endif #define SDRAM_FCSR 0xB0/* feedback calibration status */ #define SDRAM_RTSR 0xB1/* run time status tracking */ -#ifdef CONFIG_405EX +#if defined(CONFIG_405EX ) || defined(CONFIG_APM821XX )#define SDRAM_RID 0xF8/* revision ID */ #endif
arch/powerpc/include/asm/ppc4xx-uic.h +3 -2
@@ -31,7 +31,7 @@*/ #if defined(CONFIG_440GX ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM821XX )#define UIC_MAX 4#elif defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ defined(CONFIG_405EX )
@@ -252,7 +252,8 @@#define VECNUM_ETH0 (32 + 28)#endif /* CONFIG_440SPE */ -#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) +#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ + defined(CONFIG_APM821XX )/* UIC 0 */ #define VECNUM_UIC2NCI 10#define VECNUM_UIC2CI 11
arch/powerpc/include/asm/ppc4xx.h +4 -0
@@ -79,6 +79,10 @@#include <asm/ppc460sx.h> #endif +#if defined(CONFIG_APM821XX ) +#include <asm/apm821xx.h> +#endif +/* * Configure which SDRAM/DDR/DDR2 controller is equipped */
arch/powerpc/include/asm/processor.h +1 -0
@@ -916,6 +916,7 @@#define PVR_460SX_RA_V1 0x13541801/* 460SX rev A Variant 1 Security disabled */ #define PVR_460GX_RA 0x13541802/* 460GX rev A */ #define PVR_460GX_RA_V1 0x13541803/* 460GX rev A Variant 1 Security disabled */ +#define PVR_APM821XX_RA 0x12C41C80/* APM821XX rev A */ #define PVR_601 0x00010000#define PVR_602 0x00050000#define PVR_603 0x00030000
Signature · 1 line
1.6.1.rc3
PATCH v7 1/2 APM821xx: Add CPU support
Dear tmarri at apm.com,
Quoted 12 lines · In message <[email protected]> you wrote:
From: Tirumala Marri <[email protected]>
APM821XX is a new line of SoCs which are derivatives of PPC44X family of processors. This patch adds support of CPU, cache, tlb, 32k ocm, bootstraps, PLB and AHB bus.
Signed-off-by Tirumala R Marri <[email protected]>---
V6:
* Correcting indentation.
V7:
* Ordering defined(APM821XX) incpu_init.c.
Quoted 13 lines
--- arch/powerpc/cpu/ppc4xx/cpu.c | 19 ++++++++ arch/powerpc/cpu/ppc4xx/cpu_init.c | 5 +- arch/powerpc/cpu/ppc4xx/speed.c | 75 ++++++++++++++++++++++++++++++- arch/powerpc/cpu/ppc4xx/start.S | 11 +++-- arch/powerpc/include/asm/apm821xx.h | 72 +++++++++++++++++++++++++++++ arch/powerpc/include/asm/ppc4xx-ebc.h | 3 +- arch/powerpc/include/asm/ppc4xx-isram.h | 14 +++++- arch/powerpc/include/asm/ppc4xx-sdram.h | 12 +++--- arch/powerpc/include/asm/ppc4xx-uic.h | 5 +- arch/powerpc/include/asm/ppc4xx.h | 4 ++ arch/powerpc/include/asm/processor.h | 1 + 11 files changed, 202 insertions(+), 19 deletions(-)
Best regards,
Wolfgang Denk
Signature · 5 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 Fascinating is a word I use for the unexpected. -- Spock, "The Squire of Gothos", stardate 2124.5
PATCH v7 1/2 APM821xx: Add CPU support
In reply to tmarri at apm.comQuoted 5 lines · On Tuesday 28 September 2010 23:15:14 tmarri at apm.com wrote:
From: Tirumala Marri <[email protected]>
APM821XX is a new line of SoCs which are derivatives of PPC44X family of processors. This patch adds support of CPU, cache, tlb, 32k ocm, bootstraps, PLB and AHB bus.
Applied to u-boot-ppc4xx/master. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de