OSDN Git Service

igc: Expose the gPHY firmware version
authorSasha Neftin <sasha.neftin@intel.com>
Sun, 20 Dec 2020 09:16:49 +0000 (11:16 +0200)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 3 Feb 2021 23:20:32 +0000 (15:20 -0800)
Extend reporting of NVM image version to include the gPHY (i225 PHY)
firmware version.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/igc/igc.h
drivers/net/ethernet/intel/igc/igc_ethtool.c
drivers/net/ethernet/intel/igc/igc_phy.c
drivers/net/ethernet/intel/igc/igc_phy.h
drivers/net/ethernet/intel/igc/igc_regs.h

index 2d8b171..5d2809d 100644 (file)
@@ -218,7 +218,7 @@ struct igc_adapter {
        struct timespec64 prev_ptp_time; /* Pre-reset PTP clock */
        ktime_t ptp_reset_start; /* Reset time in clock mono */
 
-       char fw_version[16];
+       char fw_version[32];
 };
 
 void igc_up(struct igc_adapter *adapter);
index 7dd1ca7..a3811d7 100644 (file)
@@ -131,16 +131,21 @@ static void igc_ethtool_get_drvinfo(struct net_device *netdev,
        struct igc_adapter *adapter = netdev_priv(netdev);
        struct igc_hw *hw = &adapter->hw;
        u16 nvm_version = 0;
+       u16 gphy_version;
 
        strscpy(drvinfo->driver, igc_driver_name, sizeof(drvinfo->driver));
 
        /* NVM image version is reported as firmware version for i225 device */
        hw->nvm.ops.read(hw, IGC_NVM_DEV_STARTER, 1, &nvm_version);
 
+       /* gPHY firmware version is reported as PHY FW version */
+       gphy_version = igc_read_phy_fw_version(hw);
+
        scnprintf(adapter->fw_version,
                  sizeof(adapter->fw_version),
-                 "%x",
-                 nvm_version);
+                 "%x:%x",
+                 nvm_version,
+                 gphy_version);
 
        strscpy(drvinfo->fw_version, adapter->fw_version,
                sizeof(drvinfo->fw_version));
index 8e17995..83aeb5e 100644 (file)
@@ -791,3 +791,21 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data)
 
        return ret_val;
 }
+
+/**
+ * igc_read_phy_fw_version - Read gPHY firmware version
+ * @hw: pointer to the HW structure
+ */
+u16 igc_read_phy_fw_version(struct igc_hw *hw)
+{
+       struct igc_phy_info *phy = &hw->phy;
+       u16 gphy_version = 0;
+       u16 ret_val;
+
+       /* NVM image version is reported as firmware version for i225 device */
+       ret_val = phy->ops.read_reg(hw, IGC_GPHY_VERSION, &gphy_version);
+       if (ret_val)
+               hw_dbg("igc_phy: read wrong gphy version\n");
+
+       return gphy_version;
+}
index 25cba33..1b03137 100644 (file)
@@ -17,5 +17,6 @@ void igc_power_up_phy_copper(struct igc_hw *hw);
 void igc_power_down_phy_copper(struct igc_hw *hw);
 s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data);
 s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data);
+u16 igc_read_phy_fw_version(struct igc_hw *hw);
 
 #endif
index b52dd9d..3e5cb7a 100644 (file)
@@ -13,6 +13,7 @@
 #define IGC_MDICNFG            0x00E04  /* MDC/MDIO Configuration - RW */
 #define IGC_CONNSW             0x00034  /* Copper/Fiber switch control - RW */
 #define IGC_I225_PHPM          0x00E14  /* I225 PHY Power Management */
+#define IGC_GPHY_VERSION       0x0001E  /* I225 gPHY Firmware Version */
 
 /* Internal Packet Buffer Size Registers */
 #define IGC_RXPBS              0x02404  /* Rx Packet Buffer Size - RW */