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

Merge branch 'aquantia-fixes' 



Igor Russkikh says:

====================
Aquantia/Marvell AQtion atlantic driver fixes 10/2019

Here is a set of various bugfixes, to be considered for stable as well.

V2: double space removed
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 33902b4a 9f051db5

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

+1 −3
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev) 
{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);



	aq_nic_set_packet_filter(aq_nic, ndev->flags);



	aq_nic_set_multicast_list(aq_nic, ndev);

	(void)aq_nic_set_multicast_list(aq_nic, ndev);

}



static int aq_ndo_vlan_rx_add_vid(struct net_device *ndev, __be16 proto,

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

+16 −16
Original line number Diff line number Diff line
@@ -631,9 +631,12 @@ err_exit: 


int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)

{

	unsigned int packet_filter = self->packet_filter;

	const struct aq_hw_ops *hw_ops = self->aq_hw_ops;

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

	unsigned int packet_filter = ndev->flags;

	struct netdev_hw_addr *ha = NULL;

	unsigned int i = 0U;

	int err = 0;



	self->mc_list.count = 0;

	if (netdev_uc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
@@ -641,27 +644,24 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev) 
	} else {

		netdev_for_each_uc_addr(ha, ndev) {

			ether_addr_copy(self->mc_list.ar[i++], ha->addr);



			if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)

				break;

		}

	}



	cfg->is_mc_list_enabled = !!(packet_filter & IFF_MULTICAST);

	if (cfg->is_mc_list_enabled) {

		if (i + netdev_mc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {

			packet_filter |= IFF_ALLMULTI;

		} else {

			netdev_for_each_mc_addr(ha, ndev) {

			ether_addr_copy(self->mc_list.ar[i++], ha->addr);



			if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)

				break;

				ether_addr_copy(self->mc_list.ar[i++],

						ha->addr);

			}

		}

	}



	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,

		err = hw_ops->hw_multicast_list_set(self->aq_hw,

						    self->mc_list.ar,

						    self->mc_list.count);

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
					break;



				buff->is_error |= buff_->is_error;

				buff->is_cso_err |= buff_->is_cso_err;



			} while (!buff_->is_eop);
@@ -320,7 +321,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
				err = 0;

				goto err_exit;

			}

			if (buff->is_error) {

			if (buff->is_error || buff->is_cso_err) {

				buff_ = buff;

				do {

					next_ = buff_->next,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+18 −5
Original line number Diff line number Diff line
@@ -818,14 +818,15 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, 
				     cfg->is_vlan_force_promisc);



	hw_atl_rpfl2multicast_flr_en_set(self,

					 IS_FILTER_ENABLED(IFF_ALLMULTI), 0);

					 IS_FILTER_ENABLED(IFF_ALLMULTI) &&

					 IS_FILTER_ENABLED(IFF_MULTICAST), 0);



	hw_atl_rpfl2_accept_all_mc_packets_set(self,

					       IS_FILTER_ENABLED(IFF_ALLMULTI));

					      IS_FILTER_ENABLED(IFF_ALLMULTI) &&

					      IS_FILTER_ENABLED(IFF_MULTICAST));



	hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST));



	cfg->is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST);



	for (i = HW_ATL_B0_MAC_MIN; i < HW_ATL_B0_MAC_MAX; ++i)

		hw_atl_rpfl2_uc_flr_en_set(self,
@@ -968,14 +969,26 @@ static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self) 


static int hw_atl_b0_hw_stop(struct aq_hw_s *self)

{

	int err;

	u32 val;



	hw_atl_b0_hw_irq_disable(self, HW_ATL_B0_INT_MASK);



	/* Invalidate Descriptor Cache to prevent writing to the cached

	 * descriptors and to the data pointer of those descriptors

	 */

	hw_atl_rdm_rx_dma_desc_cache_init_set(self, 1);

	hw_atl_rdm_rx_dma_desc_cache_init_tgl(self);



	return aq_hw_err_from_flags(self);

	err = aq_hw_err_from_flags(self);



	if (err)

		goto err_exit;



	readx_poll_timeout_atomic(hw_atl_rdm_rx_dma_desc_cache_init_done_get,

				  self, val, val == 1, 1000U, 10000U);



err_exit:

	return err;

}



static int hw_atl_b0_hw_ring_tx_stop(struct aq_hw_s *self,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c

+15 −2
Original line number Diff line number Diff line
@@ -606,12 +606,25 @@ void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode 
			    HW_ATL_RPB_RX_FC_MODE_SHIFT, rx_flow_ctl_mode);

}



void hw_atl_rdm_rx_dma_desc_cache_init_set(struct aq_hw_s *aq_hw, u32 init)

void hw_atl_rdm_rx_dma_desc_cache_init_tgl(struct aq_hw_s *aq_hw)

{

	u32 val;



	val = aq_hw_read_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,

				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,

				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT);



	aq_hw_write_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,

			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,

			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT,

			    init);

			    val ^ 1);

}



u32 hw_atl_rdm_rx_dma_desc_cache_init_done_get(struct aq_hw_s *aq_hw)

{

	return aq_hw_read_reg_bit(aq_hw, RDM_RX_DMA_DESC_CACHE_INIT_DONE_ADR,

				  RDM_RX_DMA_DESC_CACHE_INIT_DONE_MSK,

				  RDM_RX_DMA_DESC_CACHE_INIT_DONE_SHIFT);

}



void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,

CRA Git | Maintained and supported by SUSTech CRA and CCSE