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

Commit 67bef942 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

ethernet/atheros: use core min/max MTU checking 



atl2: min_mtu 40, max_mtu 1504

- Remove a few redundant defines that already have equivalents in
  if_ether.h.

atl1: min_mtu 42, max_mtu 10218

atl1e: min_mtu 42, max_mtu 8170

atl1c: min_mtu 42, max_mtu 6122/1500

- GbE hardware gets a max_mtu of 6122, slower hardware gets 1500.

alx: min_mtu 34, max_mtu 9256

- Not so sure that minimum MTU number is really what was intended, but
  that's what the math actually makes it out to be, due to max_frame
  manipulations and comparison in alx_change_mtu, rather than just
  comparing new_mtu. (I think 68 was the intended min_mtu value).

CC: netdev@vger.kernel.org
CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60d2d8dd

drivers/net/ethernet/atheros/alx/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ struct alx_rrd { 
#define ALX_MAX_JUMBO_PKT_SIZE	(9*1024)

#define ALX_MAX_TSO_PKT_SIZE	(7*1024)

#define ALX_MAX_FRAME_SIZE	ALX_MAX_JUMBO_PKT_SIZE

#define ALX_MIN_FRAME_SIZE	(ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN)



#define ALX_MAX_RX_QUEUES	8

#define ALX_MAX_TX_QUEUES	4

drivers/net/ethernet/atheros/alx/main.c

+3 −7
Original line number Diff line number Diff line
@@ -892,6 +892,9 @@ static int alx_init_sw(struct alx_priv *alx) 
	hw->smb_timer = 400;

	hw->mtu = alx->dev->mtu;

	alx->rxbuf_size = ALX_MAX_FRAME_LEN(hw->mtu);

	/* MTU range: 34 - 9256 */

	alx->dev->min_mtu = 34;

	alx->dev->max_mtu = ALX_MAX_FRAME_LEN(ALX_MAX_FRAME_SIZE);

	alx->tx_ringsz = 256;

	alx->rx_ringsz = 512;

	hw->imt = 200;
@@ -994,13 +997,6 @@ static int alx_change_mtu(struct net_device *netdev, int mtu) 
	struct alx_priv *alx = netdev_priv(netdev);

	int max_frame = ALX_MAX_FRAME_LEN(mtu);



	if ((max_frame < ALX_MIN_FRAME_SIZE) ||

	    (max_frame > ALX_MAX_FRAME_SIZE))

		return -EINVAL;



	if (netdev->mtu == mtu)

		return 0;



	netdev->mtu = mtu;

	alx->hw.mtu = mtu;

	alx->rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE);

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+26 −15
Original line number Diff line number Diff line
@@ -519,6 +519,26 @@ static int atl1c_set_features(struct net_device *netdev, 
	return 0;

}



static void atl1c_set_max_mtu(struct net_device *netdev)

{

	struct atl1c_adapter *adapter = netdev_priv(netdev);

	struct atl1c_hw *hw = &adapter->hw;



	switch (hw->nic_type) {

	/* These (GbE) devices support jumbo packets, max_mtu 6122 */

	case athr_l1c:

	case athr_l1d:

	case athr_l1d_2:

		netdev->max_mtu = MAX_JUMBO_FRAME_SIZE -

				  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);

		break;

	/* The 10/100 devices don't support jumbo packets, max_mtu 1500 */

	default:

		netdev->max_mtu = ETH_DATA_LEN;

		break;

	}

}



/**

 * atl1c_change_mtu - Change the Maximum Transfer Unit

 * @netdev: network interface device structure
@@ -529,22 +549,9 @@ static int atl1c_set_features(struct net_device *netdev, 
static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct atl1c_adapter *adapter = netdev_priv(netdev);

	struct atl1c_hw *hw = &adapter->hw;

	int old_mtu   = netdev->mtu;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;



	/* Fast Ethernet controller doesn't support jumbo packet */

	if (((hw->nic_type == athr_l2c ||

	      hw->nic_type == athr_l2c_b ||

	      hw->nic_type == athr_l2c_b2) && new_mtu > ETH_DATA_LEN) ||

	      max_frame < ETH_ZLEN + ETH_FCS_LEN ||

	      max_frame > MAX_JUMBO_FRAME_SIZE) {

		if (netif_msg_link(adapter))

			dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");

		return -EINVAL;

	}



	/* set MTU */

	if (old_mtu != new_mtu && netif_running(netdev)) {

	if (netif_running(netdev)) {

		while (test_and_set_bit(__AT_RESETTING, &adapter->flags))

			msleep(1);

		netdev->mtu = new_mtu;
@@ -2511,6 +2518,7 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev) 


	netdev->netdev_ops = &atl1c_netdev_ops;

	netdev->watchdog_timeo = AT_TX_WATCHDOG;

	netdev->min_mtu = ETH_ZLEN - (ETH_HLEN + VLAN_HLEN);

	atl1c_set_ethtool_ops(netdev);



	/* TODO: add when ready */
@@ -2613,6 +2621,9 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_err(&pdev->dev, "net device private data init failed\n");

		goto err_sw_init;

	}

	/* set max MTU */

	atl1c_set_max_mtu(netdev);



	atl1c_reset_pcie(&adapter->hw, ATL1C_PCIE_L0S_L1_DISABLE);



	/* Init GPHY as early as possible due to power saving issue  */

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+5 −7
Original line number Diff line number Diff line
@@ -439,16 +439,10 @@ static int atl1e_set_features(struct net_device *netdev, 
static int atl1e_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct atl1e_adapter *adapter = netdev_priv(netdev);

	int old_mtu   = netdev->mtu;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;



	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||

			(max_frame > MAX_JUMBO_FRAME_SIZE)) {

		netdev_warn(adapter->netdev, "invalid MTU setting\n");

		return -EINVAL;

	}

	/* set MTU */

	if (old_mtu != new_mtu && netif_running(netdev)) {

	if (netif_running(netdev)) {

		while (test_and_set_bit(__AT_RESETTING, &adapter->flags))

			msleep(1);

		netdev->mtu = new_mtu;
@@ -2272,6 +2266,10 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev) 
	netdev->netdev_ops = &atl1e_netdev_ops;



	netdev->watchdog_timeo = AT_TX_WATCHDOG;

	/* MTU range: 42 - 8170 */

	netdev->min_mtu = ETH_ZLEN - (ETH_HLEN + VLAN_HLEN);

	netdev->max_mtu = MAX_JUMBO_FRAME_SIZE -

			  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);

	atl1e_set_ethtool_ops(netdev);



	netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |

drivers/net/ethernet/atheros/atlx/atl1.c

+6 −9
Original line number Diff line number Diff line
@@ -2701,23 +2701,15 @@ static void atl1_reset_dev_task(struct work_struct *work) 
static int atl1_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct atl1_adapter *adapter = netdev_priv(netdev);

	int old_mtu = netdev->mtu;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;



	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||

	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {

		if (netif_msg_link(adapter))

			dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");

		return -EINVAL;

	}



	adapter->hw.max_frame_size = max_frame;

	adapter->hw.tx_jumbo_task_th = (max_frame + 7) >> 3;

	adapter->rx_buffer_len = (max_frame + 7) & ~7;

	adapter->hw.rx_jumbo_th = adapter->rx_buffer_len / 8;



	netdev->mtu = new_mtu;

	if ((old_mtu != new_mtu) && netif_running(netdev)) {

	if (netif_running(netdev)) {

		atl1_down(adapter);

		atl1_up(adapter);

	}
@@ -3031,6 +3023,11 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* is this valid? see atl1_setup_mac_ctrl() */

	netdev->features |= NETIF_F_RXCSUM;



	/* MTU range: 42 - 10218 */

	netdev->min_mtu = ETH_ZLEN - (ETH_HLEN + VLAN_HLEN);

	netdev->max_mtu = MAX_JUMBO_FRAME_SIZE -

			  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);



	/*

	 * patch for some L1 of old version,

	 * the final version of L1 may not need these