diff options
author | Jacob Keller <jacob.e.keller@intel.com> | 2014-02-21 20:23:49 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-03-12 22:05:26 -0400 |
commit | 6997d4d1e629c23d01c3e66425f716f59e22e92e (patch) | |
tree | 95a11de22f4e95392e638ca05bbae55921a35e5e | |
parent | 0e7bcee42f32b4343f0ec2126cfd8d275905f655 (diff) |
ixgbe: move setting rx_pb_size into get_invariants
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c index 15506f0780b2..650d7afe90c2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | |||
@@ -104,6 +104,7 @@ static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw) | |||
104 | mac->mcft_size = IXGBE_82598_MC_TBL_SIZE; | 104 | mac->mcft_size = IXGBE_82598_MC_TBL_SIZE; |
105 | mac->vft_size = IXGBE_82598_VFT_TBL_SIZE; | 105 | mac->vft_size = IXGBE_82598_VFT_TBL_SIZE; |
106 | mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES; | 106 | mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES; |
107 | mac->rx_pb_size = IXGBE_82598_RX_PB_SIZE; | ||
107 | mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES; | 108 | mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES; |
108 | mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES; | 109 | mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES; |
109 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); | 110 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); |
@@ -205,8 +206,6 @@ static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw) | |||
205 | IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval); | 206 | IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval); |
206 | } | 207 | } |
207 | 208 | ||
208 | hw->mac.rx_pb_size = IXGBE_82598_RX_PB_SIZE; | ||
209 | |||
210 | /* set the completion timeout for interface */ | 209 | /* set the completion timeout for interface */ |
211 | if (ret_val == 0) | 210 | if (ret_val == 0) |
212 | ixgbe_set_pcie_completion_timeout(hw); | 211 | ixgbe_set_pcie_completion_timeout(hw); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index b96cefd5a2eb..82b74623a3dd 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | |||
@@ -270,6 +270,7 @@ static s32 ixgbe_get_invariants_82599(struct ixgbe_hw *hw) | |||
270 | mac->mcft_size = IXGBE_82599_MC_TBL_SIZE; | 270 | mac->mcft_size = IXGBE_82599_MC_TBL_SIZE; |
271 | mac->vft_size = IXGBE_82599_VFT_TBL_SIZE; | 271 | mac->vft_size = IXGBE_82599_VFT_TBL_SIZE; |
272 | mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES; | 272 | mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES; |
273 | mac->rx_pb_size = IXGBE_82599_RX_PB_SIZE; | ||
273 | mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES; | 274 | mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES; |
274 | mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES; | 275 | mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES; |
275 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); | 276 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); |
@@ -2025,7 +2026,6 @@ static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw) | |||
2025 | 2026 | ||
2026 | /* We need to run link autotry after the driver loads */ | 2027 | /* We need to run link autotry after the driver loads */ |
2027 | hw->mac.autotry_restart = true; | 2028 | hw->mac.autotry_restart = true; |
2028 | hw->mac.rx_pb_size = IXGBE_82599_RX_PB_SIZE; | ||
2029 | 2029 | ||
2030 | if (ret_val == 0) | 2030 | if (ret_val == 0) |
2031 | ret_val = ixgbe_verify_fw_version_82599(hw); | 2031 | ret_val = ixgbe_verify_fw_version_82599(hw); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index c870f37f15d3..eed790ac14f8 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | |||
@@ -61,6 +61,7 @@ static s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw) | |||
61 | mac->mcft_size = IXGBE_X540_MC_TBL_SIZE; | 61 | mac->mcft_size = IXGBE_X540_MC_TBL_SIZE; |
62 | mac->vft_size = IXGBE_X540_VFT_TBL_SIZE; | 62 | mac->vft_size = IXGBE_X540_VFT_TBL_SIZE; |
63 | mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES; | 63 | mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES; |
64 | mac->rx_pb_size = IXGBE_X540_RX_PB_SIZE; | ||
64 | mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES; | 65 | mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES; |
65 | mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES; | 66 | mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES; |
66 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); | 67 | mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw); |
@@ -187,7 +188,6 @@ static s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw) | |||
187 | goto out; | 188 | goto out; |
188 | 189 | ||
189 | ret_val = ixgbe_start_hw_gen2(hw); | 190 | ret_val = ixgbe_start_hw_gen2(hw); |
190 | hw->mac.rx_pb_size = IXGBE_X540_RX_PB_SIZE; | ||
191 | out: | 191 | out: |
192 | return ret_val; | 192 | return ret_val; |
193 | } | 193 | } |