armv8:fsl-layerscape: Add registers space defination for CCI-400 bus
Subsystems (2)
PATCH v2 1/1 armv8:fsl-layerscape: Add registers space defination for CCI-400 bus
CoreLink Cache Coherent Interconnect (CCI) is ARM BUS which provides full cache coherency between two clusters of multi-core CPUs and I/O coherency for devices and I/O masters.
This patch add new CONFIG defination and move existing register space definaton of CCI-400 bus from from immap_lsch2 to fsl_immap, so that it can be used for both chasis 2 and chasis 3.
---
v2:
Add new Kconfig in alphabetic order
README | 9 ++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 6 +++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 48 -------------------- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 1 + include/fsl_immap.h | 51 ++++++++++++++++++++++ 7 files changed, 69 insertions(+), 48 deletions(-)
README +9 -0
@@ -315,6 +315,15 @@ Many of the options are named exactly as the corresponding Linux kernel configuration options. The intention is to make it easier to build a config tool - later. +- ARM Platform Bus Type(CCI): + CoreLink Cache Coherent Interconnect (CCI) is ARM BUS which + provides full cache coherency between two clusters of multi-core + CPUs and I/O coherency for devices and I/O masters + + CONFIG_SYS_FSL_HAS_CCI400 + + Defined For SoC that has cache coherent interconnect + CCN-400 The following options need to be configured:
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +6 -0
@@ -7,6 +7,7 @@ config ARCH_LS1012A select SYS_FSL_ERRATUM_A010315 select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F + select SYS_FSL_HAS_CCI400 config ARCH_LS1043A bool
@@ -26,6 +27,7 @@ config ARCH_LS1043A select SYS_FSL_HAS_DDR4 select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F + select SYS_FSL_HAS_CCI400 config ARCH_LS1046A bool
@@ -45,6 +47,7 @@ config ARCH_LS1046A select SYS_FSL_SRDS_2 select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F + select SYS_FSL_HAS_CCI400 config ARCH_LS2080A bool
@@ -182,6 +185,9 @@ config SYS_FSL_IFC_BANK_COUNT default 4 if ARCH_LS1046A default 8 if ARCH_LS2080A +config SYS_FSL_HAS_CCI400 + bool + config SYS_FSL_HAS_DP_DDR bool
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -0
@@ -29,6 +29,7 @@#ifdef CONFIG_SYS_FSL_DDR #include <fsl_ddr.h> #endif +#include <fsl_immap.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <fsl_immap.h> #include <fsl_ifc.h> #include <ahci.h> #include <scsi.h>
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +0 -48
54 lines not on this page · raw message
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +1 -0
@@ -10,6 +10,7 @@#define __ARCH_FSL_LSCH3_IMMAP_H_#define CONFIG_SYS_IMMR 0x01000000 +#define CONFIG_SYS_CCI400_ADDR (CONFIG_SYS_IMMR + 0x3090000)#define CONFIG_SYS_FSL_DDR_ADDR (CONFIG_SYS_IMMR + 0x00080000)#define CONFIG_SYS_FSL_DDR2_ADDR (CONFIG_SYS_IMMR + 0x00090000)#define CONFIG_SYS_FSL_DDR3_ADDR 0x08210000
include/fsl_immap.h +51 -0
55 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 1/1 armv8: fsl-lsch3: Conditionally Remove errata a0009203 from lsch3 init
This i2c errata is only valid for LS2080A and its variants, namely LS2080A, LS2085A and LS2088A
---
v2:
Change Descristion to make it more specific about impacted SoC
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +4 -0
@@ -72,6 +72,7 @@ config ARCH_LS2080A select SYS_FSL_ERRATUM_A009803 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_ERRATUM_A010165 + select SYS_FSL_ERRATUM_A009203 select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F
@@ -279,6 +280,9 @@ config SYS_FSL_SDHC_CLK_DIV clock, in another word SDHC_clk = Platform_clk / this_divider. endmenu +config SYS_FSL_ERRATUM_A009203 + bool + config SYS_FSL_ERRATUM_A008336 bool
arch/arm/cpu/armv8/fsl-layerscape/soc.c +4 -0
@@ -153,6 +153,7 @@ static void erratum_rcw_src(void)* This erratum requires setting glitch_en bit to enable * digital glitch filter to improve clock stability. */ +#ifdef CONFIG_SYS_FSL_ERRATUM_A009203 static void erratum_a009203 (void ) {u8 __iomem *ptr;
@@ -179,6 +180,7 @@ static void erratum_a009203(void)#endif #endif } +#endif void bypass_smmu (void ) {
@@ -192,7 +194,9 @@ void fsl_lsch3_early_init_f(void) {erratum_rcw_src ();init_early_memctl_regs ();/* tighten IFC timing */ +#ifdef CONFIG_SYS_FSL_ERRATUM_A009203 erratum_a009203 (); +#endif erratum_a008514 ();erratum_a008336 ();#ifdef CONFIG_CHAIN_OF_TRUST
Signature · 1 line
1.9.1
PATCH v2 1/1 armv8: fsl-lsch3: Conditionally Remove errata a0009203 from lsch3 init
Quoted 7 lines · Ashish Kumar
This i2c errata is only valid for LS2080A and its variants, namely LS2080A, LS2085A and LS2088A
Signed-off-by Ashish Kumar <[email protected]>---
v2:
Change Descristion to make it more specific about impacted SoC
Minor adjustment to subject and commit message. Applied to fsl-qoriq master, awaiting upstream. Thanks.
York
PATCH v2 1/1 armv8: fsl-lsch3: Instantiate TZASC configuration in 2 groups
In reply to Ashish KumarNumber of TZASC instances may vary across NXP SoCs. So put TZASC configuration under instance specific defines.
---
v2:
Change description to make it more appropriate
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 ++++++++ arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 24 +++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +8 -0
@@ -62,6 +62,8 @@ config ARCH_LS2080A select SYS_FSL_SEC_COMPAT_5 select SYS_FSL_SEC_LE select SYS_FSL_SRDS_2 + select FSL_TZASC_1 + select FSL_TZASC_2 select SYS_FSL_ERRATUM_A008336 select SYS_FSL_ERRATUM_A008511 select SYS_FSL_ERRATUM_A008514
@@ -201,6 +203,12 @@ config SYS_FSL_SRDS_2 config SYS_HAS_SERDES bool +config FSL_TZASC_1 + bool + +config FSL_TZASC_2 + bool + endmenu menu "Layerscape clock tree configuration"
arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +13 -11
@@ -229,38 +229,40 @@ ENTRY(lowlevel_init) * NOTE: As per the CCSR map doc, TZASC 3 and TZASC 4 are just * placeholders. */ +#ifdef CONFIG_FSL_TZASC_1 ldr x1, =TZASC_GATE_KEEPER(0) ldr w0, [x1] /* Filter 0 Gate Keeper Register */ orr w0, w0, #1 << 0 /* Set open_request for Filter 0 */ str w0, [x1] - ldr x1, =TZASC_GATE_KEEPER(1) - ldr w0, [x1] /* Filter 0 Gate Keeper Register */ - orr w0, w0, #1 << 0 /* Set open_request for Filter 0 */ - str w0, [x1] - ldr x1, =TZASC_REGION_ATTRIBUTES_0(0) ldr w0, [x1] /* Region-0 Attributes Register */ orr w0, w0, #1 << 31 /* Set Sec global write en, Bit[31] */ orr w0, w0, #1 << 30 /* Set Sec global read en, Bit[30] */ str w0, [x1] + ldr x1, =TZASC_REGION_ID_ACCESS_0(0) + ldr w0, [x1] /* Region-0 Access Register */ + mov w0, #0xFFFFFFFF /* Set nsaid_wr_en and nsaid_rd_en */ + str w0, [x1] +#endif +#ifdef CONFIG_FSL_TZASC_2 + ldr x1, =TZASC_GATE_KEEPER(1) + ldr w0, [x1] /* Filter 0 Gate Keeper Register */ + orr w0, w0, #1 << 0 /* Set open_request for Filter 0 */ + str w0, [x1] + ldr x1, =TZASC_REGION_ATTRIBUTES_0(1) ldr w0, [x1] /* Region-1 Attributes Register */ orr w0, w0, #1 << 31 /* Set Sec global write en, Bit[31] */ orr w0, w0, #1 << 30 /* Set Sec global read en, Bit[30] */ str w0, [x1] - ldr x1, =TZASC_REGION_ID_ACCESS_0(0) - ldr w0, [x1] /* Region-0 Access Register */ - mov w0, #0xFFFFFFFF /* Set nsaid_wr_en and nsaid_rd_en */ - str w0, [x1] - ldr x1, =TZASC_REGION_ID_ACCESS_0(1) ldr w0, [x1] /* Region-1 Attributes Register */ mov w0, #0xFFFFFFFF /* Set nsaid_wr_en and nsaid_rd_en */ str w0, [x1] - +#endif isb dsb sy #endif
Signature · 1 line
1.9.1
PATCH v2 1/1 armv8: fsl-lsch3: Instantiate TZASC configuration in 2 groups
Quoted 3 lines · Ashish Kumar
Number of TZASC instances may vary across NXP SoCs. So put TZASC configuration under instance specific defines.
Please fix the indentation. Otherwise this patch looks OK.
York
PATCH v2 1/1 armv8:fsl-layerscape: Add registers space defination for CCI-400 bus
In reply to Ashish KumarQuoted 23 lines · Ashish Kumar
CoreLink Cache Coherent Interconnect (CCI) is ARM BUS which provides full cache coherency between two clusters of multi-core CPUs and I/O coherency for devices and I/O masters.
This patch add new CONFIG defination and move existing register space definaton of CCI-400 bus from from
immap_lsch2tofsl_immap, so that it can be used for both chasis 2 and chasis 3.Signed-off-by Prabhakar Kushwaha <[email protected]>Signed-off-by Ashish Kumar <[email protected]>---
v2:
Add newKconfigin alphabetic orderREADME | 9 ++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 6 +++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 48 -------------------- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 1 + include/fsl_immap.h | 51 ++++++++++++++++++++++ 7 files changed, 69 insertions(+), 48 deletions(-)
<snip>
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h line 13
Quoted 10 lines
#define
SMMU_SCR1(SMMU_BASE+0x4)arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +1
-0@@ -10,6 +10,7 @@#define __ARCH_FSL_LSCH3_IMMAP_H_#define CONFIG_SYS_IMMR 0x01000000 +#define CONFIG_SYS_CCI400_ADDR (CONFIG_SYS_IMMR + 0x3090000)
Can you move this macro to Kconfig and clean up existing use?
York
PATCH v2 1/1 armv8:fsl-layerscape: Add registers space defination for CCI-400 bus
In reply to Ashish KumarQuoted 8 lines · Ashish Kumar
CoreLink Cache Coherent Interconnect (CCI) is ARM BUS which provides full cache coherency between two clusters of multi-core CPUs and I/O coherency for devices and I/O masters.
This patch add new CONFIG defination and move existing register space definaton of CCI-400 bus from from
immap_lsch2tofsl_immap, so that it can be used for both chasis 2 and chasis 3.
All of your patches have the (sometime inconsistent) indentation in commit message. Please fix.
York