[src/trunk]: src/sys/arch/evbarm/marvell Support Armada 370.

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/59cc216a69d5
branches:  trunk
changeset: 794466:59cc216a69d5
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sat Mar 15 13:48:44 2014 +0000

description:
Support Armada 370.

diffstat:

 sys/arch/evbarm/marvell/marvell_machdep.c |  59 ++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 4 deletions(-)

diffs (129 lines):

diff -r db58a819751b -r 59cc216a69d5 sys/arch/evbarm/marvell/marvell_machdep.c
--- a/sys/arch/evbarm/marvell/marvell_machdep.c Sat Mar 15 13:33:48 2014 +0000
+++ b/sys/arch/evbarm/marvell/marvell_machdep.c Sat Mar 15 13:48:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: marvell_machdep.c,v 1.27 2014/01/29 04:27:26 kiyohara Exp $ */
+/*     $NetBSD: marvell_machdep.c,v 1.28 2014/03/15 13:48:44 kiyohara Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.27 2014/01/29 04:27:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.28 2014/03/15 13:48:44 kiyohara Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
@@ -230,7 +230,7 @@
 initarm(void *arg)
 {
        uint32_t target, attr, base, size;
-       int cs, memtag = 0, iotag = 0, window;
+       int cs, cs_end, memtag = 0, iotag = 0, window;
 
        mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
 
@@ -279,6 +279,9 @@
                nwindow = ORION_MLMB_NWINDOW;
                nremap = ORION_MLMB_NREMAP;
 
+               cs = MARVELL_TAG_SDRAM_CS0;
+               cs_end = MARVELL_TAG_SDRAM_CS3;
+
                orion_getclks(MARVELL_INTERREGS_VBASE);
                break;
 #endif /* ORION */
@@ -297,6 +300,9 @@
                nwindow = KIRKWOOD_MLMB_NWINDOW;
                nremap = KIRKWOOD_MLMB_NREMAP;
 
+               cs = MARVELL_TAG_SDRAM_CS0;
+               cs_end = MARVELL_TAG_SDRAM_CS3;
+
                kirkwood_getclks(MARVELL_INTERREGS_VBASE);
                mvsoc_clkgating = kirkwood_clkgating;
                break;
@@ -314,6 +320,9 @@
                nwindow = MV78XX0_MLMB_NWINDOW;
                nremap = MV78XX0_MLMB_NREMAP;
 
+               cs = MARVELL_TAG_SDRAM_CS0;
+               cs_end = MARVELL_TAG_SDRAM_CS3;
+
                mv78xx0_getclks(MARVELL_INTERREGS_VBASE);
                break;
 #endif /* MV78XX0 */
@@ -333,6 +342,9 @@
                nwindow = ARMADAXP_MLMB_NWINDOW;
                nremap = ARMADAXP_MLMB_NREMAP;
 
+               cs = MARVELL_TAG_DDR3_CS0;
+               cs_end = MARVELL_TAG_DDR3_CS3;
+
                extern vaddr_t misc_base;
                misc_base = MARVELL_INTERREGS_VBASE + ARMADAXP_MISC_BASE;
                armadaxp_getclks();
@@ -352,6 +364,41 @@
                armadaxp_io_coherency_init();
 #endif
                break;
+
+       case MARVELL_ARMADA370_MV6707:
+       case MARVELL_ARMADA370_MV6710:
+       case MARVELL_ARMADA370_MV6W11:
+               cpu_reset_address = armadaxp_system_reset;
+
+               armadaxp_intr_bootstrap(MARVELL_INTERREGS_PBASE);
+
+               memtag = ARMADAXP_TAG_PEX00_MEM;
+               iotag = ARMADAXP_TAG_PEX00_IO;
+               nwindow = ARMADAXP_MLMB_NWINDOW;
+               nremap = ARMADAXP_MLMB_NREMAP;
+
+               cs = MARVELL_TAG_DDR3_CS0;
+               cs_end = MARVELL_TAG_DDR3_CS3;
+
+               extern vaddr_t misc_base;
+               misc_base = MARVELL_INTERREGS_VBASE + ARMADAXP_MISC_BASE;
+               armada370_getclks();
+               mvsoc_clkgating = armadaxp_clkgating;
+
+#ifdef L2CACHE_ENABLE
+               /* Initialize L2 Cache */
+               {
+                       extern int armadaxp_l2_init(bus_addr_t);
+
+                       (void)armadaxp_l2_init(MARVELL_INTERREGS_PBASE);
+               }
+#endif
+
+#ifdef AURORA_IO_CACHE_COHERENCY
+               /* Initialize cache coherency */
+               armadaxp_io_coherency_init();
+#endif
+               break;
 #endif /* ARMADAXP */
 
        default:
@@ -414,7 +461,7 @@
        bootconfig.dramblocks = 0;
        paddr_t segment_end;
        segment_end = physmem = 0;
-       for (cs = MARVELL_TAG_SDRAM_CS0; cs <= MARVELL_TAG_SDRAM_CS3; cs++) {
+       for ( ; cs <= cs_end; cs++) {
                mvsoc_target(cs, &target, &attr, &base, &size);
                if (size == 0)
                        continue;
@@ -649,6 +696,10 @@
                case MARVELL_ARMADAXP_MV78230:
                case MARVELL_ARMADAXP_MV78260:
                case MARVELL_ARMADAXP_MV78460:
+
+               case MARVELL_ARMADA370_MV6707:
+               case MARVELL_ARMADA370_MV6710:
+               case MARVELL_ARMADA370_MV6W11:
                  {
                        extern struct arm32_pci_chipset
                            arm32_mvpex2_chipset, arm32_mvpex3_chipset,