Commit b424e8d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (98 commits)
  PCI PM: Put PM callbacks in the order of execution
  PCI PM: Run default PM callbacks for all devices using new framework
  PCI PM: Register power state of devices during initialization
  PCI PM: Call pci_fixup_device from legacy routines
  PCI PM: Rearrange code in pci-driver.c
  PCI PM: Avoid touching devices behind bridges in unknown state
  PCI PM: Move pci_has_legacy_pm_support
  PCI PM: Power-manage devices without drivers during suspend-resume
  PCI PM: Add suspend counterpart of pci_reenable_device
  PCI PM: Fix poweroff and restore callbacks
  PCI: Use msleep instead of cpu_relax during ASPM link retraining
  PCI: PCIe portdrv: Add kerneldoc comments to remining core funtions
  PCI: PCIe portdrv: Rearrange code so that related things are together
  PCI: PCIe portdrv: Fix suspend and resume of PCI Express port services
  PCI: PCIe portdrv: Add kerneldoc comments to some core functions
  x86/PCI: Do not use interrupt links for devices using MSI-X
  net: sfc: Use pci_clear_master() to disable bus mastering
  PCI: Add pci_clear_master() as opposite of pci_set_master()
  PCI hotplug: remove redundant test in cpq hotplug
  PCI: pciehp: cleanup register and field definitions
  ...
parents 7c7758f9 f6dc1e5e

Documentation/PCI/pci.txt

+2 −1
Original line number Diff line number Diff line
@@ -294,7 +294,8 @@ NOTE: pci_enable_device() can fail! Check the return value. 


pci_set_master() will enable DMA by setting the bus master bit

in the PCI_COMMAND register. It also fixes the latency timer value if

it's set to something bogus by the BIOS.

it's set to something bogus by the BIOS.  pci_clear_master() will

disable DMA by clearing the bus master bit.



If the PCI device can use the PCI Memory-Write-Invalidate transaction,

call pci_set_mwi().  This enables the PCI_COMMAND bit for Mem-Wr-Inval

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -919,6 +919,10 @@ and is between 256 and 4096 characters. It is defined in the file 


	inttest=	[IA64]



	iomem=		Disable strict checking of access to MMIO memory

		strict	regions from userspace.

		relaxed



	iommu=		[x86]

		off

		force

arch/alpha/kernel/pci.c

+0 −18
Original line number Diff line number Diff line
@@ -320,24 +320,6 @@ pcibios_update_irq(struct pci_dev *dev, int irq) 
	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



/* Most Alphas have straight-forward swizzling needs.  */



u8 __init

common_swizzle(struct pci_dev *dev, u8 *pinp)

{

	u8 pin = *pinp;



	while (dev->bus->parent) {

		pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));

		/* Move up the chain of bridges. */

		dev = dev->bus->self;

        }

	*pinp = pin;



	/* The slot is the slot of the last bridge. */

	return PCI_SLOT(dev->devfn);

}



void

pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			 struct resource *res)

arch/alpha/kernel/pci_impl.h

+4 −9
Original line number Diff line number Diff line
@@ -106,16 +106,11 @@ struct pci_iommu_arena; 
 *   Where A = pin 1, B = pin 2 and so on and pin=0 = default = A.

 *   Thus, each swizzle is ((pin-1) + (device#-4)) % 4

 *

 *   The following code swizzles for exactly one bridge.  The routine

 *   common_swizzle below handles multiple bridges.  But there are a

 *   couple boards that do strange things, so we define this here.

 *   pci_swizzle_interrupt_pin() swizzles for exactly one bridge.  The routine

 *   pci_common_swizzle() handles multiple bridges.  But there are a

 *   couple boards that do strange things.

 */



static inline u8 bridge_swizzle(u8 pin, u8 slot) 

{

	return (((pin-1) + slot) % 4) + 1;

}





/* The following macro is used to implement the table-based irq mapping

   function for all single-bus Alphas.  */
@@ -184,7 +179,7 @@ extern int pci_probe_only; 
extern unsigned long alpha_agpgart_size;



extern void common_init_pci(void);

extern u8 common_swizzle(struct pci_dev *, u8 *);

#define common_swizzle pci_common_swizzle

extern struct pci_controller *alloc_pci_controller(void);

extern struct resource *alloc_resource(void);

arch/alpha/kernel/sys_dp264.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ monet_swizzle(struct pci_dev *dev, u8 *pinp) 
				slot = PCI_SLOT(dev->devfn);

				break;

			}

			pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)) ;

			pin = pci_swizzle_interrupt_pin(dev, pin);



			/* Move up the chain of bridges.  */

			dev = dev->bus->self;

CRA Git | Maintained and supported by SUSTech CRA and CCSE