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

Commit 256a13dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
  PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
parents 330bcd2f 9f67fd5d

arch/x86/Kconfig

+5 −6
Original line number Diff line number Diff line
@@ -1508,13 +1508,13 @@ config PCI_GOMMCONFIG 
config PCI_GODIRECT

	bool "Direct"



config PCI_GOANY

	bool "Any"



config PCI_GOOLPC

	bool "OLPC"

	depends on OLPC



config PCI_GOANY

	bool "Any"



endchoice



config PCI_BIOS
@@ -1531,9 +1531,8 @@ config PCI_MMCONFIG 
	depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)



config PCI_OLPC

	bool

	depends on PCI && PCI_GOOLPC

	default y

	def_bool y

	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)



config PCI_DOMAINS

	def_bool y

arch/x86/pci/init.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ static __init int pci_access_init(void) 
	pci_mmcfg_early_init();



#ifdef CONFIG_PCI_OLPC

	pci_olpc_init();

	if (!pci_olpc_init())

		return 0;	/* skip additional checks if it's an XO */

#endif

#ifdef CONFIG_PCI_BIOS

	pci_pcbios_init();

arch/x86/pci/irq.c

+7 −0
Original line number Diff line number Diff line
@@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r, 
			 */

			device = PCI_DEVICE_ID_VIA_8235;

			break;

		case PCI_DEVICE_ID_VIA_8237:

			/**

			 * Asus a7v600 bios wrongly reports 8237

			 * as 586-compatible

			 */

			device = PCI_DEVICE_ID_VIA_8237;

			break;

		}

	}

arch/x86/pci/olpc.c

+3 −2
Original line number Diff line number Diff line
@@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = { 
	.write = pci_olpc_write,

};



void __init pci_olpc_init(void)

int __init pci_olpc_init(void)

{

	if (!machine_is_olpc() || olpc_has_vsa())

		return;

		return -ENODEV;



	printk(KERN_INFO "PCI: Using configuration type OLPC\n");

	raw_pci_ops = &pci_olpc_conf;

	is_lx = is_geode_lx();

	return 0;

}

arch/x86/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1; 
extern int pci_direct_probe(void);

extern void pci_direct_init(int type);

extern void pci_pcbios_init(void);

extern void pci_olpc_init(void);

extern int pci_olpc_init(void);



/* pci-mmconfig.c */