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

Commit 2b56fec6 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: Run k8t_sound_hostbridge quirk only when needed
  PCI: disable MSI on RX790
  PCI: disable MSI on RD580
  PCI: disable MSI on RS690
  PCI: make pcie_get_readrq visible in pci.h
  PCI: lets kill the 'PCI hidden behind bridge' message
  pci/hotplug/cpqphp_ctrl.c: remove stale BKL use
  PCI: Document pci_iomap()
  PCI: quirk_e100_interrupt() called too early
  PCI: Move prototypes for pci_bus_find_capability to include/linux/pci.h
parents 9e1a3e31 18166c1a

Documentation/DocBook/deviceiobook.tmpl

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) 


  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Einclude/asm-i386/io.h

!Iinclude/asm-i386/io.h

!Elib/iomap.c

  </chapter>



</book>

drivers/pci/hotplug/cpqphp_ctrl.c

+1 −3
Original line number Diff line number Diff line
@@ -1746,10 +1746,8 @@ static void pushbutton_helper_thread(unsigned long data) 
static int event_thread(void* data)

{

	struct controller *ctrl;

	lock_kernel();

	daemonize("phpd_event");



	unlock_kernel();

	daemonize("phpd_event");



	while (1) {

		dbg("!!!!event_thread sleeping\n");

drivers/pci/pci.h

+1 −7
Original line number Diff line number Diff line
@@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev, char **envp, int num_envp, 
extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);

extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);

extern void pci_cleanup_rom(struct pci_dev *dev);

extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,

				  resource_size_t size, resource_size_t align,

				  resource_size_t min, unsigned int type_mask,

				  void (*alignf)(void *, struct resource *,

					      resource_size_t, resource_size_t),

				  void *alignf_data);



/* Firmware callbacks */

extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);

extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
@@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; } 


/* Functions for PCI Hotplug drivers to use */

extern unsigned int pci_do_scan_bus(struct pci_bus *bus);

extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);



extern void pci_remove_legacy_files(struct pci_bus *bus);

drivers/pci/probe.c

+9 −9
Original line number Diff line number Diff line
@@ -653,20 +653,20 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass 


	sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);



	/* Has only triggered on CardBus, fixup is in yenta_socket */

	while (bus->parent) {

		if ((child->subordinate > bus->subordinate) ||

		    (child->number > bus->subordinate) ||

		    (child->number < bus->number) ||

		    (child->subordinate < bus->number)) {

			printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "

			       "hidden behind%s bridge #%02x (-#%02x)%s\n",

			pr_debug("PCI: Bus #%02x (-#%02x) is %s"

				"hidden behind%s bridge #%02x (-#%02x)\n",

				child->number, child->subordinate,

				(bus->number > child->subordinate &&

				 bus->subordinate < child->number) ?

					"wholly " : " partially",

				bus->self->transparent ? " transparent" : " ",

			       bus->number, bus->subordinate,

			       pcibios_assign_all_busses() ? " " :

			       " (try 'pci=assign-busses')");

			printk(KERN_WARNING "Please report the result to "

			       "<bk@suse.de> to fix this permanently\n");

				bus->number, bus->subordinate);

		}

		bus = bus->parent;

	}

drivers/pci/quirks.c

+5 −2
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static void k8t_sound_hostbridge(struct pci_dev *dev) 
	unsigned char val;



	pci_read_config_byte(dev, 0x50, &val);

	if (val == 0x88 || val == 0xc8) {

	if (val == 0xc8) {

		/* Assume it's probably a MSI-K8T-Neo2Fir */

		printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, attempting to turn soundcard ON\n");

		pci_write_config_byte(dev, 0x50, val & (~0x40));
@@ -1485,7 +1485,7 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev) 


	iounmap(csr);

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);



static void __devinit fixup_rev1_53c810(struct pci_dev* dev)

{
@@ -1650,6 +1650,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCN 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);



/* Disable MSI on chipsets that are known to not support it */