[PATCH] bestcomm: Restrict disabling of bus prefetch to original mpc5200 silicon.

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

Thanks,
g.

 arch/powerpc/sysdev/bestcomm/bestcomm.c |    9 ++++++---
 include/asm-powerpc/mpc52xx.h           |    5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index 48492a8..740ad73 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c

@@ -269,6 +269,7 @@ bcom_engine_init(void)
 	int task;
 	phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa;
 	unsigned int tdt_size, ctx_size, var_size, fdt_size;
+	u16 regval;
 
 	/* Allocate & clear SRAM zones for FDT, TDTs, contexts and vars/incs */
 	tdt_size = BCOM_MAX_TASKS * sizeof(struct bcom_tdt);

@@ -319,9 +320,11 @@ bcom_engine_init(void)
 	/* Init 'always' initiator */
 	out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS);
 
-	/* Disable COMM Bus Prefetch, apparently it's not reliable yet */
-	/* FIXME: This should be done on 5200 and not 5200B ... */
-	out_be16(&bcom_eng->regs->PtdCntrl, in_be16(&bcom_eng->regs->PtdCntrl) | 1);
+	/* Disable COMM Bus Prefetch on the original 5200; it's broken */
+	if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR) {
+		regval = in_be16(&bcom_eng->regs->PtdCntrl);
+		out_be16(&bcom_eng->regs->PtdCntrl,  regval | 1);
+	}
 
 	/* Init lock */
 	spin_lock_init(&bcom_eng->lock);

diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h
index 24751df..25b2e55 100644
--- a/include/asm-powerpc/mpc52xx.h
+++ b/include/asm-powerpc/mpc52xx.h

@@ -18,6 +18,11 @@
 #include <asm/prom.h>
 #endif /* __ASSEMBLY__ */
 
+/* Variants of the 5200(B) */
+#define MPC5200_SVR		0x80110010
+#define MPC5200_SVR_MASK	0xfffffff0
+#define MPC5200B_SVR		0x80110020
+#define MPC5200B_SVR_MASK	0xfffffff0
 
 /* ======================================================================== */
 /* Structures mapping of some unit register set                             */

On Wed, Oct 17, 2007 at 10:36:27AM -0600, Grant Likely wrote:

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I will test it tomorrow. For some obscure reason, my efika refuses to
get the console=ttyPSC0 appended, so i have a hard time testing it.

Friendly,

Sven Luther

On 17/10/07 10:36 -0600, Grant Likely wrote:

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)


	Domen

On 10/19/07, Domen Puncer [off-list ref] wrote:

On 17/10/07 10:36 -0600, Grant Likely wrote:

quoted

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)

Cool, I'll add it to my list of patches for Paulus to pull

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

On Fri, Oct 19, 2007 at 07:09:16AM -0600, Grant Likely wrote:

On 10/19/07, Domen Puncer [off-list ref] wrote:

quoted

On 17/10/07 10:36 -0600, Grant Likely wrote:

quoted

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)

Cool, I'll add it to my list of patches for Paulus to pull

Sorry, i have not had time to test, but there is a problem with the
userland serial console i want to investigate. At the latest i will test
this on monday.

Friendly,

Sven Luther

On 10/19/07, Sven Luther [off-list ref] wrote:

On Fri, Oct 19, 2007 at 07:09:16AM -0600, Grant Likely wrote:

quoted

On 10/19/07, Domen Puncer [off-list ref] wrote:

quoted

On 17/10/07 10:36 -0600, Grant Likely wrote:

quoted

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)

Cool, I'll add it to my list of patches for Paulus to pull

Sorry, i have not had time to test, but there is a problem with the
userland serial console i want to investigate. At the latest i will test
this on monday.

Your userland serial problems are unrelated to this patch though, right?

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

On Fri, Oct 19, 2007 at 09:43:38AM -0600, Grant Likely wrote:

On 10/19/07, Sven Luther [off-list ref] wrote:

quoted

On Fri, Oct 19, 2007 at 07:09:16AM -0600, Grant Likely wrote:

quoted

On 10/19/07, Domen Puncer [off-list ref] wrote:

quoted

On 17/10/07 10:36 -0600, Grant Likely wrote:

quoted

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)

Cool, I'll add it to my list of patches for Paulus to pull

Sorry, i have not had time to test, but there is a problem with the
userland serial console i want to investigate. At the latest i will test
this on monday.

Your userland serial problems are unrelated to this patch though, right?

Most definitively, sorry for the confusion.

Friendly,

Sven Luther

Grant Likely wrote:

On 10/19/07, Domen Puncer [off-list ref] wrote:

quoted

On 17/10/07 10:36 -0600, Grant Likely wrote:

quoted

From: Grant Likely <redacted>

Only the MPC5200 needs this bug fix.  MPC5200B is okay.

Signed-off-by: Grant Likely <redacted>
---

Sven, Domen;

Can you please test this patch?

I found no obvious problems with it on Efika (mpc5200b)

Cool, I'll add it to my list of patches for Paulus to pull

See now that wasn't so hard was it? :D

You earned a cookie :D

-- 
Matt Sealey [off-list ref]
Genesi, Manager, Developer Relations