e1000e: Fix incorrect ASPM locking
Subsystems (2)
PATCH 1/1 e1000e: Fix incorrect ASPM locking
This patch fixes wrong locking usage.
In the context of slot reset, we should use lock.
And during resume, there is no need of lock.
Reported-by Bjorn Helgaas <[email protected]>
Signed-off-by Raanan Avargil <[email protected]>
--- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +2 -2
@@ -6466,7 +6466,7 @@ static int __e1000_resume(struct pci_dev *pdev)if (adapter->flags2 &FLAG2_DISABLE_ASPM_L1 ) aspm_disable_flag |=PCIE_LINK_STATE_L1 ;if (aspm_disable_flag) -e1000e_disable_aspm_locked (pdev, aspm_disable_flag); +e1000e_disable_aspm (pdev, aspm_disable_flag);pci_set_master (pdev);
@@ -6744,7 +6744,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)if (adapter->flags2 &FLAG2_DISABLE_ASPM_L1 ) aspm_disable_flag |=PCIE_LINK_STATE_L1 ;if (aspm_disable_flag) -e1000e_disable_aspm (pdev, aspm_disable_flag); +e1000e_disable_aspm_locked (pdev, aspm_disable_flag); err =pci_enable_device_mem (pdev);if (err) {
Signature · 9 lines
2.1.0 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Brown
PATCH 1/1 e1000e: Fix incorrect ASPM locking
Quoted 10 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Raanan Avargil
Sent: Monday, July 06, 2015 7:58 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] e1000e: Fix incorrect ASPM lockingThis patch fixes wrong locking usage.
In the context of slot reset, we should use lock.
And during resume, there is no need of lock.
Quoted 5 lines
Reported-by Bjorn Helgaas <[email protected]>Signed-off-by Raanan Avargil <[email protected]>--- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Tested-by Aaron Brown <[email protected]>