From: Yanir Lubetkin Date: Sat, 21 Mar 2015 00:41:53 +0000 (-0700) Subject: e1000e: NVM write protect access removed from SPT HW X-Git-Tag: Ubuntu-5.2.0-15.16~11548^2~186^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=152c0a976c71386c67c89969acc427dc5cf802b8;p=mirror_ubuntu-eoan-kernel.git 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 Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 8c95fb84226f..4e56c3195989 100644 --- 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);