Commit d1d8f3b6 authored by Linus Torvalds's avatar Linus Torvalds

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.
parent 164cf89e
...@@ -509,6 +509,10 @@ static int yenta_sock_suspend(struct pcmcia_socket *sock) ...@@ -509,6 +509,10 @@ static int yenta_sock_suspend(struct pcmcia_socket *sock)
#define BRIDGE_IO_MAX 256 #define BRIDGE_IO_MAX 256
#define BRIDGE_IO_MIN 32 #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) static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type)
{ {
struct pci_bus *bus; struct pci_bus *bus;
...@@ -551,7 +555,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ ...@@ -551,7 +555,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
align = 1024; align = 1024;
size = BRIDGE_IO_MAX; size = BRIDGE_IO_MAX;
min = BRIDGE_IO_MIN; min = BRIDGE_IO_MIN;
start = PCIBIOS_MIN_IO; start = PCIBIOS_MIN_CARDBUS_IO;
end = ~0U; end = ~0U;
} else { } else {
unsigned long avail = root->end - root->start; unsigned long avail = root->end - root->start;
......
...@@ -20,6 +20,8 @@ extern unsigned long pci_mem_start; ...@@ -20,6 +20,8 @@ extern unsigned long pci_mem_start;
#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM (pci_mem_start) #define PCIBIOS_MIN_MEM (pci_mem_start)
#define PCIBIOS_MIN_CARDBUS_IO 0x4000
void pcibios_config_init(void); void pcibios_config_init(void);
struct pci_bus * pcibios_scan_root(int bus); struct pci_bus * pcibios_scan_root(int bus);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment