10 files changed, 819 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/igc/Makefile b/drivers/net/ethernet/intel/igc/Makefile
index c32c45300692..8b8022ea590a 100644
--- a/drivers/net/ethernet/intel/igc/Makefile
+++ b/drivers/net/ethernet/intel/igc/Makefile
@@ -7,4 +7,4 @@
 
 obj-$(CONFIG_IGC) += igc.o
 
-igc-objs := igc_main.o igc_mac.o igc_base.o
+igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o
diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c
index 3425b7466017..4efb47497e6b 100644
--- a/drivers/net/ethernet/intel/igc/igc_base.c
+++ b/drivers/net/ethernet/intel/igc/igc_base.c
@@ -5,6 +5,184 @@
 
 #include "igc_hw.h"
 #include "igc_i225.h"
+#include "igc_mac.h"
+#include "igc_base.h"
+#include "igc.h"
+
+/**
+ * igc_set_pcie_completion_timeout - set pci-e completion timeout
+ * @hw: pointer to the HW structure
+ */
+static s32 igc_set_pcie_completion_timeout(struct igc_hw *hw)
+{
+        u32 gcr = rd32(IGC_GCR);
+        u16 pcie_devctl2;
+        s32 ret_val = 0;
+
+        /* only take action if timeout value is defaulted to 0 */
+        if (gcr & IGC_GCR_CMPL_TMOUT_MASK)
+                goto out;
+
+        /* if capabilities version is type 1 we can write the
+         * timeout of 10ms to 200ms through the GCR register
+         */
+        if (!(gcr & IGC_GCR_CAP_VER2)) {
+                gcr |= IGC_GCR_CMPL_TMOUT_10ms;
+                goto out;
+        }
+
+        /* for version 2 capabilities we need to write the config space
+         * directly in order to set the completion timeout value for
+         * 16ms to 55ms
+         */
+        ret_val = igc_read_pcie_cap_reg(hw, PCIE_DEVICE_CONTROL2,
+                                        &pcie_devctl2);
+        if (ret_val)
+                goto out;
+
+        pcie_devctl2 |= PCIE_DEVICE_CONTROL2_16ms;
+
+        ret_val = igc_write_pcie_cap_reg(hw, PCIE_DEVICE_CONTROL2,
+                                         &pcie_devctl2);
+out:
+        /* disable completion timeout resend */
+        gcr &= ~IGC_GCR_CMPL_TMOUT_RESEND;
+
+        wr32(IGC_GCR, gcr);
+
+        return ret_val;
+}
+
+/**
+ * igc_reset_hw_base - Reset hardware
+ * @hw: pointer to the HW structure
+ *
+ * This resets the hardware into a known state.  This is a
+ * function pointer entry point called by the api module.
+ */
+static s32 igc_reset_hw_base(struct igc_hw *hw)
+{
+        s32 ret_val;
+        u32 ctrl;
+
+        /* Prevent the PCI-E bus from sticking if there is no TLP connection
+         * on the last TLP read/write transaction when MAC is reset.
+         */
+        ret_val = igc_disable_pcie_master(hw);
+        if (ret_val)
+                hw_dbg("PCI-E Master disable polling has failed.\n");
+
+        /* set the completion timeout for interface */
+        ret_val = igc_set_pcie_completion_timeout(hw);
+        if (ret_val)
+                hw_dbg("PCI-E Set completion timeout has failed.\n");
+
+        hw_dbg("Masking off all interrupts\n");
+        wr32(IGC_IMC, 0xffffffff);
+
+        wr32(IGC_RCTL, 0);
+        wr32(IGC_TCTL, IGC_TCTL_PSP);
+        wrfl();
+
+        usleep_range(10000, 20000);
+
+        ctrl = rd32(IGC_CTRL);
+
+        hw_dbg("Issuing a global reset to MAC\n");
+        wr32(IGC_CTRL, ctrl | IGC_CTRL_RST);
+
+        ret_val = igc_get_auto_rd_done(hw);
+        if (ret_val) {
+                /* When auto config read does not complete, do not
+                 * return with an error. This can happen in situations
+                 * where there is no eeprom and prevents getting link.
+                 */
+                hw_dbg("Auto Read Done did not complete\n");
+        }
+
+        /* Clear any pending interrupt events. */
+        wr32(IGC_IMC, 0xffffffff);
+        rd32(IGC_ICR);
+
+        return ret_val;
+}
+
+/**
+ * igc_init_mac_params_base - Init MAC func ptrs.
+ * @hw: pointer to the HW structure
+ */
+static s32 igc_init_mac_params_base(struct igc_hw *hw)
+{
+        struct igc_mac_info *mac = &hw->mac;
+
+        /* Set mta register count */
+        mac->mta_reg_count = 128;
+        mac->rar_entry_count = IGC_RAR_ENTRIES;
+
+        /* reset */
+        mac->ops.reset_hw = igc_reset_hw_base;
+
+        mac->ops.acquire_swfw_sync = igc_acquire_swfw_sync_i225;
+        mac->ops.release_swfw_sync = igc_release_swfw_sync_i225;
+
+        return 0;
+}
+
+static s32 igc_get_invariants_base(struct igc_hw *hw)
+{
+        u32 link_mode = 0;
+        u32 ctrl_ext = 0;
+        s32 ret_val = 0;
+
+        ctrl_ext = rd32(IGC_CTRL_EXT);
+        link_mode = ctrl_ext & IGC_CTRL_EXT_LINK_MODE_MASK;
+
+        /* mac initialization and operations */
+        ret_val = igc_init_mac_params_base(hw);
+        if (ret_val)
+                goto out;
+
+out:
+        return ret_val;
+}
+
+/**
+ * igc_init_hw_base - Initialize hardware
+ * @hw: pointer to the HW structure
+ *
+ * This inits the hardware readying it for operation.
+ */
+static s32 igc_init_hw_base(struct igc_hw *hw)
+{
+        struct igc_mac_info *mac = &hw->mac;
+        u16 i, rar_count = mac->rar_entry_count;
+        s32 ret_val = 0;
+
+        /* Setup the receive address */
+        igc_init_rx_addrs(hw, rar_count);
+
+        /* Zero out the Multicast HASH table */
+        hw_dbg("Zeroing the MTA\n");
+        for (i = 0; i < mac->mta_reg_count; i++)
+                array_wr32(IGC_MTA, i, 0);
+
+        /* Zero out the Unicast HASH table */
+        hw_dbg("Zeroing the UTA\n");
+        for (i = 0; i < mac->uta_reg_count; i++)
+                array_wr32(IGC_UTA, i, 0);
+
+        /* Setup link and flow control */
+        ret_val = igc_setup_link(hw);
+
+        /* Clear all of the statistics registers (clear on read).  It is
+         * important that we do this after we have tried to establish link
+         * because the symbol error count will increment wildly if there
+         * is no link.
+         */
+        igc_clear_hw_cntrs_base(hw);
+
+        return ret_val;
+}
 
 /**
  * igc_rx_fifo_flush_base - Clean rx fifo after Rx enable
@@ -81,3 +259,12 @@ void igc_rx_fifo_flush_base(struct igc_hw *hw)
         rd32(IGC_RNBC);
         rd32(IGC_MPC);
 }
+
+static struct igc_mac_operations igc_mac_ops_base = {
+        .init_hw                = igc_init_hw_base,
+};
+
+const struct igc_info igc_base_info = {
+        .get_invariants         = igc_get_invariants_base,
+        .mac_ops                = &igc_mac_ops_base,
+};
diff --git a/drivers/net/ethernet/intel/igc/igc_base.h b/drivers/net/ethernet/intel/igc/igc_base.h
index 3078a18f70a9..802a0cbd3123 100644
--- a/drivers/net/ethernet/intel/igc/igc_base.h
+++ b/drivers/net/ethernet/intel/igc/igc_base.h
@@ -33,6 +33,8 @@ union igc_adv_tx_desc {
 #define IGC_ADVTXD_DCMD_TSE     0x80000000 /* TCP Seg enable */
 #define IGC_ADVTXD_PAYLEN_SHIFT 14 /* Adv desc PAYLEN shift */
 
+#define IGC_RAR_ENTRIES         16
+
 struct igc_adv_data_desc {
         __le64 buffer_addr;    /* Address of the descriptor's data buffer */
         union {
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index c8a321358cf6..3d6c2cee0ad3 100644
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -10,6 +10,22 @@
 #define PCIE_DEVICE_CONTROL2            0x28
 #define PCIE_DEVICE_CONTROL2_16ms       0x0005
 
+/* Physical Func Reset Done Indication */
+#define IGC_CTRL_EXT_LINK_MODE_MASK     0x00C00000
+
+/* Number of 100 microseconds we wait for PCI Express master disable */
+#define MASTER_DISABLE_TIMEOUT          800
+/*Blocks new Master requests */
+#define IGC_CTRL_GIO_MASTER_DISABLE     0x00000004
+/* Status of Master requests. */
+#define IGC_STATUS_GIO_MASTER_ENABLE    0x00080000
+
+/* PCI Express Control */
+#define IGC_GCR_CMPL_TMOUT_MASK         0x0000F000
+#define IGC_GCR_CMPL_TMOUT_10ms         0x00001000
+#define IGC_GCR_CMPL_TMOUT_RESEND       0x00010000
+#define IGC_GCR_CAP_VER2                0x00040000
+
 /* Receive Address
  * Number of high/low register pairs in the RAR. The RAR (Receive Address
  * Registers) holds the directed and multicast addresses that we monitor.
@@ -28,10 +44,23 @@
 #define IGC_ERR_PARAM                   4
 #define IGC_ERR_MAC_INIT                5
 #define IGC_ERR_RESET                   9
+#define IGC_ERR_MASTER_REQUESTS_PENDING 10
+#define IGC_ERR_SWFW_SYNC               13
+
+/* Device Control */
+#define IGC_CTRL_RST            0x04000000  /* Global reset */
 
 /* PBA constants */
 #define IGC_PBA_34K             0x0022
 
+/* SW Semaphore Register */
+#define IGC_SWSM_SMBI           0x00000001 /* Driver Semaphore bit */
+#define IGC_SWSM_SWESMBI        0x00000002 /* FW Semaphore bit */
+
+/* Number of milliseconds for NVM auto read done after MAC reset. */
+#define AUTO_READ_DONE_TIMEOUT          10
+#define IGC_EECD_AUTO_RD                0x00000200  /* NVM Auto Read done */
+
 /* Device Status */
 #define IGC_STATUS_FD           0x00000001      /* Full duplex.0=half,1=full */
 #define IGC_STATUS_LU           0x00000002      /* Link up.0=no,1=link */
@@ -118,6 +147,13 @@
 #define IGC_CT_SHIFT                    4
 #define IGC_COLLISION_THRESHOLD         15
 
+/* Flow Control Constants */
+#define FLOW_CONTROL_ADDRESS_LOW        0x00C28001
+#define FLOW_CONTROL_ADDRESS_HIGH       0x00000100
+#define FLOW_CONTROL_TYPE               0x8808
+/* Enable XON frame transmission */
+#define IGC_FCRTL_XONE                  0x80000000
+
 /* Management Control */
 #define IGC_MANC_RCV_TCO_EN     0x00020000 /* Receive TCO Packets Enabled */
 
diff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h
index a032495a0479..e31d85f1ee12 100644
--- a/drivers/net/ethernet/intel/igc/igc_hw.h
+++ b/drivers/net/ethernet/intel/igc/igc_hw.h
@@ -6,6 +6,8 @@
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
+#include <linux/netdevice.h>
+
 #include "igc_regs.h"
 #include "igc_defines.h"
 #include "igc_mac.h"
@@ -17,6 +19,16 @@
 
 /* Function pointers for the MAC. */
 struct igc_mac_operations {
+        s32 (*check_for_link)(struct igc_hw *hw);
+        s32 (*reset_hw)(struct igc_hw *hw);
+        s32 (*init_hw)(struct igc_hw *hw);
+        s32 (*setup_physical_interface)(struct igc_hw *hw);
+        void (*rar_set)(struct igc_hw *hw, u8 *address, u32 index);
+        s32 (*read_mac_addr)(struct igc_hw *hw);
+        s32 (*get_speed_and_duplex)(struct igc_hw *hw, u16 *speed,
+                                    u16 *duplex);
+        s32 (*acquire_swfw_sync)(struct igc_hw *hw, u16 mask);
+        void (*release_swfw_sync)(struct igc_hw *hw, u16 mask);
 };
 
 enum igc_mac_type {
@@ -31,6 +43,19 @@ enum igc_phy_type {
         igc_phy_i225,
 };
 
+enum igc_nvm_type {
+        igc_nvm_unknown = 0,
+        igc_nvm_flash_hw,
+        igc_nvm_invm,
+};
+
+struct igc_info {
+        s32 (*get_invariants)(struct igc_hw *hw);
+        struct igc_mac_operations *mac_ops;
+        const struct igc_phy_operations *phy_ops;
+        struct igc_nvm_operations *nvm_ops;
+};
+
 struct igc_mac_info {
         struct igc_mac_operations ops;
 
@@ -63,11 +88,61 @@ struct igc_mac_info {
         bool get_link_status;
 };
 
+struct igc_nvm_operations {
+        s32 (*acquire)(struct igc_hw *hw);
+        s32 (*read)(struct igc_hw *hw, u16 offset, u16 i, u16 *data);
+        void (*release)(struct igc_hw *hw);
+        s32 (*write)(struct igc_hw *hw, u16 offset, u16 i, u16 *data);
+        s32 (*update)(struct igc_hw *hw);
+        s32 (*validate)(struct igc_hw *hw);
+        s32 (*valid_led_default)(struct igc_hw *hw, u16 *data);
+};
+
+struct igc_nvm_info {
+        struct igc_nvm_operations ops;
+        enum igc_nvm_type type;
+
+        u32 flash_bank_size;
+        u32 flash_base_addr;
+
+        u16 word_size;
+        u16 delay_usec;
+        u16 address_bits;
+        u16 opcode_bits;
+        u16 page_size;
+};
+
 struct igc_bus_info {
         u16 func;
         u16 pci_cmd_word;
 };
 
+enum igc_fc_mode {
+        igc_fc_none = 0,
+        igc_fc_rx_pause,
+        igc_fc_tx_pause,
+        igc_fc_full,
+        igc_fc_default = 0xFF
+};
+
+struct igc_fc_info {
+        u32 high_water;     /* Flow control high-water mark */
+        u32 low_water;      /* Flow control low-water mark */
+        u16 pause_time;     /* Flow control pause timer */
+        bool send_xon;      /* Flow control send XON */
+        bool strict_ieee;   /* Strict IEEE mode */
+        enum igc_fc_mode current_mode; /* Type of flow control */
+        enum igc_fc_mode requested_mode;
+};
+
+struct igc_dev_spec_base {
+        bool global_device_reset;
+        bool eee_disable;
+        bool clear_semaphore_once;
+        bool module_plugged;
+        u8 media_port;
+};
+
 struct igc_hw {
         void *back;
 
@@ -75,9 +150,15 @@ struct igc_hw {
         unsigned long io_base;
 
         struct igc_mac_info  mac;
+        struct igc_fc_info   fc;
+        struct igc_nvm_info  nvm;
 
         struct igc_bus_info bus;
 
+        union {
+                struct igc_dev_spec_base        _base;
+        } dev_spec;
+
         u16 device_id;
         u16 subsystem_vendor_id;
         u16 subsystem_device_id;
@@ -170,6 +251,10 @@ struct igc_hw_stats {
         u64 b2ogprc;
 };
 
+struct net_device *igc_get_hw_dev(struct igc_hw *hw);
+#define hw_dbg(format, arg...) \
+        netdev_dbg(igc_get_hw_dev(hw), format, ##arg)
+
 s32  igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value);
 s32  igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value);
 void igc_read_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value);
diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c
new file mode 100644
index 000000000000..fb1487727d79
--- /dev/null
+++ b/drivers/net/ethernet/intel/igc/igc_i225.c
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c)  2018 Intel Corporation */
+
+#include <linux/delay.h>
+
+#include "igc_hw.h"
+
+/**
+ * igc_get_hw_semaphore_i225 - Acquire hardware semaphore
+ * @hw: pointer to the HW structure
+ *
+ * Acquire the HW semaphore to access the PHY or NVM
+ */
+static s32 igc_get_hw_semaphore_i225(struct igc_hw *hw)
+{
+        s32 timeout = hw->nvm.word_size + 1;
+        s32 i = 0;
+        u32 swsm;
+
+        /* Get the SW semaphore */
+        while (i < timeout) {
+                swsm = rd32(IGC_SWSM);
+                if (!(swsm & IGC_SWSM_SMBI))
+                        break;
+
+                usleep_range(500, 600);
+                i++;
+        }
+
+        if (i == timeout) {
+                /* In rare circumstances, the SW semaphore may already be held
+                 * unintentionally. Clear the semaphore once before giving up.
+                 */
+                if (hw->dev_spec._base.clear_semaphore_once) {
+                        hw->dev_spec._base.clear_semaphore_once = false;
+                        igc_put_hw_semaphore(hw);
+                        for (i = 0; i < timeout; i++) {
+                                swsm = rd32(IGC_SWSM);
+                                if (!(swsm & IGC_SWSM_SMBI))
+                                        break;
+
+                                usleep_range(500, 600);
+                        }
+                }
+
+                /* If we do not have the semaphore here, we have to give up. */
+                if (i == timeout) {
+                        hw_dbg("Driver can't access device - SMBI bit is set.\n");
+                        return -IGC_ERR_NVM;
+                }
+        }
+
+        /* Get the FW semaphore. */
+        for (i = 0; i < timeout; i++) {
+                swsm = rd32(IGC_SWSM);
+                wr32(IGC_SWSM, swsm | IGC_SWSM_SWESMBI);
+
+                /* Semaphore acquired if bit latched */
+                if (rd32(IGC_SWSM) & IGC_SWSM_SWESMBI)
+                        break;
+
+                usleep_range(500, 600);
+        }
+
+        if (i == timeout) {
+                /* Release semaphores */
+                igc_put_hw_semaphore(hw);
+                hw_dbg("Driver can't access the NVM\n");
+                return -IGC_ERR_NVM;
+        }
+
+        return 0;
+}
+
+/**
+ * igc_acquire_swfw_sync_i225 - Acquire SW/FW semaphore
+ * @hw: pointer to the HW structure
+ * @mask: specifies which semaphore to acquire
+ *
+ * Acquire the SW/FW semaphore to access the PHY or NVM.  The mask
+ * will also specify which port we're acquiring the lock for.
+ */
+s32 igc_acquire_swfw_sync_i225(struct igc_hw *hw, u16 mask)
+{
+        s32 i = 0, timeout = 200;
+        u32 fwmask = mask << 16;
+        u32 swmask = mask;
+        s32 ret_val = 0;
+        u32 swfw_sync;
+
+        while (i < timeout) {
+                if (igc_get_hw_semaphore_i225(hw)) {
+                        ret_val = -IGC_ERR_SWFW_SYNC;
+                        goto out;
+                }
+
+                swfw_sync = rd32(IGC_SW_FW_SYNC);
+                if (!(swfw_sync & (fwmask | swmask)))
+                        break;
+
+                /* Firmware currently using resource (fwmask) */
+                igc_put_hw_semaphore(hw);
+                mdelay(5);
+                i++;
+        }
+
+        if (i == timeout) {
+                hw_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
+                ret_val = -IGC_ERR_SWFW_SYNC;
+                goto out;
+        }
+
+        swfw_sync |= swmask;
+        wr32(IGC_SW_FW_SYNC, swfw_sync);
+
+        igc_put_hw_semaphore(hw);
+out:
+        return ret_val;
+}
+
+/**
+ * igc_release_swfw_sync_i225 - Release SW/FW semaphore
+ * @hw: pointer to the HW structure
+ * @mask: specifies which semaphore to acquire
+ *
+ * Release the SW/FW semaphore used to access the PHY or NVM.  The mask
+ * will also specify which port we're releasing the lock for.
+ */
+void igc_release_swfw_sync_i225(struct igc_hw *hw, u16 mask)
+{
+        u32 swfw_sync;
+
+        while (igc_get_hw_semaphore_i225(hw))
+                ; /* Empty */
+
+        swfw_sync = rd32(IGC_SW_FW_SYNC);
+        swfw_sync &= ~mask;
+        wr32(IGC_SW_FW_SYNC, swfw_sync);
+
+        igc_put_hw_semaphore(hw);
+}
diff --git a/drivers/net/ethernet/intel/igc/igc_mac.c b/drivers/net/ethernet/intel/igc/igc_mac.c
index 9976943df51c..90a98ee14550 100644
--- a/drivers/net/ethernet/intel/igc/igc_mac.c
+++ b/drivers/net/ethernet/intel/igc/igc_mac.c
@@ -2,4 +2,319 @@
 /* Copyright (c)  2018 Intel Corporation */
 
 #include <linux/pci.h>
+#include <linux/delay.h>
+
+#include "igc_mac.h"
 #include "igc_hw.h"
+
+/* forward declaration */
+static s32 igc_set_default_fc(struct igc_hw *hw);
+static s32 igc_set_fc_watermarks(struct igc_hw *hw);
+
+/**
+ * igc_disable_pcie_master - Disables PCI-express master access
+ * @hw: pointer to the HW structure
+ *
+ * Returns 0 (0) if successful, else returns -10
+ * (-IGC_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused
+ * the master requests to be disabled.
+ *
+ * Disables PCI-Express master access and verifies there are no pending
+ * requests.
+ */
+s32 igc_disable_pcie_master(struct igc_hw *hw)
+{
+        s32 timeout = MASTER_DISABLE_TIMEOUT;
+        s32 ret_val = 0;
+        u32 ctrl;
+
+        ctrl = rd32(IGC_CTRL);
+        ctrl |= IGC_CTRL_GIO_MASTER_DISABLE;
+        wr32(IGC_CTRL, ctrl);
+
+        while (timeout) {
+                if (!(rd32(IGC_STATUS) &
+                    IGC_STATUS_GIO_MASTER_ENABLE))
+                        break;
+                usleep_range(2000, 3000);
+                timeout--;
+        }
+
+        if (!timeout) {
+                hw_dbg("Master requests are pending.\n");
+                ret_val = -IGC_ERR_MASTER_REQUESTS_PENDING;
+                goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ * igc_init_rx_addrs - Initialize receive addresses
+ * @hw: pointer to the HW structure
+ * @rar_count: receive address registers
+ *
+ * Setup the receive address registers by setting the base receive address
+ * register to the devices MAC address and clearing all the other receive
+ * address registers to 0.
+ */
+void igc_init_rx_addrs(struct igc_hw *hw, u16 rar_count)
+{
+        u8 mac_addr[ETH_ALEN] = {0};
+        u32 i;
+
+        /* Setup the receive address */
+        hw_dbg("Programming MAC Address into RAR[0]\n");
+
+        hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
+
+        /* Zero out the other (rar_entry_count - 1) receive addresses */
+        hw_dbg("Clearing RAR[1-%u]\n", rar_count - 1);
+        for (i = 1; i < rar_count; i++)
+                hw->mac.ops.rar_set(hw, mac_addr, i);
+}
+
+/**
+ * igc_setup_link - Setup flow control and link settings
+ * @hw: pointer to the HW structure
+ *
+ * Determines which flow control settings to use, then configures flow
+ * control.  Calls the appropriate media-specific link configuration
+ * function.  Assuming the adapter has a valid link partner, a valid link
+ * should be established.  Assumes the hardware has previously been reset
+ * and the transmitter and receiver are not enabled.
+ */
+s32 igc_setup_link(struct igc_hw *hw)
+{
+        s32 ret_val = 0;
+
+        /* In the case of the phy reset being blocked, we already have a link.
+         * We do not need to set it up again.
+         */
+
+        /* If requested flow control is set to default, set flow control
+         * based on the EEPROM flow control settings.
+         */
+        if (hw->fc.requested_mode == igc_fc_default) {
+                ret_val = igc_set_default_fc(hw);
+                if (ret_val)
+                        goto out;
+        }
+
+        /* We want to save off the original Flow Control configuration just
+         * in case we get disconnected and then reconnected into a different
+         * hub or switch with different Flow Control capabilities.
+         */
+        hw->fc.current_mode = hw->fc.requested_mode;
+
+        hw_dbg("After fix-ups FlowControl is now = %x\n", hw->fc.current_mode);
+
+        /* Call the necessary media_type subroutine to configure the link. */
+        ret_val = hw->mac.ops.setup_physical_interface(hw);
+        if (ret_val)
+                goto out;
+
+        /* Initialize the flow control address, type, and PAUSE timer
+         * registers to their default values.  This is done even if flow
+         * control is disabled, because it does not hurt anything to
+         * initialize these registers.
+         */
+        hw_dbg("Initializing the Flow Control address, type and timer regs\n");
+        wr32(IGC_FCT, FLOW_CONTROL_TYPE);
+        wr32(IGC_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
+        wr32(IGC_FCAL, FLOW_CONTROL_ADDRESS_LOW);
+
+        wr32(IGC_FCTTV, hw->fc.pause_time);
+
+        ret_val = igc_set_fc_watermarks(hw);
+
+out:
+        return ret_val;
+}
+
+/**
+ * igc_set_default_fc - Set flow control default values
+ * @hw: pointer to the HW structure
+ *
+ * Read the EEPROM for the default values for flow control and store the
+ * values.
+ */
+static s32 igc_set_default_fc(struct igc_hw *hw)
+{
+        return 0;
+}
+
+/**
+ * igc_set_fc_watermarks - Set flow control high/low watermarks
+ * @hw: pointer to the HW structure
+ *
+ * Sets the flow control high/low threshold (watermark) registers.  If
+ * flow control XON frame transmission is enabled, then set XON frame
+ * transmission as well.
+ */
+static s32 igc_set_fc_watermarks(struct igc_hw *hw)
+{
+        u32 fcrtl = 0, fcrth = 0;
+
+        /* Set the flow control receive threshold registers.  Normally,
+         * these registers will be set to a default threshold that may be
+         * adjusted later by the driver's runtime code.  However, if the
+         * ability to transmit pause frames is not enabled, then these
+         * registers will be set to 0.
+         */
+        if (hw->fc.current_mode & igc_fc_tx_pause) {
+                /* We need to set up the Receive Threshold high and low water
+                 * marks as well as (optionally) enabling the transmission of
+                 * XON frames.
+                 */
+                fcrtl = hw->fc.low_water;
+                if (hw->fc.send_xon)
+                        fcrtl |= IGC_FCRTL_XONE;
+
+                fcrth = hw->fc.high_water;
+        }
+        wr32(IGC_FCRTL, fcrtl);
+        wr32(IGC_FCRTH, fcrth);
+
+        return 0;
+}
+
+/**
+ * igc_clear_hw_cntrs_base - Clear base hardware counters
+ * @hw: pointer to the HW structure
+ *
+ * Clears the base hardware counters by reading the counter registers.
+ */
+void igc_clear_hw_cntrs_base(struct igc_hw *hw)
+{
+        rd32(IGC_CRCERRS);
+        rd32(IGC_SYMERRS);
+        rd32(IGC_MPC);
+        rd32(IGC_SCC);
+        rd32(IGC_ECOL);
+        rd32(IGC_MCC);
+        rd32(IGC_LATECOL);
+        rd32(IGC_COLC);
+        rd32(IGC_DC);
+        rd32(IGC_SEC);
+        rd32(IGC_RLEC);
+        rd32(IGC_XONRXC);
+        rd32(IGC_XONTXC);
+        rd32(IGC_XOFFRXC);
+        rd32(IGC_XOFFTXC);
+        rd32(IGC_FCRUC);
+        rd32(IGC_GPRC);
+        rd32(IGC_BPRC);
+        rd32(IGC_MPRC);
+        rd32(IGC_GPTC);
+        rd32(IGC_GORCL);
+        rd32(IGC_GORCH);
+        rd32(IGC_GOTCL);
+        rd32(IGC_GOTCH);
+        rd32(IGC_RNBC);
+        rd32(IGC_RUC);
+        rd32(IGC_RFC);
+        rd32(IGC_ROC);
+        rd32(IGC_RJC);
+        rd32(IGC_TORL);
+        rd32(IGC_TORH);
+        rd32(IGC_TOTL);
+        rd32(IGC_TOTH);
+        rd32(IGC_TPR);
+        rd32(IGC_TPT);
+        rd32(IGC_MPTC);
+        rd32(IGC_BPTC);
+
+        rd32(IGC_PRC64);
+        rd32(IGC_PRC127);
+        rd32(IGC_PRC255);
+        rd32(IGC_PRC511);
+        rd32(IGC_PRC1023);
+        rd32(IGC_PRC1522);
+        rd32(IGC_PTC64);
+        rd32(IGC_PTC127);
+        rd32(IGC_PTC255);
+        rd32(IGC_PTC511);
+        rd32(IGC_PTC1023);
+        rd32(IGC_PTC1522);
+
+        rd32(IGC_ALGNERRC);
+        rd32(IGC_RXERRC);
+        rd32(IGC_TNCRS);
+        rd32(IGC_CEXTERR);
+        rd32(IGC_TSCTC);
+        rd32(IGC_TSCTFC);
+
+        rd32(IGC_MGTPRC);
+        rd32(IGC_MGTPDC);
+        rd32(IGC_MGTPTC);
+
+        rd32(IGC_IAC);
+        rd32(IGC_ICRXOC);
+
+        rd32(IGC_ICRXPTC);
+        rd32(IGC_ICRXATC);
+        rd32(IGC_ICTXPTC);
+        rd32(IGC_ICTXATC);
+        rd32(IGC_ICTXQEC);
+        rd32(IGC_ICTXQMTC);
+        rd32(IGC_ICRXDMTC);
+
+        rd32(IGC_CBTMPC);
+        rd32(IGC_HTDPMC);
+        rd32(IGC_CBRMPC);
+        rd32(IGC_RPTHC);
+        rd32(IGC_HGPTC);
+        rd32(IGC_HTCBDPC);
+        rd32(IGC_HGORCL);
+        rd32(IGC_HGORCH);
+        rd32(IGC_HGOTCL);
+        rd32(IGC_HGOTCH);
+        rd32(IGC_LENERRS);
+}
+
+/**
+ * igc_get_auto_rd_done - Check for auto read completion
+ * @hw: pointer to the HW structure
+ *
+ * Check EEPROM for Auto Read done bit.
+ */
+s32 igc_get_auto_rd_done(struct igc_hw *hw)
+{
+        s32 ret_val = 0;
+        s32 i = 0;
+
+        while (i < AUTO_READ_DONE_TIMEOUT) {
+                if (rd32(IGC_EECD) & IGC_EECD_AUTO_RD)
+                        break;
+                usleep_range(1000, 2000);
+                i++;
+        }
+
+        if (i == AUTO_READ_DONE_TIMEOUT) {
+                hw_dbg("Auto read by HW from NVM has not completed.\n");
+                ret_val = -IGC_ERR_RESET;
+                goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ * igc_put_hw_semaphore - Release hardware semaphore
+ * @hw: pointer to the HW structure
+ *
+ * Release hardware semaphore used to access the PHY or NVM
+ */
+void igc_put_hw_semaphore(struct igc_hw *hw)
+{
+        u32 swsm;
+
+        swsm = rd32(IGC_SWSM);
+
+        swsm &= ~(IGC_SWSM_SMBI | IGC_SWSM_SWESMBI);
+
+        wr32(IGC_SWSM, swsm);
+}
diff --git a/drivers/net/ethernet/intel/igc/igc_mac.h b/drivers/net/ethernet/intel/igc/igc_mac.h
index 25b79a240d60..88bdb8dd6f3f 100644
--- a/drivers/net/ethernet/intel/igc/igc_mac.h
+++ b/drivers/net/ethernet/intel/igc/igc_mac.h
@@ -4,8 +4,19 @@
 #ifndef _IGC_MAC_H_
 #define _IGC_MAC_H_
 
+#include "igc_hw.h"
+#include "igc_defines.h"
+
 #ifndef IGC_REMOVED
 #define IGC_REMOVED(a) (0)
 #endif /* IGC_REMOVED */
 
+/* forward declaration */
+s32 igc_disable_pcie_master(struct igc_hw *hw);
+void igc_init_rx_addrs(struct igc_hw *hw, u16 rar_count);
+s32 igc_setup_link(struct igc_hw *hw);
+void igc_clear_hw_cntrs_base(struct igc_hw *hw);
+s32 igc_get_auto_rd_done(struct igc_hw *hw);
+void igc_put_hw_semaphore(struct igc_hw *hw);
+
 #endif
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index db7b6820e0f0..f2ad49fcd39b 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -64,6 +64,14 @@ enum latency_range {
 
 static void igc_reset(struct igc_adapter *adapter)
 {
+        struct pci_dev *pdev = adapter->pdev;
+        struct igc_hw *hw = &adapter->hw;
+
+        hw->mac.ops.reset_hw(hw);
+
+        if (hw->mac.ops.init_hw(hw))
+                dev_err(&pdev->dev, "Hardware Error\n");
+
         if (!netif_running(adapter->netdev))
                 igc_power_down_link(adapter);
 }
@@ -3556,6 +3564,19 @@ static int igc_sw_init(struct igc_adapter *adapter)
 }
 
 /**
+ * igc_get_hw_dev - return device
+ * @hw: pointer to hardware structure
+ *
+ * used by hardware layer to print debugging information
+ */
+struct net_device *igc_get_hw_dev(struct igc_hw *hw)
+{
+        struct igc_adapter *adapter = hw->back;
+
+        return adapter->netdev;
+}
+
+/**
  * igc_init_module - Driver Registration Routine
  *
  * igc_init_module is the first routine called when the driver is
diff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h
index e268986eeb9f..c57f573fb864 100644
--- a/drivers/net/ethernet/intel/igc/igc_regs.h
+++ b/drivers/net/ethernet/intel/igc/igc_regs.h
@@ -7,6 +7,7 @@
 /* General Register Descriptions */
 #define IGC_CTRL                0x00000  /* Device Control - RW */
 #define IGC_STATUS              0x00008  /* Device Status - RO */
+#define IGC_EECD                0x00010  /* EEPROM/Flash Control - RW */
 #define IGC_CTRL_EXT            0x00018  /* Extended Device Control - RW */
 #define IGC_MDIC                0x00020  /* MDI Control - RW */
 #define IGC_MDICNFG             0x00E04  /* MDC/MDIO Configuration - RW */
@@ -56,6 +57,23 @@
 #define IGC_IVAR_MISC           0x01740  /* IVAR for "other" causes - RW */
 #define IGC_GPIE                0x01514  /* General Purpose Intr Enable - RW */
 
+/* Interrupt Cause */
+#define IGC_ICRXPTC             0x04104  /* Rx Packet Timer Expire Count */
+#define IGC_ICRXATC             0x04108  /* Rx Absolute Timer Expire Count */
+#define IGC_ICTXPTC             0x0410C  /* Tx Packet Timer Expire Count */
+#define IGC_ICTXATC             0x04110  /* Tx Absolute Timer Expire Count */
+#define IGC_ICTXQEC             0x04118  /* Tx Queue Empty Count */
+#define IGC_ICTXQMTC            0x0411C  /* Tx Queue Min Threshold Count */
+#define IGC_ICRXDMTC            0x04120  /* Rx Descriptor Min Threshold Count */
+#define IGC_ICRXOC              0x04124  /* Receiver Overrun Count */
+
+#define IGC_CBTMPC              0x0402C  /* Circuit Breaker TX Packet Count */
+#define IGC_HTDPMC              0x0403C  /* Host Transmit Discarded Packets */
+#define IGC_CBRMPC              0x040FC  /* Circuit Breaker RX Packet Count */
+#define IGC_RPTHC               0x04104  /* Rx Packets To Host */
+#define IGC_HGPTC               0x04118  /* Host Good Packets TX Count */
+#define IGC_HTCBDPC             0x04124  /* Host TX Circ.Breaker Drop Count */
+
 /* MSI-X Table Register Descriptions */
 #define IGC_PBACL               0x05B68  /* MSIx PBA Clear - R/W 1 to clear */
 
@@ -73,6 +91,8 @@
 #define IGC_RXCSUM              0x05000  /* Rx Checksum Control - RW */
 #define IGC_RLPML               0x05004  /* Rx Long Packet Max Length */
 #define IGC_RFCTL               0x05008  /* Receive Filter Control*/
+#define IGC_MTA                 0x05200  /* Multicast Table Array - RW Array */
+#define IGC_UTA                 0x0A000  /* Unicast Table Array - RW */
 #define IGC_RAL(_n)             (0x05400 + ((_n) * 0x08))
 #define IGC_RAH(_n)             (0x05404 + ((_n) * 0x08))