Josh Boyer 34f9218
From 802e6d8c8477a553a677b23a247d6d2638e01958 Mon Sep 17 00:00:00 2001
Josh Boyer 34f9218
From: Dave Jones <davej@redhat.com>
Josh Boyer 34f9218
Date: Wed, 26 Oct 2011 13:31:47 -0400
Josh Boyer 34f9218
Subject: [PATCH] e1000e: ich9 montevina
Josh Boyer 34f9218
Dave Jones f737348
This only showed up in one SDV (Montevina).
Dave Jones f737348
The PCIE slots don't seem to like network cards, so this is the only hope
Dave Jones f737348
to get networking working.  It's never going upstream, but it's low impact
Dave Jones f737348
enough to carry just to keep those SDVs working.
Josh Boyer 34f9218
---
Josh Boyer 34f9218
 drivers/net/ethernet/intel/e1000e/ich8lan.c |    6 ++++++
Josh Boyer 34f9218
 drivers/net/ethernet/intel/e1000e/netdev.c  |    1 +
Josh Boyer 34f9218
 2 files changed, 7 insertions(+), 0 deletions(-)
Dave Jones f737348
Josh Boyer 34f9218
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
Josh Boyer 34f9218
index 6a17c62..0e40975 100644
Josh Boyer 34f9218
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
Josh Boyer 34f9218
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
Josh Boyer 34f9218
@@ -452,6 +452,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
Dave Jones f737348
 
Dave Jones f737348
 	/* Verify phy id */
Dave Jones f737348
 	switch (phy->id) {
Dave Jones f737348
+	case 0:
Dave Jones f737348
+		if (hw->adapter->pdev->device == 0x10be)
Dave Jones b990650
+			e_dbg("got 0 phy id, trying anyway");
Dave Jones f737348
+			/* Fall through to IGP03E1000 case below */
Dave Jones f737348
+		else
Dave Jones f737348
+			return -E1000_ERR_PHY;
Dave Jones f737348
 	case IGP03E1000_E_PHY_ID:
Dave Jones f737348
 		phy->type = e1000_phy_igp_3;
Dave Jones f737348
 		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
Josh Boyer 34f9218
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
Josh Boyer 34f9218
index a855db1..edac30b 100644
Josh Boyer 34f9218
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
Josh Boyer 34f9218
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
Josh Boyer 34f9218
@@ -6359,6 +6359,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
Dave Jones f737348
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
Dave Jones f737348
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
Dave Jones f737348
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
Dave Jones f737348
+	{ PCI_VDEVICE(INTEL, 0x10be), board_ich9lan },
Dave Jones f737348
 
Dave Jones f737348
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
Dave Jones f737348
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
Josh Boyer 34f9218
-- 
Josh Boyer 34f9218
1.7.6.4
Josh Boyer 34f9218