Aquantia Marvell atlantic driver updates 11-2019
Subsystems (5)
v2 cover Aquantia Marvell atlantic driver updates 11-2019
Hi David,
Here is a bunch of atlantic driver new features and updates.
Shortlist:
- Me adding ethtool private flags for various loopback test modes,
- Nikita is doing some work here on power management, implementing new PM API, He also did some checkpatch style cleanup of older driver parts.
- I'm also adding a new UDP GSO offload support and flags for loopback activation
- We are now Marvell, so I am changing email addresses on maintainers list.
v2: styling, ip6 correct handling in udpgso
Igor Russkikh (4):
net: atlantic: loopback tests via private flags
net: atlantic: stylistic renames
net: atlantic: implement UDP GSO offload
net: atlantic: change email domains to Marvell
Nikita Danilov (8):
net: atlantic: update firmware interface
net: atlantic: implement wake_phy feature
net: atlantic: refactoring pm logic
net: atlantic: add msglevel configuration
net: atlantic: adding ethtool physical identification
net: atlantic: add fw configuration memory area
net: atlantic: code style cleanup
net: atlantic: update flow control logic
.../device_drivers/aquantia/atlantic.txt | 46 +++- MAINTAINERS | 4 +- .../net/ethernet/aquantia/atlantic/Makefile | 7 - .../net/ethernet/aquantia/atlantic/aq_cfg.h | 9 +- .../ethernet/aquantia/atlantic/aq_ethtool.c | 235 ++++++++++++---- .../ethernet/aquantia/atlantic/aq_ethtool.h | 1 + .../net/ethernet/aquantia/atlantic/aq_hw.h | 24 ++ .../ethernet/aquantia/atlantic/aq_hw_utils.c | 1 + .../net/ethernet/aquantia/atlantic/aq_main.c | 15 +- .../net/ethernet/aquantia/atlantic/aq_nic.c | 232 +++++++++------- .../net/ethernet/aquantia/atlantic/aq_nic.h | 28 +- .../ethernet/aquantia/atlantic/aq_pci_func.c | 95 ++++++- .../net/ethernet/aquantia/atlantic/aq_ptp.c | 6 +- .../net/ethernet/aquantia/atlantic/aq_ring.c | 6 +- .../net/ethernet/aquantia/atlantic/aq_ring.h | 7 +- .../net/ethernet/aquantia/atlantic/aq_vec.c | 8 +- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 43 +-- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 112 +++++--- .../aquantia/atlantic/hw_atl/hw_atl_llh.c | 26 ++ .../aquantia/atlantic/hw_atl/hw_atl_llh.h | 11 + .../atlantic/hw_atl/hw_atl_llh_internal.h | 54 ++++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 207 +++++++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 228 ++++++++-------- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 253 ++++++++++-------- 24 files changed, 1112 insertions(+), 546 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/12 net: atlantic: update firmware interface
From: Nikita Danilov <[email protected]>
Here we improve FW interface structures layout and prepare these for the wake phy feature implementation.
--- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 18 +- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 173 ++++++------------ 2 files changed, 72 insertions(+), 119 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +11 -7
@@ -858,22 +858,26 @@ static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac)memset (prpc,0 ,sizeof (*prpc));if (wol_enabled) { - rpc_size =sizeof (prpc->msg_id) +sizeof (prpc->msg_wol); + rpc_size = offsetof(struct hw_atl_utils_fw_rpc , msg_wol_add) + +sizeof (prpc->msg_wol_add); + prpc->msg_id =HAL_ATLANTIC_UTILS_FW_MSG_WOL_ADD ; - prpc->msg_wol.priority = + prpc->msg_wol_add.priority =HAL_ATLANTIC_UTILS_FW_MSG_WOL_PRIOR ; - prpc->msg_wol.pattern_id = + prpc->msg_wol_add.pattern_id =HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN ; - prpc->msg_wol.wol_packet_type = + prpc->msg_wol_add.packet_type =HAL_ATLANTIC_UTILS_FW_MSG_WOL_MAG_PKT ; -ether_addr_copy ((u8 *)&prpc->msg_wol.wol_pattern, mac); +ether_addr_copy ((u8 *)&prpc->msg_wol_add.magic_packet_pattern, + mac); }else { - rpc_size =sizeof (prpc->msg_id) +sizeof (prpc->msg_del_id); + rpc_size =sizeof (prpc->msg_wol_remove) + + offsetof(struct hw_atl_utils_fw_rpc , msg_wol_remove); prpc->msg_id =HAL_ATLANTIC_UTILS_FW_MSG_WOL_DEL ; - prpc->msg_wol.pattern_id = + prpc->msg_wol_add.pattern_id =HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN ; }
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +61 -112
250 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/12 net: atlantic: implement wake_phy feature
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
Wake on PHY allows to configure device to wakeup host as soon as PHY link status is changed to active.
--- .../net/ethernet/aquantia/atlantic/aq_cfg.h | 3 + .../ethernet/aquantia/atlantic/aq_ethtool.c | 18 ++- .../net/ethernet/aquantia/atlantic/aq_main.c | 4 +- .../net/ethernet/aquantia/atlantic/aq_nic.c | 34 +++--- .../net/ethernet/aquantia/atlantic/aq_nic.h | 6 +- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 7 +- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 111 ++++++------------ 7 files changed, 73 insertions(+), 110 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h +3 -0
@@ -78,6 +78,9 @@#define AQ_CFG_FC_MODE AQ_NIC_FC_FULL +/* Default WOL modes used on initialization */ +#define AQ_CFG_WOL_MODES WAKE_MAGIC +#define AQ_CFG_SPEED_MSK 0xFFFFU/* 0xFFFFU==auto_neg */ #define AQ_CFG_IS_AUTONEG_DEF 1U
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +8 -10
@@ -356,11 +356,8 @@ static void aq_ethtool_get_wol(struct net_device *ndev,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 ; + wol->supported =AQ_NIC_WOL_MODES ; + wol->wolopts = cfg->wol; } static int aq_ethtool_set_wol(struct net_device *ndev,
@@ -371,11 +368,12 @@ static int aq_ethtool_set_wol(struct net_device *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); +if (wol->wolopts & ~AQ_NIC_WOL_MODES ) +return -EOPNOTSUPP ; + + cfg->wol = wol->wolopts; + + err =device_set_wakeup_enable (&pdev->dev, !!cfg->wol);return err; }
drivers/net/ethernet/aquantia/atlantic/aq_main.c +2 -2
@@ -74,7 +74,7 @@ static int aq_ndev_open(struct net_device *ndev) err_exit:if (err <0 ) -aq_nic_deinit (aq_nic); +aq_nic_deinit (aq_nic, true);return err; }
@@ -86,7 +86,7 @@ static int aq_ndev_close(struct net_device *ndev) err =aq_nic_stop (aq_nic);if (err <0 ) goto err_exit; -aq_nic_deinit (aq_nic); +aq_nic_deinit (aq_nic, true); err_exit:return err;
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +19 -15
@@ -79,6 +79,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) cfg->num_rss_queues =AQ_CFG_NUM_RSS_QUEUES_DEF ; cfg->aq_rss.base_cpu_number =AQ_CFG_RSS_BASE_CPU_NUM_DEF ; cfg->flow_control =AQ_CFG_FC_MODE ; + cfg->wol =AQ_CFG_WOL_MODES ; cfg->mtu =AQ_CFG_MTU_DEF ; cfg->link_speed_msk =AQ_CFG_SPEED_MSK ;
@@ -1000,7 +1001,20 @@ int aq_nic_stop(struct aq_nic_s *self)return self->aq_hw_ops->hw_stop (self->aq_hw); } -void aq_nic_deinit (struct aq_nic_s *self) +void aq_nic_set_power (struct aq_nic_s *self) +{ +if (self->power_state !=AQ_HW_POWER_STATE_D0 || + self->aq_hw->aq_nic_cfg->wol) +if (likely (self->aq_fw_ops->set_power)) { +mutex_lock (&self->fwreq_mutex); + self->aq_fw_ops->set_power (self->aq_hw, + self->power_state, + self->ndev->dev_addr); +mutex_unlock (&self->fwreq_mutex); + } +} + +void aq_nic_deinit (struct aq_nic_s *self,bool link_down) {struct aq_vec_s *aq_vec =NULL ;unsigned int i =0U ;
@@ -1017,23 +1031,12 @@ void aq_nic_deinit(struct aq_nic_s *self)aq_ptp_ring_free (self);aq_ptp_free (self); -if (likely (self->aq_fw_ops->deinit)) { +if (likely (self->aq_fw_ops->deinit) && link_down) {mutex_lock (&self->fwreq_mutex); self->aq_fw_ops->deinit (self->aq_hw);mutex_unlock (&self->fwreq_mutex); } -if (self->power_state !=AQ_HW_POWER_STATE_D0 || - self->aq_hw->aq_nic_cfg->wol) -if (likely (self->aq_fw_ops->set_power)) { -mutex_lock (&self->fwreq_mutex); - self->aq_fw_ops->set_power (self->aq_hw, - self->power_state, - self->ndev->dev_addr); -mutex_unlock (&self->fwreq_mutex); - } - - err_exit:; }
@@ -1072,7 +1075,7 @@ int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg)if (err <0 ) goto err_exit; -aq_nic_deinit (self); +aq_nic_deinit (self, !self->aq_hw->aq_nic_cfg->wol); }else { err =aq_nic_init (self);if (err <0 )
@@ -1108,7 +1111,8 @@ void aq_nic_shutdown(struct aq_nic_s *self)if (err <0 ) goto err_exit; } -aq_nic_deinit (self); +aq_nic_deinit (self, !self->aq_hw->aq_nic_cfg->wol); +aq_nic_set_power (self); err_exit:rtnl_unlock ();
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +4 -2
@@ -60,7 +60,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_WOL_MODES (WAKE_MAGIC |\ + WAKE_PHY)#define AQ_NIC_TCVEC2RING (_NIC_, _TC_, _VEC_) \ ((_TC_) * AQ_CFG_TCS_MAX + (_VEC_))
@@ -141,7 +142,8 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p);int aq_nic_get_regs_count (struct aq_nic_s *self);void aq_nic_get_stats (struct aq_nic_s *self,u64 *data);int aq_nic_stop (struct aq_nic_s *self); -void aq_nic_deinit (struct aq_nic_s *self); +void aq_nic_deinit (struct aq_nic_s *self,bool link_down); +void aq_nic_set_power (struct aq_nic_s *self);void aq_nic_free_hot_resources (struct aq_nic_s *self);void aq_nic_free_vectors (struct aq_nic_s *self);int aq_nic_set_mtu (struct aq_nic_s *self,int new_mtu);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +4 -3
@@ -845,7 +845,8 @@ int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version)return 0 ; } -static int aq_fw1x_set_wol (struct aq_hw_s *self,bool wol_enabled,u8 *mac) +static int aq_fw1x_set_wake_magic (struct aq_hw_s *self,bool wol_enabled, +u8 *mac) {struct hw_atl_utils_fw_rpc *prpc =NULL ;unsigned int rpc_size =0U ;
@@ -894,8 +895,8 @@ static int aq_fw1x_set_power(struct aq_hw_s *self, unsigned int power_state,unsigned int rpc_size =0U ;int err =0 ; -if (self->aq_nic_cfg->wol &AQ_NIC_WOL_ENABLED ) { - err =aq_fw1x_set_wol (self,1 , mac); +if (self->aq_nic_cfg->wol &WAKE_MAGIC ) { + err =aq_fw1x_set_wake_magic (self,1 , mac);if (err <0 ) goto err_exit;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +33 -78
140 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 3/12 net: atlantic: refactoring pm logic
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
We now implement .driver.pm callbacks, these allows driver to work correctly in hibernate usecases, especially when used in conjunction with WOL feature.
Before that driver only reacted to legacy .suspend/.resume callbacks, that was a limitation in some cases.
--- .../net/ethernet/aquantia/atlantic/aq_nic.c | 38 -------- .../net/ethernet/aquantia/atlantic/aq_nic.h | 1 - .../ethernet/aquantia/atlantic/aq_pci_func.c | 87 +++++++++++++++++-- 3 files changed, 78 insertions(+), 48 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +0 -38
@@ -1057,44 +1057,6 @@ void aq_nic_free_vectors(struct aq_nic_s *self) err_exit:; } -int aq_nic_change_pm_state (struct aq_nic_s *self,pm_message_t *pm_msg) -{ -int err =0 ; - -if (!netif_running (self->ndev)) { - err =0 ; - goto out; - } -rtnl_lock (); -if (pm_msg->event &PM_EVENT_SLEEP || pm_msg->event &PM_EVENT_FREEZE ) { - self->power_state =AQ_HW_POWER_STATE_D3 ; -netif_device_detach (self->ndev); -netif_tx_stop_all_queues (self->ndev); - - err =aq_nic_stop (self); -if (err <0 ) - goto err_exit; - -aq_nic_deinit (self, !self->aq_hw->aq_nic_cfg->wol); - }else { - err =aq_nic_init (self); -if (err <0 ) - goto err_exit; - - err =aq_nic_start (self); -if (err <0 ) - goto err_exit; - -netif_device_attach (self->ndev); -netif_tx_start_all_queues (self->ndev); - } - -err_exit: -rtnl_unlock (); -out: -return err; -} -void aq_nic_shutdown (struct aq_nic_s *self) {int err =0 ;
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +0 -1
@@ -157,7 +157,6 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, const struct ethtool_link_ksettings *cmd);struct aq_nic_cfg_s *aq_nic_get_cfg (struct aq_nic_s *self);u32 aq_nic_get_fw_version (struct aq_nic_s *self); -int aq_nic_change_pm_state (struct aq_nic_s *self,pm_message_t *pm_msg);int aq_nic_update_interrupt_moderation_settings (struct aq_nic_s *self);void aq_nic_shutdown (struct aq_nic_s *self);u8 aq_nic_reserve_filter (struct aq_nic_s *self,enum aq_rx_filter_type type);
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +78 -9
107 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 4/12 net: atlantic: add msglevel configuration
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
We add ethtool msglevel configuration and change some printouts to use netdev_info set of functions.
--- .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 16 ++++++++++++++++ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 7 ++++--- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +16 -0
@@ -607,6 +607,20 @@ static int aq_set_ringparam(struct net_device *ndev,return err; } +static u32 aq_get_msg_level (struct net_device *ndev) +{ +struct aq_nic_s *aq_nic =netdev_priv (ndev); + +return aq_nic->msg_enable; +} + +static void aq_set_msg_level (struct net_device *ndev,u32 data) +{ +struct aq_nic_s *aq_nic =netdev_priv (ndev); + + aq_nic->msg_enable = data; +} +const struct ethtool_ops aq_ethtool_ops = { .get_link = aq_ethtool_get_link, .get_regs_len = aq_ethtool_get_regs_len,
@@ -628,6 +642,8 @@ const struct ethtool_ops aq_ethtool_ops = { .set_rxfh = aq_ethtool_set_rss, .get_rxnfc = aq_ethtool_get_rxnfc, .set_rxnfc = aq_ethtool_set_rxnfc, + .get_msglevel = aq_get_msg_level, + .set_msglevel = aq_set_msg_level, .get_sset_count = aq_ethtool_get_sset_count, .get_ethtool_stats = aq_ethtool_stats, .get_link_ksettings = aq_ethtool_get_link_ksettings,
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +4 -3
@@ -144,9 +144,9 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)return err;if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps) { -pr_info ("%s: link change old %d new %d\n" , -AQ_CFG_DRV_NAME , self->link_status.mbps, - self->aq_hw->aq_link_status.mbps); +netdev_info (self->ndev,"%s: link change old %d new %d\n" , +AQ_CFG_DRV_NAME , self->link_status.mbps, + self->aq_hw->aq_link_status.mbps);aq_nic_update_interrupt_moderation_settings (self);if (self->aq_ptp) {
@@ -306,6 +306,7 @@ void aq_nic_ndev_init(struct aq_nic_s *self) self->ndev->priv_flags = aq_hw_caps->hw_priv_flags; self->ndev->priv_flags |=IFF_LIVE_ADDR_CHANGE ; + self->msg_enable =NETIF_MSG_DRV |NETIF_MSG_LINK ; self->ndev->mtu = aq_nic_cfg->mtu -ETH_HLEN ; self->ndev->max_mtu = aq_hw_caps->mtu -ETH_FCS_LEN -ETH_HLEN ;
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +1 -0
@@ -88,6 +88,7 @@ struct aq_hw_rx_fltrs_s {struct aq_nic_s {atomic_t flags; +u32 msg_enable;struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX ];struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX *AQ_CFG_TCS_MAX ];struct aq_hw_s *aq_hw;
Signature · 1 line
2.17.1
PATCH v2 5/12 net: atlantic: adding ethtool physical identification
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
ethtool -p eth0 will blink leds helping identify physical port.
--- .../ethernet/aquantia/atlantic/aq_ethtool.c | 30 +++++++++++++++++++ .../net/ethernet/aquantia/atlantic/aq_hw.h | 5 ++++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 1 + .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 14 +++++++++ 4 files changed, 50 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +30 -0
@@ -153,6 +153,35 @@ static void aq_ethtool_get_strings(struct net_device *ndev, } } +static int aq_ethtool_set_phys_id (struct net_device *ndev, +enum ethtool_phys_id_state state) +{ +struct aq_nic_s *aq_nic =netdev_priv (ndev); +struct aq_hw_s *hw = aq_nic->aq_hw; +int ret =0 ; + +if (!aq_nic->aq_fw_ops->led_control) +return -EOPNOTSUPP ; + +mutex_lock (&aq_nic->fwreq_mutex); + +switch (state) { +case ETHTOOL_ID_ACTIVE : + ret = aq_nic->aq_fw_ops->led_control (hw,AQ_HW_LED_BLINK | +AQ_HW_LED_BLINK <<2 |AQ_HW_LED_BLINK <<4 ); +break ; +case ETHTOOL_ID_INACTIVE : + ret = aq_nic->aq_fw_ops->led_control (hw,AQ_HW_LED_DEFAULT ); +break ; +default : +break ; + } + +mutex_unlock (&aq_nic->fwreq_mutex); + +return ret; +} +static int aq_ethtool_get_sset_count (struct net_device *ndev,int stringset) {int ret =0 ;
@@ -627,6 +656,7 @@ const struct ethtool_ops aq_ethtool_ops = { .get_regs = aq_ethtool_get_regs, .get_drvinfo = aq_ethtool_get_drvinfo, .get_strings = aq_ethtool_get_strings, + .set_phys_id = aq_ethtool_set_phys_id, .get_rxfh_indir_size = aq_ethtool_get_rss_indir_size, .get_wol = aq_ethtool_get_wol, .set_wol = aq_ethtool_set_wol,
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +5 -0
@@ -119,6 +119,9 @@ struct aq_stats_s {#define AQ_HW_MULTICAST_ADDRESS_MAX 32U +#define AQ_HW_LED_BLINK 0x2U +#define AQ_HW_LED_DEFAULT 0x0U +struct aq_hw_s {atomic_t flags;u8 rbl_enabled:1 ;
@@ -304,6 +307,8 @@ struct aq_fw_ops {int (*set_flow_control)(struct aq_hw_s *self); +int (*led_control)(struct aq_hw_s *self,u32 mode); +int (*set_power)(struct aq_hw_s *self,unsigned int power_state,u8 *mac);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +1 -0
@@ -970,4 +970,5 @@ const struct aq_fw_ops aq_fw_1x_ops = { .set_flow_control = NULL, .send_fw_request = NULL, .enable_ptp = NULL, + .led_control = NULL, };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +14 -0
@@ -17,6 +17,7 @@#include "hw_atl_utils.h" #include "hw_atl_llh.h" +#define HW_ATL_FW2X_MPI_LED_ADDR 0x31c#define HW_ATL_FW2X_MPI_RPC_ADDR 0x334#define HW_ATL_FW2X_MPI_MBOX_ADDR 0x360
@@ -51,6 +52,8 @@#define HAL_ATLANTIC_WOL_FILTERS_COUNT 8#define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL 0x0E +#define HW_ATL_FW_VER_LED 0x03010026U +struct __packed fw2x_msg_wol_pattern {u8 mask[16 ];u32 crc;
@@ -450,6 +453,16 @@ static void aq_fw3x_enable_ptp(struct aq_hw_s *self, int enable)aq_hw_write_reg (self,HW_ATL_FW3X_EXT_CONTROL_ADDR , ptp_opts); } +static int aq_fw2x_led_control (struct aq_hw_s *self,u32 mode) +{ +if (self->fw_ver_actual <HW_ATL_FW_VER_LED ) +return -EOPNOTSUPP ; + +aq_hw_write_reg (self,HW_ATL_FW2X_MPI_LED_ADDR , mode); + +return 0 ; +} +static int aq_fw2x_set_eee_rate (struct aq_hw_s *self,u32 speed) {u32 mpi_opts =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR );
@@ -557,4 +570,5 @@ const struct aq_fw_ops aq_fw_2x_ops = { .get_flow_control = aq_fw2x_get_flow_control, .send_fw_request = aq_fw2x_send_fw_request, .enable_ptp = aq_fw3x_enable_ptp, + .led_control = aq_fw2x_led_control, };
Signature · 1 line
2.17.1
PATCH v2 6/12 net: atlantic: add fw configuration memory area
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
Device FW has a separate memory area where various config fields are stored and could be used by the driver.
Here we modify download/upload infrastructure to allow accessing this area.
Lateron this will be used to configure various behaviours
--- .../net/ethernet/aquantia/atlantic/aq_hw.h | 1 + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 129 +++++++++++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 47 ++++++- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 19 ++- 4 files changed, 159 insertions(+), 37 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +1 -0
@@ -140,6 +140,7 @@ struct aq_hw_s {atomic_t dpc;u32 mbox_addr;u32 rpc_addr; +u32 settings_addr;u32 rpc_tid;struct hw_atl_utils_fw_rpc rpc;s64 ptp_clk_offset;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +95 -34
164 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +46 -1
59 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +17 -2
@@ -78,6 +78,7 @@ static int aq_fw2x_set_state(struct aq_hw_s *self,static u32 aq_fw2x_mbox_get (struct aq_hw_s *self);static u32 aq_fw2x_rpc_get (struct aq_hw_s *self); +static int aq_fw2x_settings_get (struct aq_hw_s *self,u32 *addr);static u32 aq_fw2x_state2_get (struct aq_hw_s *self);static int aq_fw2x_init (struct aq_hw_s *self)
@@ -95,6 +96,8 @@ static int aq_fw2x_init(struct aq_hw_s *self) self->rpc_addr !=0U , 1000U, 100000U); + err =aq_fw2x_settings_get (self, &self->settings_addr); +return err; }
@@ -418,8 +421,7 @@ static int aq_fw2x_send_fw_request(struct aq_hw_s *self, dword_cnt = size /sizeof (u32);if (size %sizeof (u32)) dword_cnt++; - err =hw_atl_utils_fw_upload_dwords (self,aq_fw2x_rpc_get (self), - (void *)fw_req, dword_cnt); + err =hw_atl_write_fwcfg_dwords (self, (void *)fw_req, dword_cnt);if (err <0 ) goto err_exit;
@@ -547,6 +549,19 @@ static u32 aq_fw2x_rpc_get(struct aq_hw_s *self)return aq_hw_read_reg (self,HW_ATL_FW2X_MPI_RPC_ADDR ); } +static int aq_fw2x_settings_get (struct aq_hw_s *self,u32 *addr) +{ +int err =0 ; +u32 offset; + + offset = self->mbox_addr + offsetof(struct hw_atl_utils_mbox , + info.setting_address); + + err =hw_atl_utils_fw_downld_dwords (self, offset, addr,1 ); + +return err; +} +static u32 aq_fw2x_state2_get (struct aq_hw_s *self) {return aq_hw_read_reg (self,HW_ATL_FW2X_MPI_STATE2_ADDR );
Signature · 1 line
2.17.1
PATCH v2 7/12 net: atlantic: loopback tests via private flags
In reply to Igor RusskikhHere we add a number of ethtool private flags
to allow enabling various loopbacks on HW.
Thats useful for verification and bringup works.
--- .../device_drivers/aquantia/atlantic.txt | 25 +++++++++ .../ethernet/aquantia/atlantic/aq_ethtool.c | 55 ++++++++++++++++++- .../ethernet/aquantia/atlantic/aq_ethtool.h | 1 + .../net/ethernet/aquantia/atlantic/aq_hw.h | 18 ++++++ .../net/ethernet/aquantia/atlantic/aq_nic.c | 45 +++++++++++++++ .../net/ethernet/aquantia/atlantic/aq_nic.h | 2 + .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 30 +++++++++- .../aquantia/atlantic/hw_atl/hw_atl_llh.c | 26 +++++++++ .../aquantia/atlantic/hw_atl/hw_atl_llh.h | 11 ++++ .../atlantic/hw_atl/hw_atl_llh_internal.h | 54 ++++++++++++++++++ .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 32 +++++++++++ 11 files changed, 297 insertions(+), 2 deletions(-)
Documentation/networking/device_drivers/aquantia/atlantic.txt +25 -0
@@ -325,6 +325,31 @@ Supported ethtool options Example: ethtool -N eth0 flow-type udp4 action 0 loc 32 + Private flags (testing) + --------------------------------- + + Atlantic driver supports private flags for hardware custom features: + + $ ethtool --show-priv-flags ethX + + Private flags for ethX: + DMASystemLoopback : off + PKTSystemLoopback : off + DMANetworkLoopback : off + PHYInternalLoopback: off + PHYExternalLoopback: off + + Example: + + $ ethtool --set-priv-flags ethX DMASystemLoopback on + + DMASystemLoopback: DMA Host loopback. + PKTSystemLoopback: Packet buffer host loopback. + DMANetworkLoopback: Network side loopback on DMA block. + PHYInternalLoopback: Internal loopback on Phy. + PHYExternalLoopback: External loopback on Phy (with loopback ethernet cable). + + Command Line Parameters ======================= The following command line parameters are available on atlantic driver:
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +54 -1
91 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h +1 -0
@@ -12,5 +12,6 @@#include "aq_common.h" extern const struct ethtool_ops aq_ethtool_ops; +#define AQ_PRIV_FLAGS_MASK (AQ_HW_LOOPBACK_MASK)#endif /* AQ_ETHTOOL_H */
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +18 -0
@@ -122,6 +122,20 @@ struct aq_stats_s {#define AQ_HW_LED_BLINK 0x2U#define AQ_HW_LED_DEFAULT 0x0U +enum aq_priv_flags { +AQ_HW_LOOPBACK_DMA_SYS , +AQ_HW_LOOPBACK_PKT_SYS , +AQ_HW_LOOPBACK_DMA_NET , +AQ_HW_LOOPBACK_PHYINT_SYS , +AQ_HW_LOOPBACK_PHYEXT_SYS , +}; + +#define AQ_HW_LOOPBACK_MASK (BIT(AQ_HW_LOOPBACK_DMA_SYS) |\ + BIT(AQ_HW_LOOPBACK_PKT_SYS) |\ + BIT(AQ_HW_LOOPBACK_DMA_NET) |\ + BIT(AQ_HW_LOOPBACK_PHYINT_SYS) |\ + BIT(AQ_HW_LOOPBACK_PHYEXT_SYS)) +struct aq_hw_s {atomic_t flags;u8 rbl_enabled:1 ;
@@ -280,6 +294,8 @@ struct aq_hw_ops { u64 *timestamp);int (*hw_set_fc)(struct aq_hw_s *self,u32 fc,u32 tc); + +int (*hw_set_loopback)(struct aq_hw_s *self,u32 mode,bool enable); };struct aq_fw_ops {
@@ -310,6 +326,8 @@ struct aq_fw_ops {int (*led_control)(struct aq_hw_s *self,u32 mode); +int (*set_phyloopback)(struct aq_hw_s *self,u32 mode,bool enable); +int (*set_power)(struct aq_hw_s *self,unsigned int power_state,u8 *mac);
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +45 -0
63 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +2 -0
@@ -46,6 +46,7 @@ struct aq_nic_cfg_s {bool is_polling;bool is_rss;bool is_lro; +u32 priv_flags;u8 tcs;struct aq_rss_parameters aq_rss;u32 eee_speeds;
@@ -158,6 +159,7 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, const struct ethtool_link_ksettings *cmd);struct aq_nic_cfg_s *aq_nic_get_cfg (struct aq_nic_s *self);u32 aq_nic_get_fw_version (struct aq_nic_s *self); +int aq_nic_set_loopback (struct aq_nic_s *self);int aq_nic_update_interrupt_moderation_settings (struct aq_nic_s *self);void aq_nic_shutdown (struct aq_nic_s *self);u8 aq_nic_reserve_filter (struct aq_nic_s *self,enum aq_rx_filter_type type);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +29 -1
@@ -1427,6 +1427,30 @@ static int hw_atl_b0_hw_vlan_ctrl(struct aq_hw_s *self, bool enable)return aq_hw_err_from_flags (self); } +static int hw_atl_b0_set_loopback (struct aq_hw_s *self,u32 mode,bool enable) +{ +switch (mode) { +case AQ_HW_LOOPBACK_DMA_SYS : +hw_atl_tpb_tx_dma_sys_lbk_en_set (self, enable); +hw_atl_rpb_dma_sys_lbk_set (self, enable); +break ; +case AQ_HW_LOOPBACK_PKT_SYS : +hw_atl_tpo_tx_pkt_sys_lbk_en_set (self, enable); +hw_atl_rpf_tpo_to_rpf_sys_lbk_set (self, enable); +break ; +case AQ_HW_LOOPBACK_DMA_NET : +hw_atl_rpf_vlan_prom_mode_en_set (self, enable); +hw_atl_rpfl2promiscuous_mode_en_set (self, enable); +hw_atl_tpb_tx_tx_clk_gate_en_set (self, !enable); +hw_atl_tpb_tx_dma_net_lbk_en_set (self, enable); +hw_atl_rpb_dma_net_lbk_set (self, enable); +break ; +default : +return -EINVAL ; + } +return 0 ; +} +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,
@@ -1481,5 +1505,9 @@ const struct aq_hw_ops hw_atl_ops_b0 = { .rx_extract_ts = hw_atl_b0_rx_extract_ts, .extract_hwts = hw_atl_b0_extract_hwts, .hw_set_offload = hw_atl_b0_hw_offload_set, - .hw_set_fc = hw_atl_b0_set_fc, + .hw_get_hw_stats = hw_atl_utils_get_hw_stats, + .hw_get_fw_version = hw_atl_utils_get_fw_version, + .hw_set_offload = hw_atl_b0_hw_offload_set, + .hw_set_loopback = hw_atl_b0_set_loopback, + .hw_set_fc = hw_atl_b0_set_fc, };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +26 -0
@@ -563,6 +563,13 @@ void hw_atl_rpb_dma_sys_lbk_set(struct aq_hw_s *aq_hw, u32 dma_sys_lbk) HW_ATL_RPB_DMA_SYS_LBK_SHIFT, dma_sys_lbk); } +void hw_atl_rpb_dma_net_lbk_set (struct aq_hw_s *aq_hw,u32 dma_net_lbk) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_RPB_DMA_NET_LBK_ADR , +HW_ATL_RPB_DMA_NET_LBK_MSK , +HW_ATL_RPB_DMA_NET_LBK_SHIFT , dma_net_lbk); +} +void hw_atl_rpb_rpf_rx_traf_class_mode_set (struct aq_hw_s *aq_hw,u32 rx_traf_class_mode) {
@@ -1341,7 +1348,26 @@ void hw_atl_tpb_tx_dma_sys_lbk_en_set(struct aq_hw_s *aq_hw, u32 tx_dma_sys_lbk_ tx_dma_sys_lbk_en); } +void hw_atl_tpb_tx_dma_net_lbk_en_set (struct aq_hw_s *aq_hw, +u32 tx_dma_net_lbk_en) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_TPB_DMA_NET_LBK_ADR , +HW_ATL_TPB_DMA_NET_LBK_MSK , +HW_ATL_TPB_DMA_NET_LBK_SHIFT , + tx_dma_net_lbk_en); +} + +void hw_atl_tpb_tx_tx_clk_gate_en_set (struct aq_hw_s *aq_hw, +u32 tx_clk_gate_en) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_TPB_TX_CLK_GATE_EN_ADR , +HW_ATL_TPB_TX_CLK_GATE_EN_MSK , +HW_ATL_TPB_TX_CLK_GATE_EN_SHIFT , + tx_clk_gate_en); +} +void hw_atl_tpb_tx_pkt_buff_size_per_tc_set (struct aq_hw_s *aq_hw, +u32 tx_pkt_buff_size_per_tc,u32 buffer) { aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_TXBBUF_SIZE_ADR(buffer),
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +11 -0
@@ -288,6 +288,9 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,/* set dma system loopback */ void hw_atl_rpb_dma_sys_lbk_set (struct aq_hw_s *aq_hw,u32 dma_sys_lbk); +/* set dma network loopback */ +void hw_atl_rpb_dma_net_lbk_set (struct aq_hw_s *aq_hw,u32 dma_net_lbk); +/* set rx traffic class mode */ void hw_atl_rpb_rpf_rx_traf_class_mode_set (struct aq_hw_s *aq_hw,u32 rx_traf_class_mode);
@@ -629,6 +632,14 @@ void hw_atl_tpb_tx_buff_lo_threshold_per_tc_set(struct aq_hw_s *aq_hw,/* set tx dma system loopback enable */ void hw_atl_tpb_tx_dma_sys_lbk_en_set (struct aq_hw_s *aq_hw,u32 tx_dma_sys_lbk_en); +/* set tx dma network loopback enable */ +void hw_atl_tpb_tx_dma_net_lbk_en_set (struct aq_hw_s *aq_hw, +u32 tx_dma_net_lbk_en); + +/* set tx clock gating enable */ +void hw_atl_tpb_tx_tx_clk_gate_en_set (struct aq_hw_s *aq_hw, +u32 tx_clk_gate_en); +/* set tx packet buffer size (per tc) */ void hw_atl_tpb_tx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw, u32 tx_pkt_buff_size_per_tc,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +54 -0
72 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +32 -0
@@ -42,6 +42,9 @@#define HW_ATL_FW2X_CTRL_PAUSE BIT(CTRL_PAUSE)#define HW_ATL_FW2X_CTRL_TEMPERATURE BIT(CTRL_TEMPERATURE)#define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE) +#define HW_ATL_FW2X_CTRL_INT_LOOPBACK BIT(CTRL_INT_LOOPBACK) +#define HW_ATL_FW2X_CTRL_EXT_LOOPBACK BIT(CTRL_EXT_LOOPBACK) +#define HW_ATL_FW2X_CTRL_DOWNSHIFT BIT(CTRL_DOWNSHIFT)#define HW_ATL_FW2X_CTRL_FORCE_RECONNECT BIT(CTRL_FORCE_RECONNECT)#define HW_ATL_FW2X_CAP_EEE_1G_MASK BIT(CAPS_HI_1000BASET_FD_EEE)
@@ -53,6 +56,7 @@#define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL 0x0E#define HW_ATL_FW_VER_LED 0x03010026U +#define HW_ATL_FW_VER_MEDIA_CONTROL 0x0301005aUstruct __packed fw2x_msg_wol_pattern {u8 mask[16 ];
@@ -539,6 +543,33 @@ static u32 aq_fw2x_get_flow_control(struct aq_hw_s *self, u32 *fcmode)return 0 ; } +static int aq_fw2x_set_phyloopback (struct aq_hw_s *self,u32 mode,bool enable) +{ +u32 mpi_opts; + +switch (mode) { +case AQ_HW_LOOPBACK_PHYINT_SYS : + mpi_opts =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR ); +if (enable) + mpi_opts |=HW_ATL_FW2X_CTRL_INT_LOOPBACK ; +else + mpi_opts &= ~HW_ATL_FW2X_CTRL_INT_LOOPBACK ; +aq_hw_write_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR , mpi_opts); +break ; +case AQ_HW_LOOPBACK_PHYEXT_SYS : + mpi_opts =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR ); +if (enable) + mpi_opts |=HW_ATL_FW2X_CTRL_EXT_LOOPBACK ; +else + mpi_opts &= ~HW_ATL_FW2X_CTRL_EXT_LOOPBACK ; +aq_hw_write_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR , mpi_opts); +break ; +default : +return -EINVAL ; + } +return 0 ; +} +static u32 aq_fw2x_mbox_get (struct aq_hw_s *self) {return aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR );
@@ -586,4 +617,5 @@ const struct aq_fw_ops aq_fw_2x_ops = { .send_fw_request = aq_fw2x_send_fw_request, .enable_ptp = aq_fw3x_enable_ptp, .led_control = aq_fw2x_led_control, + .set_phyloopback = aq_fw2x_set_phyloopback, };
Signature · 1 line
2.17.1
David Miller
maintainerRe: [PATCH v2 net-next 07/12] net: atlantic: loopback tests via private flags
From: Igor Russkikh <[email protected]>
Date: Thu, 7 Nov 2019 22:41:58 +0000
Documentation/networking/device_drivers/aquantia/atlantic.txt Supported ethtool options · line 344
Quoted 1 line
Documentation/networking/device_drivers/aquantia/atlantic.txt +1
-0+ $ ethtool --set-priv-flags ethX DMASystemLoopback on
There is a space before the TAB character here, which I removed while applying this series.
PATCH v2 8/12 net: atlantic: code style cleanup
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
Thats a pure checkpatck walkthrough the code with no functional changes. Reverse christmas tree, spacing, etc.
--- .../ethernet/aquantia/atlantic/aq_ethtool.c | 108 ++++++++++++------ .../ethernet/aquantia/atlantic/aq_hw_utils.c | 1 + .../net/ethernet/aquantia/atlantic/aq_main.c | 11 +- .../net/ethernet/aquantia/atlantic/aq_nic.c | 39 ++++--- .../net/ethernet/aquantia/atlantic/aq_nic.h | 4 +- .../ethernet/aquantia/atlantic/aq_pci_func.c | 8 +- .../net/ethernet/aquantia/atlantic/aq_ring.c | 6 +- .../net/ethernet/aquantia/atlantic/aq_vec.c | 8 +- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 39 ++++--- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 69 ++++++----- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 52 +++++---- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 34 +++--- 12 files changed, 240 insertions(+), 139 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +72 -36
@@ -18,7 +18,9 @@ static void aq_ethtool_get_regs(struct net_device *ndev, struct ethtool_regs *regs, void *p) { struct aq_nic_s *aq_nic = netdev_priv(ndev); -u32 regs_count =aq_nic_get_regs_count (aq_nic); +u32 regs_count; + + regs_count =aq_nic_get_regs_count (aq_nic);memset (p,0 , regs_count *sizeof (u32));aq_nic_get_regs (aq_nic, regs, p);
@@ -27,7 +29,9 @@ static void aq_ethtool_get_regs(struct net_device *ndev,static int aq_ethtool_get_regs_len (struct net_device *ndev) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -u32 regs_count =aq_nic_get_regs_count (aq_nic); +u32 regs_count; + + regs_count =aq_nic_get_regs_count (aq_nic);return regs_count *sizeof (u32); }
@@ -104,7 +108,9 @@ static void aq_ethtool_stats(struct net_device *ndev, struct ethtool_stats *stats, u64 *data) { struct aq_nic_s *aq_nic = netdev_priv(ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic); memset(data, 0, (ARRAY_SIZE(aq_ethtool_stat_names) + ARRAY_SIZE(aq_ethtool_queue_stat_names) *
@@ -115,11 +121,15 @@ static void aq_ethtool_stats(struct net_device *ndev,static void aq_ethtool_get_drvinfo (struct net_device *ndev,struct ethtool_drvinfo *drvinfo) { -struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic);struct pci_dev *pdev =to_pci_dev (ndev->dev.parent); -u32 firmware_version =aq_nic_get_fw_version (aq_nic); -u32 regs_count =aq_nic_get_regs_count (aq_nic); +struct aq_nic_s *aq_nic =netdev_priv (ndev); +struct aq_nic_cfg_s *cfg; +u32 firmware_version; +u32 regs_count; + + cfg =aq_nic_get_cfg (aq_nic); + firmware_version =aq_nic_get_fw_version (aq_nic); + regs_count =aq_nic_get_regs_count (aq_nic);strlcat (drvinfo->driver,AQ_CFG_DRV_NAME ,sizeof (drvinfo->driver));strlcat (drvinfo->version,AQ_CFG_DRV_VERSION ,sizeof (drvinfo->version));
@@ -140,10 +150,12 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev,static void aq_ethtool_get_strings (struct net_device *ndev,u32 stringset,u8 *data) { -int i, si;struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg;u8 *p = data; +int i, si; + + cfg =aq_nic_get_cfg (aq_nic);switch (stringset) {case ETH_SS_STATS :
@@ -198,9 +210,11 @@ static int aq_ethtool_set_phys_id(struct net_device *ndev,static int aq_ethtool_get_sset_count (struct net_device *ndev,int stringset) { -int ret =0 ;struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; +int ret =0 ; + + cfg =aq_nic_get_cfg (aq_nic);switch (stringset) {case ETH_SS_STATS :
@@ -213,6 +227,7 @@ static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset)default : ret = -EOPNOTSUPP ; } +return ret; }
@@ -224,7 +239,9 @@ static u32 aq_ethtool_get_rss_indir_size(struct net_device *ndev)static u32 aq_ethtool_get_rss_key_size (struct net_device *ndev) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic);return sizeof (cfg->aq_rss.hash_secret_key); }
@@ -233,9 +250,11 @@ static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key, u8 *hfunc) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg;unsigned int i =0U ; + cfg =aq_nic_get_cfg (aq_nic); +if (hfunc) *hfunc =ETH_RSS_HASH_TOP ;/* Toeplitz */ if (indir) {
@@ -245,6 +264,7 @@ static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key,if (key)memcpy (key, cfg->aq_rss.hash_secret_key,sizeof (cfg->aq_rss.hash_secret_key)); +return 0 ; }
@@ -288,9 +308,11 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev, u32 *rule_locs) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg;int err =0 ; + cfg =aq_nic_get_cfg (aq_nic); +switch (cmd->cmd) {case ETHTOOL_GRXRINGS : cmd->data = cfg->vecs;
@@ -315,8 +337,8 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev,static int aq_ethtool_set_rxnfc (struct net_device *ndev,struct ethtool_rxnfc *cmd) { -int err =0 ;struct aq_nic_s *aq_nic =netdev_priv (ndev); +int err =0 ;switch (cmd->cmd) {case ETHTOOL_SRXCLSRLINS :
@@ -337,7 +359,9 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic);if (cfg->itr ==AQ_CFG_INTERRUPT_MODERATION_ON || cfg->itr ==AQ_CFG_INTERRUPT_MODERATION_AUTO ) {
@@ -351,6 +375,7 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev, coal->rx_max_coalesced_frames =1 ; coal->tx_max_coalesced_frames =1 ; } +return 0 ; }
@@ -358,7 +383,9 @@ static int aq_ethtool_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic);/* This is not yet supported */
@@ -400,7 +427,9 @@ 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); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic); wol->supported =AQ_NIC_WOL_MODES ; wol->wolopts = cfg->wol;
@@ -411,9 +440,11 @@ static int aq_ethtool_set_wol(struct net_device *ndev, {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); +struct aq_nic_cfg_s *cfg;int err =0 ; + cfg =aq_nic_get_cfg (aq_nic); +if (wol->wolopts & ~AQ_NIC_WOL_MODES )return -EOPNOTSUPP ;
@@ -599,23 +630,28 @@ static void aq_get_ringparam(struct net_device *ndev, struct ethtool_ringparam *ring) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *aq_nic_cfg =aq_nic_get_cfg (aq_nic); +struct aq_nic_cfg_s *cfg; + + cfg =aq_nic_get_cfg (aq_nic); - ring->rx_pending = aq_nic_cfg->rxds; - ring->tx_pending = aq_nic_cfg->txds; + ring->rx_pending = cfg->rxds; + ring->tx_pending = cfg->txds; - ring->rx_max_pending = aq_nic_cfg->aq_hw_caps->rxds_max; - ring->tx_max_pending = aq_nic_cfg->aq_hw_caps->txds_max; + ring->rx_max_pending = cfg->aq_hw_caps->rxds_max; + ring->tx_max_pending = cfg->aq_hw_caps->txds_max; }static int aq_set_ringparam (struct net_device *ndev,struct ethtool_ringparam *ring) { -int err =0 ; -bool ndev_running = false;struct aq_nic_s *aq_nic =netdev_priv (ndev); -struct aq_nic_cfg_s *aq_nic_cfg =aq_nic_get_cfg (aq_nic); -const struct aq_hw_caps_s *hw_caps = aq_nic_cfg->aq_hw_caps; +const struct aq_hw_caps_s *hw_caps; +bool ndev_running = false; +struct aq_nic_cfg_s *cfg; +int err =0 ; + + cfg =aq_nic_get_cfg (aq_nic); + hw_caps = cfg->aq_hw_caps;if (ring->rx_mini_pending || ring->rx_jumbo_pending) { err = -EOPNOTSUPP ;
@@ -629,18 +665,18 @@ static int aq_set_ringparam(struct net_device *ndev,aq_nic_free_vectors (aq_nic); - aq_nic_cfg->rxds =max (ring->rx_pending, hw_caps->rxds_min); - aq_nic_cfg->rxds =min (aq_nic_cfg->rxds, hw_caps->rxds_max); - aq_nic_cfg->rxds =ALIGN (aq_nic_cfg->rxds,AQ_HW_RXD_MULTIPLE ); + cfg->rxds =max (ring->rx_pending, hw_caps->rxds_min); + cfg->rxds =min (cfg->rxds, hw_caps->rxds_max); + cfg->rxds =ALIGN (cfg->rxds,AQ_HW_RXD_MULTIPLE ); - aq_nic_cfg->txds =max (ring->tx_pending, hw_caps->txds_min); - aq_nic_cfg->txds =min (aq_nic_cfg->txds, hw_caps->txds_max); - aq_nic_cfg->txds =ALIGN (aq_nic_cfg->txds,AQ_HW_TXD_MULTIPLE ); + cfg->txds =max (ring->tx_pending, hw_caps->txds_min); + cfg->txds =min (cfg->txds, hw_caps->txds_max); + cfg->txds =ALIGN (cfg->txds,AQ_HW_TXD_MULTIPLE ); -for (aq_nic->aq_vecs =0 ; aq_nic->aq_vecs < aq_nic_cfg->vecs; +for (aq_nic->aq_vecs =0 ; aq_nic->aq_vecs < cfg->vecs; aq_nic->aq_vecs++) { aq_nic->aq_vec[aq_nic->aq_vecs] = -aq_vec_alloc (aq_nic, aq_nic->aq_vecs, aq_nic_cfg); +aq_vec_alloc (aq_nic, aq_nic->aq_vecs, cfg);if (unlikely (!aq_nic->aq_vec[aq_nic->aq_vecs])) { err = -ENOMEM ; goto err_exit;
drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c +1 -0
@@ -59,6 +59,7 @@ u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg)u64 value =aq_hw_read_reg (hw, reg); value |= (u64 )aq_hw_read_reg (hw, reg +4 ) <<32 ; +return value; }
drivers/net/ethernet/aquantia/atlantic/aq_main.c +7 -4
@@ -53,8 +53,8 @@ struct net_device *aq_ndev_alloc(void)static int aq_ndev_open (struct net_device *ndev) { -int err =0 ;struct aq_nic_s *aq_nic =netdev_priv (ndev); +int err =0 ; err =aq_nic_init (aq_nic);if (err <0 )
@@ -75,13 +75,14 @@ static int aq_ndev_open(struct net_device *ndev) err_exit:if (err <0 )aq_nic_deinit (aq_nic, true); +return err; }static int aq_ndev_close (struct net_device *ndev) { -int err =0 ;struct aq_nic_s *aq_nic =netdev_priv (ndev); +int err =0 ; err =aq_nic_stop (aq_nic);if (err <0 )
@@ -120,7 +121,9 @@ static int aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev)static int aq_ndev_change_mtu (struct net_device *ndev,int new_mtu) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -int err =aq_nic_set_mtu (aq_nic, new_mtu +ETH_HLEN ); +int err; + + err =aq_nic_set_mtu (aq_nic, new_mtu +ETH_HLEN );if (err <0 ) goto err_exit;
@@ -133,8 +136,8 @@ static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu)static int aq_ndev_set_features (struct net_device *ndev,netdev_features_t features) { -bool is_vlan_rx_strip = !!(features &NETIF_F_HW_VLAN_CTAG_RX );bool is_vlan_tx_insert = !!(features &NETIF_F_HW_VLAN_CTAG_TX ); +bool is_vlan_rx_strip = !!(features &NETIF_F_HW_VLAN_CTAG_RX );struct aq_nic_s *aq_nic =netdev_priv (ndev);bool need_ndev_restart = false;struct aq_nic_cfg_s *aq_cfg;
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +23 -16
@@ -41,10 +41,6 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self);static void aq_nic_rss_init (struct aq_nic_s *self,unsigned int num_rss_queues) { -struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg; -struct aq_rss_parameters *rss_params = &cfg->aq_rss; -int i =0 ; -static u8 rss_key[AQ_CFG_RSS_HASHKEY_SIZE ] = {0x1e ,0xad ,0x71 ,0x87 ,0x65 ,0xfc ,0x26 ,0x7d ,0x0d ,0x45 ,0x67 ,0x74 ,0xcd ,0x06 ,0x1a ,0x18 ,
@@ -52,6 +48,11 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)0x19 ,0x13 ,0x4b ,0xa9 ,0xd0 ,0x3e ,0xfe ,0x70 ,0x25 ,0x03 ,0xab ,0x50 ,0x6a ,0x8b ,0x82 ,0x0c }; +struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg; +struct aq_rss_parameters *rss_params; +int i =0 ; + + rss_params = &cfg->aq_rss; rss_params->hash_secret_key_size =sizeof (rss_key);memcpy (rss_params->hash_secret_key, rss_key,sizeof (rss_key));
@@ -180,6 +181,7 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)netif_tx_disable (self->ndev);aq_utils_obj_set (&self->flags,AQ_NIC_LINK_DOWN ); } +return 0 ; }
@@ -194,6 +196,7 @@ static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private) self->aq_hw_ops->hw_irq_enable (self->aq_hw,BIT (self->aq_nic_cfg.link_irq_vec)); +return IRQ_HANDLED ; }
@@ -224,7 +227,8 @@ static void aq_nic_service_timer_cb(struct timer_list *t) {struct aq_nic_s *self =from_timer (self, t, service_timer); -mod_timer (&self->service_timer, jiffies +AQ_CFG_SERVICE_TIMER_INTERVAL ); +mod_timer (&self->service_timer, + jiffies +AQ_CFG_SERVICE_TIMER_INTERVAL );aq_ndev_schedule_work (&self->service_task); }
@@ -326,8 +330,8 @@ struct net_device *aq_nic_get_ndev(struct aq_nic_s *self)int aq_nic_init (struct aq_nic_s *self) {struct aq_vec_s *aq_vec =NULL ; -int err =0 ;unsigned int i =0U ; +int err =0 ; self->power_state =AQ_HW_POWER_STATE_D0 ;mutex_lock (&self->fwreq_mutex);
@@ -371,8 +375,8 @@ int aq_nic_init(struct aq_nic_s *self)int aq_nic_start (struct aq_nic_s *self) {struct aq_vec_s *aq_vec =NULL ; -int err =0 ;unsigned int i =0U ; +int err =0 ; err = self->aq_hw_ops->hw_multicast_list_set(self->aq_hw, self->mc_list.ar,
@@ -464,14 +468,16 @@ int aq_nic_start(struct aq_nic_s *self)unsigned int aq_nic_map_skb (struct aq_nic_s *self,struct sk_buff *skb,struct aq_ring_s *ring) { -unsigned int ret =0U ;unsigned int nr_frags =skb_shinfo (skb)->nr_frags; -unsigned int frag_count =0U ; -unsigned int dx = ring->sw_tail;struct aq_ring_buff_s *first =NULL ; -struct aq_ring_buff_s *dx_buff = &ring->buff_ring[dx]; +struct aq_ring_buff_s *dx_buff;bool need_context_tag = false; +unsigned int frag_count =0U ; +unsigned int ret =0U ; +unsigned int dx; + dx = ring->sw_tail; + dx_buff = &ring->buff_ring[dx]; dx_buff->flags =0U ;if (unlikely (skb_is_gso (skb))) {
@@ -610,11 +616,11 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,int aq_nic_xmit (struct aq_nic_s *self,struct sk_buff *skb) { +unsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs;struct aq_ring_s *ring =NULL ;unsigned int frags =0U ; -unsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs; -unsigned int tc =0U ;int err =NETDEV_TX_OK ; +unsigned int tc =0U ; frags =skb_shinfo (skb)->nr_frags +1 ;
@@ -712,6 +718,7 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)if (err <0 )return err; } +return aq_nic_set_packet_filter (self, packet_filter); }
@@ -756,10 +763,10 @@ int aq_nic_get_regs_count(struct aq_nic_s *self)void aq_nic_get_stats (struct aq_nic_s *self,u64 *data) { -unsigned int i =0U ; -unsigned int count =0U ;struct aq_vec_s *aq_vec =NULL ;struct aq_stats_s *stats; +unsigned int count =0U ; +unsigned int i =0U ;if (self->aq_fw_ops->update_stats) {mutex_lock (&self->fwreq_mutex);
@@ -809,8 +816,8 @@ err_exit:;static void aq_nic_update_ndev_stats (struct aq_nic_s *self) { -struct net_device *ndev = self->ndev;struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats (self->aq_hw); +struct net_device *ndev = self->ndev; ndev->stats.rx_packets = stats->dma_pkt_rc; ndev->stats.rx_bytes = stats->dma_oct_rc;
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +2 -2
@@ -72,8 +72,8 @@ struct aq_hw_rx_fl2 { };struct aq_hw_rx_fl3l4 { -u8 active_ipv4; -u8 active_ipv6:2 ; +u8 active_ipv4; +u8 active_ipv6:2 ;u8 is_ipv6;u8 reserved_count; };
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +5 -3
@@ -185,6 +185,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)return AQ_HW_IRQ_MSIX ;if (self->pdev->msi_enabled)return AQ_HW_IRQ_MSI ; +return AQ_HW_IRQ_LEGACY ; }
@@ -196,12 +197,12 @@ static void aq_pci_free_irq_vectors(struct aq_nic_s *self)static int aq_pci_probe (struct pci_dev *pdev,const struct pci_device_id *pci_id) { -struct aq_nic_s *self; -int err;struct net_device *ndev;resource_size_t mmio_pa; -u32 bar; +struct aq_nic_s *self;u32 numvecs; +u32 bar; +int err; err =pci_enable_device (pdev);if (err)
@@ -311,6 +312,7 @@ static int aq_pci_probe(struct pci_dev *pdev,pci_release_regions (pdev); err_pci_func:pci_disable_device (pdev); +return err; }
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +5 -1
@@ -30,8 +30,8 @@ static int aq_get_rxpage(struct aq_rxpage *rxpage, unsigned int order, struct device *dev) {struct page *page; -dma_addr_t daddr;int ret = -ENOMEM ; +dma_addr_t daddr; page =dev_alloc_pages (order);if (unlikely (!page))
@@ -118,6 +118,7 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,aq_ring_free (self); self =NULL ; } +return self; }
@@ -144,6 +145,7 @@ struct aq_ring_s *aq_ring_tx_alloc(struct aq_ring_s *self,aq_ring_free (self); self =NULL ; } +return self; }
@@ -175,6 +177,7 @@ struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,aq_ring_free (self); self =NULL ; } +return self; }
@@ -207,6 +210,7 @@ int aq_ring_init(struct aq_ring_s *self) self->hw_head =0 ; self->sw_head =0 ; self->sw_tail =0 ; +return 0 ; }
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +5 -3
@@ -103,8 +103,8 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)struct aq_vec_s *aq_vec_alloc (struct aq_nic_s *aq_nic,unsigned int idx,struct aq_nic_cfg_s *aq_nic_cfg) { -struct aq_vec_s *self =NULL ;struct aq_ring_s *ring =NULL ; +struct aq_vec_s *self =NULL ;unsigned int i =0U ;int err =0 ;
@@ -159,6 +159,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,aq_vec_free (self); self =NULL ; } +return self; }
@@ -263,6 +264,7 @@ void aq_vec_deinit(struct aq_vec_s *self)aq_ring_tx_clean (&ring[AQ_VEC_TX_ID ]);aq_ring_rx_deinit (&ring[AQ_VEC_RX_ID ]); } + err_exit:; }
@@ -305,8 +307,8 @@ irqreturn_t aq_vec_isr(int irq, void *private)irqreturn_t aq_vec_isr_legacy (int irq,void *private) {struct aq_vec_s *self = private; +irqreturn_t err =0 ;u64 irq_mask =0U ; -int err;if (!self)return IRQ_NONE ;
@@ -361,9 +363,9 @@ void aq_vec_add_stats(struct aq_vec_s *self,int aq_vec_get_sw_stats (struct aq_vec_s *self,u64 *data,unsigned int *p_count) { -unsigned int count =0U ;struct aq_ring_stats_rx_s stats_rx;struct aq_ring_stats_tx_s stats_tx; +unsigned int count =0U ;memset (&stats_rx,0U ,sizeof (struct aq_ring_stats_rx_s ));memset (&stats_tx,0U ,sizeof (struct aq_ring_stats_tx_s ));
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +24 -15
@@ -119,10 +119,10 @@ static int hw_atl_a0_hw_reset(struct aq_hw_s *self)static int hw_atl_a0_hw_qos_set (struct aq_hw_s *self) { -u32 tc =0U ; -u32 buff_size =0U ; -unsigned int i_priority =0U ;bool is_rx_flow_control = false; +unsigned int i_priority =0U ; +u32 buff_size =0U ; +u32 tc =0U ;/* TPS Descriptor rate init */ hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set (self,0x0U );
@@ -180,9 +180,9 @@ static int hw_atl_a0_hw_rss_hash_set(struct aq_hw_s *self, struct aq_rss_parameters *rss_params) {struct aq_nic_cfg_s *cfg = self->aq_nic_cfg; -int err =0 ; -unsigned int i =0U ;unsigned int addr =0U ; +unsigned int i =0U ; +int err =0 ;u32 val;for (i =10 , addr =0U ; i--; ++addr) {
@@ -207,12 +207,12 @@ static int hw_atl_a0_hw_rss_hash_set(struct aq_hw_s *self,static int hw_atl_a0_hw_rss_set (struct aq_hw_s *self,struct aq_rss_parameters *rss_params) { -u8 *indirection_table = rss_params->indirection_table; -u32 i =0U ;u32 num_rss_queues =max (1U , self->aq_nic_cfg->num_rss_queues); -int err =0 ; +u8 *indirection_table = rss_params->indirection_table;u16 bitary[1 + (HW_ATL_A0_RSS_REDIRECTION_MAX *HW_ATL_A0_RSS_REDIRECTION_BITS /16U )]; +int err =0 ; +u32 i =0U ;u32 val;memset (bitary,0 ,sizeof (bitary));
@@ -321,9 +321,9 @@ static int hw_atl_a0_hw_init_rx_path(struct aq_hw_s *self)static int hw_atl_a0_hw_mac_addr_set (struct aq_hw_s *self,u8 *mac_addr) { -int err =0 ;unsigned int h =0U ;unsigned int l =0U ; +int err =0 ;if (!mac_addr) { err = -EINVAL ;
@@ -352,10 +352,9 @@ static int hw_atl_a0_hw_init(struct aq_hw_s *self, u8 *mac_addr) [AQ_HW_IRQ_MSI] = { 0x20000021U, 0x20000025U }, [AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U }, }; - +struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg;int err =0 ; -struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg;hw_atl_a0_hw_init_tx_path (self);hw_atl_a0_hw_init_rx_path (self);
@@ -404,6 +403,7 @@ static int hw_atl_a0_hw_ring_tx_start(struct aq_hw_s *self, struct aq_ring_s *ring) {hw_atl_tdm_tx_desc_en_set (self,1 , ring->idx); +return aq_hw_err_from_flags (self); }
@@ -411,6 +411,7 @@ static int hw_atl_a0_hw_ring_rx_start(struct aq_hw_s *self, struct aq_ring_s *ring) {hw_atl_rdm_rx_desc_en_set (self,1 , ring->idx); +return aq_hw_err_from_flags (self); }
@@ -418,6 +419,7 @@ static int hw_atl_a0_hw_start(struct aq_hw_s *self) {hw_atl_tpb_tx_buff_en_set (self,1 );hw_atl_rpb_rx_buff_en_set (self,1 ); +return aq_hw_err_from_flags (self); }
@@ -425,6 +427,7 @@ static int hw_atl_a0_hw_tx_ring_tail_update(struct aq_hw_s *self, struct aq_ring_s *ring) {hw_atl_reg_tx_dma_desc_tail_ptr_set (self, ring->sw_tail, ring->idx); +return 0 ; }
@@ -435,8 +438,8 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self,struct aq_ring_buff_s *buff =NULL ;struct hw_atl_txd_s *txd =NULL ;unsigned int buff_pa_len =0U ; -unsigned int pkt_len =0U ;unsigned int frag_count =0U ; +unsigned int pkt_len =0U ;bool is_gso = false; buff = &ring->buff_ring[ring->sw_tail];
@@ -500,6 +503,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, }hw_atl_a0_hw_tx_ring_tail_update (self, ring); +return aq_hw_err_from_flags (self); }
@@ -507,8 +511,8 @@ static int hw_atl_a0_hw_ring_rx_init(struct aq_hw_s *self,struct aq_ring_s *aq_ring, struct aq_ring_param_s *aq_ring_param) { - u32 dma_desc_addr_lsw = (u32)aq_ring->dx_ring_pa; u32 dma_desc_addr_msw = (u32)(((u64)aq_ring->dx_ring_pa) >> 32); +u32 dma_desc_addr_lsw = (u32 )aq_ring->dx_ring_pa;hw_atl_rdm_rx_desc_en_set (self, false, aq_ring->idx);
@@ -549,8 +553,8 @@ static int hw_atl_a0_hw_ring_tx_init(struct aq_hw_s *self,struct aq_ring_s *aq_ring, struct aq_ring_param_s *aq_ring_param) { - u32 dma_desc_lsw_addr = (u32)aq_ring->dx_ring_pa; u32 dma_desc_msw_addr = (u32)(((u64)aq_ring->dx_ring_pa) >> 32); +u32 dma_desc_lsw_addr = (u32 )aq_ring->dx_ring_pa;hw_atl_reg_tx_dma_desc_base_addresslswset (self, dma_desc_lsw_addr, aq_ring->idx);
@@ -599,8 +603,8 @@ static int hw_atl_a0_hw_ring_rx_fill(struct aq_hw_s *self,static int hw_atl_a0_hw_ring_tx_head_update (struct aq_hw_s *self,struct aq_ring_s *ring) { -int err =0 ;unsigned int hw_head =hw_atl_tdm_tx_desc_head_ptr_get (self, ring->idx); +int err =0 ;if (aq_utils_obj_test (&self->flags,AQ_HW_FLAG_ERR_UNPLUG )) { err = -ENXIO ;
@@ -720,6 +724,7 @@ static int hw_atl_a0_hw_irq_enable(struct aq_hw_s *self, u64 mask) {hw_atl_itr_irq_msk_setlsw_set (self,LODWORD (mask) | (1U <<HW_ATL_A0_ERR_INT )); +return aq_hw_err_from_flags (self); }
@@ -737,6 +742,7 @@ static int hw_atl_a0_hw_irq_disable(struct aq_hw_s *self, u64 mask)static int hw_atl_a0_hw_irq_read (struct aq_hw_s *self,u64 *mask) { *mask =hw_atl_itr_irq_statuslsw_get (self); +return aq_hw_err_from_flags (self); }
@@ -859,6 +865,7 @@ static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self)static int hw_atl_a0_hw_stop (struct aq_hw_s *self) {hw_atl_a0_hw_irq_disable (self,HW_ATL_A0_INT_MASK ); +return aq_hw_err_from_flags (self); }
@@ -866,6 +873,7 @@ static int hw_atl_a0_hw_ring_tx_stop(struct aq_hw_s *self, struct aq_ring_s *ring) {hw_atl_tdm_tx_desc_en_set (self,0U , ring->idx); +return aq_hw_err_from_flags (self); }
@@ -873,6 +881,7 @@ static int hw_atl_a0_hw_ring_rx_stop(struct aq_hw_s *self, struct aq_ring_s *ring) {hw_atl_rdm_rx_desc_en_set (self,0U , ring->idx); +return aq_hw_err_from_flags (self); }
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +43 -26
248 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +32 -20
173 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +21 -13
@@ -226,15 +226,20 @@ static int aq_fw2x_set_state(struct aq_hw_s *self,break ; }aq_hw_write_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR , mpi_state); +return 0 ; }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 );struct aq_hw_link_status_s *link_status = &self->aq_link_status; +u32 mpi_state; +u32 speed; + + mpi_state =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_STATE_ADDR ); + speed = mpi_state & (FW2X_RATE_100M |FW2X_RATE_1G | +FW2X_RATE_2G5 |FW2X_RATE_5G | +FW2X_RATE_10G );if (speed) {if (speed &FW2X_RATE_10G )
@@ -258,11 +263,11 @@ static int aq_fw2x_update_link_status(struct aq_hw_s *self)static int aq_fw2x_get_mac_permanent (struct aq_hw_s *self,u8 *mac) { +u32 efuse_addr =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_EFUSE_ADDR ); +u32 mac_addr[2 ] = {0 };int err =0 ;u32 h =0U ;u32 l =0U ; -u32 mac_addr[2 ] = {0 }; -u32 efuse_addr =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_EFUSE_ADDR );if (efuse_addr !=0 ) { err = hw_atl_utils_fw_downld_dwords(self,
@@ -296,15 +301,16 @@ static int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac) h >>=8 ; mac[0 ] = (u8)(0xFFU & h); } +return err; }static int aq_fw2x_update_stats (struct aq_hw_s *self) { -int err =0 ;u32 mpi_opts =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR );u32 orig_stats_val = mpi_opts &BIT (CAPS_HI_STATISTICS );u32 stats_val; +int err =0 ;/* Toggle statistics bit for FW to update */ mpi_opts = mpi_opts ^BIT (CAPS_HI_STATISTICS );
@@ -331,9 +337,9 @@ static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)int err =0 ;u32 val; - phy_temp_offset = self->mbox_addr + - offsetof(struct hw_atl_utils_mbox , info) + - offsetof(struct hw_aq_info , phy_temperature); + phy_temp_offset = self->mbox_addr + offsetof(struct hw_atl_utils_mbox , + info.phy_temperature); +/* Toggle statistics bit for FW to 0x36C.18 (CTRL_TEMPERATURE) */ mpi_opts = mpi_opts ^HW_ATL_FW2X_CTRL_TEMPERATURE ;aq_hw_write_reg (self,HW_ATL_FW2X_MPI_CONTROL2_ADDR , mpi_opts);
@@ -486,11 +492,12 @@ 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_atl_utils_mbox , info) + - offsetof(struct hw_aq_info , caps_hi); +u32 offset; - err =hw_atl_utils_fw_downld_dwords (self, addr, &caps_hi, -sizeof (caps_hi) /sizeof (u32)); + offset = self->mbox_addr + offsetof(struct hw_atl_utils_mbox , + info.caps_hi); + + err =hw_atl_utils_fw_downld_dwords (self, offset, &caps_hi,1 );if (err)return err;
@@ -567,6 +574,7 @@ static int aq_fw2x_set_phyloopback(struct aq_hw_s *self, u32 mode, bool enable)default :return -EINVAL ; } +return 0 ; }
Signature · 1 line
2.17.1
PATCH v2 9/12 net: atlantic: stylistic renames
In reply to Igor RusskikhWe are trying to follow the naming of the chip (atlantic), not company. So replace some old namings.
--- drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 6 +++--- .../net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +3 -3
@@ -1055,7 +1055,7 @@ static struct ptp_clock_info aq_ptp_clock = { ptp_offset[__idx].ingress = (__ingress); } \while (0 ) -static void aq_ptp_offset_init_from_fw(const struct hw_aq_ptp_offset *offsets) +static void aq_ptp_offset_init_from_fw(const struct hw_atl_ptp_offset *offsets) {int i;
@@ -1096,7 +1096,7 @@ static void aq_ptp_offset_init_from_fw(const struct hw_aq_ptp_offset *offsets) } } -static void aq_ptp_offset_init (const struct hw_aq_ptp_offset *offsets) +static void aq_ptp_offset_init (const struct hw_atl_ptp_offset *offsets) {memset (ptp_offset,0 ,sizeof (ptp_offset));
@@ -1104,7 +1104,7 @@ static void aq_ptp_offset_init(const struct hw_aq_ptp_offset *offsets) }static void aq_ptp_gpio_init (struct ptp_clock_info *info, -struct hw_aq_info *hw_info) +struct hw_atl_info *hw_info) {struct ptp_pin_desc pin_desc[MAX_PTP_GPIO_COUNT ];u32 extts_pin_cnt =0 ;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +4 -4
@@ -113,7 +113,7 @@ struct __packed hw_atl_utils_mbox_header {u32 error; }; -struct __packed hw_aq_ptp_offset { +struct __packed hw_atl_ptp_offset {u16 ingress_100;u16 egress_100;u16 ingress_1000;
@@ -148,14 +148,14 @@ enum gpio_pin_function { GPIO_PIN_FUNCTION_SIZE }; -struct __packed hw_aq_info { +struct __packed hw_atl_info {u8 reserved[6 ];u16 phy_fault_code;u16 phy_temperature;u8 cable_len;u8 reserved1;struct hw_atl_cable_diag cable_diag_data[4 ]; -struct hw_aq_ptp_offset ptp_offset; +struct hw_atl_ptp_offset ptp_offset;u8 reserved2[12 ];u32 caps_lo;u32 caps_hi;
@@ -177,7 +177,7 @@ struct __packed hw_aq_info {struct __packed hw_atl_utils_mbox {struct hw_atl_utils_mbox_header header;struct hw_atl_stats_s stats; -struct hw_aq_info info; +struct hw_atl_info info; };struct __packed offload_ip_info {
Signature · 1 line
2.17.1
PATCH v2 10/12 net: atlantic: update flow control logic
In reply to Igor RusskikhFrom: Nikita Danilov <[email protected]>
We now differentiate requested and negotiated flow control modes. Therefore ethtool -A now operates on local requested FC values, and regular link settings shows the negotiated FC settings.
--- .../net/ethernet/aquantia/atlantic/aq_cfg.h | 6 --- .../ethernet/aquantia/atlantic/aq_ethtool.c | 10 ++-- .../net/ethernet/aquantia/atlantic/aq_nic.c | 19 +++++--- .../net/ethernet/aquantia/atlantic/aq_nic.h | 14 +++++- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 47 +++++++++++-------- 7 files changed, 59 insertions(+), 41 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h +0 -6
@@ -70,12 +70,6 @@/*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/ -#define AQ_NIC_FC_OFF 0U -#define AQ_NIC_FC_TX 1U -#define AQ_NIC_FC_RX 2U -#define AQ_NIC_FC_FULL 3U -#define AQ_NIC_FC_AUTO 4U -#define AQ_CFG_FC_MODE AQ_NIC_FC_FULL/* Default WOL modes used on initialization */
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +5 -5
@@ -588,7 +588,7 @@ static void aq_ethtool_get_pauseparam(struct net_device *ndev, struct ethtool_pauseparam *pause) {struct aq_nic_s *aq_nic =netdev_priv (ndev); -u32 fc = aq_nic->aq_nic_cfg.flow_control; +u32 fc = aq_nic->aq_nic_cfg.fc.req; pause->autoneg =0 ;
@@ -610,14 +610,14 @@ static int aq_ethtool_set_pauseparam(struct net_device *ndev,return -EOPNOTSUPP ;if (pause->rx_pause) - aq_nic->aq_hw->aq_nic_cfg->flow_control |=AQ_NIC_FC_RX ; + aq_nic->aq_hw->aq_nic_cfg->fc.req |=AQ_NIC_FC_RX ;else - aq_nic->aq_hw->aq_nic_cfg->flow_control &= ~AQ_NIC_FC_RX ; + aq_nic->aq_hw->aq_nic_cfg->fc.req &= ~AQ_NIC_FC_RX ;if (pause->tx_pause) - aq_nic->aq_hw->aq_nic_cfg->flow_control |=AQ_NIC_FC_TX ; + aq_nic->aq_hw->aq_nic_cfg->fc.req |=AQ_NIC_FC_TX ;else - aq_nic->aq_hw->aq_nic_cfg->flow_control &= ~AQ_NIC_FC_TX ; + aq_nic->aq_hw->aq_nic_cfg->fc.req &= ~AQ_NIC_FC_TX ;mutex_lock (&aq_nic->fwreq_mutex); err = aq_nic->aq_fw_ops->set_flow_control (aq_nic->aq_hw);
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +12 -7
@@ -79,7 +79,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) cfg->is_rss =AQ_CFG_IS_RSS_DEF ; cfg->num_rss_queues =AQ_CFG_NUM_RSS_QUEUES_DEF ; cfg->aq_rss.base_cpu_number =AQ_CFG_RSS_BASE_CPU_NUM_DEF ; - cfg->flow_control =AQ_CFG_FC_MODE ; + cfg->fc.req =AQ_CFG_FC_MODE ; cfg->wol =AQ_CFG_WOL_MODES ; cfg->mtu =AQ_CFG_MTU_DEF ;
@@ -144,6 +144,10 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)if (err)return err; +if (self->aq_fw_ops->get_flow_control) + self->aq_fw_ops->get_flow_control (self->aq_hw, &fc); + self->aq_nic_cfg.fc.cur = fc; +if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps) { netdev_info(self->ndev, "%s: link change old %d new %d\n", AQ_CFG_DRV_NAME, self->link_status.mbps,
@@ -161,8 +165,6 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)* on any link event. * We should query FW whether it negotiated FC. */ -if (self->aq_fw_ops->get_flow_control) - self->aq_fw_ops->get_flow_control (self->aq_hw, &fc);if (self->aq_hw_ops->hw_set_fc) self->aq_hw_ops->hw_set_fc (self->aq_hw, fc,0 ); }
@@ -862,9 +864,12 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,ethtool_link_ksettings_add_link_mode (cmd, supported, 100baseT_Full); -if (self->aq_nic_cfg.aq_hw_caps->flow_control) +if (self->aq_nic_cfg.aq_hw_caps->flow_control) {ethtool_link_ksettings_add_link_mode (cmd, supported, Pause); +ethtool_link_ksettings_add_link_mode (cmd, supported, + Asym_Pause); + }ethtool_link_ksettings_add_link_mode (cmd, supported, Autoneg);
@@ -898,13 +903,13 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,ethtool_link_ksettings_add_link_mode (cmd, advertising, 100baseT_Full); -if (self->aq_nic_cfg.flow_control &AQ_NIC_FC_RX ) +if (self->aq_nic_cfg.fc.cur &AQ_NIC_FC_RX )ethtool_link_ksettings_add_link_mode (cmd, advertising, Pause);/* Asym is when either RX or TX, but not both */ -if (!!(self->aq_nic_cfg.flow_control &AQ_NIC_FC_TX ) ^ - !!(self->aq_nic_cfg.flow_control &AQ_NIC_FC_RX )) +if (!!(self->aq_nic_cfg.fc.cur &AQ_NIC_FC_TX ) ^ + !!(self->aq_nic_cfg.fc.cur &AQ_NIC_FC_RX ))ethtool_link_ksettings_add_link_mode (cmd, advertising, Asym_Pause);
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +13 -1
@@ -20,6 +20,18 @@ struct aq_vec_s;struct aq_ptp_s ;enum aq_rx_filter_type ; +enum aq_fc_mode { +AQ_NIC_FC_OFF =0 , +AQ_NIC_FC_TX , +AQ_NIC_FC_RX , +AQ_NIC_FC_FULL , +}; + +struct aq_fc_info { +enum aq_fc_mode req; +enum aq_fc_mode cur; +}; +struct aq_nic_cfg_s {const struct aq_hw_caps_s *aq_hw_caps;u64 features;
@@ -34,7 +46,7 @@ struct aq_nic_cfg_s {u32 rxpageorder;u32 num_rss_queues;u32 mtu; -u32 flow_control; +struct aq_fc_info fc;u32 link_speed_msk;u32 wol;u8 is_vlan_rx_strip;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +1 -1
@@ -155,7 +155,7 @@ static int hw_atl_a0_hw_qos_set(struct aq_hw_s *self)/* QoS Rx buf size per TC */ tc =0 ; - is_rx_flow_control = (AQ_NIC_FC_RX & self->aq_nic_cfg->flow_control); + is_rx_flow_control = (AQ_NIC_FC_RX & self->aq_nic_cfg->fc.req); buff_size =HW_ATL_A0_RXBUF_MAX ;hw_atl_rpb_rx_pkt_buff_size_per_tc_set (self, buff_size, tc);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +1 -1
@@ -168,7 +168,7 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self) (1024U / 32U) * 50U) / 100U, tc); -hw_atl_b0_set_fc (self, self->aq_nic_cfg->flow_control, tc); +hw_atl_b0_set_fc (self, self->aq_nic_cfg->fc.req, tc);/* Init TC2 for PTP_RX */ tc =2 ;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +27 -20
75 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 11/12 net: atlantic: implement UDP GSO offload
In reply to Igor Russkikhatlantic hardware does support UDP hardware segmentation offload. This allows user to specify one large contiguous buffer with data which then will be split automagically into multiple UDP packets of specified size.
Bulk sending of large UDP streams lowers CPU usage and increases bandwidth.
We did estimations both with udpgso_bench_tx test tool and with modified iperf3 measurement tool (4 streams, multithread, 200b packet size) over AQC<->AQC 10G link. Flow control is disabled to prevent RX side impact on measurements.
No UDP GSO:
iperf3 -c 10.0.1.2 -u -b0 -l 200 -P4 --multithread UDP GSO: iperf3 -c 10.0.1.2 -u -b0 -l 12600 --udp-lso 200 -P4 --multithread
Mode CPU iperf speed Line speed Packets per second
-------------------------------------------------------------
NO UDP GSO 350% 3.07 Gbps 3.8 Gbps 1,919,419 SW UDP GSO 200% 5.55 Gbps 6.4 Gbps 3,286,144 HW UDP GSO 90% 6.80 Gbps 8.4 Gbps 4,273,117
--- .../device_drivers/aquantia/atlantic.txt | 15 ++++++ .../net/ethernet/aquantia/atlantic/aq_nic.c | 52 ++++++++++--------- .../net/ethernet/aquantia/atlantic/aq_ring.h | 7 +-- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 11 ++-- 5 files changed, 55 insertions(+), 32 deletions(-)
Documentation/networking/device_drivers/aquantia/atlantic.txt +15 -0
@@ -325,6 +325,21 @@ Supported ethtool options Example: ethtool -N eth0 flow-type udp4 action 0 loc 32 + UDP GSO hardware offload + --------------------------------- + UDP GSO allows to boost UDP tx rates by offloading UDP headers allocation + into hardware. A special userspace socket option is required for this, + could be validated with /kernel/tools/testing/selftests/net/ + + udpgso_bench_tx -u -4 -D 10.0.1.1 -s 6300 -S 100 + + Will cause sending out of 100 byte sized UDP packets formed from single + 6300 bytes user buffer. + + UDP GSO is configured by: + + ethtool -K eth0 tx-udp-segmentation on + Private flags (testing) ---------------------------------
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +28 -24
90 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_ring.h +4 -3
@@ -65,19 +65,20 @@ struct __packed aq_ring_buff_s { };union {struct { -u16 len; +u32 len:16 ;u32 is_ip_cso:1 ;u32 is_udp_cso:1 ;u32 is_tcp_cso:1 ;u32 is_cso_err:1 ;u32 is_sop:1 ;u32 is_eop:1 ; -u32 is_gso:1 ; +u32 is_gso_tcp:1 ; +u32 is_gso_udp:1 ;u32 is_mapped:1 ;u32 is_cleaned:1 ;u32 is_error:1 ;u32 is_vlan:1 ; -u32 rsvd3:5 ; +u32 rsvd3:4 ;u16 eop_index;u16 rsvd4; };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +1 -1
@@ -454,7 +454,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, buff = &ring->buff_ring[ring->sw_tail]; -if (buff->is_gso) { +if (buff->is_gso_tcp) { txd->ctl |= (buff->len_l3 <<31 ) | (buff->len_l2 <<24 ) | HW_ATL_A0_TXD_CTL_CMD_TCP |
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +7 -4
@@ -43,7 +43,9 @@NETIF_F_NTUPLE | \NETIF_F_HW_VLAN_CTAG_FILTER | \NETIF_F_HW_VLAN_CTAG_RX | \ - NETIF_F_HW_VLAN_CTAG_TX, \ +NETIF_F_HW_VLAN_CTAG_TX | \ +NETIF_F_GSO_UDP_L4 | \ + NETIF_F_GSO_PARTIAL, \ .hw_priv_flags = IFF_UNICAST_FLT, \ .flow_control = true, \ .mtu = HW_ATL_B0_MTU_JUMBO, \
@@ -533,8 +535,9 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, buff = &ring->buff_ring[ring->sw_tail]; -if (buff->is_gso) { - txd->ctl |=HW_ATL_B0_TXD_CTL_CMD_TCP ; +if (buff->is_gso_tcp || buff->is_gso_udp) { +if (buff->is_gso_tcp) + txd->ctl |=HW_ATL_B0_TXD_CTL_CMD_TCP ; txd->ctl |=HW_ATL_B0_TXD_CTL_DESC_TYPE_TXC ; txd->ctl |= (buff->len_l3 <<31 ) | (buff->len_l2 <<24 );
@@ -554,7 +557,7 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, txd->ctl |= buff->vlan_tx_tag <<4 ; is_vlan = true; } -if (!buff->is_gso && !buff->is_vlan) { +if (!buff->is_gso_tcp && !buff->is_gso_udp && !buff->is_vlan) { buff_pa_len = buff->len; txd->buf_addr = buff->pa;
Signature · 1 line
2.17.1
PATCH v2 12/12 net: atlantic: change email domains to Marvell
In reply to Igor RusskikhAquantia is now part of Marvell, eventually we'll cease standalone aquantia.com domain. Thus, change the maintainers file and some other references to @marvell.com domain
--- .../networking/device_drivers/aquantia/atlantic.txt | 6 +++--- MAINTAINERS | 4 ++-- drivers/net/ethernet/aquantia/atlantic/Makefile | 7 ------- 3 files changed, 5 insertions(+), 12 deletions(-)
Documentation/networking/device_drivers/aquantia/atlantic.txt +3 -3
@@ -1,5 +1,5 @@ -aQuantia AQtion Driver for the aQuantia Multi-Gigabit PCI Express Family of -Ethernet Adapters +Marvell(Aquantia) AQtion Driver for the aQuantia Multi-Gigabit PCI Express +Family of Ethernet Adapters ============================================================================= Contents
@@ -466,7 +466,7 @@ Support If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related -to the issue to [email protected] +to the issue to [email protected] License =======
MAINTAINERS +2 -2
@@ -1182,10 +1182,10 @@ S: Maintained F: drivers/media/i2c/aptina-pll.* AQUANTIA ETHERNET DRIVER (atlantic) -M: Igor Russkikh <[email protected]> +M: Igor Russkikh <[email protected]> L: [email protected] S: Supported -W: http://www.aquantia.com +W: https://www.marvell.com/ Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/aquantia/atlantic/ F: Documentation/networking/device_drivers/aquantia/atlantic.txt
drivers/net/ethernet/aquantia/atlantic/Makefile +0 -7
@@ -4,15 +4,8 @@ # aQuantia Ethernet Controller AQtion Linux Driver # Copyright(c) 2014-2017 aQuantia Corporation. # -# Contact Information: <[email protected]> -# aQuantia Corporation, 105 E. Tasman Dr. San Jose, CA 95134, USA -# ################################################################################ -# -# Makefile for the AQtion(tm) Ethernet driver -# - obj-$(CONFIG_AQTION) += atlantic.o atlantic-objs := aq_main.o \
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Igor Russkikh <[email protected]>
Date: Thu, 7 Nov 2019 22:41:47 +0000
Quoted 10 lines
Here is a bunch of atlantic driver new features and updates.
Shortlist:
- Me adding ethtool private flags for various loopback test modes,
- Nikita is doing some work here on power management, implementing new PM API, He also did some checkpatch style cleanup of older driver parts.
- I'm also adding a new UDP GSO offload support and flags for loopback activation
- We are now Marvell, so I am changing email addresses on maintainers list.v2: styling, ip6 correct handling in udpgso
Series applied, thanks.