e1000e: NVM write protect access removed from SPT HW

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>

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 8c95fb84226f48186cede878ba679053a752ae32..4e56c31959897402bf581131af693be5375311e1 100644 (file)
--- 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 *pdev, const struct pci_device_id *ent)
                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);