bnxt_en: Enable AER support. (6316ea6d) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+109 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5412,6 +5412,8 @@ static int bnxt_init_board(struct pci_dev pdev, struct net_device dev)
	goto init_err_release;		goto init_err_release;
	}		}

			pci_enable_pcie_error_reporting(pdev);

	INIT_WORK(&bp->sp_task, bnxt_sp_task);		INIT_WORK(&bp->sp_task, bnxt_sp_task);

	spin_lock_init(&bp->ntp_fltr_lock);		spin_lock_init(&bp->ntp_fltr_lock);
	@@ -5791,6 +5793,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)
	if (BNXT_PF(bp))		if (BNXT_PF(bp))
	bnxt_sriov_disable(bp);		bnxt_sriov_disable(bp);

			pci_disable_pcie_error_reporting(pdev);
	unregister_netdev(dev);		unregister_netdev(dev);
	cancel_work_sync(&bp->sp_task);		cancel_work_sync(&bp->sp_task);
	bp->sp_event = 0;		bp->sp_event = 0;
	@@ -6030,11 +6033,117 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
	return rc;		return rc;
	}		}

			/**
			* bnxt_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 bnxt_io_error_detected(struct pci_dev *pdev,
			pci_channel_state_t state)
			{
			struct net_device *netdev = pci_get_drvdata(pdev);

			netdev_info(netdev, "PCI I/O error detected\n");

			rtnl_lock();
			netif_device_detach(netdev);

			if (state == pci_channel_io_perm_failure) {
			rtnl_unlock();
			return PCI_ERS_RESULT_DISCONNECT;
			}

			if (netif_running(netdev))
			bnxt_close(netdev);

			pci_disable_device(pdev);
			rtnl_unlock();

			/* Request a slot slot reset. */
			return PCI_ERS_RESULT_NEED_RESET;
			}

			/**
			* bnxt_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.
			* At this point, the card has exprienced a hard reset,
			* followed by fixups by BIOS, and has its config space
			* set up identically to what it was at cold boot.
			*/
			static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)
			{
			struct net_device *netdev = pci_get_drvdata(pdev);
			struct bnxt *bp = netdev_priv(netdev);
			int err = 0;
			pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;

			netdev_info(bp->dev, "PCI Slot Reset\n");

			rtnl_lock();

			if (pci_enable_device(pdev)) {
			dev_err(&pdev->dev,
			"Cannot re-enable PCI device after reset.\n");
			} else {
			pci_set_master(pdev);

			if (netif_running(netdev))
			err = bnxt_open(netdev);

			if (!err)
			result = PCI_ERS_RESULT_RECOVERED;
			}

			if (result != PCI_ERS_RESULT_RECOVERED && netif_running(netdev))
			dev_close(netdev);

			rtnl_unlock();

			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 PCI_ERS_RESULT_RECOVERED;
			}

			/**
			* bnxt_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.
			*/
			static void bnxt_io_resume(struct pci_dev *pdev)
			{
			struct net_device *netdev = pci_get_drvdata(pdev);

			rtnl_lock();

			netif_device_attach(netdev);

			rtnl_unlock();
			}

			static const struct pci_error_handlers bnxt_err_handler = {
			.error_detected = bnxt_io_error_detected,
			.slot_reset = bnxt_io_slot_reset,
			.resume = bnxt_io_resume
			};

	static struct pci_driver bnxt_pci_driver = {		static struct pci_driver bnxt_pci_driver = {
	.name = DRV_MODULE_NAME,		.name = DRV_MODULE_NAME,
	.id_table = bnxt_pci_tbl,		.id_table = bnxt_pci_tbl,
	.probe = bnxt_init_one,		.probe = bnxt_init_one,
	.remove = bnxt_remove_one,		.remove = bnxt_remove_one,
			.err_handler = &bnxt_err_handler,
	#if defined(CONFIG_BNXT_SRIOV)		#if defined(CONFIG_BNXT_SRIOV)
	.sriov_configure = bnxt_sriov_configure,		.sriov_configure = bnxt_sriov_configure,
	#endif		#endif