Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 152c0a97 authored by Yanir Lubetkin's avatar Yanir Lubetkin Committed by Jeff Kirsher
Browse files

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: default avatarYanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a60a132e

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -6874,7 +6874,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_hw_init;

		goto err_hw_init;





	if ((adapter->flags & FLAG_IS_ICH) &&

	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);

		e1000e_write_protect_nvm_ich8lan(&adapter->hw);





	hw->mac.ops.get_bus_info(&adapter->hw);

	hw->mac.ops.get_bus_info(&adapter->hw);