[PATCH] cardbus: revert IO window limit

From: Pekka J Enberg
Date: Thu Jun 22 2006 - 02:51:32 EST


From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

This patch reverts commit 4196c3af25d98204216a5d6c37ad2cb303a1f2bf "cardbus:
limit IO windows to 256 bytes" which breaks Alessio Sangalli's machine boot
when APM support is enabled. See http://lkml.org/lkml/2006/6/16/33 for
description of the problem.

Cc: Alessio Sangalli <alesan@xxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
---

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 28ce3a7..657be94 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -40,7 +40,7 @@ #define ROUND_UP(x, a) (((x) + (a) - 1)
* FIXME: IO should be max 256 bytes. However, since we may
* have a P2P bridge below a cardbus bridge, we need 4K.
*/
-#define CARDBUS_IO_SIZE (256)
+#define CARDBUS_IO_SIZE (4*1024)
#define CARDBUS_MEM_SIZE (32*1024*1024)

static void __devinit
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/