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

Commit 98ca3964 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Jesse Barnes
Browse files

PCI: aerdrv: rework find_source_device 



Return bool to indicate that the source device is found or not.
This allows us to skip calling aer_process_err_devices() if we can.

And move dev_printk for debug into this function.

v2: return bool instead of int

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 843f4697

drivers/pci/pcie/aer/aerdrv_core.c

+16 −12
Original line number Original line Diff line number Diff line
@@ -215,11 +215,13 @@ static int find_device_iter(struct pci_dev *dev, void *data) 
/**

/**

 * find_source_device - search through device hierarchy for source device

 * find_source_device - search through device hierarchy for source device

 * @parent: pointer to Root Port pci_dev data structure

 * @parent: pointer to Root Port pci_dev data structure

 * @err_info: including detailed error information such like id

 * @e_info: including detailed error information such like id

 *

 *

 * Invoked when error is detected at the Root Port.

 * Return true if found.

 *

 * Invoked by DPC when error is detected at the Root Port.

 */

 */

static void find_source_device(struct pci_dev *parent,

static bool find_source_device(struct pci_dev *parent,

		struct aer_err_info *e_info)

		struct aer_err_info *e_info)

{

{

	struct pci_dev *dev = parent;

	struct pci_dev *dev = parent;
@@ -228,9 +230,17 @@ static void find_source_device(struct pci_dev *parent, 
	/* Is Root Port an agent that sends error message? */

	/* Is Root Port an agent that sends error message? */

	result = find_device_iter(dev, e_info);

	result = find_device_iter(dev, e_info);

	if (result)

	if (result)

		return;

		return true;





	pci_walk_bus(parent->subordinate, find_device_iter, e_info);

	pci_walk_bus(parent->subordinate, find_device_iter, e_info);



	if (!e_info->error_dev_num) {

		dev_printk(KERN_DEBUG, &parent->dev,

				"can't find device of ID%04x\n",

				e_info->id);

		return false;

	}

	return true;

}

}





static int report_error_detected(struct pci_dev *dev, void *data)

static int report_error_detected(struct pci_dev *dev, void *data)
@@ -639,12 +649,6 @@ static inline void aer_process_err_devices(struct pcie_device *p_device, 
{

{

	int i;

	int i;





	if (!e_info->dev[0]) {

		dev_printk(KERN_DEBUG, &p_device->port->dev,

				"can't find device of ID%04x\n",

				e_info->id);

	}



	/* Report all before handle them, not to lost records by reset etc. */

	/* Report all before handle them, not to lost records by reset etc. */

	for (i = 0; i < e_info->error_dev_num && e_info->dev[i]; i++) {

	for (i = 0; i < e_info->error_dev_num && e_info->dev[i]; i++) {

		if (get_device_error_info(e_info->dev[i], e_info))

		if (get_device_error_info(e_info->dev[i], e_info))
@@ -702,7 +706,7 @@ static void aer_isr_one_error(struct pcie_device *p_device, 




		aer_print_port_info(p_device->port, e_info);

		aer_print_port_info(p_device->port, e_info);





		find_source_device(p_device->port, e_info);

		if (find_source_device(p_device->port, e_info))

			aer_process_err_devices(p_device, e_info);

			aer_process_err_devices(p_device, e_info);

	}

	}