Add initial support for the ICH9 IGP M and ICH9 IGP M AMT chipsets.

For now the chunk in em_detect_gig_phy() is a hack to get things going
until it can be figured out why exactly the PHY id is not probed
properly.

Based on a diff from jcs@ via ckuethe@
ok kettenis@

1 files changed, 12 insertions, 1 deletions

diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 9285f58f6f5..eadfd67234f 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.30 2008/09/24 19:12:59 chl Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.31 2008/12/04 02:36:52 brad Exp $ */
 
 /* if_em_hw.c
  * Shared functions for accessing and configuring the MAC
@@ -460,6 +460,8 @@ em_set_mac_type(struct em_hw *hw)
     case E1000_DEV_ID_ICH9_IFE_GT:
     case E1000_DEV_ID_ICH9_IGP_AMT:
     case E1000_DEV_ID_ICH9_IGP_C:
+    case E1000_DEV_ID_ICH9_IGP_M:
+    case E1000_DEV_ID_ICH9_IGP_M_AMT:
         hw->mac_type = em_ich9lan;
         break;
     default:
@@ -4048,6 +4050,15 @@ em_detect_gig_phy(struct em_hw *hw)
         return E1000_SUCCESS;
     }
 
+    /* until something better comes along... makes the Lenovo X200 work */
+    if (hw->mac_type == em_ich9lan &&
+        (hw->device_id == E1000_DEV_ID_ICH9_IGP_M ||
+         hw->device_id == E1000_DEV_ID_ICH9_IGP_M_AMT)) {
+        hw->phy_id = IGP03E1000_E_PHY_ID;
+        hw->phy_type = em_phy_igp_3;
+        return E1000_SUCCESS;
+    }
+
     /* ESB-2 PHY reads require em_phy_gg82563 to be set because of a work-
      * around that forces PHY page 0 to be set or the reads fail.  The rest of
      * the code in this routine uses em_read_phy_reg to read the PHY ID.