[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4122/common pciu.c,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common
In directory usw-pr-cvs1:/tmp/cvs-serv19489/vr4122/common

Modified Files:
	pciu.c 
Log Message:
Fix PCIU access race on Vr4131.



Index: pciu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/pciu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pciu.c	7 Mar 2002 03:16:54 -0000	1.1
+++ pciu.c	20 Apr 2002 19:08:43 -0000	1.2
@@ -32,6 +32,9 @@
  */
 /*
  * Changes:
+ *  Paul Mundt <le...@ch...>
+ *  - Fix deadlock-causing PCIU access race for VR4131.
+ *
  *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
  *  - New creation, NEC VR4122 and VR4131 are supported.
  */
@@ -206,6 +209,12 @@
 
 	/* Supply PCI clock by PCI bus */
 	vr41xx_clock_supply(PCI_CLOCK);
+
+	/* 
+	 * Sleep for 1us after setting MSKPPCIU bit in CMUCLKMSK
+	 * before doing any PCIU access to avoid deadlock on VR4131. 
+	 */
+	udelay(1);
 
 	/* Set master memory & I/O windows */
 	writel(0x100f9010, PCIMMAW1REG);