[parisc-linux-cvs] linux bame

[Paul Bame]

CVSROOT:	/var/cvs
Module name:	linux
Changes by:	bame	01/11/14 10:44:12

Modified files:
	arch/parisc/kernel: lba_pci.c 

Log message:
Index: lba_pci.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/lba_pci.c,v
retrieving revision 1.43
diff -u -r1.43 lba_pci.c
--- lba_pci.c	2001/11/03 23:05:59	1.43
+++ lba_pci.c	2001/11/14 17:34:56
@@ -514,6 +514,11 @@

+/* XXX FIXME the '1 ||' in the if() below triggers the 'broken elroy'
+ * code always.  This was required on B2000 and probably other PA-8600
+ * boxes even they have un-broken elroy's.  ggg thinks firmware leaves
+ * things in a state for which we are unprepared.  This is the wrong fix
+ * but works for now. -PB */
#define LBA_CFG_RD(size, mask) \
static int lba_cfg_read##size (struct pci_dev *dev, int pos, u##size *data) \
{ \
@@ -521,7 +526,7 @@
u32 local_bus = (dev->bus->parent == NULL) ? 0 : dev->bus->secondary; \
u32 tok = LBA_CFG_TOK(local_bus,dev->devfn); \
\
-	if ((!LBA_TR4PLUS(d)) && (!LBA_SKIP_PROBE(d))) { \
+	if (1 || (!LBA_TR4PLUS(d)) && (!LBA_SKIP_PROBE(d))) { \
/* original - Generate config cycle on broken elroy \
with risk we will miss PCI bus errors. */ \
*data = (u##size) lba_rd_cfg(d, tok, pos, sizeof(u##size)); \