* [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400
@ 2015-01-15 9:29 Alison Wang
2015-01-15 16:52 ` York Sun
2015-01-24 15:07 ` York Sun
0 siblings, 2 replies; 4+ messages in thread
From: Alison Wang @ 2015-01-15 9:29 UTC (permalink / raw)
To: u-boot
CAAM is connected to CCI-400 S0 slave interface. Disable snooping for
S0 will cause CAAM self test failure. This patch is to enable snooping
for S0 slave interface. These CCI-400 operations are moved to
board_early_init_f() to be initialized earlier. For S4 slave interface,
issuing of snoop requests and DVM message requests are enabled.
Signed-off-by: Alison Wang <alison.wang@freescale.com>
---
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 ++
board/freescale/ls1021aqds/ls1021aqds.c | 21 ++++++++++++-------
board/freescale/ls1021atwr/ls1021atwr.c | 25 ++++++++++++++---------
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index 697d4ca..7287969 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -456,6 +456,8 @@ struct ccsr_ddr {
#define CCI400_CTRLORD_TERM_BARRIER 0x00000008
#define CCI400_CTRLORD_EN_BARRIER 0
#define CCI400_SHAORD_NON_SHAREABLE 0x00000002
+#define CCI400_DVM_MESSAGE_REQ_EN 0x00000002
+#define CCI400_SNOOP_REQ_EN 0x00000001
/* CCI-400 registers */
struct ccsr_cci400 {
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index f08e54f..93a8028 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -188,6 +188,20 @@ int board_early_init_f(void)
out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
#endif
+ /*
+ * Enable snoop requests and DVM message requests for
+ * Slave insterface S4 (A7 core cluster)
+ */
+ out_le32(&cci->slave[4].snoop_ctrl,
+ CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN);
+
+ /*
+ * Set CCI-400 Slave interface S1, S2 Shareable Override Register
+ * All transactions are treated as non-shareable
+ */
+ out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
+ out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
+
/* Workaround for the issue that DDR could not respond to
* barrier transaction which is generated by executing DSB/ISB
* instruction. Set CCI-400 control override register to
@@ -474,13 +488,6 @@ int board_init(void)
/* Set CCI-400 control override register to
* enable barrier transaction */
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
- /*
- * Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register
- * All transactions are treated as non-shareable
- */
- out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
- out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
- out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 8ab229d..c8e8bd8 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -263,6 +263,7 @@ int config_serdes_mux(void)
int board_early_init_f(void)
{
struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
+ struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;
#ifdef CONFIG_TSEC_ENET
out_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
@@ -281,6 +282,20 @@ int board_early_init_f(void)
out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
#endif
+ /*
+ * Enable snoop requests and DVM message requests for
+ * Slave insterface S4 (A7 core cluster)
+ */
+ out_le32(&cci->slave[4].snoop_ctrl,
+ CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN);
+
+ /*
+ * Set CCI-400 Slave interface S1, S2 Shareable Override Register
+ * All transactions are treated as non-shareable
+ */
+ out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
+ out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
+
return 0;
}
@@ -408,16 +423,6 @@ struct smmu_stream_id dev_stream_id[] = {
int board_init(void)
{
- struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;
-
- /*
- * Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register
- * All transactions are treated as non-shareable
- */
- out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
- out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
- out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE);
-
#ifndef CONFIG_SYS_FSL_NO_SERDES
fsl_serdes_init();
#ifndef CONFIG_QSPI_BOOT
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400
2015-01-15 9:29 [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400 Alison Wang
@ 2015-01-15 16:52 ` York Sun
2015-01-16 9:01 ` Huan Wang
2015-01-24 15:07 ` York Sun
1 sibling, 1 reply; 4+ messages in thread
From: York Sun @ 2015-01-15 16:52 UTC (permalink / raw)
To: u-boot
On 01/15/2015 01:29 AM, Alison Wang wrote:
> CAAM is connected to CCI-400 S0 slave interface. Disable snooping for
> S0 will cause CAAM self test failure. This patch is to enable snooping
> for S0 slave interface. These CCI-400 operations are moved to
> board_early_init_f() to be initialized earlier. For S4 slave interface,
> issuing of snoop requests and DVM message requests are enabled.
>
> Signed-off-by: Alison Wang <alison.wang@freescale.com>
> ---
It should be prefixed with v2 and have a change log. Please do that for future
patches.
York
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400
2015-01-15 16:52 ` York Sun
@ 2015-01-16 9:01 ` Huan Wang
0 siblings, 0 replies; 4+ messages in thread
From: Huan Wang @ 2015-01-16 9:01 UTC (permalink / raw)
To: u-boot
York,
> On 01/15/2015 01:29 AM, Alison Wang wrote:
> > CAAM is connected to CCI-400 S0 slave interface. Disable snooping for
> > S0 will cause CAAM self test failure. This patch is to enable
> snooping
> > for S0 slave interface. These CCI-400 operations are moved to
> > board_early_init_f() to be initialized earlier. For S4 slave
> > interface, issuing of snoop requests and DVM message requests are
> enabled.
> >
> > Signed-off-by: Alison Wang <alison.wang@freescale.com>
> > ---
>
> It should be prefixed with v2 and have a change log. Please do that for
> future patches.
>
[Alison Wang] Ok. Thanks.
Best Regards,
Alison Wang
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400
2015-01-15 9:29 [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400 Alison Wang
2015-01-15 16:52 ` York Sun
@ 2015-01-24 15:07 ` York Sun
1 sibling, 0 replies; 4+ messages in thread
From: York Sun @ 2015-01-24 15:07 UTC (permalink / raw)
To: u-boot
On 01/15/2015 03:29 AM, Alison Wang wrote:
> CAAM is connected to CCI-400 S0 slave interface. Disable snooping for
> S0 will cause CAAM self test failure. This patch is to enable snooping
> for S0 slave interface. These CCI-400 operations are moved to
> board_early_init_f() to be initialized earlier. For S4 slave interface,
> issuing of snoop requests and DVM message requests are enabled.
>
> Signed-off-by: Alison Wang <alison.wang@freescale.com>
> ---
Applied to u-boot-fsl-qoriq master branch, awaiting upstream.
York
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-24 15:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-15 9:29 [U-Boot] [PATCH] arm: ls102xa: Update snoop settings for CCI-400 Alison Wang
2015-01-15 16:52 ` York Sun
2015-01-16 9:01 ` Huan Wang
2015-01-24 15:07 ` York Sun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.