ixgbe: Fix copper PHY initialization code

While cleaning up the internal API focussing on Fiber and CX4 code
we found that I had broken the copper PHY initialization code. This
patch restores the PHY-specific code. This is mostly uninteresting
since no copper PHY boards are yet available. The changes have been
tested against Fiber only as I do not even have copper PHY versions
of 82598 macs.

This change actually cleans up the API code a bit more and we
lose some initialization code. A few PHY link detection helper
lines of code have been snuck into this patch, as well as a
read flush where it was suspected that this might cause issues.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 88341bfb5634..28c0fac1feed 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -54,9 +54,7 @@ static const char ixgbe_copyright[] =
          "Copyright (c) 1999-2007 Intel Corporation.";
 
 static const struct ixgbe_info *ixgbe_info_tbl[] = {
-        [board_82598AF]                 = &ixgbe_82598AF_info,
-        [board_82598EB]                 = &ixgbe_82598EB_info,
-        [board_82598AT]                 = &ixgbe_82598AT_info,
+        [board_82598]                   = &ixgbe_82598_info,
 };
 
 /* ixgbe_pci_tbl - PCI Device ID Table
@@ -69,13 +67,13 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = {
  */
 static struct pci_device_id ixgbe_pci_tbl[] = {
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT),
-         board_82598AF },
+         board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT),
-         board_82598AF },
+         board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT_DUAL_PORT),
-         board_82598AT },
+         board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
-         board_82598EB },
+         board_82598 },
 
         /* required last entry */
         {0, }
@@ -1570,8 +1568,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
                 dev_err(&pdev->dev, "HW Init failed\n");
                 return -EIO;
         }
-        if (hw->phy.ops.setup_speed(hw, IXGBE_LINK_SPEED_10GB_FULL, true,
-                                   false)) {
+        if (hw->mac.ops.setup_link_speed(hw, IXGBE_LINK_SPEED_10GB_FULL, true,
+                                         false)) {
                 dev_err(&pdev->dev, "Link Speed setup failed\n");
                 return -EIO;
         }
@@ -2038,7 +2036,7 @@ static void ixgbe_watchdog(unsigned long data)
         bool link_up;
         u32 link_speed = 0;
 
-        adapter->hw.phy.ops.check(&adapter->hw, &(link_speed), &link_up);
+        adapter->hw.mac.ops.check_link(&adapter->hw, &(link_speed), &link_up);
 
         if (link_up) {
                 if (!netif_carrier_ok(netdev)) {
@@ -2606,7 +2604,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         /* Setup hw api */
         memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
-        memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
 
         err = ii->get_invariants(hw);
         if (err)