mips: add more definitions for asm/cm.h

This patch add more definitions needed for MT7621 initialization.
MT7621 needs to initialize GIC/CPC and other related parts.

Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>

diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h
index 99ddbccd808b52560c8e36fc09bd07cc395551de..5cc8c09621d6118f986fb27503f7528104461ca0 100644 (file)
--- a/arch/mips/include/asm/cm.h
+++ b/arch/mips/include/asm/cm.h
@@ -8,9 +8,23 @@
 #define __MIPS_ASM_CM_H__
 
 /* Global Control Register (GCR) offsets */
+#define GCR_CONFIG                     0x0000
 #define GCR_BASE                       0x0008
 #define GCR_BASE_UPPER                 0x000c
+#define GCR_CONTROL                    0x0010
+#define GCR_ACCESS                     0x0020
 #define GCR_REV                                0x0030
+#define GCR_GIC_BASE                   0x0080
+#define GCR_CPC_BASE                   0x0088
+#define GCR_REG0_BASE                  0x0090
+#define GCR_REG0_MASK                  0x0098
+#define GCR_REG1_BASE                  0x00a0
+#define GCR_REG1_MASK                  0x00a8
+#define GCR_REG2_BASE                  0x00b0
+#define GCR_REG2_MASK                  0x00b8
+#define GCR_REG3_BASE                  0x00c0
+#define GCR_REG3_MASK                  0x00c8
+#define GCR_CPC_STATUS                 0x00f0
 #define GCR_L2_CONFIG                  0x0130
 #define GCR_L2_TAG_ADDR                        0x0600
 #define GCR_L2_TAG_ADDR_UPPER          0x0604
@@ -19,10 +33,59 @@
 #define GCR_L2_DATA                    0x0610
 #define GCR_L2_DATA_UPPER              0x0614
 #define GCR_Cx_COHERENCE               0x2008
+#define GCR_Cx_OTHER                   0x2018
+#define GCR_Cx_ID                      0x2028
+#define GCR_CO_COHERENCE               0x4008
+
+/* GCR_CONFIG fields */
+#define GCR_CONFIG_NUM_CLUSTERS_SHIFT  23
+#define GCR_CONFIG_NUM_CLUSTERS                (0x7f << 23)
+#define GCR_CONFIG_NUMIOCU_SHIFT       8
+#define GCR_CONFIG_NUMIOCU             (0xff << 8)
+#define GCR_CONFIG_PCORES_SHIFT                0
+#define GCR_CONFIG_PCORES              (0xff << 0)
+
+/* GCR_BASE fields */
+#define GCR_BASE_SHIFT                 15
+#define CCA_DEFAULT_OVR_SHIFT          5
+#define CCA_DEFAULT_OVR_MASK           (0x7 << 5)
+#define CCA_DEFAULT_OVREN              (0x1 << 4)
+#define CM_DEFAULT_TARGET_SHIFT                0
+#define CM_DEFAULT_TARGET_MASK         (0x3 << 0)
+
+/* GCR_CONTROL fields */
+#define GCR_CONTROL_SYNCCTL            (0x1 << 16)
 
 /* GCR_REV CM versions */
 #define GCR_REV_CM3                    0x0800
 
+/* GCR_GIC_BASE fields */
+#define GCR_GIC_BASE_ADDRMASK_SHIFT    7
+#define GCR_GIC_BASE_ADDRMASK          (0x1ffffff << 7)
+#define GCR_GIC_EN                     (0x1 << 0)
+
+/* GCR_CPC_BASE fields */
+#define GCR_CPC_BASE_ADDRMASK_SHIFT    15
+#define GCR_CPC_BASE_ADDRMASK          (0x1ffff << 15)
+#define GCR_CPC_EN                     (0x1 << 0)
+
+/* GCR_REGn_MASK fields */
+#define GCR_REGn_MASK_ADDRMASK_SHIFT   16
+#define GCR_REGn_MASK_ADDRMASK         (0xffff << 16)
+#define GCR_REGn_MASK_CCAOVR_SHIFT     5
+#define GCR_REGn_MASK_CCAOVR           (0x7 << 5)
+#define GCR_REGn_MASK_CCAOVREN         (1 << 4)
+#define GCR_REGn_MASK_DROPL2           (1 << 2)
+#define GCR_REGn_MASK_CMTGT_SHIFT      0
+#define GCR_REGn_MASK_CMTGT            (0x3 << 0)
+#define  GCR_REGn_MASK_CMTGT_DISABLED  0x0
+#define  GCR_REGn_MASK_CMTGT_MEM       0x1
+#define  GCR_REGn_MASK_CMTGT_IOCU0     0x2
+#define  GCR_REGn_MASK_CMTGT_IOCU1     0x3
+
+/* GCR_CPC_STATUS fields */
+#define GCR_CPC_EX                     (0x1 << 0)
+
 /* GCR_L2_CONFIG fields */
 #define GCR_L2_CONFIG_ASSOC_SHIFT      0
 #define GCR_L2_CONFIG_ASSOC_BITS       8
@@ -36,6 +99,10 @@
 #define GCR_Cx_COHERENCE_DOM_EN                (0xff << 0)
 #define GCR_Cx_COHERENCE_EN            (0x1 << 0)
 
+/* GCR_Cx_OTHER fields */
+#define GCR_Cx_OTHER_CORENUM_SHIFT     16
+#define GCR_Cx_OTHER_CORENUM           (0xffff << 16)
+
 #ifndef __ASSEMBLY__
 
 #include <asm/io.h>