APM821xx: Add CPU support
PATCH v3 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.
---
V2:
* Removed Defines added to 405ex.
V3:
* Change APM82XXX to APM821XX
* Modify the way cpu id is printed.
* Correct inadvertent change.
* Sort define list.
* Remove comment for get_sys_info().
* Define a symbolic constat ISRAM1_OCM_SIZE.
* Create apm821xx.h instead of using ppc440.h
* Correct multiline comment.
--- arch/powerpc/cpu/ppc4xx/cpu.c | 36 ++- arch/powerpc/cpu/ppc4xx/cpu_init.c | 5 +- arch/powerpc/cpu/ppc4xx/speed.c | 76 +++++- arch/powerpc/cpu/ppc4xx/start.S | 11 +- arch/powerpc/cpu/ppc4xx/tlb.c | 2 + arch/powerpc/include/asm/ppc4xx-ebc.h | 4 + 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/processor.h | 1 + include/apm821xx.h | 493 +++++++++++++++++++++++++++++++ include/ppc4xx.h | 11 +- 12 files changed, 645 insertions(+), 25 deletions(-)
arch/powerpc/cpu/ppc4xx/cpu.c +33 -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_APM821XX )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_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 )
@@ -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_APM821XX )u32 reg;#endif
@@ -301,7 +317,9 @@ int checkcpu (void)puts ("CPU: " );get_sys_info (&sys_info); - +#if defined(CONFIG_APM821XX ) +puts ("APM PowerPC APM821XX" ); +#else #if defined(CONFIG_XILINX_440 )puts ("IBM PowerPC 4" );#else
@@ -320,6 +338,7 @@ int checkcpu (void)puts ("40" );#endif #endif +#endif switch (pvr) {case PVR_405GP_RB :
@@ -598,7 +617,18 @@ int checkcpu (void)puts ("GX Rev. A" );strcpy (addstr,"No Security support" );break ; +#if defined(CONFIG_APM821XX ) +case PVR_APM821XX_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 +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_APM821XX ) && (defined(CONFIG_405EP ) || \ + defined(CONFIG_405EX )) && !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 +75 -1
94 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/start.S +7 -4
@@ -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_APM821XX) 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_APM821XX) lis r1,0x0000 /* BAS = X_0000_0000 */ ori r1,r1,0x0984 /* first 64k */ mtdcr ISRAM0_SB0CR,r1
@@ -741,7 +743,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
@@ -752,7 +755,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/cpu/ppc4xx/tlb.c +2 -0
@@ -25,7 +25,9 @@#if defined(CONFIG_440 ) +#if !defined(CONFIG_APM821XX )#include <ppc440.h> +#endif #include <asm/cache.h> #include <asm/io.h> #include <asm/mmu.h>
arch/powerpc/include/asm/ppc4xx-ebc.h +4 -0
@@ -73,6 +73,10 @@#define EBC_NUM_BANKS 3#endif +#if defined(CONFIG_APM821XX ) +#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 +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/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
include/apm821xx.h new file +493 -0
493 lines not on this page · raw message
include/ppc4xx.h +7 -4
@@ -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_APM821XX )#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_APM821XX )#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_APM821XX)#define PLB_ARBITER_BASE 0x80
@@ -99,7 +100,9 @@#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/ -#if defined(CONFIG_440 ) +#if defined(CONFIG_APM821XX ) +#include <apm821xx.h> +#elif defined(CONFIG_440 )#include <ppc440.h> #else #include <ppc405.h>
Signature · 1 line
1.6.1.rc3
PATCH v3 1/2 APM821xx: Add CPU support
Hi Marri,
Quoted 5 lines · On Wednesday 08 September 2010 04:06:21 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.
Look mostly good. One comment though below.
Quoted 13 lines
Signed-off-by Tirumala R Marri <[email protected]>---
V2:
* Removed Defines added to 405ex.
V3:
* Change APM82XXX to APM821XX
* Modify the way cpu id is printed.
* Correct inadvertent change.
* Sort define list.
* Remove comment forget_sys_info().
* Define a symbolic constatISRAM1_OCM_SIZE.
* Createapm821xx.hinstead of usingppc440.h
* Correct multiline comment.
Quoted 12 lines
--- arch/powerpc/cpu/ppc4xx/cpu.c | 36 ++- arch/powerpc/cpu/ppc4xx/cpu_init.c | 5 +- arch/powerpc/cpu/ppc4xx/speed.c | 76 +++++- arch/powerpc/cpu/ppc4xx/start.S | 11 +- arch/powerpc/cpu/ppc4xx/tlb.c | 2 + arch/powerpc/include/asm/ppc4xx-ebc.h | 4 + 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/processor.h | 1 + include/apm821xx.h | 493 +++++++++++++++++++++++++++++++
I know that Wolfgang specifically asked you to add this file for this "new" SoC. But I'm not so sure if this is the right way. Most of the defines in this new file are a plain copy from include/ppc440.h.
Wolfgang, do you really think this is better than adding support for this SoC into ppc440.h? After all, the CPU core of this SoC is still a PPC4xx PowerPC.
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
PATCH v3 1/2 APM821xx: Add CPU support
Dear Stefan Roese,
Quoted 10 lines · In message <[email protected]> you wrote:
Quoted 2 lines
include/apm821xx.h | 493 +++++++++++++++++++++++++++++++I know that Wolfgang specifically asked you to add this file for this "new" SoC. But I'm not so sure if this is the right way. Most of the defines in this new file are a plain copy from
include/ppc440.h.Wolfgang, do you really think this is better than adding support for this SoC into
ppc440.h? After all, the CPU core of this SoC is still a PPC4xx PowerPC.
It makes no sense to duplicate common parts. Only different code should be moved to separate files.
Viele Gr??e,
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 When in doubt, mumble; when in trouble, delegate; when in charge, ponder. -- James H. Boren
PATCH v3 1/2 APM821xx: Add CPU support
Quoted 7 lines
Quoted 1 line
Quoted 1 line
include/apm821xx.h | 493+++++++++++++++++++++++++++++++
Quoted 5 lines
I know that Wolfgang specifically asked you to add this file for this "new" SoC. But I'm not so sure if this is the right way. Most of the defines in this new file are a plain copy from
include/ppc440.h.
Quoted 7 lines
Quoted 3 lines
Wolfgang, do you really think this is better than adding support for this SoC into
ppc440.h? After all, the CPU core of this SoC is still a PPC4xx PowerPC.It makes no sense to duplicate common parts. Only different code should be moved to separate files.
[Marri] It is only few lines of code is different. Any way I will make a change and
Send it.
Regards,
Marri
PATCH v3 1/2 APM821xx: Add CPU support
Hi Marri,
Quoted 5 lines · On Thursday 09 September 2010 18:43:31 Tirumala Marri wrote:
Quoted 2 lines
It makes no sense to duplicate common parts. Only different code should be moved to separate files.
[Marri] It is only few lines of code is different. Any way I will make a change and Send it.
Please wait a day or two. I have an idea on how to best cleanup this PPC4xx header mess and will post some patches for it soon. It would be best if you could rebase your work on those patches then (if we find a consensus here).
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
PATCH v3 1/2 APM821xx: Add CPU support
Stefan,
Quoted 7 lines
Please wait a day or two. I have an idea on how to best cleanup this PPC4xx
header mess and will post some patches for it soon. It would be best if you
could rebase your work on those patches then (if we find a consensus here).
Sure I will wait for your changes.
Regards,
Marri
PATCH v3 1/2 APM821xx: Add CPU support
In reply to Stefan RoeseQuoted 6 lines · Stefan Roese
Hi Marri,
Quoted 3 lines · On Thursday 09 September 2010 18:43:31 Tirumala Marri wrote:
Quoted 2 lines
It makes no sense to duplicate common parts. Only different code should be moved to separate files.
Quoted 7 lines
Quoted 2 lines
[Marri] It is only few lines of code is different. Any way I will make a change and Send it.
Please wait a day or two. I have an idea on how to best cleanup this PPC4xx header mess and will post some patches for it soon. It would be best if you could rebase your work on those patches then (if we find a consensus here).
Hi Stefan, just a heads up. There are number of processors coming down the pipeline. All with the apm8Xxxx convention. The X is processor family and the later xxx are SoC specializations.
Quoted 12 lines
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
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot