net: aquantia: implement WOL and EEE support
Subsystems (3)
v2 cover net: aquantia: implement WOL and EEE support
This is v2 of WOL/EEE functionality patch for atlantic driver. Sorry for long gap, I was on vacation.
In this patchset Yana Esina and Nikita Danilov implemented:
- Upload function to interact with FW memory
- Definitions and structures necessary for the correct operation of Wake ON Lan
- The functionality Wake On Lan via ethtool (Magic packet is supported)
- The functionality for Energy-Efficient Ethernet configuration via ethtool
Version 2 has the following fixes:
- patchset reorganized to extract renaming and whitespace fixes into separate patches
- some of magic numbers replaced with defines
- reverse christmas tree applied
Discussion outcome regarding driver version bumps was not finished (here https://patchwork.ozlabs.org/patch/954905/)
David, could you suggest the best way to proceed on this?
Igor Russkikh (1):
net: aquantia: bump driver version
Nikita Danilov (2):
net: aquantia: whitespace changes
net: aquantia: renaming for better visibility
Yana Esina (4):
net: aquantia: fix hw_atl_utils_fw_upload_dwords
net: aquantia: definitions for WOL
net: aquantia: implement WOL support
net: aquantia: implement EEE support
drivers/net/ethernet/aquantia/atlantic/aq_common.h | 5 + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 113 +++++++++- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 13 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 24 ++- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 4 + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 4 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 41 ++-- .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 6 - .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 35 ++-- .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 6 - .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 ++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 163 ++++++++++---- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 130 +++++++++++- .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 233 ++++++++++++++++++++- drivers/net/ethernet/aquantia/atlantic/ver.h | 2 +- 17 files changed, 675 insertions(+), 128 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/7 net: aquantia: fix hw_atl_utils_fw_upload_dwords
From: Yana Esina <[email protected]>
This patch fixes the upload function, which worked incorrectly with some chips.
--- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 +++++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 ++ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 ++++++++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 36 +++++++++++++++------- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 5 +++ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 5 +++ 6 files changed, 59 insertions(+), 11 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +8 -0
@@ -1460,3 +1460,11 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,aq_hw_write_reg (aq_hw,HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp), glb_cpu_scratch_scp); } + +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR , +HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK , +HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT , + up_force_intr); +}
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +3 -0
@@ -698,4 +698,7 @@ void hw_atl_msm_reg_wr_strobe_set(struct aq_hw_s *aq_hw, u32 reg_wr_strobe);/* set pci register reset disable */ void hw_atl_pci_pci_reg_res_dis_set (struct aq_hw_s *aq_hw,u32 pci_reg_res_dis); +/* set uP Force Interrupt */ +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr); +#endif /* HW_ATL_LLH_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +13 -0
@@ -2387,4 +2387,17 @@#define HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp) \ (0x00000300u + (scratch_scp) * 0x4) +/* register address for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR 0x00000404 +/* bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK 0x00000002 +/* inverted bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSKN 0xFFFFFFFD +/* lower bit position of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT 1 +/* width of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_WIDTH 1 +/* default value of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_DEFAULT 0x0 +#endif /* HW_ATL_LLH_INTERNAL_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +25 -11
@@ -325,17 +325,31 @@ static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s *self, u32 a, u32 *p, err = -ETIME ; goto err_exit; } +if (IS_CHIP_FEATURE (REVISION_B1 )) { +u32 offset =0 ; + +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x328 , p[offset]); +aq_hw_write_reg (self,0x32C , + (0x80000000 | (0xFFFF & (offset *4 )))); +hw_atl_mcp_up_force_intr_set (self,1 ); +/* 1000 times by 10us = 10ms */ +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self, +0x32C ) &0xF0000000 ) != +0x80000000 , +10 ,1000 ); + } + }else { +u32 offset =0 ; -aq_hw_write_reg (self,0x00000208U , a); - -for (++cnt; --cnt;) { -u32 i =0U ; +aq_hw_write_reg (self,0x208 , a); -aq_hw_write_reg (self,0x0000020CU , *(p++)); -aq_hw_write_reg (self,0x00000200U ,0xC000U ); +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x20C , p[offset]); +aq_hw_write_reg (self,0x200 ,0xC000 ); -for (i =1024U ; - (0x100U &aq_hw_read_reg (self,0x00000200U )) && --i;) { +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,0x200U ) & +0x100 ) ==0 ,10 ,1000 ); } }
@@ -399,7 +413,7 @@ struct aq_hw_atl_utils_fw_rpc_tid_s {#define hw_atl_utils_fw_rpc_init (_H_) hw_atl_utils_fw_rpc_wait(_H_, NULL) -static int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
@@ -423,8 +437,8 @@ static int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size)return err; } -static int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, -struct hw_aq_atl_utils_fw_rpc **rpc) +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +5 -0
@@ -319,6 +319,11 @@ struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);int hw_atl_utils_fw_downld_dwords (struct aq_hw_s *self,u32 a,u32 *p,u32 cnt); +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size); + +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc); +extern const struct aq_fw_ops aq_fw_1x_ops;extern const struct aq_fw_ops aq_fw_2x_ops;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +5 -0
@@ -21,6 +21,7 @@#define HW_ATL_FW2X_MPI_EFUSE_ADDR 0x364#define HW_ATL_FW2X_MPI_MBOX_ADDR 0x360 +#define HW_ATL_FW2X_MPI_RPC_ADDR 0x334#define HW_ATL_FW2X_MPI_CONTROL_ADDR 0x368#define HW_ATL_FW2X_MPI_CONTROL2_ADDR 0x36C
@@ -40,6 +41,10 @@ static int aq_fw2x_init(struct aq_hw_s *self)AQ_HW_WAIT_FOR (0U != (self->mbox_addr =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR )),1000U ,10U ); +AQ_HW_WAIT_FOR (0U != (self->rpc_addr = +aq_hw_read_reg (self,HW_ATL_FW2X_MPI_RPC_ADDR )), +1000U ,100U ); +return err; }
Signature · 1 line
2.7.4
PATCH v2 2/7 net: aquantia: definitions for WOL
In reply to Igor RusskikhFrom: Yana Esina <[email protected]>
Added definitions and structures needed to support WOL.
--- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 3 + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 94 ++++++++++++++++++++-- .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 32 ++++++++ 3 files changed, 124 insertions(+), 5 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +3 -0
@@ -36,6 +36,7 @@ struct aq_nic_cfg_s {u32 flow_control;u32 link_speed_msk;u32 vlan_id; +u32 wol;u16 is_mc_list_enabled;u16 mc_list_count;bool is_autoneg;
@@ -54,6 +55,8 @@ struct aq_nic_cfg_s {#define AQ_NIC_FLAG_ERR_UNPLUG 0x40000000U#define AQ_NIC_FLAG_ERR_HW 0x80000000U +#define AQ_NIC_WOL_ENABLED BIT(0) +#define AQ_NIC_TCVEC2RING (_NIC_, _TC_, _VEC_) \ ((_TC_) * AQ_CFG_TCS_MAX + (_VEC_))
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +89 -5
122 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +32 -0
@@ -16,6 +16,7 @@#include "../aq_pci_func.h" #include "../aq_ring.h" #include "../aq_vec.h" +#include "../aq_nic.h" #include "hw_atl_utils.h" #include "hw_atl_llh.h"
@@ -29,6 +30,37 @@#define HW_ATL_FW2X_MPI_STATE_ADDR 0x370#define HW_ATL_FW2X_MPI_STATE2_ADDR 0x374 +#define HW_ATL_FW2X_CAP_SLEEP_PROXY BIT(CAPS_HI_SLEEP_PROXY) +#define HW_ATL_FW2X_CAP_WOL BIT(CAPS_HI_WOL) + +#define HW_ATL_FW2X_CTRL_SLEEP_PROXY BIT(CTRL_SLEEP_PROXY) +#define HW_ATL_FW2X_CTRL_WOL BIT(CTRL_WOL) +#define HW_ATL_FW2X_CTRL_LINK_DROP BIT(CTRL_LINK_DROP) +#define HW_ATL_FW2X_CTRL_PAUSE BIT(CTRL_PAUSE) +#define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE) +#define HW_ATL_FW2X_CTRL_FORCE_RECONNECT BIT(CTRL_FORCE_RECONNECT) + +#define HAL_ATLANTIC_WOL_FILTERS_COUNT 8 +#define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL 0x0E + +struct __packed fw2x_msg_wol_pattern { +u8 mask[16 ]; +u32 crc; +}; + +struct __packed fw2x_msg_wol { +u32 msg_id; +u8 hw_addr[6 ]; +u8 magic_packet_enabled; +u8 filter_count; +struct fw2x_msg_wol_pattern filter[HAL_ATLANTIC_WOL_FILTERS_COUNT ]; +u8 link_up_enabled; +u8 link_down_enabled; +u16 reserved; +u32 link_up_timeout; +u32 link_down_timeout; +}; +static int aq_fw2x_set_link_speed (struct aq_hw_s *self,u32 speed);static int aq_fw2x_set_state (struct aq_hw_s *self,enum hal_atl_utils_fw_state_e state);
Signature · 1 line
2.7.4
Re: [PATCH net-next v2 2/7] net: aquantia: definitions for WOL
Quoted 1 line · Igor Russkikh
From: Yana Esina <[email protected]>
Hi Igor, Yana
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h struct __packed hw_aq_atl_utils_fw_rpc { · line 137
Quoted 7 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +3
-0@@ -134,13 +132,36 @@ struct __packed hw_aq_atl_utils_fw_rpc {u32 pattern_offset;u32 pattern_size; } wol_bit_map_pattern; + +struct { +u8 mac_addr[6 ];
ETH_ALEN
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h struct __packed hw_aq_atl_utils_mbox { · line 219
Quoted 4 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +4
-0+struct __packed offload_info { +u32 version; +u32 len; +u8 mac_addr[6 ];
ETH_ALEN
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c line 53
Quoted 3 lines
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +3
-0+struct __packed fw2x_msg_wol { +u32 msg_id; +u8 hw_addr[6 ];
ETH_ALEN
PATCH v2 3/7 net: aquantia: implement WOL support
In reply to Igor RusskikhFrom: Yana Esina <[email protected]>
Add WOL support. Currently only magic packet (ethtool -s <ethX> wol g) feature is implemented.
Remove hw_set_power and move that to FW_OPS set_power:
because WOL configuration behaves differently on 1x and 2x firmwares
--- .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 32 +++++++ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 12 +-- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 1 - .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 1 - .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 84 +++++++++++++++++-- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 5 ++ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 98 +++++++++++++++++++++- 8 files changed, 220 insertions(+), 17 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +32 -0
@@ -285,6 +285,36 @@ static int aq_ethtool_set_coalesce(struct net_device *ndev,return aq_nic_update_interrupt_moderation_settings (aq_nic); } +static void aq_ethtool_get_wol (struct net_device *ndev, +struct ethtool_wolinfo *wol) +{ +struct aq_nic_s *aq_nic =netdev_priv (ndev); +struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); + + wol->supported =WAKE_MAGIC ; + wol->wolopts =0 ; + +if (cfg->wol) + wol->wolopts |=WAKE_MAGIC ; +} + +static int aq_ethtool_set_wol (struct net_device *ndev, +struct ethtool_wolinfo *wol) +{ +struct pci_dev *pdev =to_pci_dev (ndev->dev.parent); +struct aq_nic_s *aq_nic =netdev_priv (ndev); +struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +int err =0 ; + +if (wol->wolopts &WAKE_MAGIC ) + cfg->wol |=AQ_NIC_WOL_ENABLED ; +else + cfg->wol &= ~AQ_NIC_WOL_ENABLED ; + err =device_set_wakeup_enable (&pdev->dev, wol->wolopts); + +return err; +} +static int aq_ethtool_nway_reset (struct net_device *ndev) {struct aq_nic_s *aq_nic =netdev_priv (ndev);
@@ -403,6 +433,8 @@ const struct ethtool_ops aq_ethtool_ops = { .get_drvinfo = aq_ethtool_get_drvinfo, .get_strings = aq_ethtool_get_strings, .get_rxfh_indir_size = aq_ethtool_get_rss_indir_size, + .get_wol = aq_ethtool_get_wol, + .set_wol = aq_ethtool_set_wol, .nway_reset = aq_ethtool_nway_reset, .get_ringparam = aq_get_ringparam, .set_ringparam = aq_set_ringparam,
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +3 -1
@@ -204,7 +204,6 @@ struct aq_hw_ops {int (*hw_get_fw_version)(struct aq_hw_s *self,u32 *fw_version); -int (*hw_set_power)(struct aq_hw_s *self,unsigned int power_state); };struct aq_fw_ops {
@@ -228,6 +227,9 @@ struct aq_fw_ops {int (*update_stats)(struct aq_hw_s *self);int (*set_flow_control)(struct aq_hw_s *self); + +int (*set_power)(struct aq_hw_s *self,unsigned int power_state, + u8 *mac); };#endif /* AQ_HW_H */
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +7 -5
@@ -889,11 +889,13 @@ void aq_nic_deinit(struct aq_nic_s *self) self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])aq_vec_deinit (aq_vec); -if (self->power_state ==AQ_HW_POWER_STATE_D0 ) { - (void )self->aq_fw_ops->deinit (self->aq_hw); - }else { - (void )self->aq_hw_ops->hw_set_power (self->aq_hw, - self->power_state); + self->aq_fw_ops->deinit (self->aq_hw); + +if (self->power_state !=AQ_HW_POWER_STATE_D0 || + self->aq_hw->aq_nic_cfg->wol) { + self->aq_fw_ops->set_power (self->aq_hw, + self->power_state, + self->ndev->dev_addr); } err_exit:;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +0 -1
@@ -877,7 +877,6 @@ static int hw_atl_a0_hw_ring_rx_stop(struct aq_hw_s *self,const struct aq_hw_ops hw_atl_ops_a0 = { .hw_set_mac_address = hw_atl_a0_hw_mac_addr_set, .hw_init = hw_atl_a0_hw_init, - .hw_set_power = hw_atl_utils_hw_set_power, .hw_reset = hw_atl_a0_hw_reset, .hw_start = hw_atl_a0_hw_start, .hw_ring_tx_start = hw_atl_a0_hw_ring_tx_start,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +0 -1
@@ -935,7 +935,6 @@ static int hw_atl_b0_hw_ring_rx_stop(struct aq_hw_s *self,const struct aq_hw_ops hw_atl_ops_b0 = { .hw_set_mac_address = hw_atl_b0_hw_mac_addr_set, .hw_init = hw_atl_b0_hw_init, - .hw_set_power = hw_atl_utils_hw_set_power, .hw_reset = hw_atl_b0_hw_reset, .hw_start = hw_atl_b0_hw_start, .hw_ring_tx_start = hw_atl_b0_hw_ring_tx_start,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +76 -8
101 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +5 -0
@@ -257,6 +257,9 @@ enum hal_atl_utils_fw_state_e {#define HAL_ATLANTIC_UTILS_FW_MSG_ARP 0x2U#define HAL_ATLANTIC_UTILS_FW_MSG_INJECT 0x3U#define HAL_ATLANTIC_UTILS_FW_MSG_WOL_ADD 0x4U +#define HAL_ATLANTIC_UTILS_FW_MSG_WOL_PRIOR 0x10000000U +#define HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN 0x1U +#define HAL_ATLANTIC_UTILS_FW_MSG_WOL_MAG_PKT 0x2U#define HAL_ATLANTIC_UTILS_FW_MSG_WOL_DEL 0x5U#define HAL_ATLANTIC_UTILS_FW_MSG_ENABLE_WAKEUP 0x6U#define HAL_ATLANTIC_UTILS_FW_MSG_MSM_PFC 0x7U
@@ -403,6 +406,8 @@ struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);int hw_atl_utils_fw_downld_dwords (struct aq_hw_s *self,u32 a,u32 *p,u32 cnt); +int hw_atl_utils_fw_set_wol (struct aq_hw_s *self,bool wol_enabled,u8 *mac); +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size); int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +97 -1
115 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH net-next v2 3/7] net: aquantia: implement WOL support
Quoted 8 lines · Igor Russkikh
From: Yana Esina <[email protected]>
Add WOL support. Currently only magic packet
(ethtool -s <ethX> wol g) feature is implemented.Remove
hw_set_powerand move that toFW_OPSset_power:
because WOL configuration behaves differently on 1x and 2x firmwares
Hi Igor, Yana
It looks like the set_power refactor could of been a patch of its own. Then add the WOL support as a second patch.
In the future, try to make a patch do one thing, and only one thing. It makes them easier to review.
Andrew
Re: [PATCH net-next v2 3/7] net: aquantia: implement WOL support
In reply to Igor RusskikhQuoted 5 lines · Igor Russkikh
From: Yana Esina <[email protected]>
Add WOL support. Currently only magic packet (ethtool -s <ethX> wol g) feature is implemented.
Quoted 8 lines
Remove
hw_set_powerand move that toFW_OPSset_power:
because WOL configuration behaves differently on 1x and 2x firmwaresSigned-off-by Yana Esina <[email protected]>Signed-off-by Nikita Danilov <[email protected]>Tested-by Nikita Danilov <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Andrew
PATCH v2 4/7 net: aquantia: implement EEE support
In reply to Igor RusskikhFrom: Yana Esina <[email protected]>
Support of Energy-Efficient Ethernet to aQuantia NIC's via ethtool (according to the IEEE 802.3az specifications)
--- drivers/net/ethernet/aquantia/atlantic/aq_common.h | 5 ++ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 77 +++++++++++++++++++ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 5 ++ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 13 ++++ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 86 ++++++++++++++++++++++ 7 files changed, 189 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_common.h +5 -0
@@ -57,4 +57,9 @@#define AQ_NIC_RATE_1G BIT(4)#define AQ_NIC_RATE_100M BIT(5) +#define AQ_NIC_RATE_EEE_10G BIT(6) +#define AQ_NIC_RATE_EEE_5G BIT(7) +#define AQ_NIC_RATE_EEE_2GS BIT(8) +#define AQ_NIC_RATE_EEE_1G BIT(9) +#endif /* AQ_COMMON_H */
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +77 -0
89 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +5 -0
@@ -230,6 +230,11 @@ struct aq_fw_ops {int (*set_power)(struct aq_hw_s *self,unsigned int power_state,u8 *mac); + +int (*set_eee_rate)(struct aq_hw_s *self,u32 speed); + +int (*get_eee_rate)(struct aq_hw_s *self,u32 *rate, + u32 *supported_rates); };#endif /* AQ_HW_H */
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +1 -0
@@ -45,6 +45,7 @@ struct aq_nic_cfg_s {bool is_lro;u8 tcs;struct aq_rss_parameters aq_rss; +u32 eee_speeds; };#define AQ_NIC_FLAG_STARTED 0x00000004U
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
@@ -916,5 +916,7 @@ const struct aq_fw_ops aq_fw_1x_ops = { .update_link_status = hw_atl_utils_mpi_get_link_status, .update_stats = hw_atl_utils_update_stats, .set_power = aq_fw1x_set_power, + .set_eee_rate = NULL, + .get_eee_rate = NULL, .set_flow_control = NULL, };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +13 -0
@@ -171,9 +171,22 @@ struct __packed hw_aq_atl_utils_mbox_header {u32 error; }; +struct __packed hw_aq_info { +u8 reserved[6 ]; +u16 phy_fault_code; +u16 phy_temperature; +u8 cable_len; +u8 reserved1; +u32 cable_diag_data[4 ]; +u8 reserved2[32 ]; +u32 caps_lo; +u32 caps_hi; +}; +struct __packed hw_aq_atl_utils_mbox {struct hw_aq_atl_utils_mbox_header header;struct hw_atl_stats_s stats; +struct hw_aq_info info; };/* fw2x */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +86 -0
123 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 5/7 net: aquantia: whitespace changes
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
Removed extra spaces, corrected alignment.
--- .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 4 +-- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 12 ++++---- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 4 +-- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 18 ++++++------ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 14 ++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 33 +++++++++++----------- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 1 + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 12 ++++---- 8 files changed, 49 insertions(+), 49 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +2 -2
@@ -98,8 +98,8 @@ static void aq_ethtool_stats(struct net_device *ndev,struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic);memset (data,0 , (ARRAY_SIZE (aq_ethtool_stat_names) + -ARRAY_SIZE (aq_ethtool_queue_stat_names) * - cfg->vecs) *sizeof (u64)); +ARRAY_SIZE (aq_ethtool_queue_stat_names) * + cfg->vecs) *sizeof (u64));aq_nic_get_stats (aq_nic, data); }
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +6 -6
@@ -189,7 +189,7 @@ static void aq_nic_polling_timer_cb(struct timer_list *t)aq_vec_isr (i, (void *)aq_vec);mod_timer (&self->polling_timer, jiffies + -AQ_CFG_POLLING_TIMER_INTERVAL ); +AQ_CFG_POLLING_TIMER_INTERVAL ); }int aq_nic_ndev_register (struct aq_nic_s *self)
@@ -301,13 +301,13 @@ int aq_nic_start(struct aq_nic_s *self)unsigned int i =0U ; err = self->aq_hw_ops->hw_multicast_list_set (self->aq_hw, - self->mc_list.ar, - self->mc_list.count); + self->mc_list.ar, + self->mc_list.count);if (err <0 ) goto err_exit; err = self->aq_hw_ops->hw_packet_filter_set (self->aq_hw, - self->packet_filter); + self->packet_filter);if (err <0 ) goto err_exit;
@@ -327,7 +327,7 @@ int aq_nic_start(struct aq_nic_s *self) goto err_exit;timer_setup (&self->service_timer, aq_nic_service_timer_cb,0 );mod_timer (&self->service_timer, jiffies + -AQ_CFG_SERVICE_TIMER_INTERVAL ); +AQ_CFG_SERVICE_TIMER_INTERVAL );if (self->aq_nic_cfg.is_polling) {timer_setup (&self->polling_timer, aq_nic_polling_timer_cb,0 );
@@ -344,7 +344,7 @@ int aq_nic_start(struct aq_nic_s *self) } err = self->aq_hw_ops->hw_irq_enable (self->aq_hw, -AQ_CFG_IRQ_MASK ); +AQ_CFG_IRQ_MASK );if (err <0 ) goto err_exit; }
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +2 -2
@@ -29,8 +29,8 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self, goto err_exit; } self->dx_ring =dma_alloc_coherent (aq_nic_get_dev (aq_nic), - self->size * self->dx_size, - &self->dx_ring_pa,GFP_KERNEL ); + self->size * self->dx_size, + &self->dx_ring_pa,GFP_KERNEL );if (!self->dx_ring) { err = -ENOMEM ; goto err_exit;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +9 -9
@@ -49,9 +49,9 @@const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = {DEFAULT_A0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_FIBRE , - .link_speed_msk =HW_ATL_A0_RATE_5G | + .link_speed_msk =HW_ATL_A0_RATE_5G |HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | +HW_ATL_A0_RATE_1G |HW_ATL_A0_RATE_100M , };
@@ -59,9 +59,9 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = { DEFAULT_A0_BOARD_BASIC_CAPABILITIES, .media_type = AQ_HW_MEDIA_TYPE_TP, .link_speed_msk =HW_ATL_A0_RATE_10G | -HW_ATL_A0_RATE_5G | +HW_ATL_A0_RATE_5G |HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | +HW_ATL_A0_RATE_1G | HW_ATL_A0_RATE_100M, };
@@ -78,7 +78,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = { DEFAULT_A0_BOARD_BASIC_CAPABILITIES, .media_type = AQ_HW_MEDIA_TYPE_TP, .link_speed_msk =HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | +HW_ATL_A0_RATE_1G | HW_ATL_A0_RATE_100M, };
@@ -284,7 +284,7 @@ static int hw_atl_a0_hw_init_rx_path(struct aq_hw_s *self)/* RSS Ring selection */ hw_atl_reg_rx_flr_rss_control1set (self, cfg->is_rss ? -0xB3333333U :0x00000000U ); +0xB3333333U :0x00000000U );/* Multicast filters */ for (i =HW_ATL_A0_MAC_MAX ; i--;) {
@@ -325,7 +325,7 @@ static int hw_atl_a0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr) } h = (mac_addr[0 ] <<8 ) | (mac_addr[1 ]); l = (mac_addr[2 ] <<24 ) | (mac_addr[3 ] <<16 ) | - (mac_addr[4 ] <<8 ) | mac_addr[5 ]; + (mac_addr[4 ] <<8 ) | mac_addr[5 ];hw_atl_rpfl2_uc_flr_en_set (self,0U ,HW_ATL_A0_MAC );hw_atl_rpfl2unicast_dest_addresslsw_set (self, l,HW_ATL_A0_MAC );
@@ -519,7 +519,7 @@ static int hw_atl_a0_hw_ring_rx_init(struct aq_hw_s *self,hw_atl_rdm_rx_desc_data_buff_size_set (self,AQ_CFG_RX_FRAME_MAX /1024U , - aq_ring->idx); + aq_ring->idx);hw_atl_rdm_rx_desc_head_buff_size_set (self,0U , aq_ring->idx);hw_atl_rdm_rx_desc_head_splitting_set (self,0U , aq_ring->idx);
@@ -758,7 +758,7 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,hw_atl_rpfl2_uc_flr_en_set (self, (self->aq_nic_cfg->is_mc_list_enabled && (i <= self->aq_nic_cfg->mc_list_count)) ? -1U :0U , i); +1U :0U , i);return aq_hw_err_from_flags (self); }
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +7 -7
@@ -52,9 +52,9 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = { DEFAULT_B0_BOARD_BASIC_CAPABILITIES, .media_type = AQ_HW_MEDIA_TYPE_FIBRE, .link_speed_msk =HW_ATL_B0_RATE_10G | -HW_ATL_B0_RATE_5G | +HW_ATL_B0_RATE_5G |HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | +HW_ATL_B0_RATE_1G | HW_ATL_B0_RATE_100M, };
@@ -62,18 +62,18 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = { DEFAULT_B0_BOARD_BASIC_CAPABILITIES, .media_type = AQ_HW_MEDIA_TYPE_TP, .link_speed_msk =HW_ATL_B0_RATE_10G | -HW_ATL_B0_RATE_5G | +HW_ATL_B0_RATE_5G |HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | +HW_ATL_B0_RATE_1G | HW_ATL_B0_RATE_100M, };const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {DEFAULT_B0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_B0_RATE_5G | + .link_speed_msk =HW_ATL_B0_RATE_5G |HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | +HW_ATL_B0_RATE_1G |HW_ATL_B0_RATE_100M , };
@@ -81,7 +81,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = { DEFAULT_B0_BOARD_BASIC_CAPABILITIES, .media_type = AQ_HW_MEDIA_TYPE_TP, .link_speed_msk =HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | +HW_ATL_B0_RATE_1G | HW_ATL_B0_RATE_100M, };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +17 -16
@@ -49,6 +49,7 @@#define FORCE_FLASHLESS 0static int hw_atl_utils_ver_match (u32 ver_expected,u32 ver_actual); +static int hw_atl_utils_mpi_set_state (struct aq_hw_s *self,enum hal_atl_utils_fw_state_e state);
@@ -69,10 +70,10 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops) self->fw_ver_actual) == 0) { *fw_ops = &aq_fw_1x_ops; } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X, - self->fw_ver_actual) == 0) { + self->fw_ver_actual) == 0) { *fw_ops = &aq_fw_2x_ops; } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X, - self->fw_ver_actual) == 0) { + self->fw_ver_actual) == 0) { *fw_ops = &aq_fw_2x_ops; } else { aq_pr_err("Bad FW version detected: %x\n",
@@ -260,7 +261,7 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)hw_atl_utils_mpi_set_state (self,MPI_DEINIT );AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,HW_ATL_MPI_STATE_ADR ) & -HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT , +HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT ,10 ,1000U ); }
@@ -277,7 +278,7 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,AQ_HW_WAIT_FOR (hw_atl_reg_glb_cpu_sem_get (self,HW_ATL_FW_SM_RAM ) ==1U , -1U ,10000U ); +1U ,10000U );if (err <0 ) {bool is_locked;
@@ -393,7 +394,7 @@ static int hw_atl_utils_init_ucp(struct aq_hw_s *self,/* check 10 times by 1ms */ AQ_HW_WAIT_FOR (0U != (self->mbox_addr = -aq_hw_read_reg (self,0x360U )),1000U ,10U ); +aq_hw_read_reg (self,0x360U )),1000U ,10U );return err; }
@@ -425,7 +426,7 @@ int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size) err =hw_atl_utils_fw_upload_dwords (self, self->rpc_addr, (u32 *)(void *)&self->rpc, (rpc_size +sizeof (u32) - -sizeof (u8)) /sizeof (u32)); +sizeof (u8)) /sizeof (u32));if (err <0 ) goto err_exit;
@@ -450,7 +451,7 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self, self->rpc_tid = sw.tid;AQ_HW_WAIT_FOR (sw.tid == - (fw.val = + (fw.val =aq_hw_read_reg (self,HW_ATL_RPC_STATE_ADR ), fw.tid),1000U ,100U );if (err <0 )
@@ -473,7 +474,7 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self, (u32 *)(void *) &self->rpc, (fw.len +sizeof (u32) - -sizeof (u8)) / +sizeof (u8)) / sizeof(u32));if (err <0 ) goto err_exit;
@@ -506,9 +507,9 @@ int hw_atl_utils_mpi_read_mbox(struct aq_hw_s *self, struct hw_aq_atl_utils_mbox_header *pmbox) {return hw_atl_utils_fw_downld_dwords (self, - self->mbox_addr, - (u32 *)(void *)pmbox, -sizeof (*pmbox) /sizeof (u32)); + self->mbox_addr, + (u32 *)(void *)pmbox, +sizeof (*pmbox) /sizeof (u32)); } void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
@@ -561,8 +562,8 @@ static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self, transaction_id = mbox.transaction_id;AQ_HW_WAIT_FOR (transaction_id != - (hw_atl_utils_mpi_read_mbox (self, &mbox), - mbox.transaction_id), + (hw_atl_utils_mpi_read_mbox (self, &mbox), + mbox.transaction_id),1000U ,100U );if (err <0 ) goto err_exit;
@@ -659,9 +660,9 @@ int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,if ((mac[0 ] &0x01U ) || ((mac[0 ] | mac[1 ] | mac[2 ]) ==0x00U )) {/* chip revision */ - l =0xE3000000U - | (0xFFFFU &aq_hw_read_reg (self,HW_ATL_UCP_0X370_REG )) - | (0x00 <<16 ); + l =0xE3000000U | + (0xFFFFU &aq_hw_read_reg (self,HW_ATL_UCP_0X370_REG )) | + (0x00 <<16 ); h =0x8001300EU ; mac[5 ] = (u8)(0xFFU & l);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +1 -0
@@ -416,6 +416,7 @@ int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version);int hw_atl_utils_update_stats (struct aq_hw_s *self);struct aq_stats_s *hw_atl_utils_get_hw_stats (struct aq_hw_s *self); +int hw_atl_utils_fw_downld_dwords (struct aq_hw_s *self,u32 a,u32 *p,u32 cnt);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +5 -7
@@ -76,7 +76,7 @@ static int aq_fw2x_init(struct aq_hw_s *self)/* check 10 times by 1ms */ AQ_HW_WAIT_FOR (0U != (self->mbox_addr = -aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR )), +aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR )),1000U ,10U ); AQ_HW_WAIT_FOR(0U != (self->rpc_addr = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_RPC_ADDR)),
@@ -213,7 +213,7 @@ static int aq_fw2x_update_link_status(struct aq_hw_s *self) {u32 mpi_state =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_STATE_ADDR );u32 speed = mpi_state & (FW2X_RATE_100M |FW2X_RATE_1G | -FW2X_RATE_2G5 |FW2X_RATE_5G |FW2X_RATE_10G ); +FW2X_RATE_2G5 |FW2X_RATE_5G |FW2X_RATE_10G );struct aq_hw_link_status_s *link_status = &self->aq_link_status;if (speed) {
@@ -262,9 +262,7 @@ static int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)get_random_bytes (&rnd,sizeof (unsigned int )); - l =0xE3000000U - | (0xFFFFU & rnd) - | (0x00 <<16 ); + l =0xE3000000U | (0xFFFFU & rnd) | (0x00 <<16 ); h =0x8001300EU ; mac[5 ] = (u8)(0xFFU & l);
@@ -294,7 +292,7 @@ int aq_fw2x_update_stats(struct aq_hw_s *self)/* Wait FW to report back */ AQ_HW_WAIT_FOR (orig_stats_val != (aq_hw_read_reg (self,HW_ATL_FW2X_MPI_STATE2_ADDR ) & -BIT (CAPS_HI_STATISTICS )), +BIT (CAPS_HI_STATISTICS )),1U ,10000U );if (err)return err;
@@ -466,5 +464,5 @@ const struct aq_fw_ops aq_fw_2x_ops = { .set_power = aq_fw2x_set_power, .set_eee_rate = aq_fw2x_set_eee_rate, .get_eee_rate = aq_fw2x_get_eee_rate, - .set_flow_control = aq_fw2x_set_flow_control, + .set_flow_control = aq_fw2x_set_flow_control, };
Signature · 1 line
2.7.4
Re: [PATCH net-next v2 5/7] net: aquantia: whitespace changes
Quoted 6 lines · Igor Russkikh
From: Nikita Danilov <[email protected]>
Removed extra spaces, corrected alignment.
Signed-off-by Nikita Danilov <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Andrew
PATCH v2 6/7 net: aquantia: renaming for better visibility
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
Removed extra characters from the names of structures to unify prefixes used through the driver code (we normally use hw_atl for hw specifics). HW_ATL_B0_ and HW_ATL_A0_ are the same and useless copies.
--- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 4 +-- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 32 ++++++++++---------- .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 6 ---- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 34 +++++++++++----------- .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 6 ---- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 14 ++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 14 ++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 6 ++-- 8 files changed, 52 insertions(+), 64 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -2
@@ -112,7 +112,7 @@ struct aq_hw_s {const struct aq_fw_ops *aq_fw_ops;void __iomem *mmio;struct aq_hw_link_status_s aq_link_status; -struct hw_aq_atl_utils_mbox mbox; +struct hw_atl_utils_mbox mbox;struct hw_atl_stats_s last_stats;struct aq_stats_s curr_stats;u64 speed;
@@ -124,7 +124,7 @@ struct aq_hw_s {u32 mbox_addr;u32 rpc_addr;u32 rpc_tid; -struct hw_aq_atl_utils_fw_rpc rpc; +struct hw_atl_utils_fw_rpc rpc; };struct aq_ring_s ;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +16 -16
@@ -49,37 +49,37 @@const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = {DEFAULT_A0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_FIBRE , - .link_speed_msk =HW_ATL_A0_RATE_5G | -HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | -HW_ATL_A0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = {DEFAULT_A0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_A0_RATE_10G | -HW_ATL_A0_RATE_5G | -HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | -HW_ATL_A0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_10G | +AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = {DEFAULT_A0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_A0_RATE_5G | -HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | -HW_ATL_A0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = {DEFAULT_A0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_A0_RATE_2G5 | -HW_ATL_A0_RATE_1G | -HW_ATL_A0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };static int hw_atl_a0_hw_reset (struct aq_hw_s *self)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h +0 -6
@@ -62,12 +62,6 @@#define HW_ATL_A0_MPI_SPEED_MSK 0xFFFFU#define HW_ATL_A0_MPI_SPEED_SHIFT 16U -#define HW_ATL_A0_RATE_10G BIT(0) -#define HW_ATL_A0_RATE_5G BIT(1) -#define HW_ATL_A0_RATE_2G5 BIT(3) -#define HW_ATL_A0_RATE_1G BIT(4) -#define HW_ATL_A0_RATE_100M BIT(5) -#define HW_ATL_A0_TXBUF_MAX 160U#define HW_ATL_A0_RXBUF_MAX 320U
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +17 -17
@@ -51,38 +51,38 @@const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = {DEFAULT_B0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_FIBRE , - .link_speed_msk =HW_ATL_B0_RATE_10G | -HW_ATL_B0_RATE_5G | -HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | -HW_ATL_B0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_10G | +AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = {DEFAULT_B0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_B0_RATE_10G | -HW_ATL_B0_RATE_5G | -HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | -HW_ATL_B0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_10G | +AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {DEFAULT_B0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_B0_RATE_5G | -HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | -HW_ATL_B0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_5G | +AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = {DEFAULT_B0_BOARD_BASIC_CAPABILITIES , .media_type =AQ_HW_MEDIA_TYPE_TP , - .link_speed_msk =HW_ATL_B0_RATE_2G5 | -HW_ATL_B0_RATE_1G | -HW_ATL_B0_RATE_100M , + .link_speed_msk =AQ_NIC_RATE_2GS | +AQ_NIC_RATE_1G | +AQ_NIC_RATE_100M , };static int hw_atl_b0_hw_reset (struct aq_hw_s *self)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h +0 -6
@@ -67,12 +67,6 @@#define HW_ATL_B0_MPI_SPEED_MSK 0xFFFFU#define HW_ATL_B0_MPI_SPEED_SHIFT 16U -#define HW_ATL_B0_RATE_10G BIT(0) -#define HW_ATL_B0_RATE_5G BIT(1) -#define HW_ATL_B0_RATE_2G5 BIT(3) -#define HW_ATL_B0_RATE_1G BIT(4) -#define HW_ATL_B0_RATE_100M BIT(5) -#define HW_ATL_B0_TXBUF_MAX 160U#define HW_ATL_B0_RXBUF_MAX 320U
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +7 -7
@@ -439,7 +439,7 @@ int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size) }int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, -struct hw_aq_atl_utils_fw_rpc **rpc) +struct hw_atl_utils_fw_rpc **rpc) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
@@ -504,7 +504,7 @@ static int hw_atl_utils_mpi_create(struct aq_hw_s *self) }int hw_atl_utils_mpi_read_mbox (struct aq_hw_s *self, -struct hw_aq_atl_utils_mbox_header *pmbox) +struct hw_atl_utils_mbox_header *pmbox) { return hw_atl_utils_fw_downld_dwords(self, self->mbox_addr,
@@ -513,7 +513,7 @@ int hw_atl_utils_mpi_read_mbox(struct aq_hw_s *self, }void hw_atl_utils_mpi_read_stats (struct aq_hw_s *self, -struct hw_aq_atl_utils_mbox *pmbox) +struct hw_atl_utils_mbox *pmbox) {int err =0 ;
@@ -553,7 +553,7 @@ static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self, {int err =0 ;u32 transaction_id =0 ; -struct hw_aq_atl_utils_mbox_header mbox; +struct hw_atl_utils_mbox_header mbox;u32 val =aq_hw_read_reg (self,HW_ATL_MPI_CONTROL_ADR );if (state ==MPI_RESET ) {
@@ -747,7 +747,7 @@ static int hw_atl_fw1x_deinit(struct aq_hw_s *self)int hw_atl_utils_update_stats (struct aq_hw_s *self) { -struct hw_aq_atl_utils_mbox mbox; +struct hw_atl_utils_mbox mbox;hw_atl_utils_mpi_read_stats (self, &mbox);
@@ -834,7 +834,7 @@ int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version)static int aq_fw1x_set_wol (struct aq_hw_s *self,bool wol_enabled,u8 *mac) { -struct hw_aq_atl_utils_fw_rpc *prpc =NULL ; +struct hw_atl_utils_fw_rpc *prpc =NULL ;unsigned int rpc_size =0U ;int err =0 ;
@@ -873,7 +873,7 @@ static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac)int aq_fw1x_set_power (struct aq_hw_s *self,unsigned int power_state,u8 *mac) { -struct hw_aq_atl_utils_fw_rpc *prpc =NULL ; +struct hw_atl_utils_fw_rpc *prpc =NULL ;unsigned int rpc_size =0U ;int err =0 ;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +7 -7
@@ -75,7 +75,7 @@ union __packed ip_addr { } v4; }; -struct __packed hw_aq_atl_utils_fw_rpc { +struct __packed hw_atl_utils_fw_rpc {u32 msg_id;union {
@@ -165,7 +165,7 @@ struct __packed hw_aq_atl_utils_fw_rpc { }; }; -struct __packed hw_aq_atl_utils_mbox_header { +struct __packed hw_atl_utils_mbox_header {u32 version;u32 transaction_id;u32 error;
@@ -183,8 +183,8 @@ struct __packed hw_aq_info {u32 caps_hi; }; -struct __packed hw_aq_atl_utils_mbox { -struct hw_aq_atl_utils_mbox_header header; +struct __packed hw_atl_utils_mbox { +struct hw_atl_utils_mbox_header header;struct hw_atl_stats_s stats;struct hw_aq_info info; };
@@ -386,10 +386,10 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self);void hw_atl_utils_hw_chip_features_init (struct aq_hw_s *self,u32 *p);int hw_atl_utils_mpi_read_mbox (struct aq_hw_s *self, -struct hw_aq_atl_utils_mbox_header *pmbox); +struct hw_atl_utils_mbox_header *pmbox);void hw_atl_utils_mpi_read_stats (struct aq_hw_s *self, -struct hw_aq_atl_utils_mbox *pmbox); +struct hw_atl_utils_mbox *pmbox); void hw_atl_utils_mpi_set(struct aq_hw_s *self, enum hal_atl_utils_fw_state_e state,
@@ -425,7 +425,7 @@ int hw_atl_utils_fw_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac);int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size);int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, -struct hw_aq_atl_utils_fw_rpc **rpc); +struct hw_atl_utils_fw_rpc **rpc);extern const struct aq_fw_ops aq_fw_1x_ops;extern const struct aq_fw_ops aq_fw_2x_ops;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +3 -3
@@ -302,7 +302,7 @@ int aq_fw2x_update_stats(struct aq_hw_s *self)static int aq_fw2x_set_sleep_proxy (struct aq_hw_s *self,u8 *mac) { -struct hw_aq_atl_utils_fw_rpc *rpc =NULL ; +struct hw_atl_utils_fw_rpc *rpc =NULL ;struct offload_info *cfg =NULL ;unsigned int rpc_size =0U ;u32 mpi_opts;
@@ -344,7 +344,7 @@ static int aq_fw2x_set_sleep_proxy(struct aq_hw_s *self, u8 *mac)static int aq_fw2x_set_wol_params (struct aq_hw_s *self,u8 *mac) { -struct hw_aq_atl_utils_fw_rpc *rpc =NULL ; +struct hw_atl_utils_fw_rpc *rpc =NULL ;struct fw2x_msg_wol *msg =NULL ;u32 mpi_opts;int err =0 ;
@@ -412,7 +412,7 @@ static int aq_fw2x_get_eee_rate(struct aq_hw_s *self, u32 *rate,u32 mpi_state;u32 caps_hi;int err =0 ; -u32 addr = self->mbox_addr + offsetof(struct hw_aq_atl_utils_mbox , info) + +u32 addr = self->mbox_addr + offsetof(struct hw_atl_utils_mbox , info) + offsetof(struct hw_aq_info , caps_hi); err = hw_atl_utils_fw_downld_dwords(self, addr, &caps_hi,
Signature · 1 line
2.7.4
Re: [PATCH net-next v2 6/7] net: aquantia: renaming for better visibility
Quoted 8 lines · Igor Russkikh
From: Nikita Danilov <[email protected]>
Removed extra characters from the names of structures to unify prefixes used through the driver code (we normally use
hw_atlfor hw specifics).HW_ATL_B0_andHW_ATL_A0_are the same and useless copies.Signed-off-by Nikita Danilov <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Andrew
PATCH v2 7/7 net: aquantia: bump driver version
In reply to Igor Russkikh--- drivers/net/ethernet/aquantia/atlantic/ver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/ver.h +1 -1
@@ -12,7 +12,7 @@#define NIC_MAJOR_DRIVER_VERSION 2#define NIC_MINOR_DRIVER_VERSION 0 -#define NIC_BUILD_DRIVER_VERSION 3 +#define NIC_BUILD_DRIVER_VERSION 4#define NIC_REVISION_DRIVER_VERSION 0#define AQ_CFG_DRV_VERSION_SUFFIX "-kern"
Signature · 1 line
2.7.4