diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-21 01:05:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-21 01:05:42 +0100 |
| commit | 36a44bcdd8df092d76c11bc213e81c5817d4e302 (patch) | |
| tree | f008ac7473b6837a34043a49d30566802c9b9a8a /drivers/net | |
| parent | net: netlink: cap max groups which will be considered in netlink_bind() (diff) | |
| parent | bnxt_en: Issue PCIe FLR in kdump kernel to cleanup pending DMAs. (diff) | |
| download | linux-36a44bcdd8df092d76c11bc213e81c5817d4e302.tar.xz linux-36a44bcdd8df092d76c11bc213e81c5817d4e302.zip | |
Merge branch 'bnxt_en-shutdown-and-kexec-kdump-related-fixes'
Michael Chan says:
====================
bnxt_en: shutdown and kexec/kdump related fixes.
2 small patches to fix kexec shutdown and kdump kernel driver init issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 597e6fd5bfea..fd6e0e48cd51 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11786,6 +11786,14 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (version_printed++ == 0) pr_info("%s", version); + /* Clear any pending DMA transactions from crash kernel + * while loading driver in capture kernel. + */ + if (is_kdump_kernel()) { + pci_clear_master(pdev); + pcie_flr(pdev); + } + max_irqs = bnxt_get_max_irq(pdev); dev = alloc_etherdev_mq(sizeof(*bp), max_irqs); if (!dev) @@ -11983,10 +11991,10 @@ static void bnxt_shutdown(struct pci_dev *pdev) dev_close(dev); bnxt_ulp_shutdown(bp); + bnxt_clear_int_mode(bp); + pci_disable_device(pdev); if (system_state == SYSTEM_POWER_OFF) { - bnxt_clear_int_mode(bp); - pci_disable_device(pdev); pci_wake_from_d3(pdev, bp->wol); pci_set_power_state(pdev, PCI_D3hot); } |