diff mbox

[V4,net-next] net: hns3: Add support to change MTU in HNS3 hardware

Message ID 20170821144003.49436-1-salil.mehta@huawei.com
State Superseded
Headers show

Commit Message

Salil Mehta Aug. 21, 2017, 2:40 p.m. UTC
This patch adds the following support to the HNS3 driver:
1. Support to change the Maximum Transmission Unit of a
   port in the HNS NIC hardware.
2. Initializes the supported MTU range for the netdevice.

Signed-off-by: lipeng <lipeng321@huawei.com>

Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

---
PATCH V4: Addressed some minor comments Leon Romanovsky
          1. https://lkml.org/lkml/2017/8/21/212
PATCH V3: Addressed some minor comments Leon Romanovsky
          1. https://lkml.org/lkml/2017/8/20/27
PATCH V2: Addresses comments given by Andrew Lunn
          1. https://lkml.org/lkml/2017/8/18/282
PATCH V1: Initial Submit
---
 .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 34 ++++++++++++++++++++++
 .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h |  1 +
 2 files changed, 35 insertions(+)

-- 
2.7.4

Comments

Leon Romanovsky Aug. 21, 2017, 2:48 p.m. UTC | #1
On Mon, Aug 21, 2017 at 03:40:03PM +0100, Salil Mehta wrote:
> This patch adds the following support to the HNS3 driver:

> 1. Support to change the Maximum Transmission Unit of a

>    port in the HNS NIC hardware.

> 2. Initializes the supported MTU range for the netdevice.

>

> Signed-off-by: lipeng <lipeng321@huawei.com>

> Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

> ---

> PATCH V4: Addressed some minor comments Leon Romanovsky

>           1. https://lkml.org/lkml/2017/8/21/212

> PATCH V3: Addressed some minor comments Leon Romanovsky

>           1. https://lkml.org/lkml/2017/8/20/27

> PATCH V2: Addresses comments given by Andrew Lunn

>           1. https://lkml.org/lkml/2017/8/18/282

> PATCH V1: Initial Submit

> ---

>  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 34 ++++++++++++++++++++++

>  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h |  1 +

>  2 files changed, 35 insertions(+)

>


Wrong error code is not "minor" comment.

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Salil Mehta Aug. 21, 2017, 2:49 p.m. UTC | #2
Sorry, Please ignore this mail.

I forgot to add the Andrew Lunn signed-off-by Tag will this patch.
I will add the tag and send the updated version of V4 again.

Sorry again.

> -----Original Message-----

> From: Salil Mehta

> Sent: Monday, August 21, 2017 3:40 PM

> To: davem@davemloft.net

> Cc: Salil Mehta; Zhuangyuzeng (Yisen); lipeng (Y);

> mehta.salil.lnk@gmail.com; netdev@vger.kernel.org; linux-

> kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Linuxarm

> Subject: [PATCH V4 net-next] net: hns3: Add support to change MTU in

> HNS3 hardware

> 

> This patch adds the following support to the HNS3 driver:

> 1. Support to change the Maximum Transmission Unit of a

>    port in the HNS NIC hardware.

> 2. Initializes the supported MTU range for the netdevice.

> 

> Signed-off-by: lipeng <lipeng321@huawei.com>

> Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

> ---

> PATCH V4: Addressed some minor comments Leon Romanovsky

>           1. https://lkml.org/lkml/2017/8/21/212

> PATCH V3: Addressed some minor comments Leon Romanovsky

>           1. https://lkml.org/lkml/2017/8/20/27

> PATCH V2: Addresses comments given by Andrew Lunn

>           1. https://lkml.org/lkml/2017/8/18/282

> PATCH V1: Initial Submit

> ---

>  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 34

> ++++++++++++++++++++++

>  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h |  1 +

>  2 files changed, 35 insertions(+)

> 

> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c

> b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c

> index e731f87..1c3e294 100644

> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c

> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c

> @@ -1278,11 +1278,42 @@ static int hns3_ndo_set_vf_vlan(struct

> net_device *netdev, int vf, u16 vlan,

>  	return ret;

>  }

> 

> +static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)

> +{

> +	struct hns3_nic_priv *priv = netdev_priv(netdev);

> +	struct hnae3_handle *h = priv->ae_handle;

> +	bool if_running = netif_running(netdev);

> +	int ret;

> +

> +	if (!h->ae_algo->ops->set_mtu)

> +		return -EOPNOTSUPP;

> +

> +	/* if this was called with netdev up then bring netdevice down */

> +	if (if_running) {

> +		(void)hns3_nic_net_stop(netdev);

> +		msleep(100);

> +	}

> +

> +	ret = h->ae_algo->ops->set_mtu(h, new_mtu);

> +	if (ret) {

> +		netdev_err(netdev, "failed to change MTU in hardware %d\n",

> +			   ret);

> +		return ret;

> +	}

> +

> +	/* if the netdev was running earlier, bring it up again */

> +	if (if_running && hns3_nic_net_open(netdev))

> +		ret = -EINVAL;

> +

> +	return ret;

> +}

> +

>  static const struct net_device_ops hns3_nic_netdev_ops = {

>  	.ndo_open		= hns3_nic_net_open,

>  	.ndo_stop		= hns3_nic_net_stop,

>  	.ndo_start_xmit		= hns3_nic_net_xmit,

>  	.ndo_set_mac_address	= hns3_nic_net_set_mac_address,

> +	.ndo_change_mtu		= hns3_nic_change_mtu,

>  	.ndo_set_features	= hns3_nic_set_features,

>  	.ndo_get_stats64	= hns3_nic_get_stats64,

>  	.ndo_setup_tc		= hns3_nic_setup_tc,

> @@ -2752,6 +2783,9 @@ static int hns3_client_init(struct hnae3_handle

> *handle)

>  		goto out_reg_netdev_fail;

>  	}

> 

> +	/* MTU range: (ETH_MIN_MTU(kernel default) - 9706) */

> +	netdev->max_mtu = HNS3_MAX_MTU - (ETH_HLEN + ETH_FCS_LEN +

> VLAN_HLEN);

> +

>  	return ret;

> 

>  out_reg_netdev_fail:

> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h

> b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h

> index a6e8f15..7e87461 100644

> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h

> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h

> @@ -76,6 +76,7 @@ enum hns3_nic_state {

>  #define HNS3_RING_NAME_LEN			16

>  #define HNS3_BUFFER_SIZE_2048			2048

>  #define HNS3_RING_MAX_PENDING			32768

> +#define HNS3_MAX_MTU				9728

> 

>  #define HNS3_BD_SIZE_512_TYPE			0

>  #define HNS3_BD_SIZE_1024_TYPE			1

> --

> 2.7.4

>
Salil Mehta Aug. 21, 2017, 2:58 p.m. UTC | #3
Hi Leon,

> -----Original Message-----

> From: Leon Romanovsky [mailto:leon@kernel.org]

> Sent: Monday, August 21, 2017 3:49 PM

> To: Salil Mehta

> Cc: davem@davemloft.net; Zhuangyuzeng (Yisen); lipeng (Y);

> mehta.salil.lnk@gmail.com; netdev@vger.kernel.org; linux-

> kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Linuxarm

> Subject: Re: [PATCH V4 net-next] net: hns3: Add support to change MTU

> in HNS3 hardware

> 

> On Mon, Aug 21, 2017 at 03:40:03PM +0100, Salil Mehta wrote:

> > This patch adds the following support to the HNS3 driver:

> > 1. Support to change the Maximum Transmission Unit of a

> >    port in the HNS NIC hardware.

> > 2. Initializes the supported MTU range for the netdevice.

> >

> > Signed-off-by: lipeng <lipeng321@huawei.com>

> > Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

> > ---

> > PATCH V4: Addressed some minor comments Leon Romanovsky

> >           1. https://lkml.org/lkml/2017/8/21/212

> > PATCH V3: Addressed some minor comments Leon Romanovsky

> >           1. https://lkml.org/lkml/2017/8/20/27

> > PATCH V2: Addresses comments given by Andrew Lunn

> >           1. https://lkml.org/lkml/2017/8/18/282

> > PATCH V1: Initial Submit

> > ---

> >  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 34

> ++++++++++++++++++++++

> >  .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h |  1 +

> >  2 files changed, 35 insertions(+)

> >

> 

> Wrong error code is not "minor" comment.

Sorry for the wrong terminology used. Both of the comments
were definitely useful and I have taken into consideration
both of them in my recent patch. I think I missed it while
replying, saw it while and created the patch later.
Sorry for that again.

I will correct this in my subsequent patch.

Best regards
Salil
> 

> Thanks,

> Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
diff mbox

Patch

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
index e731f87..1c3e294 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
@@ -1278,11 +1278,42 @@  static int hns3_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
 	return ret;
 }
 
+static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
+{
+	struct hns3_nic_priv *priv = netdev_priv(netdev);
+	struct hnae3_handle *h = priv->ae_handle;
+	bool if_running = netif_running(netdev);
+	int ret;
+
+	if (!h->ae_algo->ops->set_mtu)
+		return -EOPNOTSUPP;
+
+	/* if this was called with netdev up then bring netdevice down */
+	if (if_running) {
+		(void)hns3_nic_net_stop(netdev);
+		msleep(100);
+	}
+
+	ret = h->ae_algo->ops->set_mtu(h, new_mtu);
+	if (ret) {
+		netdev_err(netdev, "failed to change MTU in hardware %d\n",
+			   ret);
+		return ret;
+	}
+
+	/* if the netdev was running earlier, bring it up again */
+	if (if_running && hns3_nic_net_open(netdev))
+		ret = -EINVAL;
+
+	return ret;
+}
+
 static const struct net_device_ops hns3_nic_netdev_ops = {
 	.ndo_open		= hns3_nic_net_open,
 	.ndo_stop		= hns3_nic_net_stop,
 	.ndo_start_xmit		= hns3_nic_net_xmit,
 	.ndo_set_mac_address	= hns3_nic_net_set_mac_address,
+	.ndo_change_mtu		= hns3_nic_change_mtu,
 	.ndo_set_features	= hns3_nic_set_features,
 	.ndo_get_stats64	= hns3_nic_get_stats64,
 	.ndo_setup_tc		= hns3_nic_setup_tc,
@@ -2752,6 +2783,9 @@  static int hns3_client_init(struct hnae3_handle *handle)
 		goto out_reg_netdev_fail;
 	}
 
+	/* MTU range: (ETH_MIN_MTU(kernel default) - 9706) */
+	netdev->max_mtu = HNS3_MAX_MTU - (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);
+
 	return ret;
 
 out_reg_netdev_fail:
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h
index a6e8f15..7e87461 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h
@@ -76,6 +76,7 @@  enum hns3_nic_state {
 #define HNS3_RING_NAME_LEN			16
 #define HNS3_BUFFER_SIZE_2048			2048
 #define HNS3_RING_MAX_PENDING			32768
+#define HNS3_MAX_MTU				9728
 
 #define HNS3_BD_SIZE_512_TYPE			0
 #define HNS3_BD_SIZE_1024_TYPE			1