]> www.infradead.org Git - users/jedix/linux-maple.git/commit
e1000e: fix locking issue with e1000e_disable_aspm
authorYanir Lubetkin <yanirx.lubetkin@intel.com>
Tue, 9 Jun 2015 22:15:05 +0000 (01:15 +0300)
committerBrian Maly <brian.maly@oracle.com>
Fri, 4 Sep 2015 20:54:19 +0000 (16:54 -0400)
commit30b540bf0a0cc7378549311a0b0ef7c5d2eafbf6
tree208058da270965b07493a5743545ab35d4d78f38
parent7151771fdd37262cfc1724fd9cfcb9ba42f7510c
e1000e: fix locking issue with e1000e_disable_aspm

Orabug: 21792108

e1000e_disable_aspm called pci_disable_link_state_locked which requires
pci_bus_sem to be held, but is also called from places where this semaphore
was not previously acquired. This patch implements two flavors of
disable_aspm, one that acquires the lock, and the other (_locked) which
should be called when the semaphore is already acquired.

Signed-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit beb0a1520bec17cfaf0c3c77bbdd56cbf942883a)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/e1000e/netdev.c