projects/linux·commit 2ba84684

Revert PCIBIOS_MIN_IO changes for 2.6.13

2ba84684 · Linus Torvalds <[email protected]> · 2005-08-14 18:21:30 -07:00

This reverts commits

  71db63acff69618b3d9d3114bd061938150e146b
	[PATCH] increase PCIBIOS_MIN_IO on x86

and

  0b2bfb4e7ff61f286676867c3508569bea6fbf7a
    ACPI: increase PCIBIOS_MIN_IO on x86

since Lukas Sandströ<[email protected]> 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 <[email protected]>
Commit
2ba84684e8cf6f980e4e95a2300f53a505eb794e
Parents
b4b08e58

Changes

3 files changed · +7 −3

FileStatusAddDelContent
drivers/acpi/motherboard.cmodified+1−1View file
include/asm-i386/pci.hmodified+3−1View file
include/asm-x86_64/pci.hmodified+3−1View file

drivers/acpi/motherboard.c

View file
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index 2934475..61ea707 100644
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -43,7 +43,7 @@ ACPI_MODULE_NAME ("acpi_motherboard")
*/
#define IS_RESERVED_ADDR(base, len) \
(((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \
- && ((base) + (len) > 0x1000))
+ && ((base) + (len) > PCIBIOS_MIN_IO))
/*
* Clearing the flag (IORESOURCE_BUSY) allows drivers to use

include/asm-i386/pci.h

View file
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 2cbab30..78c8598 100644
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -18,9 +18,11 @@ extern unsigned int pcibios_assign_all_busses(void);
#define pcibios_scan_all_fns(a, b) 0
extern unsigned long pci_mem_start;
-#define PCIBIOS_MIN_IO 0x4000
+#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);

include/asm-x86_64/pci.h

View file
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index 9c4527e..eeb3088 100644
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
@@ -22,9 +22,11 @@ extern unsigned int pcibios_assign_all_busses(void);
extern int no_iommu, force_iommu;
extern unsigned long pci_mem_start;
-#define PCIBIOS_MIN_IO 0x4000
+#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);
extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value);