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

Commit 6fabd715 authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

ixgbe: Implement PCIe AER support 



This patch implements the PCIe Advanced Error Reporting callbacks in
ixgbe.  The 82598 hardware supports AER, so we enable it.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e8427e5

drivers/net/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/pci.h>

#include <linux/netdevice.h>

#include <linux/inet_lro.h>

#include <linux/aer.h>



#include "ixgbe_type.h"

#include "ixgbe_common.h"

drivers/net/ixgbe/ixgbe_main.c

+33 −8
Original line number Diff line number Diff line
@@ -4020,6 +4020,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
		goto err_pci_reg;

	}



	err = pci_enable_pcie_error_reporting(pdev);

	if (err) {

		dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed "

		                    "0x%x\n", err);

		/* non-fatal, continue */

	}



	pci_set_master(pdev);

	pci_save_state(pdev);
@@ -4257,6 +4264,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 
{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	int err;



	set_bit(__IXGBE_DOWN, &adapter->state);

	/* clear the module not found bit to make sure the worker won't
@@ -4295,6 +4303,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 


	free_netdev(netdev);



	err = pci_disable_pcie_error_reporting(pdev);

	if (err)

		dev_err(&pdev->dev,

		        "pci_disable_pcie_error_reporting failed 0x%x\n", err);



	pci_disable_device(pdev);

}
@@ -4332,12 +4345,14 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) 
{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	pci_ers_result_t result;

	int err;



	if (pci_enable_device(pdev)) {

		DPRINTK(PROBE, ERR,

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

		return PCI_ERS_RESULT_DISCONNECT;

	}

		result = PCI_ERS_RESULT_DISCONNECT;

	} else {

		pci_set_master(pdev);

		pci_restore_state(pdev);
@@ -4346,7 +4361,17 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) 


		ixgbe_reset(adapter);



	return PCI_ERS_RESULT_RECOVERED;

		result = PCI_ERS_RESULT_RECOVERED;

	}



	err = pci_cleanup_aer_uncorrect_error_status(pdev);

	if (err) {

		dev_err(&pdev->dev,

		  "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n", err);

		/* non-fatal, continue */

	}



	return result;

}



/**