aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2010-10-12 18:20:59 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-14 13:49:43 -0400
commit5d5b7c39cfdc459c079ed75b65a537f40ffb82da (patch)
tree1012a11bef0eacb5134019ee9f5c7af59434cc46
parentf32f837b75233588cd4f8542214a30915ab7847b (diff)
ixgbe: declare functions as static
Following patch fixes warnings reported by `make namespacecheck` Reported by Stephen Hemminger CC: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c30
-rw-r--r--drivers/net/ixgbe/ixgbe_common.c5
-rw-r--r--drivers/net/ixgbe/ixgbe_common.h1
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_82598.c8
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_82598.h11
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_82599.c12
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_82599.h12
-rw-r--r--drivers/net/ixgbe/ixgbe_mbx.c19
-rw-r--r--drivers/net/ixgbe/ixgbe_mbx.h3
-rw-r--r--drivers/net/ixgbe/ixgbe_sriov.c17
-rw-r--r--drivers/net/ixgbe/ixgbe_sriov.h8
11 files changed, 40 insertions, 86 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 344c5d6ae02a..0bd8fbb5bfd0 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -39,20 +39,20 @@
39#define IXGBE_82599_MC_TBL_SIZE 128 39#define IXGBE_82599_MC_TBL_SIZE 128
40#define IXGBE_82599_VFT_TBL_SIZE 128 40#define IXGBE_82599_VFT_TBL_SIZE 128
41 41
42void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); 42static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
43void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); 43static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
44void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw); 44static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
45s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, 45static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
46 ixgbe_link_speed speed, 46 ixgbe_link_speed speed,
47 bool autoneg, 47 bool autoneg,
48 bool autoneg_wait_to_complete); 48 bool autoneg_wait_to_complete);
49static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw, 49static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
50 ixgbe_link_speed speed, 50 ixgbe_link_speed speed,
51 bool autoneg, 51 bool autoneg,
52 bool autoneg_wait_to_complete); 52 bool autoneg_wait_to_complete);
53s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, 53static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
54 bool autoneg_wait_to_complete); 54 bool autoneg_wait_to_complete);
55s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, 55static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
56 ixgbe_link_speed speed, 56 ixgbe_link_speed speed,
57 bool autoneg, 57 bool autoneg,
58 bool autoneg_wait_to_complete); 58 bool autoneg_wait_to_complete);
@@ -369,7 +369,7 @@ out:
369 * Configures link settings based on values in the ixgbe_hw struct. 369 * Configures link settings based on values in the ixgbe_hw struct.
370 * Restarts the link. Performs autonegotiation if needed. 370 * Restarts the link. Performs autonegotiation if needed.
371 **/ 371 **/
372s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, 372static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
373 bool autoneg_wait_to_complete) 373 bool autoneg_wait_to_complete)
374{ 374{
375 u32 autoc_reg; 375 u32 autoc_reg;
@@ -418,7 +418,7 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
418 * PHY states. This includes selectively shutting down the Tx 418 * PHY states. This includes selectively shutting down the Tx
419 * laser on the PHY, effectively halting physical link. 419 * laser on the PHY, effectively halting physical link.
420 **/ 420 **/
421void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 421static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
422{ 422{
423 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP); 423 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
424 424
@@ -437,7 +437,7 @@ void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
437 * PHY states. This includes selectively turning on the Tx 437 * PHY states. This includes selectively turning on the Tx
438 * laser on the PHY, effectively starting physical link. 438 * laser on the PHY, effectively starting physical link.
439 **/ 439 **/
440void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 440static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
441{ 441{
442 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP); 442 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
443 443
@@ -460,7 +460,7 @@ void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
460 * end. This is consistent with true clause 37 autoneg, which also 460 * end. This is consistent with true clause 37 autoneg, which also
461 * involves a loss of signal. 461 * involves a loss of signal.
462 **/ 462 **/
463void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 463static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
464{ 464{
465 hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n"); 465 hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");
466 466
@@ -729,7 +729,7 @@ out:
729 * 729 *
730 * Set the link speed in the AUTOC register and restarts link. 730 * Set the link speed in the AUTOC register and restarts link.
731 **/ 731 **/
732s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, 732static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
733 ixgbe_link_speed speed, bool autoneg, 733 ixgbe_link_speed speed, bool autoneg,
734 bool autoneg_wait_to_complete) 734 bool autoneg_wait_to_complete)
735{ 735{
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 939e60f43fb9..e3eca1316389 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -52,6 +52,7 @@ static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index);
52static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr); 52static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
53static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq); 53static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);
54static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num); 54static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
55static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
55 56
56/** 57/**
57 * ixgbe_start_hw_generic - Prepare hardware for Tx/Rx 58 * ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
@@ -637,7 +638,7 @@ out:
637 * Polls the status bit (bit 1) of the EERD or EEWR to determine when the 638 * Polls the status bit (bit 1) of the EERD or EEWR to determine when the
638 * read or write is done respectively. 639 * read or write is done respectively.
639 **/ 640 **/
640s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg) 641static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
641{ 642{
642 u32 i; 643 u32 i;
643 u32 reg; 644 u32 reg;
@@ -2449,7 +2450,7 @@ s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw)
2449 * return the VLVF index where this VLAN id should be placed 2450 * return the VLVF index where this VLAN id should be placed
2450 * 2451 *
2451 **/ 2452 **/
2452s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan) 2453static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)
2453{ 2454{
2454 u32 bits = 0; 2455 u32 bits = 0;
2455 u32 first_empty_slot = 0; 2456 u32 first_empty_slot = 0;
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 5cf15aa11cac..424c223437dc 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -52,7 +52,6 @@ s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
52s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw, 52s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
53 u16 *checksum_val); 53 u16 *checksum_val);
54s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw); 54s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);
55s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
56 55
57s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq, 56s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
58 u32 enable_addr); 57 u32 enable_addr);
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
index 6e9c8bb16dde..50288bcadc59 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c
@@ -78,7 +78,7 @@ static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
78 * 78 *
79 * Configure Rx Data Arbiter and credits for each traffic class. 79 * Configure Rx Data Arbiter and credits for each traffic class.
80 */ 80 */
81s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw, 81static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
82 struct ixgbe_dcb_config *dcb_config) 82 struct ixgbe_dcb_config *dcb_config)
83{ 83{
84 struct tc_bw_alloc *p; 84 struct tc_bw_alloc *p;
@@ -135,7 +135,7 @@ s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
135 * 135 *
136 * Configure Tx Descriptor Arbiter and credits for each traffic class. 136 * Configure Tx Descriptor Arbiter and credits for each traffic class.
137 */ 137 */
138s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw, 138static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
139 struct ixgbe_dcb_config *dcb_config) 139 struct ixgbe_dcb_config *dcb_config)
140{ 140{
141 struct tc_bw_alloc *p; 141 struct tc_bw_alloc *p;
@@ -183,7 +183,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
183 * 183 *
184 * Configure Tx Data Arbiter and credits for each traffic class. 184 * Configure Tx Data Arbiter and credits for each traffic class.
185 */ 185 */
186s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw, 186static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
187 struct ixgbe_dcb_config *dcb_config) 187 struct ixgbe_dcb_config *dcb_config)
188{ 188{
189 struct tc_bw_alloc *p; 189 struct tc_bw_alloc *p;
@@ -296,7 +296,7 @@ out:
296 * Configure queue statistics registers, all queues belonging to same traffic 296 * Configure queue statistics registers, all queues belonging to same traffic
297 * class uses a single set of queue statistics counters. 297 * class uses a single set of queue statistics counters.
298 */ 298 */
299s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw) 299static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
300{ 300{
301 u32 reg = 0; 301 u32 reg = 0;
302 u8 i = 0; 302 u8 i = 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
index def907f6cf20..abc03ccfa088 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.h
@@ -73,17 +73,6 @@
73/* DCB PFC functions */ 73/* DCB PFC functions */
74s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *); 74s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
75 75
76/* DCB traffic class stats */
77s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *);
78
79/* DCB config arbiters */
80s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *,
81 struct ixgbe_dcb_config *);
82s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *,
83 struct ixgbe_dcb_config *);
84s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *,
85 struct ixgbe_dcb_config *);
86
87/* DCB hw initialization */ 76/* DCB hw initialization */
88s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *); 77s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
89 78
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index 13647186a406..67c219f86c3a 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -37,7 +37,7 @@
37 * 37 *
38 * Configure packet buffers for DCB mode. 38 * Configure packet buffers for DCB mode.
39 */ 39 */
40s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw, 40static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
41 struct ixgbe_dcb_config *dcb_config) 41 struct ixgbe_dcb_config *dcb_config)
42{ 42{
43 s32 ret_val = 0; 43 s32 ret_val = 0;
@@ -79,7 +79,7 @@ s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
79 * 79 *
80 * Configure Rx Packet Arbiter and credits for each traffic class. 80 * Configure Rx Packet Arbiter and credits for each traffic class.
81 */ 81 */
82s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw, 82static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
83 struct ixgbe_dcb_config *dcb_config) 83 struct ixgbe_dcb_config *dcb_config)
84{ 84{
85 struct tc_bw_alloc *p; 85 struct tc_bw_alloc *p;
@@ -134,7 +134,7 @@ s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
134 * 134 *
135 * Configure Tx Descriptor Arbiter and credits for each traffic class. 135 * Configure Tx Descriptor Arbiter and credits for each traffic class.
136 */ 136 */
137s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw, 137static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
138 struct ixgbe_dcb_config *dcb_config) 138 struct ixgbe_dcb_config *dcb_config)
139{ 139{
140 struct tc_bw_alloc *p; 140 struct tc_bw_alloc *p;
@@ -181,7 +181,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
181 * 181 *
182 * Configure Tx Packet Arbiter and credits for each traffic class. 182 * Configure Tx Packet Arbiter and credits for each traffic class.
183 */ 183 */
184s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw, 184static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
185 struct ixgbe_dcb_config *dcb_config) 185 struct ixgbe_dcb_config *dcb_config)
186{ 186{
187 struct tc_bw_alloc *p; 187 struct tc_bw_alloc *p;
@@ -302,7 +302,7 @@ out:
302 * Configure queue statistics registers, all queues belonging to same traffic 302 * Configure queue statistics registers, all queues belonging to same traffic
303 * class uses a single set of queue statistics counters. 303 * class uses a single set of queue statistics counters.
304 */ 304 */
305s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw) 305static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
306{ 306{
307 u32 reg = 0; 307 u32 reg = 0;
308 u8 i = 0; 308 u8 i = 0;
@@ -355,7 +355,7 @@ s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
355 * 355 *
356 * Configure general DCB parameters. 356 * Configure general DCB parameters.
357 */ 357 */
358s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw) 358static s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
359{ 359{
360 u32 reg; 360 u32 reg;
361 u32 q; 361 u32 q;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
index 88819b2e562e..18d7fbf6c292 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.h
@@ -102,18 +102,6 @@
102s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, 102s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
103 struct ixgbe_dcb_config *dcb_config); 103 struct ixgbe_dcb_config *dcb_config);
104 104
105/* DCB traffic class stats */
106s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw);
107
108/* DCB config arbiters */
109s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
110 struct ixgbe_dcb_config *dcb_config);
111s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
112 struct ixgbe_dcb_config *dcb_config);
113s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
114 struct ixgbe_dcb_config *dcb_config);
115
116
117/* DCB hw initialization */ 105/* DCB hw initialization */
118s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, 106s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
119 struct ixgbe_dcb_config *config); 107 struct ixgbe_dcb_config *config);
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index d75f9148eb1f..435e0281e1f8 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
@@ -200,7 +200,8 @@ out:
200 * returns SUCCESS if it successfully received a message notification and 200 * returns SUCCESS if it successfully received a message notification and
201 * copied it into the receive buffer. 201 * copied it into the receive buffer.
202 **/ 202 **/
203s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id) 203static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
204 u16 mbx_id)
204{ 205{
205 struct ixgbe_mbx_info *mbx = &hw->mbx; 206 struct ixgbe_mbx_info *mbx = &hw->mbx;
206 s32 ret_val = IXGBE_ERR_MBX; 207 s32 ret_val = IXGBE_ERR_MBX;
@@ -227,7 +228,7 @@ out:
227 * returns SUCCESS if it successfully copied message into the buffer and 228 * returns SUCCESS if it successfully copied message into the buffer and
228 * received an ack to that message within delay * timeout period 229 * received an ack to that message within delay * timeout period
229 **/ 230 **/
230s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, 231static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
231 u16 mbx_id) 232 u16 mbx_id)
232{ 233{
233 struct ixgbe_mbx_info *mbx = &hw->mbx; 234 struct ixgbe_mbx_info *mbx = &hw->mbx;
@@ -247,20 +248,6 @@ out:
247 return ret_val; 248 return ret_val;
248} 249}
249 250
250/**
251 * ixgbe_init_mbx_ops_generic - Initialize MB function pointers
252 * @hw: pointer to the HW structure
253 *
254 * Setup the mailbox read and write message function pointers
255 **/
256void ixgbe_init_mbx_ops_generic(struct ixgbe_hw *hw)
257{
258 struct ixgbe_mbx_info *mbx = &hw->mbx;
259
260 mbx->ops.read_posted = ixgbe_read_posted_mbx;
261 mbx->ops.write_posted = ixgbe_write_posted_mbx;
262}
263
264static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index) 251static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
265{ 252{
266 u32 mbvficr = IXGBE_READ_REG(hw, IXGBE_MBVFICR(index)); 253 u32 mbvficr = IXGBE_READ_REG(hw, IXGBE_MBVFICR(index));
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/ixgbe_mbx.h
index be7ab3309ab7..c5ae4b4da83a 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/ixgbe_mbx.h
@@ -83,12 +83,9 @@
83 83
84s32 ixgbe_read_mbx(struct ixgbe_hw *, u32 *, u16, u16); 84s32 ixgbe_read_mbx(struct ixgbe_hw *, u32 *, u16, u16);
85s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16); 85s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
86s32 ixgbe_read_posted_mbx(struct ixgbe_hw *, u32 *, u16, u16);
87s32 ixgbe_write_posted_mbx(struct ixgbe_hw *, u32 *, u16, u16);
88s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16); 86s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
89s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16); 87s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
90s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16); 88s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
91void ixgbe_init_mbx_ops_generic(struct ixgbe_hw *hw);
92void ixgbe_init_mbx_params_pf(struct ixgbe_hw *); 89void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
93 90
94extern struct ixgbe_mbx_operations mbx_ops_82599; 91extern struct ixgbe_mbx_operations mbx_ops_82599;
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 49661a138e22..a6b720ae7fea 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -43,8 +43,8 @@
43 43
44#include "ixgbe_sriov.h" 44#include "ixgbe_sriov.h"
45 45
46int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter, 46static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
47 int entries, u16 *hash_list, u32 vf) 47 int entries, u16 *hash_list, u32 vf)
48{ 48{
49 struct vf_data_storage *vfinfo = &adapter->vfinfo[vf]; 49 struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];
50 struct ixgbe_hw *hw = &adapter->hw; 50 struct ixgbe_hw *hw = &adapter->hw;
@@ -104,13 +104,14 @@ void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter)
104 } 104 }
105} 105}
106 106
107int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf) 107static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
108 u32 vf)
108{ 109{
109 return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add); 110 return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
110} 111}
111 112
112 113
113void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe) 114static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
114{ 115{
115 u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); 116 u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
116 vmolr |= (IXGBE_VMOLR_ROMPE | 117 vmolr |= (IXGBE_VMOLR_ROMPE |
@@ -134,7 +135,7 @@ static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
134 IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0); 135 IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);
135} 136}
136 137
137inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf) 138static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
138{ 139{
139 struct ixgbe_hw *hw = &adapter->hw; 140 struct ixgbe_hw *hw = &adapter->hw;
140 int rar_entry = hw->mac.num_rar_entries - (vf + 1); 141 int rar_entry = hw->mac.num_rar_entries - (vf + 1);
@@ -162,8 +163,8 @@ inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
162 hw->mac.ops.clear_rar(hw, rar_entry); 163 hw->mac.ops.clear_rar(hw, rar_entry);
163} 164}
164 165
165int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter, 166static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
166 int vf, unsigned char *mac_addr) 167 int vf, unsigned char *mac_addr)
167{ 168{
168 struct ixgbe_hw *hw = &adapter->hw; 169 struct ixgbe_hw *hw = &adapter->hw;
169 int rar_entry = hw->mac.num_rar_entries - (vf + 1); 170 int rar_entry = hw->mac.num_rar_entries - (vf + 1);
@@ -197,7 +198,7 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
197 return 0; 198 return 0;
198} 199}
199 200
200inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) 201static inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
201{ 202{
202 struct ixgbe_hw *hw = &adapter->hw; 203 struct ixgbe_hw *hw = &adapter->hw;
203 u32 reg; 204 u32 reg;
diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ixgbe/ixgbe_sriov.h
index 184730ecdfb6..9a424bb688c0 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ixgbe/ixgbe_sriov.h
@@ -28,16 +28,8 @@
28#ifndef _IXGBE_SRIOV_H_ 28#ifndef _IXGBE_SRIOV_H_
29#define _IXGBE_SRIOV_H_ 29#define _IXGBE_SRIOV_H_
30 30
31int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
32 int entries, u16 *hash_list, u32 vf);
33void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter); 31void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);
34int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf);
35void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe);
36void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf);
37void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf);
38void ixgbe_msg_task(struct ixgbe_adapter *adapter); 32void ixgbe_msg_task(struct ixgbe_adapter *adapter);
39int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
40 int vf, unsigned char *mac_addr);
41int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask); 33int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);
42void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter); 34void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);
43void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter); 35void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
generated by cgit v1.2.2 (git 2.25.0) at 2025-11-01 05:06:01 -0400