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

Commit 01a6a779 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: irq and pci_ids patch for Intel Tolapai
  PCI: unhide SMBus on Compaq Deskpro EP 401963-001 motherboard
  PCI: Remove __devinit from pcibios_get_irq_routing_table
  PCI: remove devinit from pci_read_bridge_bases
  PCI AER: fix warnings when PCIEAER=n
parents ae292dbd 99fa9844

arch/i386/pci/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
		case PCI_DEVICE_ID_INTEL_ICH9_3:

		case PCI_DEVICE_ID_INTEL_ICH9_4:

		case PCI_DEVICE_ID_INTEL_ICH9_5:

		case PCI_DEVICE_ID_INTEL_TOLAPAI_0:

			r->name = "PIIX/ICH";

			r->get = pirq_piix_get;

			r->set = pirq_piix_set;

arch/i386/pci/pcbios.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ struct irq_routing_options { 
	u16 segment;

} __attribute__((packed));



struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void)

struct irq_routing_table * pcibios_get_irq_routing_table(void)

{

	struct irq_routing_options opt;

	struct irq_routing_table *rt = NULL;

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) 
	}

}



void __devinit pci_read_bridge_bases(struct pci_bus *child)

void pci_read_bridge_bases(struct pci_bus *child)

{

	struct pci_dev *dev = child->self;

	u8 io_base_lo, io_limit_lo;

drivers/pci/quirks.c

+14 −2
Original line number Diff line number Diff line
@@ -972,8 +972,8 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho 
 *

 * The SMBus PCI Device can be activated by setting a bit in the ICH LPC 

 * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 

 * becomes necessary to do this tweak in two steps -- I've chosen the Host

 * bridge as trigger.

 * becomes necessary to do this tweak in two steps -- the chosen trigger

 * is either the Host bridge (preferred) or on-board VGA controller.

 *

 * Note that we used to unhide the SMBus that way on Toshiba laptops

 * (Satellite A40 and Tecra M2) but then found that the thermal management
@@ -1070,6 +1070,14 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) 
			case 0x0058: /* Compaq Evo N620c */

				asus_hides_smbus = 1;

			}

		else if (dev->device == PCI_DEVICE_ID_INTEL_82810_IG3)

			switch(dev->subsystem_device) {

			case 0xB16C: /* Compaq Deskpro EP 401963-001 (PCA# 010174) */

				/* Motherboard doesn't have Host bridge

				 * subvendor/subdevice IDs, therefore checking

				 * its on-board VGA controller */

				asus_hides_smbus = 1;

			}

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82845_HB,	asus_hides_smbus_hostbridge );
@@ -1082,6 +1090,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855PM_HB, as 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855GM_HB,	asus_hides_smbus_hostbridge );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );



DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82810_IG3,	asus_hides_smbus_hostbridge );



static void asus_hides_smbus_lpc(struct pci_dev *dev)

{

	u16 val;
@@ -1099,12 +1109,14 @@ static void asus_hides_smbus_lpc(struct pci_dev *dev) 
			printk(KERN_INFO "PCI: Enabled i801 SMBus device\n");

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801AA_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801BA_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_12,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_12,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801EB_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801AA_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801BA_0,	asus_hides_smbus_lpc );

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asus_hides_smbus_lpc );

include/linux/aer.h

+20 −5
Original line number Diff line number Diff line
@@ -15,11 +15,26 @@ extern int pci_disable_pcie_error_reporting(struct pci_dev *dev); 
extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);

#else

#define pci_enable_pcie_error_reporting(dev)		(-EINVAL)

#define pci_find_aer_capability(dev)			(0)

#define pci_disable_pcie_error_reporting(dev)		(-EINVAL)

#define pci_cleanup_aer_uncorrect_error_status(dev)	(-EINVAL)

#define pci_cleanup_aer_correct_error_status(dev)	(-EINVAL)

static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)

{

	return -EINVAL;

}

static inline int pci_find_aer_capability(struct pci_dev *dev)

{

	return 0;

}

static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)

{

	return -EINVAL;

}

static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)

{

	return -EINVAL;

}

static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)

{

	return -EINVAL;

}

#endif



#endif //_AER_H_