Commit c052a22e authored by Grant Likely's avatar Grant Likely

[POWERPC] bestcomm: Restrict bus prefetch bugfix to original mpc5200 silicon.

Only the MPC5200 needs this bug fix.  MPC5200B is okay.
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 2fb59d62
...@@ -269,6 +269,7 @@ bcom_engine_init(void) ...@@ -269,6 +269,7 @@ bcom_engine_init(void)
int task; int task;
phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa; phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa;
unsigned int tdt_size, ctx_size, var_size, fdt_size; unsigned int tdt_size, ctx_size, var_size, fdt_size;
u16 regval;
/* Allocate & clear SRAM zones for FDT, TDTs, contexts and vars/incs */ /* Allocate & clear SRAM zones for FDT, TDTs, contexts and vars/incs */
tdt_size = BCOM_MAX_TASKS * sizeof(struct bcom_tdt); tdt_size = BCOM_MAX_TASKS * sizeof(struct bcom_tdt);
...@@ -319,9 +320,11 @@ bcom_engine_init(void) ...@@ -319,9 +320,11 @@ bcom_engine_init(void)
/* Init 'always' initiator */ /* Init 'always' initiator */
out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS); out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS);
/* Disable COMM Bus Prefetch, apparently it's not reliable yet */ /* Disable COMM Bus Prefetch on the original 5200; it's broken */
/* FIXME: This should be done on 5200 and not 5200B ... */ if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR) {
out_be16(&bcom_eng->regs->PtdCntrl, in_be16(&bcom_eng->regs->PtdCntrl) | 1); regval = in_be16(&bcom_eng->regs->PtdCntrl);
out_be16(&bcom_eng->regs->PtdCntrl, regval | 1);
}
/* Init lock */ /* Init lock */
spin_lock_init(&bcom_eng->lock); spin_lock_init(&bcom_eng->lock);
......
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
#include <linux/suspend.h> #include <linux/suspend.h>
/* 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 */ /* Structures mapping of some unit register set */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment