upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / ppc / syslib / mpc10x_common.c

diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c
index ddcb9e0..fd93adf 100644 (file)
--- a/arch/ppc/syslib/mpc10x_common.c
+++ b/arch/ppc/syslib/mpc10x_common.c
@@ -306,6 +306,41 @@ mpc10x_bridge_init(struct pci_controller *hose,
        mpc10x_disable_store_gathering(hose);
 #endif
 
+       /*
+        * 8240 erratum 26, 8241/8245 erratum 29, 107 erratum 23: speculative
+        * PCI reads may return stale data so turn off.
+        */
+       if ((host_bridge == MPC10X_BRIDGE_8240)
+               || (host_bridge == MPC10X_BRIDGE_8245)
+               || (host_bridge == MPC10X_BRIDGE_107)) {
+
+               early_read_config_dword(hose, 0, PCI_DEVFN(0,0),
+                       MPC10X_CFG_PICR1_REG, &picr1);
+
+               picr1 &= ~MPC10X_CFG_PICR1_SPEC_PCI_RD;
+
+               early_write_config_dword(hose, 0, PCI_DEVFN(0,0),
+                       MPC10X_CFG_PICR1_REG, picr1);
+       }
+
+       /*
+        * 8241/8245 erratum 28: PCI reads from local memory may return
+        * stale data.  Workaround by setting PICR2[0] to disable copyback
+        * optimization.  Oddly, the latest available user manual for the
+        * 8245 (Rev 2., dated 10/2003) says PICR2[0] is reserverd.
+        */
+       if (host_bridge == MPC10X_BRIDGE_8245) {
+               ulong   picr2;
+
+               early_read_config_dword(hose, 0, PCI_DEVFN(0,0),
+                       MPC10X_CFG_PICR2_REG, &picr2);
+
+               picr2 |= MPC10X_CFG_PICR2_COPYBACK_OPT;
+
+               early_write_config_dword(hose, 0, PCI_DEVFN(0,0),
+                        MPC10X_CFG_PICR2_REG, picr2);
+       }
+
        if (ppc_md.progress) ppc_md.progress("mpc10x:exit", 0x100);
        return 0;
 }