5 files changed, 243 insertions, 218 deletions

diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index b9d09bafd6c1..4272c52e38a4 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -110,6 +110,7 @@ static unsigned int sysfs_idx_addr;
 
 static struct pci_device_id nes_pci_table[] = {
         {PCI_VENDOR_ID_NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020, PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VENDOR_ID_NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020_KR, PCI_ANY_ID, PCI_ANY_ID},
         {0}
 };
 
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index cffdac4a899f..cc78fee1dd51 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -64,8 +64,9 @@
  * NetEffect PCI vendor id and NE010 PCI device id.
  */
 #ifndef PCI_VENDOR_ID_NETEFFECT /* not in pci.ids yet */
-#define PCI_VENDOR_ID_NETEFFECT       0x1678
-#define PCI_DEVICE_ID_NETEFFECT_NE020 0x0100
+#define PCI_VENDOR_ID_NETEFFECT          0x1678
+#define PCI_DEVICE_ID_NETEFFECT_NE020    0x0100
+#define PCI_DEVICE_ID_NETEFFECT_NE020_KR 0x0110
 #endif
 
 #define NE020_REV   4
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 310cc7cab396..ce7f53833577 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -748,16 +748,28 @@ static int nes_init_serdes(struct nes_device *nesdev, u8 hw_rev, u8 port_count,
 
         if (hw_rev != NE020_REV) {
                 /* init serdes 0 */
-                if (wide_ppm_offset && (nesadapter->phy_type[0] == NES_PHY_TYPE_CX4))
-                        nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000FFFAA);
-                else
+                switch (nesadapter->phy_type[0]) {
+                case NES_PHY_TYPE_CX4:
+                        if (wide_ppm_offset)
+                                nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000FFFAA);
+                        else
+                                nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000000FF);
+                        break;
+                case NES_PHY_TYPE_KR:
+                        nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000000FF);
+                        nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_TX_EMP0, 0x00000000);
+                        break;
+                case NES_PHY_TYPE_PUMA_1G:
                         nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000000FF);
-
-                if (nesadapter->phy_type[0] == NES_PHY_TYPE_PUMA_1G) {
                         sds = nes_read_indexed(nesdev, NES_IDX_ETH_SERDES_COMMON_CONTROL0);
                         sds |= 0x00000100;
                         nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_COMMON_CONTROL0, sds);
+                        break;
+                default:
+                        nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL0, 0x000000FF);
+                        break;
                 }
+
                 if (!OneG_Mode)
                         nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_TX_HIGHZ_LANE_MODE0, 0x11110000);
 
@@ -778,6 +790,9 @@ static int nes_init_serdes(struct nes_device *nesdev, u8 hw_rev, u8 port_count,
                         if (wide_ppm_offset)
                                 nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_CDR_CONTROL1, 0x000FFFAA);
                         break;
+                case NES_PHY_TYPE_KR:
+                        nes_write_indexed(nesdev, NES_IDX_ETH_SERDES_TX_EMP1, 0x00000000);
+                        break;
                 case NES_PHY_TYPE_PUMA_1G:
                         sds = nes_read_indexed(nesdev, NES_IDX_ETH_SERDES_COMMON_CONTROL1);
                         sds |= 0x000000100;
@@ -1279,115 +1294,115 @@ int nes_destroy_cqp(struct nes_device *nesdev)
 
 
 /**
- * nes_init_phy
+ * nes_init_1g_phy
  */
-int nes_init_phy(struct nes_device *nesdev)
+int nes_init_1g_phy(struct nes_device *nesdev, u8 phy_type, u8 phy_index)
 {
-        struct nes_adapter *nesadapter = nesdev->nesadapter;
         u32 counter = 0;
-        u32 sds;
-        u32 mac_index = nesdev->mac_index;
-        u32 tx_config = 0;
         u16 phy_data;
-        u32 temp_phy_data = 0;
-        u32 temp_phy_data2 = 0;
-        u8  phy_type = nesadapter->phy_type[mac_index];
-        u8  phy_index = nesadapter->phy_index[mac_index];
-
-        if ((nesadapter->OneG_Mode) &&
-            (phy_type != NES_PHY_TYPE_PUMA_1G)) {
-                nes_debug(NES_DBG_PHY, "1G PHY, mac_index = %d.\n", mac_index);
-                if (phy_type == NES_PHY_TYPE_1G) {
-                        tx_config = nes_read_indexed(nesdev, NES_IDX_MAC_TX_CONFIG);
-                        tx_config &= 0xFFFFFFE3;
-                        tx_config |= 0x04;
-                        nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config);
-                }
-
-                nes_read_1G_phy_reg(nesdev, 1, phy_index, &phy_data);
-                nes_write_1G_phy_reg(nesdev, 23, phy_index, 0xb000);
+        int ret = 0;
 
-                /* Reset the PHY */
-                nes_write_1G_phy_reg(nesdev, 0, phy_index, 0x8000);
-                udelay(100);
-                counter = 0;
-                do {
-                        nes_read_1G_phy_reg(nesdev, 0, phy_index, &phy_data);
-                        if (counter++ > 100)
-                                break;
-                } while (phy_data & 0x8000);
+        nes_read_1G_phy_reg(nesdev, 1, phy_index, &phy_data);
+        nes_write_1G_phy_reg(nesdev, 23, phy_index, 0xb000);
 
-                /* Setting no phy loopback */
-                phy_data &= 0xbfff;
-                phy_data |= 0x1140;
-                nes_write_1G_phy_reg(nesdev, 0, phy_index,  phy_data);
+        /* Reset the PHY */
+        nes_write_1G_phy_reg(nesdev, 0, phy_index, 0x8000);
+        udelay(100);
+        counter = 0;
+        do {
                 nes_read_1G_phy_reg(nesdev, 0, phy_index, &phy_data);
-                nes_read_1G_phy_reg(nesdev, 0x17, phy_index, &phy_data);
-                nes_read_1G_phy_reg(nesdev, 0x1e, phy_index, &phy_data);
-
-                /* Setting the interrupt mask */
-                nes_read_1G_phy_reg(nesdev, 0x19, phy_index, &phy_data);
-                nes_write_1G_phy_reg(nesdev, 0x19, phy_index, 0xffee);
-                nes_read_1G_phy_reg(nesdev, 0x19, phy_index, &phy_data);
+                if (counter++ > 100) {
+                        ret = -1;
+                        break;
+                }
+        } while (phy_data & 0x8000);
+
+        /* Setting no phy loopback */
+        phy_data &= 0xbfff;
+        phy_data |= 0x1140;
+        nes_write_1G_phy_reg(nesdev, 0, phy_index,  phy_data);
+        nes_read_1G_phy_reg(nesdev, 0, phy_index, &phy_data);
+        nes_read_1G_phy_reg(nesdev, 0x17, phy_index, &phy_data);
+        nes_read_1G_phy_reg(nesdev, 0x1e, phy_index, &phy_data);
+
+        /* Setting the interrupt mask */
+        nes_read_1G_phy_reg(nesdev, 0x19, phy_index, &phy_data);
+        nes_write_1G_phy_reg(nesdev, 0x19, phy_index, 0xffee);
+        nes_read_1G_phy_reg(nesdev, 0x19, phy_index, &phy_data);
+
+        /* turning on flow control */
+        nes_read_1G_phy_reg(nesdev, 4, phy_index, &phy_data);
+        nes_write_1G_phy_reg(nesdev, 4, phy_index, (phy_data & ~(0x03E0)) | 0xc00);
+        nes_read_1G_phy_reg(nesdev, 4, phy_index, &phy_data);
+
+        /* Clear Half duplex */
+        nes_read_1G_phy_reg(nesdev, 9, phy_index, &phy_data);
+        nes_write_1G_phy_reg(nesdev, 9, phy_index, phy_data & ~(0x0100));
+        nes_read_1G_phy_reg(nesdev, 9, phy_index, &phy_data);
+
+        nes_read_1G_phy_reg(nesdev, 0, phy_index, &phy_data);
+        nes_write_1G_phy_reg(nesdev, 0, phy_index, phy_data | 0x0300);
+
+        return ret;
+}
 
-                /* turning on flow control */