The following commit has been merged in the linux branch: commit 30fc24b5cbc55f9e6c686e2710cc812419bddc0c Author: Kenji Kaneshige kaneshige.kenji@jp.fujitsu.com Date: Wed Oct 7 09:28:56 2009 -0700

PCI: Prevent AER driver from being loaded on non-root port PCIE devices

A bug was seen on boards using a PLX 8518 switch device which advertises AER on each of it's transparent bridges. The AER driver was loaded for each bridge and this driver tried to access the AER source ID register whenever an interrupt occured on the shared PCI INTX lines. The source ID register does not exist on non root port PCIE device's which advertise AER and trying to access this register causes a unsupported request error on the bridge. Thus, when the next interrupt occurs, another error is found and the non existent source ID register is accessed again, and so it goes on.

The result is a spammed dmesg with unsupported request PCI express errors on the bridge device that the AER driver is loaded against.

Reported-by: Malcolm Crossley malcolm.crossley2@gefanuc.com Signed-off-by: Kenji Kaneshige kaneshige.kenji@jp.fujitsu.com Tested-by: Malcolm Crossley malcolm.crossley2@gefanuc.com Signed-off-by: Jesse Barnes jbarnes@virtuousgeek.org

diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index 2ce8f9c..6bf5b15 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c @@ -52,7 +52,7 @@ static struct pci_error_handlers aer_error_handlers = {

static struct pcie_port_service_driver aerdriver = { .name = "aer", - .port_type = PCIE_ANY_PORT, + .port_type = PCIE_RC_PORT, .service = PCIE_PORT_SERVICE_AER,

.probe = aer_probe,