Add CPU and other peripheral support
PATCH 1/2 Add CPU and other peripheral support
From: Tirumala Marri <[email protected]>
APM82XXX 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 AHB bus, DDR and Some common register definitions.
---
V1:
* Squash some of the patches.
* add space between "||" and "\".
* Add spaces around operators.
* Unsigned int to u32.
* Add empty line which was removed.
* remove warning "unused variable" in cpu_init.c
--- arch/powerpc/cpu/ppc4xx/cpu.c | 35 ++++++++++++- arch/powerpc/cpu/ppc4xx/cpu_init.c | 8 ++- arch/powerpc/cpu/ppc4xx/speed.c | 85 ++++++++++++++++++++++++++++++- arch/powerpc/cpu/ppc4xx/start.S | 10 +++- arch/powerpc/include/asm/ppc4xx-ebc.h | 4 ++ arch/powerpc/include/asm/ppc4xx-isram.h | 8 ++- arch/powerpc/include/asm/ppc4xx-sdram.h | 25 +++++++-- arch/powerpc/include/asm/ppc4xx-uic.h | 5 +- arch/powerpc/include/asm/processor.h | 1 + include/ppc440.h | 57 ++++++++++++++++++++- include/ppc4xx.h | 7 ++- 11 files changed, 220 insertions(+), 25 deletions(-)
arch/powerpc/cpu/ppc4xx/cpu.c +32 -3
@@ -80,7 +80,8 @@ static int pci_async_enabled(void)#endif /* CONFIG_PCI */ #if defined(CONFIG_PCI ) && !defined(CONFIG_IOP480 ) && \ - !defined(CONFIG_405 ) && !defined(CONFIG_405EX ) + !defined(CONFIG_405 ) && !defined(CONFIG_405EX ) && \ + !defined(CONFIG_APM82XXX )int pci_arbiter_enabled (void ) {#if defined(CONFIG_405GP )
@@ -250,6 +251,21 @@ static char *bootstrap_str[] = { };static char bootstrap_char[] = {'A' ,'B' ,'C' ,'D' ,'E' ,'G' ,'F' ,'H' };#endif +#if defined(CONFIG_APM82XXX ) +#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 )
@@ -285,7 +301,7 @@ int checkcpu (void)uint pvr =get_pvr ();ulong clock = gd->cpu_clk;char buf[32 ]; -#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) +#if defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || defined(CONFIG_APM82XXX )u32 reg;#endif
@@ -304,6 +320,8 @@ int checkcpu (void)#if defined(CONFIG_XILINX_440 )puts ("IBM PowerPC 4" ); +#elif defined(CONFIG_APM82XXX ) +puts ("APM PowerPC APM82" );#else puts ("AMCC PowerPC 4" );#endif
@@ -316,7 +334,7 @@ int checkcpu (void)#if defined(CONFIG_440 )#if defined(CONFIG_460EX ) || defined(CONFIG_460GT )puts ("60" ); -#else +#elif !defined(CONFIG_APM82XXX )puts ("40" );#endif #endif
@@ -598,7 +616,18 @@ int checkcpu (void)puts ("GX Rev. A" );strcpy (addstr,"No Security support" );break ; +#if defined(CONFIG_APM82XXX ) +case PVR_APM82XXX_RA : +mfsdr (SDR0_ECID3 , reg); +if (reg &0x00200000 ) +puts ("181 Rev. A" ); +if (reg &0x00100000 ) +strcpy (addstr,"No Security support" ); +else +strcpy (addstr,"Security support" ); +break ; +#endif case PVR_VIRTEX5 :puts ("x5 VIRTEX5" );break ;
arch/powerpc/cpu/ppc4xx/cpu_init.c +5 -3
@@ -222,13 +222,15 @@ void reconfigure_pll(u32 new_cpu_freq)void cpu_init_f (void ) { -#if defined(CONFIG_WATCHDOG ) || defined(CONFIG_440GX ) || defined(CONFIG_460EX ) +#if defined(CONFIG_WATCHDOG ) || defined(CONFIG_440GX ) || \ + defined(CONFIG_460EX )u32 val;#endif 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_SYS_4xx_GPIO_TABLE) && !defined(CONFIG_APM82XXX )/* * GPIO0 setup (select GPIO or alternate function) */
@@ -384,7 +386,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_APM82XXX )/* * Set PLB4 arbiter (Segment 0 and 1) to 4 deep pipeline read */
arch/powerpc/cpu/ppc4xx/speed.c +84 -1
103 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/start.S +8 -2
@@ -700,7 +700,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_APM82XXX) lis r1, 0x0000 ori r1,r1,0x0008 /* Set L2_CACHE_CFG[RDBW]=1 */ mtdcr L2_CACHE_CFG,r1
@@ -728,7 +729,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_APM82XXX) lis r1,0x0000 /* BAS = X_0000_0000 */ ori r1,r1,0x0984 /* first 64k */ mtdcr ISRAM0_SB0CR,r1
@@ -752,7 +754,11 @@ _start: mtdcr ISRAM1_PMEG,r1 lis r1,0x0004 /* BAS = 4_0004_0000 */ +#if defined(CONFIG_APM82XXX) /* APM82XXX only has 32KB of OCM */ + ori r1,r1,0x0784 /* 32k */ +#else ori r1,r1,0x0984 /* 64k */ +#endif mtdcr ISRAM1_SB0CR,r1 #endif #elif defined(CONFIG_460SX)
arch/powerpc/include/asm/ppc4xx-ebc.h +4 -0
@@ -73,6 +73,10 @@#define EBC_NUM_BANKS 3#endif +#if defined(CONFIG_APM82XXX ) +#define EBC_NUM_BANKS 3 +#endif +/* Bank Configuration Register */ #define EBC_BXCR (n) (n)#define EBC_BXCR_BANK_SIZE (n) (0x100000 << (((n) & EBC_BXCR_BS_MASK) >> 17))
arch/powerpc/include/asm/ppc4xx-isram.h +5 -3
@@ -25,7 +25,8 @@/* * Internal SRAM */ -#if defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) +#if defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ + defined(CONFIG_APM82XXX )#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_APM82XXX )#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 */
@@ -60,7 +62,7 @@#if defined (CONFIG_440GX ) || \ defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM82XXX )#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 +19 -6
@@ -292,7 +292,7 @@*/ #if defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM82XXX )#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)
@@ -322,6 +322,7 @@* Revisit this file to check if all these 405EX defines are correct and * can be used in the common 44x_spd_ddr2 code as well. sr, 2008-06-02 */ +#define SDRAM_MBXCF_BASE_ENCODE (n) (((n) & 0xFFC00000) >> 3)#define SDRAM_RXBAS_SDSZ_MASK PPC_REG_VAL(19, 0xF)#define SDRAM_RXBAS_SDSZ_4MB PPC_REG_VAL(19, 0x0)#define SDRAM_RXBAS_SDSZ_8MB PPC_REG_VAL(19, 0x1)
@@ -346,6 +347,18 @@#define SDRAM_RXBAS_SDSZ_2048 SDRAM_RXBAS_SDSZ_2048MB#define SDRAM_RXBAS_SDSZ_4096 SDRAM_RXBAS_SDSZ_4096MB#define SDRAM_RXBAS_SDSZ_8192 SDRAM_RXBAS_SDSZ_8192MB +#define SDRAM_RXBAS_SDAM_MODE0 PPC_REG_VAL(23, 0x0) +#define SDRAM_RXBAS_SDAM_MODE1 PPC_REG_VAL(23, 0x1) +#define SDRAM_RXBAS_SDAM_MODE2 PPC_REG_VAL(23, 0x2) +#define SDRAM_RXBAS_SDAM_MODE3 PPC_REG_VAL(23, 0x3) +#define SDRAM_RXBAS_SDAM_MODE4 PPC_REG_VAL(23, 0x4) +#define SDRAM_RXBAS_SDAM_MODE5 PPC_REG_VAL(23, 0x5) +#define SDRAM_RXBAS_SDAM_MODE6 PPC_REG_VAL(23, 0x6) +#define SDRAM_RXBAS_SDAM_MODE7 PPC_REG_VAL(23, 0x7) +#define SDRAM_RXBAS_SDAM_MODE8 PPC_REG_VAL(23, 0x8) +#define SDRAM_RXBAS_SDAM_MODE9 PPC_REG_VAL(23, 0x9) +#define SDRAM_RXBAS_SDBE_DISABLE PPC_REG_VAL(31, 0x0) +#define SDRAM_RXBAS_SDBE_ENABLE PPC_REG_VAL(31, 0x1)#endif /* CONFIG_405EX */ /* The mode definitions are the same for all PPC4xx variants */
@@ -365,7 +378,7 @@/* * Memory controller registers */ -#ifdef CONFIG_405EX +#if defined(CONFIG_405EX ) || defined(CONFIG_APM82XXX )#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 +388,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_APM82XXX */ #define SDRAM_MCSTAT 0x14/* memory controller status */ -#endif /* CONFIG_405EX */ +#endif /* CONFIG_405EX || CONFIG_APM82XXX */ #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 +436,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_APM82XXX )#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_APM82XXX )#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_APM82XXX )#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_APM82XXX )/* UIC 0 */ #define VECNUM_UIC2NCI 10#define VECNUM_UIC2CI 11
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_APM82XXX_RA 0x12C41C80/* APM82XXX rev A */ #define PVR_601 0x00010000#define PVR_602 0x00050000#define PVR_603 0x00030000
include/ppc440.h +55 -2
90 lines not on this page · raw message
include/ppc4xx.h +4 -3
@@ -44,14 +44,15 @@#if defined(CONFIG_405EX ) || \ defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM82XXX )#define CONFIG_SDRAM_PPC4xx_IBM_DDR2/* IBM DDR(2) controller */ #endif #if defined(CONFIG_440EP ) || defined(CONFIG_440GR ) || \ defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ defined(CONFIG_405EZ ) || defined(CONFIG_405EX ) || \ - defined(CONFIG_460EX ) || defined(CONFIG_460GT ) + defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ + defined(CONFIG_APM82XXX )#define CONFIG_NAND_NDFC #endif
@@ -61,7 +62,7 @@defined (CONFIG_440GR ) ||defined (CONFIG_440GRX ) || \defined (CONFIG_440SP ) ||defined (CONFIG_440SPE ) || \defined (CONFIG_460EX ) ||defined (CONFIG_460GT ) || \ - defined(CONFIG_460SX) + defined(CONFIG_460SX) || defined(CONFIG_APM82XXX)#define PLB_ARBITER_BASE 0x80
Signature · 1 line
1.6.1.rc3
PATCH 1/2 Add CPU and other peripheral support
Hi Marri,
Quoted 8 lines · On Wednesday 01 September 2010 04:11:14 tmarri at apm.com wrote:
From: Tirumala Marri <[email protected]>
APM82XXX 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 AHB bus, DDR and Some common register definitions.
Please find some comments below.
<snip>
arch/powerpc/include/asm/ppc4xx-sdram.h line 296
Quoted 11 lines
(quoted diff) +0
-0
b/arch/powerpc/include/asm/ppc4xx-sdram.hindex 4ec1ef8..a6cdace 100644arch/powerpc/include/asm/ppc4xx-sdram.h +1
-1@@ -292,7 +292,7 @@*/ #if defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ - defined(CONFIG_460SX ) + defined(CONFIG_460SX ) || defined(CONFIG_APM82XXX )#define SDRAM_RXBAS_SDBA_MASK 0xFFE00000/* Base
address */
Quoted 7 lines
arch/powerpc/include/asm/ppc4xx-sdram.h +0
-0#define SDRAM_RXBAS_SDBA_ENCODE (n) ((u32)(((phys_size_t)(n) >> 2) &
0xFFE00000)) #defineSDRAM_RXBAS_SDBA_DECODE(n)((((phys_size_t)(n)) &0xFFE00000) << 2) @@ -322,6 +322,7 @@
* Revisit this file to check if all these 405EX defines are correct and
* can be used in the common 44x_spd_ddr2 code as well. sr, 2008-06-02 */
+#defineSDRAM_MBXCF_BASE_ENCODE(n)(((n) &0xFFC00000) >> 3)
It seems to me, that you are adding this to the 405EX part of the header. Please re-check if this is correct.
Quoted 9 lines
#define
SDRAM_RXBAS_SDSZ_MASKPPC_REG_VAL(19, 0xF)
#defineSDRAM_RXBAS_SDSZ_4MBPPC_REG_VAL(19, 0x0)
#defineSDRAM_RXBAS_SDSZ_8MBPPC_REG_VAL(19, 0x1)arch/powerpc/include/asm/ppc4xx-sdram.h +2
-0@@ -346,6 +347,18 @@#define SDRAM_RXBAS_SDSZ_2048 SDRAM_RXBAS_SDSZ_2048MB#define SDRAM_RXBAS_SDSZ_4096 SDRAM_RXBAS_SDSZ_4096MB#define SDRAM_RXBAS_SDSZ_8192 SDRAM_RXBAS_SDSZ_8192MB +#define SDRAM_RXBAS_SDAM_MODE0 PPC_REG_VAL(23, 0x0) +#define SDRAM_RXBAS_SDAM_MODE1 PPC_REG_VAL(23, 0x1)
arch/powerpc/include/asm/ppc4xx-sdram.h line 361
Quoted 10 lines
arch/powerpc/include/asm/ppc4xx-sdram.h +10
-0+#define SDRAM_RXBAS_SDAM_MODE2 PPC_REG_VAL(23, 0x2) +#define SDRAM_RXBAS_SDAM_MODE3 PPC_REG_VAL(23, 0x3) +#define SDRAM_RXBAS_SDAM_MODE4 PPC_REG_VAL(23, 0x4) +#define SDRAM_RXBAS_SDAM_MODE5 PPC_REG_VAL(23, 0x5) +#define SDRAM_RXBAS_SDAM_MODE6 PPC_REG_VAL(23, 0x6) +#define SDRAM_RXBAS_SDAM_MODE7 PPC_REG_VAL(23, 0x7) +#define SDRAM_RXBAS_SDAM_MODE8 PPC_REG_VAL(23, 0x8) +#define SDRAM_RXBAS_SDAM_MODE9 PPC_REG_VAL(23, 0x9) +#define SDRAM_RXBAS_SDBE_DISABLE PPC_REG_VAL(31, 0x0) +#define SDRAM_RXBAS_SDBE_ENABLE PPC_REG_VAL(31, 0x1)
Again, this is the 405EX part.
Please fix and resubmit. 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