31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From: Yanir Lubetkin <yanirx.lubetkin@intel.com>
|
|
Date: Fri, 20 Mar 2015 17:41:53 -0700
|
|
Subject: e1000e: NVM write protect access removed from SPT HW
|
|
Origin: https://git.kernel.org/linus/152c0a976c71386c67c89969acc427dc5cf802b8
|
|
Bug-Debian: https://bugs.debian.org/784546
|
|
|
|
The call to e1000e_write_protect_nvm_ich8lan() is no longer supported by HW.
|
|
Access to these registers causes a system freeze in A step hardware and is
|
|
ignored in B step hardware. This function must not be called in hardware
|
|
newer than LPT.
|
|
|
|
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>
|
|
---
|
|
drivers/net/ethernet/intel/e1000e/netdev.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
|
|
@@ -6874,7 +6874,8 @@ static int e1000_probe(struct pci_dev *p
|
|
goto err_hw_init;
|
|
|
|
if ((adapter->flags & FLAG_IS_ICH) &&
|
|
- (adapter->flags & FLAG_READ_ONLY_NVM))
|
|
+ (adapter->flags & FLAG_READ_ONLY_NVM) &&
|
|
+ (hw->mac.type < e1000_pch_spt))
|
|
e1000e_write_protect_nvm_ich8lan(&adapter->hw);
|
|
|
|
hw->mac.ops.get_bus_info(&adapter->hw);
|