igc: Add NVM support

Add code for NVM support and get MAC address, complete probe
method.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index f2ad49fcd39b..115fc2a544d7 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -27,9 +27,13 @@ static const char igc_driver_string[] = DRV_SUMMARY;
 static const char igc_copyright[] =
         "Copyright(c) 2018 Intel Corporation.";
 
+static const struct igc_info *igc_info_tbl[] = {
+        [board_base] = &igc_base_info,
+};
+
 static const struct pci_device_id igc_pci_tbl[] = {
-        { PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LM) },
-        { PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_V) },
+        { PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LM), board_base },
+        { PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_V), board_base },
         /* required last entry */
         {0, }
 };
@@ -3289,6 +3293,7 @@ static int igc_probe(struct pci_dev *pdev,
         struct igc_adapter *adapter;
         struct net_device *netdev;
         struct igc_hw *hw;
+        const struct igc_info *ei = igc_info_tbl[ent->driver_data];
         int err, pci_using_dac;
 
         err = pci_enable_device_mem(pdev);
@@ -3370,6 +3375,14 @@ static int igc_probe(struct pci_dev *pdev,
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_device_id = pdev->subsystem_device;
 
+        /* Copy the default MAC and PHY function pointers */
+        memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
+
+        /* Initialize skew-specific constants */
+        err = ei->get_invariants(hw);
+        if (err)
+                goto err_sw_init;
+
         /* setup the private structure */
         err = igc_sw_init(adapter);
         if (err)
@@ -3403,6 +3416,9 @@ static int igc_probe(struct pci_dev *pdev,
          /* carrier off reporting is important to ethtool even BEFORE open */
         netif_carrier_off(netdev);
 
+        /* Check if Media Autosense is enabled */
+        adapter->ei = *ei;
+
         /* print pcie link status and MAC address */
         pcie_print_link_status(pdev);
         netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);