Skip to contentSkip to conversation

powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

PATCH New Aneesh Bansal 2 participants 7 messages Apr 18, 2016 – May 25, 2016 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled.
So, L2PE must be set before enabling L2 cache.

---
 arch/powerpc/cpu/mpc85xx/start.S | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
arch/powerpc/cpu/mpc85xx/start.S +23 -0
index 82a151a..4c51225 100644
@@ -720,16 +720,39 @@ enable_l2_cluster_l2:
 	ori	r4, r4, (L2CSR0_L2FI|L2CSR0_L2LFC)@l
 	sync
 	stw	r4, 0(r3)	/* invalidate L2 */
+	/* Poll till the bits are cleared */
 1:	sync
 	lwz	r0, 0(r3)
 	twi	0, r0, 0
 	isync
 	and.	r1, r0, r4
 	bne	1b
+
+	/* L2PE must be set before L2 cache is enabled */
+	lis	r4, (L2CSR0_L2PE)@h
+	ori	r4, r4, (L2CSR0_L2PE)@l
+	sync
+	stw	r4, 0(r3)	/* enable L2 parity/ECC error checking */
+	/* Poll till the bit is set */
+1:	sync
+	lwz	r0, 0(r3)
+	twi	0, r0, 0
+	isync
+	and.	r1, r0, r4
+	beq	1b
+
 	lis	r4, (L2CSR0_L2E|L2CSR0_L2PE)@h
 	ori	r4, r4, (L2CSR0_L2REP_MODE)@l
 	sync
 	stw	r4, 0(r3)	/* enable L2 */
+	/* Poll till the bit is set */
+1:	sync
+	lwz	r0, 0(r3)
+	twi	0, r0, 0
+	isync
+	and.	r1, r0, r4
+	beq	1b
+
 delete_ccsr_l2_tlb:
 	delete_tlb0_entry 0, CONFIG_SYS_CCSRBAR + 0xC20000, MAS2_I|MAS2_G, r3
 #endif
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 4 lines · Aneesh Bansal

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled.
So, L2PE must be set before enabling L2 cache.

Aneesh,

The original code set L2PE and L2E together. The L2PE bit doesn't change after that. Doesn't this satisfy the requirement? Did you observe any failure before your patch?

York

#2 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 14 lines

-----Original Message-----
From: York Sun [mailto:york.sun at nxp.com]
Sent: Tuesday, April 19, 2016 10:03 PM
To: Aneesh Bansal <[email protected]>; u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Prabhakar Kushwaha <[email protected]>
Subject: Re: [PATCH] powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 3 lines · Aneesh Bansal

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled. So, L2PE must be set before enabling L2 cache.

Quoted 6 lines

Aneesh,

The original code set L2PE and L2E together. The L2PE bit doesn't change after that. Doesn't this satisfy the requirement? Did you observe any failure before your patch?

York

e6500 block guide states that "The value of L2PE must not be changed while the L2 cache is enabled" So, when both the bits are set together, it might lead to L2 cache getting enabled first and L2PE getting set after that. So L2PE is getting changed from 0 to 1 while L2 is still enabled which should not be done.

In normal non-secure boot, U-Boot is the first to use L2 after reset but in case of secure boot, L2 is used by Bot ROM before U-Boot. If L2PE and L2E are done together, ECC errors are observed on L2 (L2CAPTECC - L2 cache error capture ECC syndrome) and U-Boot crashes.

I believe this is because of ECC/Parity checking not getting enabled properly and resulting into erroneous detection of errors

When this is changed to setting L2PE before L2E, or not setting L2PE at all i.e. disabling ECC error checks, no ECC errors are observed and U-Boot works fine.

Aneesh

#3 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 29 lines · Aneesh Bansal
Quoted 14 lines

-----Original Message-----
From: York Sun [mailto:york.sun at nxp.com]
Sent: Tuesday, April 19, 2016 10:03 PM
To: Aneesh Bansal <[email protected]>; u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Prabhakar Kushwaha <[email protected]>
Subject: Re: [PATCH] powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 3 lines · Aneesh Bansal

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled. So, L2PE must be set before enabling L2 cache.

Quoted 6 lines

Aneesh,

The original code set L2PE and L2E together. The L2PE bit doesn't change after that. Doesn't this satisfy the requirement? Did you observe any failure before your patch?

York

e6500 block guide states that "The value of L2PE must not be changed while the L2 cache is enabled" So, when both the bits are set together, it might lead to L2 cache getting enabled first and L2PE getting set after that. So L2PE is getting changed from 0 to 1 while L2 is still enabled which should not be done.

In normal non-secure boot, U-Boot is the first to use L2 after reset but in case of secure boot, L2 is used by Bot ROM before U-Boot. If L2PE and L2E are done together, ECC errors are observed on L2 (L2CAPTECC - L2 cache error capture ECC syndrome) and U-Boot crashes.

Quoted 6 lines

I believe this is because of ECC/Parity checking not getting enabled properly and resulting into erroneous detection of errors

When this is changed to setting L2PE before L2E, or not setting L2PE at all i.e. disabling ECC error checks, no ECC errors are observed and U-Boot works fine.

Aneesh,

You said for secure boot L2 cache was used by bootrom before U-Boot. Could the L2 cache be left enabled when U-Boot runs? If true, that indeed sets L2PE bit while L2E is enabled. Please confirm.

If L2E was left set by secure boot, your change actually fixes it, but the commit message needs to be rewritten.

York

#4 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 32 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled. So, L2PE must be set before enabling L2 cache.

Aneesh,

The original code set L2PE and L2E together. The L2PE bit doesn't change after

that.

Quoted 1 line
Quoted 1 line

Doesn't this satisfy the requirement? Did you observe any failure before your

patch?

Quoted 4 lines
Quoted 2 lines

York

e6500 block guide states that "The value of L2PE must not be changed while the L2

cache is enabled"

Quoted 2 lines

So, when both the bits are set together, it might lead to L2 cache getting enabled first and L2PE getting set after that. So L2PE is getting changed from

0 to 1 while L2 is still enabled which should not be done.

Quoted 4 lines

In normal non-secure boot, U-Boot is the first to use L2 after reset but in case of secure boot, L2 is used by Bot ROM before U-Boot. If L2PE and L2E are done together, ECC errors are observed on L2 (L2CAPTECC - L2

cache error capture ECC syndrome) and U-Boot crashes.

Quoted 6 lines

I believe this is because of ECC/Parity checking not getting enabled properly and resulting into erroneous detection of errors

When this is changed to setting L2PE before L2E, or not setting L2PE at all i.e. disabling ECC error checks, no ECC errors are observed and U-Boot works

fine.

Quoted 1 line
Quoted 8 lines

Aneesh,

You said for secure boot L2 cache was used by bootrom before U-Boot. Could the L2 cache be left enabled when U-Boot runs? If true, that indeed sets L2PE bit while L2E is enabled. Please confirm.

If L2E was left set by secure boot, your change actually fixes it, but the commit message needs to be rewritten.

L2 is not left enabled by Boot ROM in case of Secure Boot. The IBR code enables L2 but disables it before transferring control to U-Boot.
What I was trying to suggest is that the way we are enabling L2 in U-Boot seems to be incorrect as we are setting L2PE and L2E simultaneously. This does not cause any issues in case of non-secure boot as U-Boot is the first entity to enable and use L2 cache.

But in case of secure boot, L2 is enabled, used and disabled by Boot ROM first. Now in U-Boot, if ECC/Parity checking is not enabled correctly then it starts reporting ECC errors randomly and U-Boot crashes.

After making this change, no ECC errors are observed and U-Boot starts working correct in case of non-secure boot.

#5 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

Quoted 47 lines · Aneesh Bansal
Quoted 32 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled. So, L2PE must be set before enabling L2 cache.

Aneesh,

The original code set L2PE and L2E together. The L2PE bit doesn't change after

that.

Quoted 1 line
Quoted 1 line

Doesn't this satisfy the requirement? Did you observe any failure before your

patch?

Quoted 4 lines
Quoted 2 lines

York

e6500 block guide states that "The value of L2PE must not be changed while the L2

cache is enabled"

Quoted 2 lines

So, when both the bits are set together, it might lead to L2 cache getting enabled first and L2PE getting set after that. So L2PE is getting changed from

0 to 1 while L2 is still enabled which should not be done.

Quoted 4 lines

In normal non-secure boot, U-Boot is the first to use L2 after reset but in case of secure boot, L2 is used by Bot ROM before U-Boot. If L2PE and L2E are done together, ECC errors are observed on L2 (L2CAPTECC - L2

cache error capture ECC syndrome) and U-Boot crashes.

Quoted 6 lines

I believe this is because of ECC/Parity checking not getting enabled properly and resulting into erroneous detection of errors

When this is changed to setting L2PE before L2E, or not setting L2PE at all i.e. disabling ECC error checks, no ECC errors are observed and U-Boot works

fine.

Quoted 1 line
Quoted 8 lines

Aneesh,

You said for secure boot L2 cache was used by bootrom before U-Boot. Could the L2 cache be left enabled when U-Boot runs? If true, that indeed sets L2PE bit while L2E is enabled. Please confirm.

If L2E was left set by secure boot, your change actually fixes it, but the commit message needs to be rewritten.

L2 is not left enabled by Boot ROM in case of Secure Boot. The IBR code enables L2 but disables it before transferring control to U-Boot.
What I was trying to suggest is that the way we are enabling L2 in U-Boot seems to be incorrect as we are setting L2PE and L2E simultaneously. This does not cause any issues in case of non-secure boot as U-Boot is the first entity to enable and use L2 cache.

Quoted 7 lines

But in case of secure boot, L2 is enabled, used and disabled by Boot ROM first. Now in U-Boot, if ECC/Parity checking is not enabled correctly then it starts reporting ECC errors randomly and U-Boot crashes.

After making this change, no ECC errors are observed and U-Boot starts working correct in case of non-secure boot.

All right. That clears my questions. Thanks.

York

#6 lore raw

PATCH 1/1 powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache

In reply to Aneesh Bansal
Quoted 9 lines · Aneesh Bansal

While enabling L2 cache, the value of L2PE (L2 cache parity/ECC error checking enable) must not be changed while the L2 cache is enabled.
So, L2PE must be set before enabling L2 cache.

---
 arch/powerpc/cpu/mpc85xx/start.S | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Applied to u-boot-mpc85xx master branch, awaiting upstream.

Thanks.

York