From d1d8f3b60f6e2cf5d9a37db265ef2199cdd466a2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 22 Oct 2003 18:29:45 -0700 Subject: [PATCH] Make yenta allocate IO resource windows in same range as in 2.4.x Apparently some laptops (Compaq EVO N620c for one) have something hidden at IO port range 0x1000, and the 2.4.x default of allocating IO starting at 0x4000 is safer. --- drivers/pcmcia/yenta_socket.c | 6 +++++- include/asm-i386/pci.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 0fde149e0d6dd..27324a8561548 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -509,6 +509,10 @@ static int yenta_sock_suspend(struct pcmcia_socket *sock) #define BRIDGE_IO_MAX 256 #define BRIDGE_IO_MIN 32 +#ifndef PCIBIOS_MIN_CARDBUS_IO +#define PCIBIOS_MIN_CARDBUS_IO PCIBIOS_MIN_IO +#endif + static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type) { struct pci_bus *bus; @@ -551,7 +555,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ align = 1024; size = BRIDGE_IO_MAX; min = BRIDGE_IO_MIN; - start = PCIBIOS_MIN_IO; + start = PCIBIOS_MIN_CARDBUS_IO; end = ~0U; } else { unsigned long avail = root->end - root->start; diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index f9af605e42bf3..0fc93a7d3c07c 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h @@ -20,6 +20,8 @@ extern unsigned long pci_mem_start; #define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM (pci_mem_start) +#define PCIBIOS_MIN_CARDBUS_IO 0x4000 + void pcibios_config_init(void); struct pci_bus * pcibios_scan_root(int bus); -- 2.53.0