From: Jacob Keller Date: Tue, 7 Jun 2016 23:08:57 +0000 (-0700) Subject: fm10k: enable bus master after every reset X-Git-Tag: v4.1.12-92~3^2~106 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2f88589c6e7471ecd452d6036c4cdd3e86b04314;p=users%2Fjedix%2Flinux-maple.git fm10k: enable bus master after every reset If an FLR occurs, VF devices will be knocked out of bus master mode, and the driver will be unable to recover from the reset properly, resulting in malicious driver events and an infinite reset loop. In the normal case, the bus master mode will already be enabled and this call will essentially be a no-op. Since we're doing this every reset, it is possible we could remove the other calls to pci_set_master() but it seems not harmful to just leave them in place. Signed-off-by: Jacob Keller Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher Orabug: 25394529 (cherry picked from commit 0d63a8f50e7a7810b0631cd8ea66d44dafb215e6) Signed-off-by: Jack Vogel --- diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index 27597f3ade99f..5d23096cdb22a 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -174,6 +174,8 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface) rtnl_lock(); + pci_set_master(interface->pdev); + /* reset and initialize the hardware so it is in a known state */ err = hw->mac.ops.reset_hw(hw); if (err) {