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

Commit 9f19f31d authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbevf: Add support for PCI error handling 



This change adds support for handling IO errors and slot resets.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1c55ed76

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+80 −0
Original line number Diff line number Diff line
@@ -3189,12 +3189,92 @@ static void __devexit ixgbevf_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



/**

 * ixgbevf_io_error_detected - called when PCI error is detected

 * @pdev: Pointer to PCI device

 * @state: The current pci connection state

 *

 * This function is called after a PCI bus error affecting

 * this device has been detected.

 */

static pci_ers_result_t ixgbevf_io_error_detected(struct pci_dev *pdev,

						  pci_channel_state_t state)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	netif_device_detach(netdev);



	if (state == pci_channel_io_perm_failure)

		return PCI_ERS_RESULT_DISCONNECT;



	if (netif_running(netdev))

		ixgbevf_down(adapter);



	pci_disable_device(pdev);



	/* Request a slot slot reset. */

	return PCI_ERS_RESULT_NEED_RESET;

}



/**

 * ixgbevf_io_slot_reset - called after the pci bus has been reset.

 * @pdev: Pointer to PCI device

 *

 * Restart the card from scratch, as if from a cold-boot. Implementation

 * resembles the first-half of the ixgbevf_resume routine.

 */

static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	if (pci_enable_device_mem(pdev)) {

		dev_err(&pdev->dev,

			"Cannot re-enable PCI device after reset.\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}



	pci_set_master(pdev);



	ixgbevf_reset(adapter);



	return PCI_ERS_RESULT_RECOVERED;

}



/**

 * ixgbevf_io_resume - called when traffic can start flowing again.

 * @pdev: Pointer to PCI device

 *

 * This callback is called when the error recovery driver tells us that

 * its OK to resume normal operation. Implementation resembles the

 * second-half of the ixgbevf_resume routine.

 */

static void ixgbevf_io_resume(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	if (netif_running(netdev))

		ixgbevf_up(adapter);



	netif_device_attach(netdev);

}



/* PCI Error Recovery (ERS) */

static struct pci_error_handlers ixgbevf_err_handler = {

	.error_detected = ixgbevf_io_error_detected,

	.slot_reset = ixgbevf_io_slot_reset,

	.resume = ixgbevf_io_resume,

};



static struct pci_driver ixgbevf_driver = {

	.name     = ixgbevf_driver_name,

	.id_table = ixgbevf_pci_tbl,

	.probe    = ixgbevf_probe,

	.remove   = __devexit_p(ixgbevf_remove),

	.shutdown = ixgbevf_shutdown,

	.err_handler = &ixgbevf_err_handler

};



/**