arm: ls1021x: Add support for initializing CAAM's stream id
PATCH v2 1/1 arm: ls1021x: Add support for initializing CAAM's stream id
There 4 JRs, 4 RTICs and 8 DECOs, and set them the same stream id for using the same SMMU3 on LS1021A.
Signed-off-by Xiubo Li <[email protected]>
Signed-off-by Alison Wang <[email protected]>
---
Changes in v2:
- Move changing CCSR macros to a separated patch.
arch/arm/include/asm/arch-ls102xa/config.h | 1 + .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 57 ++++++++++++++++++++++ board/freescale/common/ls102xa_stream_id.c | 15 ++++++ board/freescale/ls1021aqds/ls1021aqds.c | 21 ++++++++ board/freescale/ls1021atwr/ls1021atwr.c | 21 ++++++++ 5 files changed, 115 insertions(+)
arch/arm/include/asm/arch-ls102xa/config.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_SYS_LS102XA_USB1_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_LS102XA_USB1_OFFSET) +#define CONFIG_SYS_FSL_SEC_OFFSET 0x00700000#define CONFIG_SYS_LS102XA_USB1_OFFSET 0x07600000#define CONFIG_SYS_TSEC1_OFFSET 0x01d10000#define CONFIG_SYS_TSEC2_OFFSET 0x01d50000
arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h +57 -0
68 lines not on this page · raw message
board/freescale/common/ls102xa_stream_id.c +15 -0
@@ -16,3 +16,18 @@ void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num)for (i =0 ; i < num; i++)out_be32 (scfg + id[i].offset, id[i].stream_id); } + +void ls1021x_config_caam_stream_id (struct liodn_id_table *tbl,int size) +{ +int i; +u32 liodn; + +for (i =0 ; i < size; i++) { +if (tbl[i].num_ids ==2 ) + liodn = (tbl[i].id[0 ] <<16 ) | tbl[i].id[1 ]; +else + liodn = tbl[i].id[0 ]; + +out_le32 ((uint32_t *)(tbl[i].reg_offset), liodn); + } +}
board/freescale/ls1021aqds/ls1021aqds.c +21 -0
@@ -450,6 +450,25 @@ static struct csu_ns_dev ns_dev[] = { };#endif +struct liodn_id_table sec_liodn_tbl[] = { +SET_SEC_JR_LIODN_ENTRY (0 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (1 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (2 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (3 ,0x10 ,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (a,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (b,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (c,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (d,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (0 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (1 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (2 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (3 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (4 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (5 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (6 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (7 ,0x10 ,0x10 ), +}; +struct smmu_stream_id dev_stream_id[] = { {0x100 ,0x01 ,"ETSEC MAC1" }, {0x104 ,0x02 ,"ETSEC MAC2" },
@@ -489,6 +508,8 @@ int board_init(void)config_serdes_mux ();#endif +ls1021x_config_caam_stream_id (sec_liodn_tbl, +ARRAY_SIZE (sec_liodn_tbl));ls102xa_config_smmu_stream_id (dev_stream_id,ARRAY_SIZE (dev_stream_id));
board/freescale/ls1021atwr/ls1021atwr.c +21 -0
@@ -389,6 +389,25 @@ static struct csu_ns_dev ns_dev[] = { };#endif +struct liodn_id_table sec_liodn_tbl[] = { +SET_SEC_JR_LIODN_ENTRY (0 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (1 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (2 ,0x10 ,0x10 ), +SET_SEC_JR_LIODN_ENTRY (3 ,0x10 ,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (a,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (b,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (c,0x10 ), +SET_SEC_RTIC_LIODN_ENTRY (d,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (0 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (1 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (2 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (3 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (4 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (5 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (6 ,0x10 ,0x10 ), +SET_SEC_DECO_LIODN_ENTRY (7 ,0x10 ,0x10 ), +}; +struct smmu_stream_id dev_stream_id[] = { {0x100 ,0x01 ,"ETSEC MAC1" }, {0x104 ,0x02 ,"ETSEC MAC2" },
@@ -425,6 +444,8 @@ int board_init(void)#endif #endif +ls1021x_config_caam_stream_id (sec_liodn_tbl, +ARRAY_SIZE (sec_liodn_tbl));ls102xa_config_smmu_stream_id (dev_stream_id,ARRAY_SIZE (dev_stream_id));
Signature · 1 line
2.1.0.27.g96db324
PATCH v2 1/1 arm: ls1021x: Add support for initializing CAAM's stream id
Quoted 8 lines · Alison Wang
There 4 JRs, 4 RTICs and 8 DECOs, and set them the same stream id for using the same SMMU3 on LS1021A.
Signed-off-by Xiubo Li <[email protected]>Signed-off-by Alison Wang <[email protected]>---
Changes in v2:
- Move changing CCSR macros to a separated patch.
Applied to u-boot-fsl-qoriq master branch, awaiting upstream.
York