tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert PCIBIOS_MIN_IO changes for 2.6.13

This reverts commits

71db63acff69618b3d9d3114bd061938150e146b
[PATCH] increase PCIBIOS_MIN_IO on x86

and

0b2bfb4e7ff61f286676867c3508569bea6fbf7a
ACPI: increase PCIBIOS_MIN_IO on x86

since Lukas Sandströ<lukass@etek.chalmers.se> reports that this breaks
his on-board nvidia audio.

We should re-visit this later. For now we revert the change

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds 2ba84684 b4b08e58

+7 -3
+1 -1
drivers/acpi/motherboard.c
··· 43 43 */ 44 44 #define IS_RESERVED_ADDR(base, len) \ 45 45 (((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \ 46 - && ((base) + (len) > 0x1000)) 46 + && ((base) + (len) > PCIBIOS_MIN_IO)) 47 47 48 48 /* 49 49 * Clearing the flag (IORESOURCE_BUSY) allows drivers to use
+3 -1
include/asm-i386/pci.h
··· 18 18 #define pcibios_scan_all_fns(a, b) 0 19 19 20 20 extern unsigned long pci_mem_start; 21 - #define PCIBIOS_MIN_IO 0x4000 21 + #define PCIBIOS_MIN_IO 0x1000 22 22 #define PCIBIOS_MIN_MEM (pci_mem_start) 23 + 24 + #define PCIBIOS_MIN_CARDBUS_IO 0x4000 23 25 24 26 void pcibios_config_init(void); 25 27 struct pci_bus * pcibios_scan_root(int bus);
+3 -1
include/asm-x86_64/pci.h
··· 22 22 extern int no_iommu, force_iommu; 23 23 24 24 extern unsigned long pci_mem_start; 25 - #define PCIBIOS_MIN_IO 0x4000 25 + #define PCIBIOS_MIN_IO 0x1000 26 26 #define PCIBIOS_MIN_MEM (pci_mem_start) 27 + 28 + #define PCIBIOS_MIN_CARDBUS_IO 0x4000 27 29 28 30 void pcibios_config_init(void); 29 31 struct pci_bus * pcibios_scan_root(int bus);