leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

igc: Expose the gPHY firmware version

Browse Source 
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>
This commit is contained in:
Sasha Neftin
2020-12-20 11:16:49 +02:00
committed by Tony Nguyen
parent 01bb6129c6
commit 94f794d15a
5 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/igc/igc.h
View File

@@ -218,7 +218,7 @@ struct igc_adapter {
struct timespec64 prev_ptp_time; /* Pre-reset PTP clock */ struct timespec64 prev_ptp_time; /* Pre-reset PTP clock */
ktime_t ptp_reset_start; /* Reset time in clock mono */ 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); void igc_up(struct igc_adapter *adapter);

9
drivers/net/ethernet/intel/igc/igc_ethtool.c
View File

@@ -131,16 +131,21 @@ static void igc_ethtool_get_drvinfo(struct net_device *netdev,
struct igc_adapter *adapter = netdev_priv(netdev); struct igc_adapter *adapter = netdev_priv(netdev);
struct igc_hw *hw = &adapter->hw; struct igc_hw *hw = &adapter->hw;
u16 nvm_version = 0; u16 nvm_version = 0;
u16 gphy_version;
strscpy(drvinfo->driver, igc_driver_name, sizeof(drvinfo->driver)); strscpy(drvinfo->driver, igc_driver_name, sizeof(drvinfo->driver));
/* NVM image version is reported as firmware version for i225 device */ /* NVM image version is reported as firmware version for i225 device */
hw->nvm.ops.read(hw, IGC_NVM_DEV_STARTER, 1, &nvm_version); 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, scnprintf(adapter->fw_version,
sizeof(adapter->fw_version), sizeof(adapter->fw_version),
"%x", "%x:%x",
nvm_version); nvm_version,
gphy_version);
strscpy(drvinfo->fw_version, adapter->fw_version, strscpy(drvinfo->fw_version, adapter->fw_version,
sizeof(drvinfo->fw_version)); sizeof(drvinfo->fw_version));

18
drivers/net/ethernet/intel/igc/igc_phy.c
View File

@@ -791,3 +791,21 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data)
return ret_val; 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;
}

1
drivers/net/ethernet/intel/igc/igc_phy.h
View 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); 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_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); 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 #endif

1
drivers/net/ethernet/intel/igc/igc_regs.h
View File

@@ -13,6 +13,7 @@
#define IGC_MDICNFG 0x00E04 /* MDC/MDIO Configuration - RW */ #define IGC_MDICNFG 0x00E04 /* MDC/MDIO Configuration - RW */
#define IGC_CONNSW 0x00034 /* Copper/Fiber switch control - RW */ #define IGC_CONNSW 0x00034 /* Copper/Fiber switch control - RW */
#define IGC_I225_PHPM 0x00E14 /* I225 PHY Power Management */ #define IGC_I225_PHPM 0x00E14 /* I225 PHY Power Management */
#define IGC_GPHY_VERSION 0x0001E /* I225 gPHY Firmware Version */
/* Internal Packet Buffer Size Registers */ /* Internal Packet Buffer Size Registers */
#define IGC_RXPBS 0x02404 /* Rx Packet Buffer Size - RW */ #define IGC_RXPBS 0x02404 /* Rx Packet Buffer Size - RW */