aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 654a402f0e9e..91bde90f9265 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -378,7 +378,7 @@ static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)
378 378
379/** 379/**
380 * ixgbe_get_phy_type_from_id - Get the phy type 380 * ixgbe_get_phy_type_from_id - Get the phy type
381 * @hw: pointer to hardware structure 381 * @phy_id: hardware phy id
382 * 382 *
383 **/ 383 **/
384static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) 384static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
@@ -489,6 +489,7 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
489 * the SWFW lock 489 * the SWFW lock
490 * @hw: pointer to hardware structure 490 * @hw: pointer to hardware structure
491 * @reg_addr: 32 bit address of PHY register to read 491 * @reg_addr: 32 bit address of PHY register to read
492 * @device_type: 5 bit device type
492 * @phy_data: Pointer to read data from PHY register 493 * @phy_data: Pointer to read data from PHY register
493 **/ 494 **/
494s32 ixgbe_read_phy_reg_mdi(struct ixgbe_hw *hw, u32 reg_addr, u32 device_type, 495s32 ixgbe_read_phy_reg_mdi(struct ixgbe_hw *hw, u32 reg_addr, u32 device_type,
@@ -564,6 +565,7 @@ s32 ixgbe_read_phy_reg_mdi(struct ixgbe_hw *hw, u32 reg_addr, u32 device_type,
564 * using the SWFW lock - this function is needed in most cases 565 * using the SWFW lock - this function is needed in most cases
565 * @hw: pointer to hardware structure 566 * @hw: pointer to hardware structure
566 * @reg_addr: 32 bit address of PHY register to read 567 * @reg_addr: 32 bit address of PHY register to read
568 * @device_type: 5 bit device type
567 * @phy_data: Pointer to read data from PHY register 569 * @phy_data: Pointer to read data from PHY register
568 **/ 570 **/
569s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr, 571s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
@@ -763,6 +765,7 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
763 * ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities 765 * ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities
764 * @hw: pointer to hardware structure 766 * @hw: pointer to hardware structure
765 * @speed: new link speed 767 * @speed: new link speed
768 * @autoneg_wait_to_complete: unused
766 **/ 769 **/
767s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw, 770s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
768 ixgbe_link_speed speed, 771 ixgbe_link_speed speed,
@@ -861,6 +864,8 @@ s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
861/** 864/**
862 * ixgbe_check_phy_link_tnx - Determine link and speed status 865 * ixgbe_check_phy_link_tnx - Determine link and speed status
863 * @hw: pointer to hardware structure 866 * @hw: pointer to hardware structure
867 * @speed: link speed
868 * @link_up: status of link
864 * 869 *
865 * Reads the VS1 register to determine if link is up and the current speed for 870 * Reads the VS1 register to determine if link is up and the current speed for
866 * the PHY. 871 * the PHY.
@@ -1667,7 +1672,7 @@ s32 ixgbe_read_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
1667 * ixgbe_read_i2c_sff8472_generic - Reads 8 bit word over I2C interface 1672 * ixgbe_read_i2c_sff8472_generic - Reads 8 bit word over I2C interface
1668 * @hw: pointer to hardware structure 1673 * @hw: pointer to hardware structure
1669 * @byte_offset: byte offset at address 0xA2 1674 * @byte_offset: byte offset at address 0xA2
1670 * @eeprom_data: value read 1675 * @sff8472_data: value read
1671 * 1676 *
1672 * Performs byte read operation to SFP module's SFF-8472 data over I2C 1677 * Performs byte read operation to SFP module's SFF-8472 data over I2C
1673 **/ 1678 **/
@@ -1714,6 +1719,7 @@ static bool ixgbe_is_sfp_probe(struct ixgbe_hw *hw, u8 offset, u8 addr)
1714 * ixgbe_read_i2c_byte_generic_int - Reads 8 bit word over I2C 1719 * ixgbe_read_i2c_byte_generic_int - Reads 8 bit word over I2C
1715 * @hw: pointer to hardware structure 1720 * @hw: pointer to hardware structure
1716 * @byte_offset: byte offset to read 1721 * @byte_offset: byte offset to read
1722 * @dev_addr: device address
1717 * @data: value read 1723 * @data: value read
1718 * @lock: true if to take and release semaphore 1724 * @lock: true if to take and release semaphore
1719 * 1725 *
@@ -1804,6 +1810,7 @@ fail:
1804 * ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C 1810 * ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C
1805 * @hw: pointer to hardware structure 1811 * @hw: pointer to hardware structure
1806 * @byte_offset: byte offset to read 1812 * @byte_offset: byte offset to read
1813 * @dev_addr: device address
1807 * @data: value read 1814 * @data: value read
1808 * 1815 *
1809 * Performs byte read operation to SFP module's EEPROM over I2C interface at 1816 * Performs byte read operation to SFP module's EEPROM over I2C interface at
@@ -1820,6 +1827,7 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
1820 * ixgbe_read_i2c_byte_generic_unlocked - Reads 8 bit word over I2C 1827 * ixgbe_read_i2c_byte_generic_unlocked - Reads 8 bit word over I2C
1821 * @hw: pointer to hardware structure 1828 * @hw: pointer to hardware structure
1822 * @byte_offset: byte offset to read 1829 * @byte_offset: byte offset to read
1830 * @dev_addr: device address
1823 * @data: value read 1831 * @data: value read
1824 * 1832 *
1825 * Performs byte read operation to SFP module's EEPROM over I2C interface at 1833 * Performs byte read operation to SFP module's EEPROM over I2C interface at
@@ -1836,6 +1844,7 @@ s32 ixgbe_read_i2c_byte_generic_unlocked(struct ixgbe_hw *hw, u8 byte_offset,
1836 * ixgbe_write_i2c_byte_generic_int - Writes 8 bit word over I2C 1844 * ixgbe_write_i2c_byte_generic_int - Writes 8 bit word over I2C
1837 * @hw: pointer to hardware structure 1845 * @hw: pointer to hardware structure
1838 * @byte_offset: byte offset to write 1846 * @byte_offset: byte offset to write
1847 * @dev_addr: device address
1839 * @data: value to write 1848 * @data: value to write
1840 * @lock: true if to take and release semaphore 1849 * @lock: true if to take and release semaphore
1841 * 1850 *
@@ -1904,6 +1913,7 @@ fail:
1904 * ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C 1913 * ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C
1905 * @hw: pointer to hardware structure 1914 * @hw: pointer to hardware structure
1906 * @byte_offset: byte offset to write 1915 * @byte_offset: byte offset to write
1916 * @dev_addr: device address
1907 * @data: value to write 1917 * @data: value to write
1908 * 1918 *
1909 * Performs byte write operation to SFP module's EEPROM over I2C interface at 1919 * Performs byte write operation to SFP module's EEPROM over I2C interface at
@@ -1920,6 +1930,7 @@ s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
1920 * ixgbe_write_i2c_byte_generic_unlocked - Writes 8 bit word over I2C 1930 * ixgbe_write_i2c_byte_generic_unlocked - Writes 8 bit word over I2C
1921 * @hw: pointer to hardware structure 1931 * @hw: pointer to hardware structure
1922 * @byte_offset: byte offset to write 1932 * @byte_offset: byte offset to write
1933 * @dev_addr: device address
1923 * @data: value to write 1934 * @data: value to write
1924 * 1935 *
1925 * Performs byte write operation to SFP module's EEPROM over I2C interface at 1936 * Performs byte write operation to SFP module's EEPROM over I2C interface at