aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Nguyen <anthony.l.nguyen@intel.com>2017-12-04 14:28:30 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-01-12 11:20:40 -0500
commit5ba643c6b886d6e5c0d5f0cb0f5886ad80d0a7be (patch)
tree6c0d7c26f3cdd96d401a1eff791c92d6105bc808
parentd584527c70399cf0d095396d696029f54a10cfd3 (diff)
ixgbe: Fix kernel-doc format warnings
Recent checks added for formatting kernel-doc comments are causing warnings if W= is run with a non-zero value. This patch fixes function comments to resolve warnings when W=1 is used. Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c11
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_common.c9
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c10
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c22
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c5
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c31
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c15
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c8
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c19
12 files changed, 99 insertions, 39 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index 8a32eb7d47b9..a0ebd9ecf243 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -431,6 +431,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw)
431/** 431/**
432 * ixgbe_start_mac_link_82598 - Configures MAC link settings 432 * ixgbe_start_mac_link_82598 - Configures MAC link settings
433 * @hw: pointer to hardware structure 433 * @hw: pointer to hardware structure
434 * @autoneg_wait_to_complete: true when waiting for completion is needed
434 * 435 *
435 * Configures link settings based on values in the ixgbe_hw struct. 436 * Configures link settings based on values in the ixgbe_hw struct.
436 * Restarts the link. Performs autonegotiation if needed. 437 * Restarts the link. Performs autonegotiation if needed.
@@ -1054,7 +1055,7 @@ static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
1054 * ixgbe_read_i2c_sff8472_82598 - Reads 8 bit word over I2C interface. 1055 * ixgbe_read_i2c_sff8472_82598 - Reads 8 bit word over I2C interface.
1055 * @hw: pointer to hardware structure 1056 * @hw: pointer to hardware structure
1056 * @byte_offset: byte offset at address 0xA2 1057 * @byte_offset: byte offset at address 0xA2
1057 * @eeprom_data: value read 1058 * @sff8472_data: value read
1058 * 1059 *
1059 * Performs 8 byte read operation to SFP module's SFF-8472 data over I2C 1060 * Performs 8 byte read operation to SFP module's SFF-8472 data over I2C
1060 **/ 1061 **/
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index d602637ccc40..4dfc81dbee4b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -221,7 +221,7 @@ static s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked,
221/** 221/**
222 * prot_autoc_write_82599 - Hides MAC differences needed for AUTOC write 222 * prot_autoc_write_82599 - Hides MAC differences needed for AUTOC write
223 * @hw: pointer to hardware structure 223 * @hw: pointer to hardware structure
224 * @reg_val: value to write to AUTOC 224 * @autoc: value to write to AUTOC
225 * @locked: bool to indicate whether the SW/FW lock was already taken by 225 * @locked: bool to indicate whether the SW/FW lock was already taken by
226 * previous proc_autoc_read_82599. 226 * previous proc_autoc_read_82599.
227 * 227 *
@@ -1310,10 +1310,11 @@ do { \
1310 1310
1311/** 1311/**
1312 * ixgbe_atr_compute_sig_hash_82599 - Compute the signature hash 1312 * ixgbe_atr_compute_sig_hash_82599 - Compute the signature hash
1313 * @stream: input bitstream to compute the hash on 1313 * @input: input bitstream to compute the hash on
1314 * @common: compressed common input dword
1314 * 1315 *
1315 * This function is almost identical to the function above but contains 1316 * This function is almost identical to the function above but contains
1316 * several optomizations such as unwinding all of the loops, letting the 1317 * several optimizations such as unwinding all of the loops, letting the
1317 * compiler work out all of the conditional ifs since the keys are static 1318 * compiler work out all of the conditional ifs since the keys are static
1318 * defines, and computing two keys at once since the hashed dword stream 1319 * defines, and computing two keys at once since the hashed dword stream
1319 * will be the same for both keys. 1320 * will be the same for both keys.
@@ -1446,7 +1447,7 @@ do { \
1446 1447
1447/** 1448/**
1448 * ixgbe_atr_compute_perfect_hash_82599 - Compute the perfect filter hash 1449 * ixgbe_atr_compute_perfect_hash_82599 - Compute the perfect filter hash
1449 * @atr_input: input bitstream to compute the hash on 1450 * @input: input bitstream to compute the hash on
1450 * @input_mask: mask for the input bitstream 1451 * @input_mask: mask for the input bitstream
1451 * 1452 *
1452 * This function serves two main purposes. First it applies the input_mask 1453 * This function serves two main purposes. First it applies the input_mask
@@ -2078,6 +2079,7 @@ reset_pipeline_out:
2078 * ixgbe_read_i2c_byte_82599 - Reads 8 bit word over I2C 2079 * ixgbe_read_i2c_byte_82599 - Reads 8 bit word over I2C
2079 * @hw: pointer to hardware structure 2080 * @hw: pointer to hardware structure
2080 * @byte_offset: byte offset to read 2081 * @byte_offset: byte offset to read
2082 * @dev_addr: address to read from
2081 * @data: value read 2083 * @data: value read
2082 * 2084 *
2083 * Performs byte read operation to SFP module's EEPROM over I2C interface at 2085 * Performs byte read operation to SFP module's EEPROM over I2C interface at
@@ -2131,6 +2133,7 @@ release_i2c_access:
2131 * ixgbe_write_i2c_byte_82599 - Writes 8 bit word over I2C 2133 * ixgbe_write_i2c_byte_82599 - Writes 8 bit word over I2C
2132 * @hw: pointer to hardware structure 2134 * @hw: pointer to hardware structure
2133 * @byte_offset: byte offset to write 2135 * @byte_offset: byte offset to write
2136 * @dev_addr: address to write to
2134 * @data: value to write 2137 * @data: value to write
2135 * 2138 *
2136 * Performs byte write operation to SFP module's EEPROM over I2C interface at 2139 * Performs byte write operation to SFP module's EEPROM over I2C interface at
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 1948e4208fb4..7ac7ef9b37ff 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1613,6 +1613,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
1613/** 1613/**
1614 * ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM 1614 * ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM
1615 * @hw: pointer to hardware structure 1615 * @hw: pointer to hardware structure
1616 * @count: number of bits to shift
1616 **/ 1617 **/
1617static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count) 1618static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count)
1618{ 1619{
@@ -1667,7 +1668,7 @@ static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
1667/** 1668/**
1668 * ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input. 1669 * ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input.
1669 * @hw: pointer to hardware structure 1670 * @hw: pointer to hardware structure
1670 * @eecd: EECD's current value 1671 * @eec: EEC's current value
1671 **/ 1672 **/
1672static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec) 1673static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
1673{ 1674{
@@ -2037,7 +2038,7 @@ static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
2037/** 2038/**
2038 * ixgbe_set_mta - Set bit-vector in multicast table 2039 * ixgbe_set_mta - Set bit-vector in multicast table
2039 * @hw: pointer to hardware structure 2040 * @hw: pointer to hardware structure
2040 * @hash_value: Multicast address hash value 2041 * @mc_addr: Multicast address
2041 * 2042 *
2042 * Sets the bit-vector in the multicast table. 2043 * Sets the bit-vector in the multicast table.
2043 **/ 2044 **/
@@ -3086,6 +3087,8 @@ s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw)
3086 * ixgbe_find_vlvf_slot - find the vlanid or the first empty slot 3087 * ixgbe_find_vlvf_slot - find the vlanid or the first empty slot
3087 * @hw: pointer to hardware structure 3088 * @hw: pointer to hardware structure
3088 * @vlan: VLAN id to write to VLAN filter 3089 * @vlan: VLAN id to write to VLAN filter
3090 * @vlvf_bypass: true to find vlanid only, false returns first empty slot if
3091 * vlanid not found
3089 * 3092 *
3090 * return the VLVF index where this VLAN id should be placed 3093 * return the VLVF index where this VLAN id should be placed
3091 * 3094 *
@@ -3476,7 +3479,7 @@ void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)
3476 * ixgbe_set_vlan_anti_spoofing - Enable/Disable VLAN anti-spoofing 3479 * ixgbe_set_vlan_anti_spoofing - Enable/Disable VLAN anti-spoofing
3477 * @hw: pointer to hardware structure 3480 * @hw: pointer to hardware structure
3478 * @enable: enable or disable switch for VLAN anti-spoofing 3481 * @enable: enable or disable switch for VLAN anti-spoofing
3479 * @pf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing 3482 * @vf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing
3480 * 3483 *
3481 **/ 3484 **/
3482void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf) 3485void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
index 072ef3b5fc61..aaea8282bfd2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
@@ -39,6 +39,10 @@
39 * are the smallest unit programmable into the underlying 39 * are the smallest unit programmable into the underlying
40 * hardware. The IEEE 802.1Qaz specification do not use bandwidth 40 * hardware. The IEEE 802.1Qaz specification do not use bandwidth
41 * groups so this is much simplified from the CEE case. 41 * groups so this is much simplified from the CEE case.
42 * @bw: bandwidth index by traffic class
43 * @refill: refill credits index by traffic class
44 * @max: max credits by traffic class
45 * @max_frame: maximum frame size
42 */ 46 */
43static s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, 47static s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill,
44 __u16 *max, int max_frame) 48 __u16 *max, int max_frame)
@@ -72,8 +76,10 @@ static s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill,
72 76
73/** 77/**
74 * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits 78 * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits
75 * @ixgbe_dcb_config: Struct containing DCB settings. 79 * @hw: pointer to hardware structure
76 * @direction: Configuring either Tx or Rx. 80 * @dcb_config: Struct containing DCB settings
81 * @max_frame: Maximum frame size
82 * @direction: Configuring either Tx or Rx
77 * 83 *
78 * This function calculates the credits allocated to each traffic class. 84 * This function calculates the credits allocated to each traffic class.
79 * It should be called only after the rules are checked by 85 * It should be called only after the rules are checked by
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
index b79e93a5b699..f94c7e82a30b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
@@ -34,7 +34,9 @@
34/** 34/**
35 * ixgbe_dcb_config_rx_arbiter_82598 - Config Rx data arbiter 35 * ixgbe_dcb_config_rx_arbiter_82598 - Config Rx data arbiter
36 * @hw: pointer to hardware structure 36 * @hw: pointer to hardware structure
37 * @dcb_config: pointer to ixgbe_dcb_config structure 37 * @refill: refill credits index by traffic class
38 * @max: max credits index by traffic class
39 * @prio_type: priority type indexed by traffic class
38 * 40 *
39 * Configure Rx Data Arbiter and credits for each traffic class. 41 * Configure Rx Data Arbiter and credits for each traffic class.
40 */ 42 */
@@ -91,7 +93,10 @@ s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
91/** 93/**
92 * ixgbe_dcb_config_tx_desc_arbiter_82598 - Config Tx Desc. arbiter 94 * ixgbe_dcb_config_tx_desc_arbiter_82598 - Config Tx Desc. arbiter
93 * @hw: pointer to hardware structure 95 * @hw: pointer to hardware structure
94 * @dcb_config: pointer to ixgbe_dcb_config structure 96 * @refill: refill credits index by traffic class
97 * @max: max credits index by traffic class
98 * @bwg_id: bandwidth grouping indexed by traffic class
99 * @prio_type: priority type indexed by traffic class
95 * 100 *
96 * Configure Tx Descriptor Arbiter and credits for each traffic class. 101 * Configure Tx Descriptor Arbiter and credits for each traffic class.
97 */ 102 */
@@ -137,7 +142,10 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
137/** 142/**
138 * ixgbe_dcb_config_tx_data_arbiter_82598 - Config Tx data arbiter 143 * ixgbe_dcb_config_tx_data_arbiter_82598 - Config Tx data arbiter
139 * @hw: pointer to hardware structure 144 * @hw: pointer to hardware structure
140 * @dcb_config: pointer to ixgbe_dcb_config structure 145 * @refill: refill credits index by traffic class
146 * @max: max credits index by traffic class
147 * @bwg_id: bandwidth grouping indexed by traffic class
148 * @prio_type: priority type indexed by traffic class
141 * 149 *
142 * Configure Tx Data Arbiter and credits for each traffic class. 150 * Configure Tx Data Arbiter and credits for each traffic class.
143 */ 151 */
@@ -184,7 +192,7 @@ s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
184/** 192/**
185 * ixgbe_dcb_config_pfc_82598 - Config priority flow control 193 * ixgbe_dcb_config_pfc_82598 - Config priority flow control
186 * @hw: pointer to hardware structure 194 * @hw: pointer to hardware structure
187 * @dcb_config: pointer to ixgbe_dcb_config structure 195 * @pfc_en: enabled pfc bitmask
188 * 196 *
189 * Configure Priority Flow Control for each traffic class. 197 * Configure Priority Flow Control for each traffic class.
190 */ 198 */
@@ -269,7 +277,11 @@ static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
269/** 277/**
270 * ixgbe_dcb_hw_config_82598 - Config and enable DCB 278 * ixgbe_dcb_hw_config_82598 - Config and enable DCB
271 * @hw: pointer to hardware structure 279 * @hw: pointer to hardware structure
272 * @dcb_config: pointer to ixgbe_dcb_config structure 280 * @pfc_en: enabled pfc bitmask
281 * @refill: refill credits index by traffic class
282 * @max: max credits index by traffic class
283 * @bwg_id: bandwidth grouping indexed by traffic class
284 * @prio_type: priority type indexed by traffic class
273 * 285 *
274 * Configure dcb settings and enable dcb mode. 286 * Configure dcb settings and enable dcb mode.
275 */ 287 */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
index 1011d644978f..1eed6811e914 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
@@ -38,6 +38,7 @@
38 * @max: max credits index by traffic class 38 * @max: max credits index by traffic class
39 * @bwg_id: bandwidth grouping indexed by traffic class 39 * @bwg_id: bandwidth grouping indexed by traffic class
40 * @prio_type: priority type indexed by traffic class 40 * @prio_type: priority type indexed by traffic class
41 * @prio_tc: priority to tc assignments indexed by priority
41 * 42 *
42 * Configure Rx Packet Arbiter and credits for each traffic class. 43 * Configure Rx Packet Arbiter and credits for each traffic class.
43 */ 44 */
@@ -148,6 +149,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
148 * @max: max credits index by traffic class 149 * @max: max credits index by traffic class
149 * @bwg_id: bandwidth grouping indexed by traffic class 150 * @bwg_id: bandwidth grouping indexed by traffic class
150 * @prio_type: priority type indexed by traffic class 151 * @prio_type: priority type indexed by traffic class
152 * @prio_tc: priority to tc assignments indexed by priority
151 * 153 *
152 * Configure Tx Packet Arbiter and credits for each traffic class. 154 * Configure Tx Packet Arbiter and credits for each traffic class.
153 */ 155 */
@@ -344,11 +346,12 @@ static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
344/** 346/**
345 * ixgbe_dcb_hw_config_82599 - Configure and enable DCB 347 * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
346 * @hw: pointer to hardware structure 348 * @hw: pointer to hardware structure
349 * @pfc_en: enabled pfc bitmask
347 * @refill: refill credits index by traffic class 350 * @refill: refill credits index by traffic class
348 * @max: max credits index by traffic class 351 * @max: max credits index by traffic class
349 * @bwg_id: bandwidth grouping indexed by traffic class 352 * @bwg_id: bandwidth grouping indexed by traffic class
350 * @prio_type: priority type indexed by traffic class 353 * @prio_type: priority type indexed by traffic class
351 * @pfc_en: enabled pfc bitmask 354 * @prio_tc: priority to tc assignments indexed by priority
352 * 355 *
353 * Configure dcb settings and enable dcb mode. 356 * Configure dcb settings and enable dcb mode.
354 */ 357 */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
index 5e2c1e35e517..ad54080488ee 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
@@ -249,7 +249,7 @@ void ixgbe_dbg_adapter_init(struct ixgbe_adapter *adapter)
249 249
250/** 250/**
251 * ixgbe_dbg_adapter_exit - clear out the adapter's debugfs entries 251 * ixgbe_dbg_adapter_exit - clear out the adapter's debugfs entries
252 * @pf: the pf that is stopping 252 * @adapter: the adapter that is exiting
253 **/ 253 **/
254void ixgbe_dbg_adapter_exit(struct ixgbe_adapter *adapter) 254void ixgbe_dbg_adapter_exit(struct ixgbe_adapter *adapter)
255{ 255{
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index 6e6b3c175267..7a09a40e4472 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -150,6 +150,7 @@ skip_ddpinv:
150 * @xid: the exchange id requesting ddp 150 * @xid: the exchange id requesting ddp
151 * @sgl: the scatter-gather list for this request 151 * @sgl: the scatter-gather list for this request
152 * @sgc: the number of scatter-gather items 152 * @sgc: the number of scatter-gather items
153 * @target_mode: 1 to setup target mode, 0 to setup initiator mode
153 * 154 *
154 * Returns : 1 for success and 0 for no ddp 155 * Returns : 1 for success and 0 for no ddp
155 */ 156 */
@@ -1063,7 +1064,7 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,
1063 1064
1064/** 1065/**
1065 * ixgbe_fcoe_get_tc - get the current TC that fcoe is mapped to 1066 * ixgbe_fcoe_get_tc - get the current TC that fcoe is mapped to
1066 * @adapter - pointer to the device adapter structure 1067 * @adapter: pointer to the device adapter structure
1067 * 1068 *
1068 * Return : TC that FCoE is mapped to 1069 * Return : TC that FCoE is mapped to
1069 */ 1070 */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index d8c4c1b90378..4f28621b76e1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1128,6 +1128,9 @@ static void ixgbe_tx_timeout_reset(struct ixgbe_adapter *adapter)
1128 1128
1129/** 1129/**
1130 * ixgbe_tx_maxrate - callback to set the maximum per-queue bitrate 1130 * ixgbe_tx_maxrate - callback to set the maximum per-queue bitrate
1131 * @netdev: network interface device structure
1132 * @queue_index: Tx queue to set
1133 * @maxrate: desired maximum transmit bitrate
1131 **/ 1134 **/
1132static int ixgbe_tx_maxrate(struct net_device *netdev, 1135static int ixgbe_tx_maxrate(struct net_device *netdev,
1133 int queue_index, u32 maxrate) 1136 int queue_index, u32 maxrate)
@@ -2025,8 +2028,8 @@ static bool ixgbe_can_reuse_rx_page(struct ixgbe_rx_buffer *rx_buffer)
2025 * ixgbe_add_rx_frag - Add contents of Rx buffer to sk_buff 2028 * ixgbe_add_rx_frag - Add contents of Rx buffer to sk_buff
2026 * @rx_ring: rx descriptor ring to transact packets on 2029 * @rx_ring: rx descriptor ring to transact packets on
2027 * @rx_buffer: buffer containing page to add 2030 * @rx_buffer: buffer containing page to add
2028 * @rx_desc: descriptor containing length of buffer written by hardware
2029 * @skb: sk_buff to place the data into 2031 * @skb: sk_buff to place the data into
2032 * @size: size of data in rx_buffer
2030 * 2033 *
2031 * This function will add the data contained in rx_buffer->page to the skb. 2034 * This function will add the data contained in rx_buffer->page to the skb.
2032 * This is done either through a direct copy if the data in the buffer is 2035 * This is done either through a direct copy if the data in the buffer is
@@ -3017,6 +3020,8 @@ static inline void ixgbe_irq_disable_queues(struct ixgbe_adapter *adapter,
3017/** 3020/**
3018 * ixgbe_irq_enable - Enable default interrupt generation settings 3021 * ixgbe_irq_enable - Enable default interrupt generation settings
3019 * @adapter: board private structure 3022 * @adapter: board private structure
3023 * @queues: enable irqs for queues
3024 * @flush: flush register write
3020 **/ 3025 **/
3021static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues, 3026static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
3022 bool flush) 3027 bool flush)
@@ -3472,6 +3477,7 @@ static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
3472 3477
3473/** 3478/**
3474 * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts 3479 * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts
3480 * @adapter: board private structure
3475 * 3481 *
3476 **/ 3482 **/
3477static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter) 3483static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
@@ -4000,8 +4006,8 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
4000 4006
4001/** 4007/**
4002 * ixgbe_configure_rscctl - enable RSC for the indicated ring 4008 * ixgbe_configure_rscctl - enable RSC for the indicated ring
4003 * @adapter: address of board private structure 4009 * @adapter: address of board private structure
4004 * @index: index of ring to set 4010 * @ring: structure containing ring specific data
4005 **/ 4011 **/
4006static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter, 4012static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
4007 struct ixgbe_ring *ring) 4013 struct ixgbe_ring *ring)
@@ -4857,9 +4863,11 @@ int ixgbe_del_mac_filter(struct ixgbe_adapter *adapter,
4857 4863
4858 return -ENOMEM; 4864 return -ENOMEM;
4859} 4865}
4866
4860/** 4867/**
4861 * ixgbe_write_uc_addr_list - write unicast addresses to RAR table 4868 * ixgbe_write_uc_addr_list - write unicast addresses to RAR table
4862 * @netdev: network interface device structure 4869 * @netdev: network interface device structure
4870 * @vfn: pool to associate with unicast addresses
4863 * 4871 *
4864 * Writes unicast address list to the RAR table. 4872 * Writes unicast address list to the RAR table.
4865 * Returns: -ENOMEM on failure/insufficient address space 4873 * Returns: -ENOMEM on failure/insufficient address space
@@ -6037,6 +6045,7 @@ static void ixgbe_init_dcb(struct ixgbe_adapter *adapter)
6037/** 6045/**
6038 * ixgbe_sw_init - Initialize general software structures (struct ixgbe_adapter) 6046 * ixgbe_sw_init - Initialize general software structures (struct ixgbe_adapter)
6039 * @adapter: board private structure to initialize 6047 * @adapter: board private structure to initialize
6048 * @ii: pointer to ixgbe_info for device
6040 * 6049 *
6041 * ixgbe_sw_init initializes the Adapter private data structure. 6050 * ixgbe_sw_init initializes the Adapter private data structure.
6042 * Fields are initialized based on PCI device information and 6051 * Fields are initialized based on PCI device information and
@@ -6321,6 +6330,7 @@ err_setup_tx:
6321 6330
6322/** 6331/**
6323 * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors) 6332 * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors)
6333 * @adapter: pointer to ixgbe_adapter
6324 * @rx_ring: rx descriptor ring (for a specific queue) to setup 6334 * @rx_ring: rx descriptor ring (for a specific queue) to setup
6325 * 6335 *
6326 * Returns 0 on success, negative on failure 6336 * Returns 0 on success, negative on failure
@@ -7133,7 +7143,6 @@ static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)
7133/** 7143/**
7134 * ixgbe_watchdog_update_link - update the link status 7144 * ixgbe_watchdog_update_link - update the link status
7135 * @adapter: pointer to the device adapter structure 7145 * @adapter: pointer to the device adapter structure
7136 * @link_speed: pointer to a u32 to store the link_speed
7137 **/ 7146 **/
7138static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter) 7147static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
7139{ 7148{
@@ -7586,7 +7595,7 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
7586 7595
7587/** 7596/**
7588 * ixgbe_service_timer - Timer Call-back 7597 * ixgbe_service_timer - Timer Call-back
7589 * @data: pointer to adapter cast into an unsigned long 7598 * @t: pointer to timer_list structure
7590 **/ 7599 **/
7591static void ixgbe_service_timer(struct timer_list *t) 7600static void ixgbe_service_timer(struct timer_list *t)
7592{ 7601{
@@ -8574,7 +8583,7 @@ static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
8574/** 8583/**
8575 * ixgbe_add_sanmac_netdev - Add the SAN MAC address to the corresponding 8584 * ixgbe_add_sanmac_netdev - Add the SAN MAC address to the corresponding
8576 * netdev->dev_addrs 8585 * netdev->dev_addrs
8577 * @netdev: network interface device structure 8586 * @dev: network interface device structure
8578 * 8587 *
8579 * Returns non-zero on failure 8588 * Returns non-zero on failure
8580 **/ 8589 **/
@@ -8598,7 +8607,7 @@ static int ixgbe_add_sanmac_netdev(struct net_device *dev)
8598/** 8607/**
8599 * ixgbe_del_sanmac_netdev - Removes the SAN MAC address to the corresponding 8608 * ixgbe_del_sanmac_netdev - Removes the SAN MAC address to the corresponding
8600 * netdev->dev_addrs 8609 * netdev->dev_addrs
8601 * @netdev: network interface device structure 8610 * @dev: network interface device structure
8602 * 8611 *
8603 * Returns non-zero on failure 8612 * Returns non-zero on failure
8604 **/ 8613 **/
@@ -8765,7 +8774,7 @@ static void ixgbe_set_prio_tc_map(struct ixgbe_adapter *adapter)
8765/** 8774/**
8766 * ixgbe_setup_tc - configure net_device for multiple traffic classes 8775 * ixgbe_setup_tc - configure net_device for multiple traffic classes
8767 * 8776 *
8768 * @netdev: net device to configure 8777 * @dev: net device to configure
8769 * @tc: number of traffic classes to enable 8778 * @tc: number of traffic classes to enable
8770 */ 8779 */
8771int ixgbe_setup_tc(struct net_device *dev, u8 tc) 8780int ixgbe_setup_tc(struct net_device *dev, u8 tc)
@@ -9602,8 +9611,8 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
9602 9611
9603/** 9612/**
9604 * ixgbe_configure_bridge_mode - set various bridge modes 9613 * ixgbe_configure_bridge_mode - set various bridge modes
9605 * @adapter - the private structure 9614 * @adapter: the private structure
9606 * @mode - requested bridge mode 9615 * @mode: requested bridge mode
9607 * 9616 *
9608 * Configure some settings require for various bridge modes. 9617 * Configure some settings require for various bridge modes.
9609 **/ 9618 **/
@@ -10071,7 +10080,7 @@ static inline int ixgbe_enumerate_functions(struct ixgbe_adapter *adapter)
10071 * ixgbe_wol_supported - Check whether device supports WoL 10080 * ixgbe_wol_supported - Check whether device supports WoL
10072 * @adapter: the adapter private structure 10081 * @adapter: the adapter private structure
10073 * @device_id: the device ID 10082 * @device_id: the device ID
10074 * @subdev_id: the subsystem device ID 10083 * @subdevice_id: the subsystem device ID
10075 * 10084 *
10076 * This function is used by probe and ethtool to determine 10085 * This function is used by probe and ethtool to determine
10077 * which devices have WoL support 10086 * which devices have WoL support
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
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index ae312c45696a..f6cc9166082a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -166,7 +166,7 @@
166 166
167/** 167/**
168 * ixgbe_ptp_setup_sdp_x540 168 * ixgbe_ptp_setup_sdp_x540
169 * @hw: the hardware private structure 169 * @adapter: private adapter structure
170 * 170 *
171 * this function enables or disables the clock out feature on SDP0 for 171 * this function enables or disables the clock out feature on SDP0 for
172 * the X540 device. It will create a 1second periodic output that can 172 * the X540 device. It will create a 1second periodic output that can
@@ -299,7 +299,7 @@ static u64 ixgbe_ptp_read_82599(const struct cyclecounter *cc)
299 * ixgbe_ptp_convert_to_hwtstamp - convert register value to hw timestamp 299 * ixgbe_ptp_convert_to_hwtstamp - convert register value to hw timestamp
300 * @adapter: private adapter structure 300 * @adapter: private adapter structure
301 * @hwtstamp: stack timestamp structure 301 * @hwtstamp: stack timestamp structure
302 * @systim: unsigned 64bit system time value 302 * @timestamp: unsigned 64bit system time value
303 * 303 *
304 * We need to convert the adapter's RX/TXSTMP registers into a hwtstamp value 304 * We need to convert the adapter's RX/TXSTMP registers into a hwtstamp value
305 * which can be used by the stack's ptp functions. 305 * which can be used by the stack's ptp functions.
@@ -1015,7 +1015,7 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,
1015/** 1015/**
1016 * ixgbe_ptp_set_ts_config - user entry point for timestamp mode 1016 * ixgbe_ptp_set_ts_config - user entry point for timestamp mode
1017 * @adapter: pointer to adapter struct 1017 * @adapter: pointer to adapter struct
1018 * @ifreq: ioctl data 1018 * @ifr: ioctl data
1019 * 1019 *
1020 * Set hardware to requested mode. If unsupported, return an error with no 1020 * Set hardware to requested mode. If unsupported, return an error with no
1021 * changes. Otherwise, store the mode for future reference. 1021 * changes. Otherwise, store the mode for future reference.
@@ -1338,7 +1338,7 @@ void ixgbe_ptp_init(struct ixgbe_adapter *adapter)
1338 1338
1339/** 1339/**
1340 * ixgbe_ptp_suspend - stop PTP work items 1340 * ixgbe_ptp_suspend - stop PTP work items
1341 * @ adapter: pointer to adapter struct 1341 * @adapter: pointer to adapter struct
1342 * 1342 *
1343 * this function suspends PTP activity, and prevents more PTP work from being 1343 * this function suspends PTP activity, and prevents more PTP work from being
1344 * generated, but does not destroy the PTP clock device. 1344 * generated, but does not destroy the PTP clock device.
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index cb7da5f9c4da..3bce26e77090 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -1642,10 +1642,12 @@ static s32 ixgbe_supported_sfp_modules_X550em(struct ixgbe_hw *hw, bool *linear)
1642} 1642}
1643 1643
1644/** 1644/**
1645 * ixgbe_setup_mac_link_sfp_x550em - Configure the KR PHY for SFP. 1645 * ixgbe_setup_mac_link_sfp_x550em - Configure the KR PHY for SFP.
1646 * @hw: pointer to hardware structure 1646 * @hw: pointer to hardware structure
1647 * @speed: the link speed to force
1648 * @autoneg_wait_to_complete: unused
1647 * 1649 *
1648 * Configures the extern PHY and the integrated KR PHY for SFP support. 1650 * Configures the extern PHY and the integrated KR PHY for SFP support.
1649 */ 1651 */
1650static s32 1652static s32
1651ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw, 1653ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
@@ -1737,6 +1739,8 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
1737/** 1739/**
1738 * ixgbe_setup_mac_link_sfp_n - Setup internal PHY for native SFP 1740 * ixgbe_setup_mac_link_sfp_n - Setup internal PHY for native SFP
1739 * @hw: pointer to hardware structure 1741 * @hw: pointer to hardware structure
1742 * @speed: link speed
1743 * @autoneg_wait_to_complete: unused
1740 * 1744 *
1741 * Configure the the integrated PHY for native SFP support. 1745 * Configure the the integrated PHY for native SFP support.
1742 */ 1746 */
@@ -1784,6 +1788,8 @@ ixgbe_setup_mac_link_sfp_n(struct ixgbe_hw *hw, ixgbe_link_speed speed,
1784/** 1788/**
1785 * ixgbe_setup_mac_link_sfp_x550a - Setup internal PHY for SFP 1789 * ixgbe_setup_mac_link_sfp_x550a - Setup internal PHY for SFP
1786 * @hw: pointer to hardware structure 1790 * @hw: pointer to hardware structure
1791 * @speed: link speed
1792 * @autoneg_wait_to_complete: unused
1787 * 1793 *
1788 * Configure the the integrated PHY for SFP support. 1794 * Configure the the integrated PHY for SFP support.
1789 */ 1795 */
@@ -1859,7 +1865,7 @@ ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw, ixgbe_link_speed speed,
1859 * ixgbe_setup_mac_link_t_X550em - Sets the auto advertised link speed 1865 * ixgbe_setup_mac_link_t_X550em - Sets the auto advertised link speed
1860 * @hw: pointer to hardware structure 1866 * @hw: pointer to hardware structure
1861 * @speed: new link speed 1867 * @speed: new link speed
1862 * @autoneg_wait_to_complete: true when waiting for completion is needed 1868 * @autoneg_wait: true when waiting for completion is needed
1863 * 1869 *
1864 * Setup internal/external PHY link speed based on link speed, then set 1870 * Setup internal/external PHY link speed based on link speed, then set
1865 * external PHY auto advertised link speed. 1871 * external PHY auto advertised link speed.
@@ -1943,6 +1949,8 @@ static s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw,
1943/** 1949/**
1944 * ixgbe_setup_sgmii - Set up link for sgmii 1950 * ixgbe_setup_sgmii - Set up link for sgmii
1945 * @hw: pointer to hardware structure 1951 * @hw: pointer to hardware structure
1952 * @speed: unused
1953 * @autoneg_wait_to_complete: unused
1946 */ 1954 */
1947static s32 1955static s32
1948ixgbe_setup_sgmii(struct ixgbe_hw *hw, __always_unused ixgbe_link_speed speed, 1956ixgbe_setup_sgmii(struct ixgbe_hw *hw, __always_unused ixgbe_link_speed speed,
@@ -2014,6 +2022,8 @@ ixgbe_setup_sgmii(struct ixgbe_hw *hw, __always_unused ixgbe_link_speed speed,
2014/** 2022/**
2015 * ixgbe_setup_sgmii_fw - Set up link for sgmii with firmware-controlled PHYs 2023 * ixgbe_setup_sgmii_fw - Set up link for sgmii with firmware-controlled PHYs
2016 * @hw: pointer to hardware structure 2024 * @hw: pointer to hardware structure
2025 * @speed: the link speed to force
2026 * @autoneg_wait: true when waiting for completion is needed
2017 */ 2027 */
2018static s32 ixgbe_setup_sgmii_fw(struct ixgbe_hw *hw, ixgbe_link_speed speed, 2028static s32 ixgbe_setup_sgmii_fw(struct ixgbe_hw *hw, ixgbe_link_speed speed,
2019 bool autoneg_wait) 2029 bool autoneg_wait)
@@ -3735,6 +3745,7 @@ static void ixgbe_release_swfw_sync_x550em_a(struct ixgbe_hw *hw, u32 mask)
3735 * ixgbe_read_phy_reg_x550a - Reads specified PHY register 3745 * ixgbe_read_phy_reg_x550a - Reads specified PHY register
3736 * @hw: pointer to hardware structure 3746 * @hw: pointer to hardware structure
3737 * @reg_addr: 32 bit address of PHY register to read 3747 * @reg_addr: 32 bit address of PHY register to read
3748 * @device_type: 5 bit device type
3738 * @phy_data: Pointer to read data from PHY register 3749 * @phy_data: Pointer to read data from PHY register
3739 * 3750 *
3740 * Reads a value from a specified PHY register using the SWFW lock and PHY 3751 * Reads a value from a specified PHY register using the SWFW lock and PHY