powerpc/corenet_ds: Slave core in holdoff when boot from SRIO

When boot from SRIO, slave's core can be in holdoff after powered on for
some specific requirements. Master can release the slave's core at the
right time by SRIO interface.

Master needs to:
	1. Set outbound SRIO windows in order to configure slave's registers
	   for the core's releasing.
	2. Check the SRIO port status when release slave core, if no errors,
	   will implement the process of the slave core's releasing.
Slave needs to:
	1. Set all the cores in holdoff by RCW.
	2. Be powered on before master's boot.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 97a7fe1b9792532aa9f35b98ce898487966c5bc8..2cd5db7c59b852a05a4f69f388406bf5ddadc4b2 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -444,6 +444,9 @@ skip_l2:
        srio_init();
 #ifdef CONFIG_SRIOBOOT_MASTER
        srio_boot_master();
+#ifdef CONFIG_SRIOBOOT_SLAVE_HOLDOFF
+       srio_boot_master_release_slave();
+#endif
 #endif
 #endif
 

diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index 5694561eba54615d3454a0a800b667d15b484a5b..c7f394972bf0d334b29ec3af94777f1fbfddd1f4 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -25,6 +25,12 @@
 
 #define SRIO_PORT_ACCEPT_ALL 0x10000001
 #define SRIO_IB_ATMU_AR 0x80f55000
+#define SRIO_OB_ATMU_AR_MAINT 0x80077000
+#define SRIO_OB_ATMU_AR_RW 0x80045000
+#define SRIO_LCSBA1CSR_OFFSET 0x5c
+#define SRIO_MAINT_WIN_SIZE 0x1000000 /* 16M */
+#define SRIO_RW_WIN_SIZE 0x100000 /* 1M */
+#define SRIO_LCSBA1CSR 0x60000000
 
 #if defined(CONFIG_FSL_CORENET)
        #define _DEVDISR_SRIO1 FSL_CORENET_DEVDISR_SRIO1
@@ -168,4 +174,123 @@ void srio_boot_master(void)
                        SRIO_IB_ATMU_AR
                        | atmu_size_mask(CONFIG_SRIOBOOT_SLAVE_ENV_SIZE));
 }
+
+#ifdef CONFIG_SRIOBOOT_SLAVE_HOLDOFF
+void srio_boot_master_release_slave(void)
+{
+       struct ccsr_rio *srio = (void *)CONFIG_SYS_FSL_SRIO_ADDR;
+       u32 escsr;
+       debug("SRIOBOOT - MASTER: "
+                       "Check the port status and release slave core ...\n");
+
+       escsr = in_be32((void *)&srio->lp_serial
+                       .port[CONFIG_SRIOBOOT_MASTER_PORT].pescsr);
+       if (escsr & 0x2) {
+               if (escsr & 0x10100) {
+                       debug("SRIOBOOT - MASTER: Port [ %d ] is error.\n",
+                                       CONFIG_SRIOBOOT_MASTER_PORT);
+               } else {
+                       debug("SRIOBOOT - MASTER: "
+                                       "Port [ %d ] is ready, now release slave's core ...\n",
+                                       CONFIG_SRIOBOOT_MASTER_PORT);
+                       /*
+                        * configure outbound window
+                        * with maintenance attribute to set slave's LCSBA1CSR
+                        */
+                       out_be32((void *)&srio->atmu
+                               .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                               .outbw[1].rowtar, 0);
+                       out_be32((void *)&srio->atmu
+                               .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                               .outbw[1].rowtear, 0);
+                       if (CONFIG_SRIOBOOT_MASTER_PORT)
+                               out_be32((void *)&srio->atmu
+                                       .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                                       .outbw[1].rowbar,
+                                       CONFIG_SYS_SRIO2_MEM_PHYS >> 12);
+                       else
+                               out_be32((void *)&srio->atmu
+                                       .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                                       .outbw[1].rowbar,
+                                       CONFIG_SYS_SRIO1_MEM_PHYS >> 12);
+                       out_be32((void *)&srio->atmu
+                                       .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                                       .outbw[1].rowar,
+                                       SRIO_OB_ATMU_AR_MAINT
+                                       | atmu_size_mask(SRIO_MAINT_WIN_SIZE));
+
+                       /*
+                        * configure outbound window
+                        * with R/W attribute to set slave's BRR
+                        */
+                       out_be32((void *)&srio->atmu
+                               .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                               .outbw[2].rowtar,
+                               SRIO_LCSBA1CSR >> 9);
+                       out_be32((void *)&srio->atmu
+                               .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                               .outbw[2].rowtear, 0);
+                       if (CONFIG_SRIOBOOT_MASTER_PORT)
+                               out_be32((void *)&srio->atmu
+                                       .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                                       .outbw[2].rowbar,
+                                       (CONFIG_SYS_SRIO2_MEM_PHYS
+                                       + SRIO_MAINT_WIN_SIZE) >> 12);
+                       else
+                               out_be32((void *)&srio->atmu
+                                       .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                                       .outbw[2].rowbar,
+                                       (CONFIG_SYS_SRIO1_MEM_PHYS
+                                       + SRIO_MAINT_WIN_SIZE) >> 12);
+                       out_be32((void *)&srio->atmu
+                               .port[CONFIG_SRIOBOOT_MASTER_PORT]
+                               .outbw[2].rowar,
+                               SRIO_OB_ATMU_AR_RW
+                               | atmu_size_mask(SRIO_RW_WIN_SIZE));
+
+                       /*
+                        * Set the LCSBA1CSR register in slave
+                        * by the maint-outbound window
+                        */
+                       if (CONFIG_SRIOBOOT_MASTER_PORT) {
+                               out_be32((void *)CONFIG_SYS_SRIO2_MEM_VIRT
+                                       + SRIO_LCSBA1CSR_OFFSET,
+                                       SRIO_LCSBA1CSR);
+                               while (in_be32((void *)CONFIG_SYS_SRIO2_MEM_VIRT
+                                       + SRIO_LCSBA1CSR_OFFSET)
+                                       != SRIO_LCSBA1CSR)
+                                       ;
+                               /*
+                                * And then set the BRR register
+                                * to release slave core
+                                */
+                               out_be32((void *)CONFIG_SYS_SRIO2_MEM_VIRT
+                                       + SRIO_MAINT_WIN_SIZE
+                                       + CONFIG_SRIOBOOT_SLAVE_BRR_OFFSET,
+                                       CONFIG_SRIOBOOT_SLAVE_RELEASE_MASK);
+                       } else {
+                               out_be32((void *)CONFIG_SYS_SRIO1_MEM_VIRT
+                                       + SRIO_LCSBA1CSR_OFFSET,
+                                       SRIO_LCSBA1CSR);
+                               while (in_be32((void *)CONFIG_SYS_SRIO1_MEM_VIRT
+                                       + SRIO_LCSBA1CSR_OFFSET)
+                                       != SRIO_LCSBA1CSR)
+                                       ;
+                               /*
+                                * And then set the BRR register
+                                * to release slave core
+                                */
+                               out_be32((void *)CONFIG_SYS_SRIO1_MEM_VIRT
+                                       + SRIO_MAINT_WIN_SIZE
+                                       + CONFIG_SRIOBOOT_SLAVE_BRR_OFFSET,
+                                       CONFIG_SRIOBOOT_SLAVE_RELEASE_MASK);
+                       }
+                       debug("SRIOBOOT - MASTER: "
+                                       "Release slave successfully! Now the slave should start up!\n");
+               }
+       } else
+               debug("SRIOBOOT - MASTER: Port [ %d ] is not ready.\n",
+                               CONFIG_SRIOBOOT_MASTER_PORT);
+}
+#endif
 #endif

diff --git a/arch/powerpc/include/asm/fsl_srio.h b/arch/powerpc/include/asm/fsl_srio.h
index e4cd9b6544d753b1472e51d4ead9177fea38e3d8..a905a266c4dda5480f720d14c4dea7f0166dc26e 100644 (file)
--- a/arch/powerpc/include/asm/fsl_srio.h
+++ b/arch/powerpc/include/asm/fsl_srio.h
@@ -57,5 +57,8 @@ enum atmu_size {
 extern void srio_init(void);
 #ifdef CONFIG_SRIOBOOT_MASTER
 extern void srio_boot_master(void);
+#ifdef CONFIG_SRIOBOOT_SLAVE_HOLDOFF
+extern void srio_boot_master_release_slave(void);
+#endif
 #endif
 #endif

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index aa8b384d669aa9091819a79e1f9bbf6b8f5f1efb..8ed37a58c200458fe8c7d48bfb5048a126b69147 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -419,6 +419,10 @@
 #define CONFIG_SRIOBOOT_SLAVE_ENV_LAW_PHYS 0xfef060000ull
 #define CONFIG_SRIOBOOT_SLAVE_ENV_SRIO_PHYS 0x3ffe20000ull
 #define CONFIG_SRIOBOOT_SLAVE_ENV_SIZE 0x20000 /* 128K */
+/* slave core release by master*/
+#define CONFIG_SRIOBOOT_SLAVE_HOLDOFF
+#define CONFIG_SRIOBOOT_SLAVE_BRR_OFFSET 0xe00e4
+#define CONFIG_SRIOBOOT_SLAVE_RELEASE_MASK 0x00000001 /* release core 0 */
 #endif
 
 /*