lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: aerdrv: remove is_downstream

Browse Source 
The pcie->port of port service device points the port associated
the service with.  The find_aer_service iterates over children of
given port udev.

So it is clear that the pcie->port of port service of given port
udev must always point the udev.

Therefore we can know the type of udev without checking its children.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Hidetoshi Seto
2010-04-15 13:19:48 +09:00
committed by Jesse Barnes
parent e167bfcaa4
commit 4f7ccf6a60
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pci/pcie/aer/aerdrv_core.c
View File

@@ -375,30 +375,20 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
struct find_aer_service_data { struct find_aer_service_data {
struct pcie_port_service_driver *aer_driver; struct pcie_port_service_driver *aer_driver;
int is_downstream;
}; };
static int find_aer_service_iter(struct device *device, void *data) static int find_aer_service_iter(struct device *device, void *data)
{ {
struct device_driver *driver;
struct pcie_port_service_driver *service_driver; struct pcie_port_service_driver *service_driver;
struct find_aer_service_data *result; struct find_aer_service_data *result;
result = (struct find_aer_service_data *) data; result = (struct find_aer_service_data *) data;
if (device->bus == &pcie_port_bus_type) { if (device->bus == &pcie_port_bus_type && device->driver) {
struct pcie_device *pcie = to_pcie_device(device); service_driver = to_service_driver(device->driver);
if (service_driver->service == PCIE_PORT_SERVICE_AER) {
if (pcie->port->pcie_type == PCI_EXP_TYPE_DOWNSTREAM) result->aer_driver = service_driver;
result->is_downstream = 1; return 1;
driver = device->driver;
if (driver) {
service_driver = to_service_driver(driver);
if (service_driver->service == PCIE_PORT_SERVICE_AER) {
result->aer_driver = service_driver;
return 1;
}
} }
} }
@@ -424,7 +414,6 @@ static pci_ers_result_t reset_link(struct pcie_device *aerdev,
else else
udev = dev->bus->self; udev = dev->bus->self;
data.is_downstream = 0;
data.aer_driver = NULL; data.aer_driver = NULL;
find_aer_service(udev, &data); find_aer_service(udev, &data);
@@ -433,22 +422,24 @@ static pci_ers_result_t reset_link(struct pcie_device *aerdev,
* If it hasn't the aer driver, use the root port's * If it hasn't the aer driver, use the root port's
*/ */
if (!data.aer_driver || !data.aer_driver->reset_link) { if (!data.aer_driver || !data.aer_driver->reset_link) {
if (data.is_downstream && if (udev->pcie_type == PCI_EXP_TYPE_DOWNSTREAM &&
aerdev->device.driver && aerdev->device.driver &&
to_service_driver(aerdev->device.driver)->reset_link) { to_service_driver(aerdev->device.driver)->reset_link) {
data.aer_driver = data.aer_driver =
to_service_driver(aerdev->device.driver); to_service_driver(aerdev->device.driver);
} else { } else {
dev_printk(KERN_DEBUG, &dev->dev, "no link-reset " dev_printk(KERN_DEBUG, &dev->dev,
"support\n"); "no link-reset support at upstream device %s\n",
pci_name(udev));
return PCI_ERS_RESULT_DISCONNECT; return PCI_ERS_RESULT_DISCONNECT;
} }
} }
status = data.aer_driver->reset_link(udev); status = data.aer_driver->reset_link(udev);
if (status != PCI_ERS_RESULT_RECOVERED) { if (status != PCI_ERS_RESULT_RECOVERED) {
dev_printk(KERN_DEBUG, &dev->dev, "link reset at upstream " dev_printk(KERN_DEBUG, &dev->dev,
"device %s failed\n", pci_name(udev)); "link reset at upstream device %s failed\n",
pci_name(udev));
return PCI_ERS_RESULT_DISCONNECT; return PCI_ERS_RESULT_DISCONNECT;
} }