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

Commit a7ef6a40 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:
  PCI: Limit VPD length for Broadcom 5708S
  PCI PM: Export pci_pme_active to drivers
  PCI: remove duplicate symbol from pci_ids.h
  PCI: check the return value of device_create_bin_file() in pci_create_bus()
  PCI: fully restore MSI state at resume time
  DMA: make dma-coherent.c documentation kdoc-friendly
  PCI: make pci_register_driver() a macro
  PCI: add Broadcom 5708S to VPD length quirk
parents 000b9151 35405f25

drivers/pci/msi.c

+2 −3
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev) 
				  entry->msi_attrib.masked);



	pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);

	control &= ~(PCI_MSI_FLAGS_QSIZE | PCI_MSI_FLAGS_ENABLE);

	if (entry->msi_attrib.maskbit || !entry->msi_attrib.masked)

	control &= ~PCI_MSI_FLAGS_QSIZE;

	control |= PCI_MSI_FLAGS_ENABLE;

	pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);

}

drivers/pci/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ bool pci_pme_capable(struct pci_dev *dev, pci_power_t state) 
 * The caller must verify that the device is capable of generating PME# before

 * calling this function with @enable equal to 'true'.

 */

static void pci_pme_active(struct pci_dev *dev, bool enable)

void pci_pme_active(struct pci_dev *dev, bool enable)

{

	u16 pmcsr;
@@ -1941,6 +1941,7 @@ EXPORT_SYMBOL(pci_set_power_state); 
EXPORT_SYMBOL(pci_save_state);

EXPORT_SYMBOL(pci_restore_state);

EXPORT_SYMBOL(pci_pme_capable);

EXPORT_SYMBOL(pci_pme_active);

EXPORT_SYMBOL(pci_enable_wake);

EXPORT_SYMBOL(pci_target_state);

EXPORT_SYMBOL(pci_prepare_to_sleep);

drivers/pci/probe.c

+38 −16
Original line number Diff line number Diff line
@@ -52,18 +52,27 @@ EXPORT_SYMBOL(no_pci_devices); 
 * Some platforms allow access to legacy I/O port and ISA memory space on

 * a per-bus basis.  This routine creates the files and ties them into

 * their associated read, write and mmap files from pci-sysfs.c

 *

 * On error unwind, but don't propogate the error to the caller

 * as it is ok to set up the PCI bus without these files.

 */

static void pci_create_legacy_files(struct pci_bus *b)

{

	int error;



	b->legacy_io = kzalloc(sizeof(struct bin_attribute) * 2,

			       GFP_ATOMIC);

	if (b->legacy_io) {

	if (!b->legacy_io)

		goto kzalloc_err;



	b->legacy_io->attr.name = "legacy_io";

	b->legacy_io->size = 0xffff;

	b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;

	b->legacy_io->read = pci_read_legacy_io;

	b->legacy_io->write = pci_write_legacy_io;

		device_create_bin_file(&b->dev, b->legacy_io);

	error = device_create_bin_file(&b->dev, b->legacy_io);

	if (error)

		goto legacy_io_err;



	/* Allocated above after the legacy_io struct */

	b->legacy_mem = b->legacy_io + 1;
@@ -71,8 +80,21 @@ static void pci_create_legacy_files(struct pci_bus *b) 
	b->legacy_mem->size = 1024*1024;

	b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;

	b->legacy_mem->mmap = pci_mmap_legacy_mem;

		device_create_bin_file(&b->dev, b->legacy_mem);

	}

	error = device_create_bin_file(&b->dev, b->legacy_mem);

	if (error)

		goto legacy_mem_err;



	return;



legacy_mem_err:

	device_remove_bin_file(&b->dev, b->legacy_io);

legacy_io_err:

	kfree(b->legacy_io);

	b->legacy_io = NULL;

kzalloc_err:

	printk(KERN_WARNING "pci: warning: could not create legacy I/O port "

	       "and ISA memory resources to sysfs\n");

	return;

}



void pci_remove_legacy_files(struct pci_bus *b)

drivers/pci/quirks.c

+6 −1
Original line number Diff line number Diff line
@@ -1756,9 +1756,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, 0x324e, quirk_via_cx700_pci_parking_c 
 */

static void __devinit quirk_brcm_570x_limit_vpd(struct pci_dev *dev)

{

	/*  Only disable the VPD capability for 5706, 5708, and 5709 rev. A */

	/*

	 * Only disable the VPD capability for 5706, 5706S, 5708,

	 * 5708S and 5709 rev. A

	 */

	if ((dev->device == PCI_DEVICE_ID_NX2_5706) ||

	    (dev->device == PCI_DEVICE_ID_NX2_5706S) ||

	    (dev->device == PCI_DEVICE_ID_NX2_5708) ||

	    (dev->device == PCI_DEVICE_ID_NX2_5708S) ||

	    ((dev->device == PCI_DEVICE_ID_NX2_5709) &&

	     (dev->revision & 0xf0) == 0x0)) {

		if (dev->vpd)

include/linux/pci.h

+7 −4
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ int pci_restore_state(struct pci_dev *dev); 
int pci_set_power_state(struct pci_dev *dev, pci_power_t state);

pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);

bool pci_pme_capable(struct pci_dev *dev, pci_power_t state);

void pci_pme_active(struct pci_dev *dev, bool enable);

int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);

pci_power_t pci_target_state(struct pci_dev *dev);

int pci_prepare_to_sleep(struct pci_dev *dev);
@@ -680,10 +681,12 @@ void pci_enable_bridges(struct pci_bus *bus); 
/* Proper probing supporting hot-pluggable devices */

int __must_check __pci_register_driver(struct pci_driver *, struct module *,

				       const char *mod_name);

static inline int __must_check pci_register_driver(struct pci_driver *driver)

{

	return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);

}



/*

 * pci_register_driver must be a macro so that KBUILD_MODNAME can be expanded

 */

#define pci_register_driver(driver)		\

	__pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)



void pci_unregister_driver(struct pci_driver *dev);

void pci_remove_behind_bridge(struct pci_dev *dev);