Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd63c3e0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'aquantia-fixes' 



Igor Russkikh says:

====================
net: aquantia: 2018-11 bugfixes

The patchset fixes a number of bugs found in various areas after
driver validation.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 85b18b02 bbb67a44

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -407,13 +407,13 @@ 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;



	pause->autoneg = 0;



	if (aq_nic->aq_hw->aq_nic_cfg->flow_control & AQ_NIC_FC_RX)

		pause->rx_pause = 1;

	if (aq_nic->aq_hw->aq_nic_cfg->flow_control & AQ_NIC_FC_TX)

		pause->tx_pause = 1;

	pause->rx_pause = !!(fc & AQ_NIC_FC_RX);

	pause->tx_pause = !!(fc & AQ_NIC_FC_TX);



}



static int aq_ethtool_set_pauseparam(struct net_device *ndev,

drivers/net/ethernet/aquantia/atlantic/aq_hw.h

+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ struct aq_hw_ops { 


	int (*hw_get_fw_version)(struct aq_hw_s *self, u32 *fw_version);



	int (*hw_set_offload)(struct aq_hw_s *self,

			      struct aq_nic_cfg_s *aq_nic_cfg);



	int (*hw_set_fc)(struct aq_hw_s *self, u32 fc, u32 tc);

};



struct aq_fw_ops {
@@ -226,6 +230,8 @@ struct aq_fw_ops { 


	int (*update_stats)(struct aq_hw_s *self);



	u32 (*get_flow_control)(struct aq_hw_s *self, u32 *fcmode);



	int (*set_flow_control)(struct aq_hw_s *self);



	int (*set_power)(struct aq_hw_s *self, unsigned int power_state,

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+8 −2
Original line number Diff line number Diff line
@@ -99,8 +99,11 @@ static int aq_ndev_set_features(struct net_device *ndev, 
	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *aq_cfg = aq_nic_get_cfg(aq_nic);

	bool is_lro = false;

	int err = 0;



	aq_cfg->features = features;



	if (aq_cfg->hw_features & NETIF_F_LRO) {

	if (aq_cfg->aq_hw_caps->hw_features & NETIF_F_LRO) {

		is_lro = features & NETIF_F_LRO;



		if (aq_cfg->is_lro != is_lro) {
@@ -112,8 +115,11 @@ static int aq_ndev_set_features(struct net_device *ndev, 
			}

		}

	}

	if ((aq_nic->ndev->features ^ features) & NETIF_F_RXCSUM)

		err = aq_nic->aq_hw_ops->hw_set_offload(aq_nic->aq_hw,

							aq_cfg);



	return 0;

	return err;

}



static int aq_ndev_set_mac_address(struct net_device *ndev, void *addr)

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+15 −3
Original line number Diff line number Diff line
@@ -118,12 +118,13 @@ void aq_nic_cfg_start(struct aq_nic_s *self) 
	}



	cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk;

	cfg->hw_features = cfg->aq_hw_caps->hw_features;

	cfg->features = cfg->aq_hw_caps->hw_features;

}



static int aq_nic_update_link_status(struct aq_nic_s *self)

{

	int err = self->aq_fw_ops->update_link_status(self->aq_hw);

	u32 fc = 0;



	if (err)

		return err;
@@ -133,6 +134,15 @@ static int aq_nic_update_link_status(struct aq_nic_s *self) 
			AQ_CFG_DRV_NAME, self->link_status.mbps,

			self->aq_hw->aq_link_status.mbps);

		aq_nic_update_interrupt_moderation_settings(self);



		/* Driver has to update flow control settings on RX block

		 * 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);

	}



	self->link_status = self->aq_hw->aq_link_status;
@@ -590,7 +600,7 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev) 
		}

	}



	if (i > 0 && i < AQ_HW_MULTICAST_ADDRESS_MAX) {

	if (i > 0 && i <= AQ_HW_MULTICAST_ADDRESS_MAX) {

		packet_filter |= IFF_MULTICAST;

		self->mc_list.count = i;

		self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
@@ -772,7 +782,9 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self, 
		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     Pause);



	if (self->aq_nic_cfg.flow_control & AQ_NIC_FC_TX)

	/* 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))

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     Asym_Pause);

drivers/net/ethernet/aquantia/atlantic/aq_nic.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct aq_vec_s; 


struct aq_nic_cfg_s {

	const struct aq_hw_caps_s *aq_hw_caps;

	u64 hw_features;

	u64 features;

	u32 rxds;		/* rx ring size, descriptors # */

	u32 txds;		/* tx ring size, descriptors # */

	u32 vecs;		/* vecs==allocated irqs */