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

Merge branch 'atlantic-fixes' 



Igor Russkikh says:

====================
Marvell atlantic 2020/02 updates

Hi David, here is another set of bugfixes on AQC family found on
last integration phase.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4e867c9a 5a292c89

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

+5 −0
Original line number Diff line number Diff line
@@ -722,6 +722,11 @@ static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags) 
	if (flags & ~AQ_PRIV_FLAGS_MASK)

		return -EOPNOTSUPP;



	if (hweight32((flags | priv_flags) & AQ_HW_LOOPBACK_MASK) > 1) {

		netdev_info(ndev, "Can't enable more than one loopback simultaneously\n");

		return -EINVAL;

	}



	cfg->priv_flags = flags;



	if ((priv_flags ^ flags) & BIT(AQ_HW_LOOPBACK_DMA_NET)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ aq_check_approve_fvlan(struct aq_nic_s *aq_nic, 
	}



	if ((aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) &&

	    (!test_bit(be16_to_cpu(fsp->h_ext.vlan_tci),

	    (!test_bit(be16_to_cpu(fsp->h_ext.vlan_tci) & VLAN_VID_MASK,

		       aq_nic->active_vlans))) {

		netdev_err(aq_nic->ndev,

			   "ethtool: unknown vlan-id specified");

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

+2 −0
Original line number Diff line number Diff line
@@ -337,6 +337,8 @@ struct aq_fw_ops { 


	void (*enable_ptp)(struct aq_hw_s *self, int enable);



	void (*adjust_ptp)(struct aq_hw_s *self, uint64_t adj);



	int (*set_eee_rate)(struct aq_hw_s *self, u32 speed);



	int (*get_eee_rate)(struct aq_hw_s *self, u32 *rate,

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

+3 −5
Original line number Diff line number Diff line
@@ -533,8 +533,10 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb, 
				     dx_buff->len,

				     DMA_TO_DEVICE);



	if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa)))

	if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa))) {

		ret = 0;

		goto exit;

	}



	first = dx_buff;

	dx_buff->len_pkt = skb->len;
@@ -655,10 +657,6 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb) 
	if (likely(frags)) {

		err = self->aq_hw_ops->hw_ring_tx_xmit(self->aq_hw,

						       ring, frags);

		if (err >= 0) {

			++ring->stats.tx.packets;

			ring->stats.tx.bytes += skb->len;

		}

	} else {

		err = NETDEV_TX_BUSY;

	}

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

+8 −5
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ static int aq_suspend_common(struct device *dev, bool deep) 
	netif_device_detach(nic->ndev);

	netif_tx_stop_all_queues(nic->ndev);



	if (netif_running(nic->ndev))

		aq_nic_stop(nic);



	if (deep) {
@@ -375,7 +376,7 @@ static int atl_resume_common(struct device *dev, bool deep) 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct aq_nic_s *nic;

	int ret;

	int ret = 0;



	nic = pci_get_drvdata(pdev);
@@ -390,9 +391,11 @@ static int atl_resume_common(struct device *dev, bool deep) 
			goto err_exit;

	}



	if (netif_running(nic->ndev)) {

		ret = aq_nic_start(nic);

		if (ret)

			goto err_exit;

	}



	netif_device_attach(nic->ndev);

	netif_tx_start_all_queues(nic->ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE