myri10ge - drop 2 workarounds that have been fixed in the PCI core
Subsystems (2)
cover myri10ge - drop 2 workarounds that have been fixed in the PCI core
Hi,
The following 2 patches remove 2 workarounds that were in myri10ge until the PCI core included a nice fix, which is the case now.
[PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
Please apply.
Thanks,
Brice Goglin
PATCH 1/2 myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
[PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
We don't need to hardcode the AER capability of the nVidia CK804 chipset anymore since commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b (PCI: nVidia quirk to make AER PCI-E extended capability visible) now makes sure that this cap will be available to pci_find_ext_capability().
--- drivers/net/myri10ge/myri10ge.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/myri10ge/myri10ge.c +0 -6
@@ -2251,12 +2251,6 @@ } cap =pci_find_ext_capability (bridge,PCI_EXT_CAP_ID_ERR ); -/* nvidia ext cap is not always linked in ext cap chain */ -if (!cap - && bridge->vendor ==PCI_VENDOR_ID_NVIDIA - && bridge->device ==PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE ) - cap =0x160 ; -if (!cap)return ;
Re: [PATCH 1/2] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
applied patches 1-2, with pleasure
PATCH 2/2 myri10ge - drop workaround pci_save_state() disabling MSI
In reply to Brice Goglin[PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
We don't need to restore the state right after saving it for later recovery since commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c (PCI: disable msi mode in pci_disable_device) now prevents pci_save_state() from disabling MSI.
--- drivers/net/myri10ge/myri10ge.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/myri10ge/myri10ge.c +0 -2
@@ -2726,8 +2726,6 @@/* Save configuration space to be restored if the * nic resets due to a parity error */ myri10ge_save_state (mgp); -/* Restore state immediately since pci_save_msi_state disables MSI */ -myri10ge_restore_state (mgp);/* Setup the watchdog timer */ setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,