diff mbox series

[4.9,23/71] bnxt_en: Fix PCI AER error recovery flow

Message ID	20200911122506.095483887@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=6oDz=CU=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Vasundhara Volam <vasundhara-v.volam@broadcom.com>, Michael Chan <michael.chan@broadcom.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 23/71] bnxt_en: Fix PCI AER error recovery flow Date: Fri, 11 Sep 2020 14:46:07 +0200 Message-Id: <20200911122506.095483887@linuxfoundation.org> In-Reply-To: <20200911122504.928931589@linuxfoundation.org> References: <20200911122504.928931589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,02/71] HID: core: Sanitize event code and type when mapping input [4.9,03/71] perf record/stat: Explicitly call out event modifiers in the documentation [4.9,04/71] hwmon: (applesmc) check status earlier. [4.9,05/71] nvmet: Disable keep-alive timer when kato is cleared to 0h [4.9,06/71] ceph: dont allow setlease on cephfs [4.9,07/71] s390: dont trace preemption in percpu macros [4.9,08/71] xen/xenbus: Fix granting of vmallocd memory [4.9,09/71] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling [4.9,10/71] batman-adv: Avoid uninitialized chaddr when handling DHCP [4.9,11/71] batman-adv: bla: use netif_rx_ni when not in interrupt context [4.9,12/71] dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() [4.9,13/71] MIPS: mm: BMIPS5000 has inclusive physical caches [4.9,14/71] MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores [4.9,15/71] netfilter: nf_tables: add NFTA_SET_USERDATA if not null [4.9,16/71] netfilter: nf_tables: incorrect enum nft_list_attributes definition [4.9,17/71] netfilter: nf_tables: fix destination register zeroing [4.9,18/71] net: hns: Fix memleak in hns_nic_dev_probe [4.9,19/71] ravb: Fixed to be able to unload modules [4.9,20/71] net: arc_emac: Fix memleak in arc_mdio_probe [4.9,21/71] dmaengine: pl330: Fix burst length if burst size is smaller than bus width [4.9,22/71] bnxt_en: Check for zero dir entries in NVRAM. [4.9,23/71] bnxt_en: Fix PCI AER error recovery flow [4.9,24/71] fix regression in "epoll: Keep a reference on files added to the check list" [4.9,25/71] tg3: Fix soft lockup when tg3_reset_task() fails. [4.9,26/71] iommu/vt-d: Serialize IOMMU GCMD register modifications [4.9,27/71] thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 [4.9,28/71] include/linux/log2.h: add missing () around n in roundup_pow_of_two() [4.9,29/71] btrfs: drop path before adding new uuid tree entry [4.9,30/71] btrfs: Remove redundant extent_buffer_get in get_old_root [4.9,31/71] btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind [4.9,32/71] btrfs: set the lockdep class for log tree extent buffers [4.9,33/71] uaccess: Add non-pagefault user-space read functions [4.9,34/71] uaccess: Add non-pagefault user-space write function [4.9,35/71] btrfs: fix potential deadlock in the search ioctl [4.9,36/71] net: usb: qmi_wwan: add Telit 0x1050 composition [4.9,37/71] drivers: net: usb: qmi_wwan: add QMI_QUIRK_SET_DTR for Telit PID 0x1201 [4.9,38/71] qmi_wwan: new Telewell and Sierra device IDs [4.9,39/71] usb: qmi_wwan: add D-Link DWM-222 A2 device ID [4.9,40/71] ALSA: ca0106: fix error code handling [4.9,41/71] ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check [4.9,42/71] ALSA: firewire-digi00x: exclude Avid Adrenaline from detection [4.9,43/71] block: allow for_each_bvec to support zero len bvec [4.9,44/71] block: Move SECTOR_SIZE and SECTOR_SHIFT definitions into <linux/blkdev.h> [4.9,45/71] libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks [4.9,46/71] dm cache metadata: Avoid returning cmd->bm wild pointer on error [4.9,47/71] dm thin metadata: Avoid returning cmd->bm wild pointer on error [4.9,48/71] mm: slub: fix conversion of freelist_corrupted() [4.9,49/71] vfio/type1: Support faulting PFNMAP vmas [4.9,50/71] vfio-pci: Fault mmaps to enable vma tracking [4.9,51/71] vfio-pci: Invalidate mmaps and block MMIO access on disabled memory [4.9,52/71] KVM: arm64: Add kvm_extable for vaxorcism code [4.9,53/71] KVM: arm64: Defer guest entry when an asynchronous exception is pending [4.9,54/71] KVM: arm64: Survive synchronous exceptions caused by AT instructions [4.9,55/71] KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception [4.9,56/71] net: refactor bind_bucket fastreuse into helper [4.9,57/71] net: initialize fastreuse on inet_inherit_port [4.9,58/71] vfio/pci: Fix SR-IOV VF handling with MMIO blocking [4.9,59/71] checkpatch: fix the usage of capture group ( ... ) [4.9,60/71] mm/hugetlb: fix a race between hugetlb sysctl handlers [4.9,61/71] cfg80211: regulatory: reject invalid hints [4.9,62/71] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr() [4.9,63/71] ALSA; firewire-tascam: exclude Tascam FE-8 from detection [4.9,64/71] fs/affs: use octal for permissions [4.9,65/71] affs: fix basic permission bits to actually work [4.9,66/71] net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init() [4.9,67/71] bnxt: dont enable NAPI until rings are ready [4.9,68/71] netlabel: fix problems with mapping removal [4.9,69/71] net: usb: dm9601: Add USB ID of Keenetic Plus DSL [4.9,70/71] sctp: not disable bh in the whole sctp_get_port_local() [4.9,71/71] net: disable netpoll on fresh napis

Commit Message

Greg Kroah-Hartman Sept. 11, 2020, 12:46 p.m. UTC

From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>

[ Upstream commit df3875ec550396974b1d8a518bd120d034738236 ]

When a PCI error is detected the PCI state could be corrupt, save
the PCI state after initialization and restore it after the slot
reset.

Fixes: 6316ea6db93d ("bnxt_en: Enable AER support.")
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 421cbba9a3bc8..f451be63ab7e6 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7085,6 +7085,7 @@  static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	bnxt_parse_log_pcie_link(bp);
 
+	pci_save_state(pdev);
 	return 0;
 
 init_err:
@@ -7158,6 +7159,8 @@  static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)
 			"Cannot re-enable PCI device after reset.\n");
 	} else {
 		pci_set_master(pdev);
+		pci_restore_state(pdev);
+		pci_save_state(pdev);
 
 		if (netif_running(netdev))
 			err = bnxt_open(netdev);