Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 2ba84684 authored Aug 14, 2005 by Linus Torvalds

Revert PCIBIOS_MIN_IO changes for 2.6.13



This reverts commits

  71db63ac
	[PATCH] increase PCIBIOS_MIN_IO on x86

and

  0b2bfb4e
    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>

parent b4b08e58

drivers/acpi/motherboard.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ ACPI_MODULE_NAME ("acpi_motherboard")
	*/		*/
	#define IS_RESERVED_ADDR(base, len) \		#define IS_RESERVED_ADDR(base, len) \
	(((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \		(((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		* Clearing the flag (IORESOURCE_BUSY) allows drivers to use

include/asm-i386/pci.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,9 +18,11 @@ extern unsigned int pcibios_assign_all_busses(void);
	#define pcibios_scan_all_fns(a, b) 0		#define pcibios_scan_all_fns(a, b) 0

	extern unsigned long pci_mem_start;		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_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);

include/asm-x86_64/pci.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,9 +22,11 @@ extern unsigned int pcibios_assign_all_busses(void);
	extern int no_iommu, force_iommu;		extern int no_iommu, force_iommu;

	extern unsigned long pci_mem_start;		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_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);
	extern int (pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);		extern int (pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);