Commit 59ef7a83 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: (74 commits)
  PCI: make msi_free_irqs() to use msix_mask_irq() instead of open coded write
  PCI: Fix the NIU MSI-X problem in a better way
  PCI ASPM: remove get_root_port_link
  PCI ASPM: cleanup pcie_aspm_sanity_check
  PCI ASPM: remove has_switch field
  PCI ASPM: cleanup calc_Lx_latency
  PCI ASPM: cleanup pcie_aspm_get_cap_device
  PCI ASPM: cleanup clkpm checks
  PCI ASPM: cleanup __pcie_aspm_check_state_one
  PCI ASPM: cleanup initialization
  PCI ASPM: cleanup change input argument of aspm functions
  PCI ASPM: cleanup misc in struct pcie_link_state
  PCI ASPM: cleanup clkpm state in struct pcie_link_state
  PCI ASPM: cleanup latency field in struct pcie_link_state
  PCI ASPM: cleanup aspm state field in struct pcie_link_state
  PCI ASPM: fix typo in struct pcie_link_state
  PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS
  PCI: remove redundant __msi_set_enable()
  PCI PM: consistently use type bool for wake enable variable
  x86/ACPI: Correct maximum allowed _CRS returned resources and warn if exceeded
  ...
parents 5165aece 2af5066f

Documentation/ABI/testing/sysfs-bus-pci

+7 −0
Original line number Diff line number Diff line
@@ -122,3 +122,10 @@ Description: 
		This symbolic link appears when a device is a Virtual Function.

		The symbolic link points to the PCI device sysfs entry of the

		Physical Function this device associates with.



What:		/sys/bus/pci/slots/.../module

Date:		June 2009

Contact:	linux-pci@vger.kernel.org

Description:

		This symbolic link points to the PCI hotplug controller driver

		module that manages the hotplug slot.

Documentation/PCI/pcieaer-howto.txt

+25 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ be initiated although firmwares have no _OSC support. To enable the 
walkaround, pls. add aerdriver.forceload=y to kernel boot parameter line

when booting kernel. Note that forceload=n by default.



nosourceid, another parameter of type bool, can be used when broken

hardware (mostly chipsets) has root ports that cannot obtain the reporting

source ID. nosourceid=n by default.



2.3 AER error output

When a PCI-E AER error is captured, an error message will be outputed to

console. If it's a correctable error, it is outputed as a warning.
@@ -246,3 +250,24 @@ with the PCI Express AER Root driver? 
A: It could call the helper functions to enable AER in devices and

cleanup uncorrectable status register. Pls. refer to section 3.3.





4. Software error injection



Debugging PCIE AER error recovery code is quite difficult because it

is hard to trigger real hardware errors. Software based error

injection can be used to fake various kinds of PCIE errors.



First you should enable PCIE AER software error injection in kernel

configuration, that is, following item should be in your .config.



CONFIG_PCIEAER_INJECT=y or CONFIG_PCIEAER_INJECT=m



After reboot with new kernel or insert the module, a device file named

/dev/aer_inject should be created.



Then, you need a user space tool named aer-inject, which can be gotten

from:

    http://www.kernel.org/pub/linux/utils/pci/aer-inject/



More information about aer-inject can be found in the document comes

with its source code.

Documentation/kernel-parameters.txt

+10 −1
Original line number Diff line number Diff line
@@ -1776,6 +1776,9 @@ and is between 256 and 4096 characters. It is defined in the file 
				root domains (aka PCI segments, in ACPI-speak).

		nommconf	[X86] Disable use of MMCONFIG for PCI

				Configuration

		check_enable_amd_mmconf [X86] check for and enable

				properly configured MMIO access to PCI

				config space on AMD family 10h CPU

		nomsi		[MSI] If the PCI_MSI kernel config parameter is

				enabled, this kernel boot option can be used to

				disable the use of MSI interrupts system-wide.
@@ -1828,7 +1831,7 @@ and is between 256 and 4096 characters. It is defined in the file 
				IRQ routing is enabled.

		noacpi		[X86] Do not use ACPI for IRQ routing

				or for PCI scanning.

		use_crs		[X86] Use _CRS for PCI resource

		nocrs		[X86] Don't use _CRS for PCI resource

				allocation.

		routeirq	Do IRQ routing for all PCI devices.

				This is normally done in pci_enable_device(),
@@ -1865,6 +1868,12 @@ and is between 256 and 4096 characters. It is defined in the file 
				PAGE_SIZE is used as alignment.

				PCI-PCI bridge can be specified, if resource

				windows need to be expanded.

		ecrc=		Enable/disable PCIe ECRC (transaction layer

				end-to-end CRC checking).

				bios: Use BIOS/firmware settings. This is the

				the default.

				off: Turn ECRC off

				on: Turn ECRC on.



	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power

			Management.

arch/powerpc/platforms/pseries/eeh_driver.c

+24 −14
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void eeh_enable_irq(struct pci_dev *dev) 
 * passed back in "userdata".

 */



static void eeh_report_error(struct pci_dev *dev, void *userdata)

static int eeh_report_error(struct pci_dev *dev, void *userdata)

{

	enum pci_ers_result rc, *res = userdata;

	struct pci_driver *driver = dev->driver;
@@ -130,19 +130,21 @@ static void eeh_report_error(struct pci_dev *dev, void *userdata) 
	dev->error_state = pci_channel_io_frozen;



	if (!driver)

		return;

		return 0;



	eeh_disable_irq(dev);



	if (!driver->err_handler ||

	    !driver->err_handler->error_detected)

		return;

		return 0;



	rc = driver->err_handler->error_detected (dev, pci_channel_io_frozen);



	/* A driver that needs a reset trumps all others */

	if (rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

	if (*res == PCI_ERS_RESULT_NONE) *res = rc;



	return 0;

}



/**
@@ -153,7 +155,7 @@ static void eeh_report_error(struct pci_dev *dev, void *userdata) 
 * Cumulative response passed back in "userdata".

 */



static void eeh_report_mmio_enabled(struct pci_dev *dev, void *userdata)

static int eeh_report_mmio_enabled(struct pci_dev *dev, void *userdata)

{

	enum pci_ers_result rc, *res = userdata;

	struct pci_driver *driver = dev->driver;
@@ -161,26 +163,28 @@ static void eeh_report_mmio_enabled(struct pci_dev *dev, void *userdata) 
	if (!driver ||

	    !driver->err_handler ||

	    !driver->err_handler->mmio_enabled)

		return;

		return 0;



	rc = driver->err_handler->mmio_enabled (dev);



	/* A driver that needs a reset trumps all others */

	if (rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;

	if (*res == PCI_ERS_RESULT_NONE) *res = rc;



	return 0;

}



/**

 * eeh_report_reset - tell device that slot has been reset

 */



static void eeh_report_reset(struct pci_dev *dev, void *userdata)

static int eeh_report_reset(struct pci_dev *dev, void *userdata)

{

	enum pci_ers_result rc, *res = userdata;

	struct pci_driver *driver = dev->driver;



	if (!driver)

		return;

		return 0;



	dev->error_state = pci_channel_io_normal;
@@ -188,35 +192,39 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata) 


	if (!driver->err_handler ||

	    !driver->err_handler->slot_reset)

		return;

		return 0;



	rc = driver->err_handler->slot_reset(dev);

	if ((*res == PCI_ERS_RESULT_NONE) ||

	    (*res == PCI_ERS_RESULT_RECOVERED)) *res = rc;

	if (*res == PCI_ERS_RESULT_DISCONNECT &&

	     rc == PCI_ERS_RESULT_NEED_RESET) *res = rc;



	return 0;

}



/**

 * eeh_report_resume - tell device to resume normal operations

 */



static void eeh_report_resume(struct pci_dev *dev, void *userdata)

static int eeh_report_resume(struct pci_dev *dev, void *userdata)

{

	struct pci_driver *driver = dev->driver;



	dev->error_state = pci_channel_io_normal;



	if (!driver)

		return;

		return 0;



	eeh_enable_irq(dev);



	if (!driver->err_handler ||

	    !driver->err_handler->resume)

		return;

		return 0;



	driver->err_handler->resume(dev);



	return 0;

}



/**
@@ -226,22 +234,24 @@ static void eeh_report_resume(struct pci_dev *dev, void *userdata) 
 * dead, and that no further recovery attempts will be made on it.

 */



static void eeh_report_failure(struct pci_dev *dev, void *userdata)

static int eeh_report_failure(struct pci_dev *dev, void *userdata)

{

	struct pci_driver *driver = dev->driver;



	dev->error_state = pci_channel_io_perm_failure;



	if (!driver)

		return;

		return 0;



	eeh_disable_irq(dev);



	if (!driver->err_handler ||

	    !driver->err_handler->error_detected)

		return;

		return 0;



	driver->err_handler->error_detected(dev, pci_channel_io_perm_failure);



	return 0;

}



/* ------------------------------------------------------- */

arch/x86/include/asm/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ extern void pci_iommu_alloc(void); 


/* generic pci stuff */

#include <asm-generic/pci.h>

#define PCIBIOS_MAX_MEM_32 0xffffffff



#ifdef CONFIG_NUMA

/* Returns the node based on pci bus */

CRA Git | Maintained and supported by SUSTech CRA and CCSE