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

Commit dc7c65db 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: (72 commits)
  Revert "x86/PCI: ACPI based PCI gap calculation"
  PCI: remove unnecessary volatile in PCIe hotplug struct controller
  x86/PCI: ACPI based PCI gap calculation
  PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
  PCI PM: Fix pci_prepare_to_sleep
  x86/PCI: Fix PCI config space for domains > 0
  Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
  PCI: Simplify PCI device PM code
  PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
  PCI ACPI: Rework PCI handling of wake-up
  ACPI: Introduce new device wakeup flag 'prepared'
  ACPI: Introduce acpi_device_sleep_wake function
  PCI: rework pci_set_power_state function to call platform first
  PCI: Introduce platform_pci_power_manageable function
  ACPI: Introduce acpi_bus_power_manageable function
  PCI: make pci_name use dev_name
  PCI: handle pci_name() being const
  PCI: add stub for pci_set_consistent_dma_mask()
  PCI: remove unused arch pcibios_update_resource() functions
  PCI: fix pci_setup_device()'s sprinting into a const buffer
  ...

Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually.
parents 8a0ca91e 58b6e553

Documentation/kernel-parameters.txt

+8 −1
Original line number Original line Diff line number Diff line
@@ -147,10 +147,14 @@ and is between 256 and 4096 characters. It is defined in the file 
			default: 0

			default: 0





	acpi_sleep=	[HW,ACPI] Sleep options

	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode, s3_beep }

			Format: { s3_bios, s3_mode, s3_beep, old_ordering }

			See Documentation/power/video.txt for s3_bios and s3_mode.

			See Documentation/power/video.txt for s3_bios and s3_mode.

			s3_beep is for debugging; it makes the PC's speaker beep

			s3_beep is for debugging; it makes the PC's speaker beep

			as soon as the kernel's real-mode entry point is called.

			as soon as the kernel's real-mode entry point is called.

			old_ordering causes the ACPI 1.0 ordering of the _PTS

			control method, wrt putting devices into low power

			states, to be enforced (the ACPI 2.0 ordering of _PTS is

			used by default).





	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

			Format: { level | edge | high | low }

			Format: { level | edge | high | low }
@@ -1537,6 +1541,9 @@ and is between 256 and 4096 characters. It is defined in the file 
				Use with caution as certain devices share

				Use with caution as certain devices share

				address decoders between ROMs and other

				address decoders between ROMs and other

				resources.

				resources.

		norom		[X86-32,X86_64] Do not assign address space to

				expansion ROMs that do not already have

				BIOS assigned address ranges.

		irqmask=0xMMMM	[X86-32] Set a bit mask of IRQs allowed to be

		irqmask=0xMMMM	[X86-32] Set a bit mask of IRQs allowed to be

				assigned automatically to PCI devices. You can

				assigned automatically to PCI devices. You can

				make the kernel exclude IRQs of your ISA cards

				make the kernel exclude IRQs of your ISA cards

MAINTAINERS

+6 −6
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ S: Supported 
ACPI PCI HOTPLUG DRIVER

ACPI PCI HOTPLUG DRIVER

P:	Kristen Carlson Accardi

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

M:	kristen.c.accardi@intel.com

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





ACPI THERMAL DRIVER

ACPI THERMAL DRIVER
@@ -1145,21 +1145,21 @@ COMPACTPCI HOTPLUG CORE 
P:	Scott Murray

P:	Scott Murray

M:	scottm@somanetworks.com

M:	scottm@somanetworks.com

M:	scott@spiteful.org

M:	scott@spiteful.org

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER

COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER

P:	Scott Murray

P:	Scott Murray

M:	scottm@somanetworks.com

M:	scottm@somanetworks.com

M:	scott@spiteful.org

M:	scott@spiteful.org

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





COMPACTPCI HOTPLUG GENERIC DRIVER

COMPACTPCI HOTPLUG GENERIC DRIVER

P:	Scott Murray

P:	Scott Murray

M:	scottm@somanetworks.com

M:	scottm@somanetworks.com

M:	scott@spiteful.org

M:	scott@spiteful.org

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





COMPAL LAPTOP SUPPORT

COMPAL LAPTOP SUPPORT
@@ -3219,7 +3219,7 @@ S: Supported 
PCIE HOTPLUG DRIVER

PCIE HOTPLUG DRIVER

P:	Kristen Carlson Accardi

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

M:	kristen.c.accardi@intel.com

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





PCMCIA SUBSYSTEM

PCMCIA SUBSYSTEM
@@ -3865,7 +3865,7 @@ S: Maintained 
SHPC HOTPLUG DRIVER

SHPC HOTPLUG DRIVER

P:	Kristen Carlson Accardi

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

M:	kristen.c.accardi@intel.com

L:	pcihpd-discuss@lists.sourceforge.net

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported





SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER

SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER

arch/frv/mb93090-mb00/pci-frv.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -19,36 +19,6 @@ 




#include "pci-frv.h"

#include "pci-frv.h"





#if 0

void

pcibios_update_resource(struct pci_dev *dev, struct resource *root,

			struct resource *res, int resource)

{

	u32 new, check;

	int reg;



	new = res->start | (res->flags & PCI_REGION_FLAG_MASK);

	if (resource < 6) {

		reg = PCI_BASE_ADDRESS_0 + 4*resource;

	} else if (resource == PCI_ROM_RESOURCE) {

		res->flags |= IORESOURCE_ROM_ENABLE;

		new |= PCI_ROM_ADDRESS_ENABLE;

		reg = dev->rom_base_reg;

	} else {

		/* Somebody might have asked allocation of a non-standard resource */

		return;

	}



	pci_write_config_dword(dev, reg, new);

	pci_read_config_dword(dev, reg, &check);

	if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) {

		printk(KERN_ERR "PCI: Error while updating region "

		       "%s/%d (%08x != %08x)\n", pci_name(dev), resource,

		       new, check);

	}

}

#endif



/*

/*

 * We need to avoid collisions with `mirrored' VGA ports

 * We need to avoid collisions with `mirrored' VGA ports

 * and other strange ISA hardware, so we always want the

 * and other strange ISA hardware, so we always want the

arch/m68knommu/kernel/comempci.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -373,15 +373,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	return(0);

	return(0);

}

}





/*****************************************************************************/



void pcibios_update_resource(struct pci_dev *dev, struct resource *root, struct resource *r, int resource)

{

	printk(KERN_WARNING "%s(%d): no support for changing PCI resources...\n",

		__FILE__, __LINE__);

}





/*****************************************************************************/

/*****************************************************************************/





/*

/*

arch/mips/pmc-sierra/yosemite/ht.c

+0 −36
Original line number Original line Diff line number Diff line
@@ -345,42 +345,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
        return pcibios_enable_resources(dev);

        return pcibios_enable_resources(dev);

}

}









void pcibios_update_resource(struct pci_dev *dev, struct resource *root,

                             struct resource *res, int resource)

{

        u32 new, check;

        int reg;



        return;



        new = res->start | (res->flags & PCI_REGION_FLAG_MASK);

        if (resource < 6) {

                reg = PCI_BASE_ADDRESS_0 + 4 * resource;

        } else if (resource == PCI_ROM_RESOURCE) {

		res->flags |= IORESOURCE_ROM_ENABLE;

                reg = dev->rom_base_reg;

        } else {

                /*

                 * Somebody might have asked allocation of a non-standard

                 * resource

                 */

                return;

        }



        pci_write_config_dword(dev, reg, new);

        pci_read_config_dword(dev, reg, &check);

        if ((new ^ check) &

            ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK :

             PCI_BASE_ADDRESS_MEM_MASK)) {

                printk(KERN_ERR "PCI: Error while updating region "

                       "%s/%d (%08x != %08x)\n", pci_name(dev), resource,

                       new, check);

        }

}





void pcibios_align_resource(void *data, struct resource *res,

void pcibios_align_resource(void *data, struct resource *res,

                            resource_size_t size, resource_size_t align)

                            resource_size_t size, resource_size_t align)

{

{