Commit f252d062 authored by Oza Pawandeep's avatar Oza Pawandeep Committed by Bjorn Helgaas
Browse files

PCI/portdrv: Add generic pcie_port_find_service() 



Add generic pcie_port_find_service() routine.

Signed-off-by: default avatarOza Pawandeep <poza@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
parent 2e28bc84

drivers/pci/pcie/aer/aerdrv_core.c

+0 −26
Original line number Diff line number Diff line
@@ -228,32 +228,6 @@ static bool find_source_device(struct pci_dev *parent, 
	return true;

}



static int find_aer_service_iter(struct device *device, void *data)

{

	struct pcie_port_service_driver *service_driver, **drv;



	drv = (struct pcie_port_service_driver **) data;



	if (device->bus == &pcie_port_bus_type && device->driver) {

		service_driver = to_service_driver(device->driver);

		if (service_driver->service == PCIE_PORT_SERVICE_AER) {

			*drv = service_driver;

			return 1;

		}

	}



	return 0;

}



struct pcie_port_service_driver *find_aer_service(struct pci_dev *dev)

{

	struct pcie_port_service_driver *drv = NULL;



	device_for_each_child(&dev->dev, &drv, find_aer_service_iter);



	return drv;

}



/**

 * handle_error_source - handle logging error into an event log

 * @aerdev: pointer to pcie_device data structure of the root port

drivers/pci/pcie/err.c

+1 −3
Original line number Diff line number Diff line
@@ -194,10 +194,8 @@ static pci_ers_result_t reset_link(struct pci_dev *dev) 
		udev = dev->bus->self;

	}



#if IS_ENABLED(CONFIG_PCIEAER)

	/* Use the aer driver of the component firstly */

	driver = find_aer_service(udev);

#endif

	driver = pcie_port_find_service(udev, PCIE_PORT_SERVICE_AER);



	if (driver && driver->reset_link) {

		status = driver->reset_link(udev);

drivers/pci/pcie/portdrv.h

+2 −1
Original line number Diff line number Diff line
@@ -112,5 +112,6 @@ static inline bool pcie_pme_no_msi(void) { return false; } 
static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {}

#endif /* !CONFIG_PCIE_PME */



struct pcie_port_service_driver *find_aer_service(struct pci_dev *dev);

struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,

							u32 service);

#endif /* _PORTDRV_H_ */

drivers/pci/pcie/portdrv_core.c

+46 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
#include "../pci.h"

#include "portdrv.h"



struct portdrv_service_data {

	struct pcie_port_service_driver *drv;

	u32 service;

};



/**

 * release_pcie_device - free PCI Express port service device structure

 * @dev: Port service device to release
@@ -398,6 +403,47 @@ static int remove_iter(struct device *dev, void *data) 
	return 0;

}



static int find_service_iter(struct device *device, void *data)

{

	struct pcie_port_service_driver *service_driver;

	struct portdrv_service_data *pdrvs;

	u32 service;



	pdrvs = (struct portdrv_service_data *) data;

	service = pdrvs->service;



	if (device->bus == &pcie_port_bus_type && device->driver) {

		service_driver = to_service_driver(device->driver);

		if (service_driver->service == service) {

			pdrvs->drv = service_driver;

			return 1;

		}

	}



	return 0;

}



/**

 * pcie_port_find_service - find the service driver

 * @dev: PCI Express port the service is associated with

 * @service: Service to find

 *

 * Find PCI Express port service driver associated with given service

 */

struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,

							u32 service)

{

	struct pcie_port_service_driver *drv;

	struct portdrv_service_data pdrvs;



	pdrvs.drv = NULL;

	pdrvs.service = service;

	device_for_each_child(&dev->dev, &pdrvs, find_service_iter);



	drv = pdrvs.drv;

	return drv;

}



/**

 * pcie_port_device_remove - unregister PCI Express port service devices

 * @dev: PCI Express port the service devices to unregister are associated with