net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool.

o min_tx_rate puts lower limit on the VF bandwidth. VF is guaranteed
  to have a bandwidth of at least this value.
  max_tx_rate puts cap on the VF bandwidth. VF can have a bandwidth
  of up to this value.

o A new handler set_vf_rate for attr IFLA_VF_RATE has been introduced
  which takes 4 arguments:
  netdev, VF number, min_tx_rate, max_tx_rate

o ndo_set_vf_rate replaces ndo_set_vf_tx_rate handler.

o Drivers that currently implement ndo_set_vf_tx_rate should now call
  ndo_set_vf_rate instead and reject attempt to set a minimum bandwidth
  greater than 0 for IFLA_VF_TX_RATE when IFLA_VF_RATE is not yet
  implemented by driver.

o If user enters only one of either min_tx_rate or max_tx_rate, then,
  userland should read back the other value from driver and set both
  for IFLA_VF_RATE.
  Drivers that have not yet implemented IFLA_VF_RATE should always
  return min_tx_rate as 0 when read from ip tool.

o If both IFLA_VF_TX_RATE and IFLA_VF_RATE options are specified, then
  IFLA_VF_RATE should override.

o Idea is to have consistent display of rate values to user.

o Usage example: -

  ./ip link set p4p1 vf 0 rate 900

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f0 brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5a, tx rate 900 (Mbps), max_tx_rate 900Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

  ./ip link set p4p1 vf 0 max_tx_rate 300 min_tx_rate 200

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f0 brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5a, tx rate 300 (Mbps), max_tx_rate 300Mbps,
    min_tx_rate 200Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

  ./ip link set p4p1 vf 0 max_tx_rate 600 rate 300

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5, tx rate 600 (Mbps), max_tx_rate 600Mbps,
    min_tx_rate 200Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

16 files changed, 109 insertions, 56 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 81cc2d9831c2..8d0479d5be8e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2576,7 +2576,8 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx,
 
         ivi->vf = vfidx;
         ivi->qos = 0;
-        ivi->tx_rate = 10000; /* always 10G. TBA take from link struct */
+        ivi->max_tx_rate = 10000; /* always 10G. TBA take from link struct */
+        ivi->min_tx_rate = 0;
         ivi->spoofchk = 1; /*always enabled */
         if (vf->state == VF_ENABLED) {
                 /* mac and vlan are in vlan_mac objects */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index dcc5e5c69743..4693d004a223 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1302,7 +1302,8 @@ static int be_get_vf_config(struct net_device *netdev, int vf,
                 return -EINVAL;
 
         vi->vf = vf;
-        vi->tx_rate = vf_cfg->tx_rate;
+        vi->max_tx_rate = vf_cfg->tx_rate;
+        vi->min_tx_rate = 0;
         vi->vlan = vf_cfg->vlan_tag & VLAN_VID_MASK;
         vi->qos = vf_cfg->vlan_tag >> VLAN_PRIO_SHIFT;
         memcpy(&vi->mac, vf_cfg->mac_addr, ETH_ALEN);
@@ -1342,7 +1343,8 @@ static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
         return status;
 }
 
-static int be_set_vf_tx_rate(struct net_device *netdev, int vf, int rate)
+static int be_set_vf_tx_rate(struct net_device *netdev, int vf,
+                             int min_tx_rate, int max_tx_rate)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
         int status = 0;
@@ -1353,18 +1355,21 @@ static int be_set_vf_tx_rate(struct net_device *netdev, int vf, int rate)
         if (vf >= adapter->num_vfs)
                 return -EINVAL;
 
-        if (rate < 100 || rate > 10000) {
+        if (min_tx_rate)
+                return -EINVAL;
+
+        if (max_tx_rate < 100 || max_tx_rate > 10000) {
                 dev_err(&adapter->pdev->dev,
-                        "tx rate must be between 100 and 10000 Mbps\n");
+                        "max tx rate must be between 100 and 10000 Mbps\n");
                 return -EINVAL;
         }
 
-        status = be_cmd_config_qos(adapter, rate / 10, vf + 1);
+        status = be_cmd_config_qos(adapter, max_tx_rate / 10, vf + 1);
         if (status)
                 dev_err(&adapter->pdev->dev,
-                        "tx rate %d on VF %d failed\n", rate, vf);
+                        "max tx rate %d on VF %d failed\n", max_tx_rate, vf);
         else
-                adapter->vf_cfg[vf].tx_rate = rate;
+                adapter->vf_cfg[vf].tx_rate = max_tx_rate;
         return status;
 }
 static int be_set_vf_link_state(struct net_device *netdev, int vf,
@@ -4257,7 +4262,7 @@ static const struct net_device_ops be_netdev_ops = {
         .ndo_vlan_rx_kill_vid   = be_vlan_rem_vid,
         .ndo_set_vf_mac         = be_set_vf_mac,
         .ndo_set_vf_vlan        = be_set_vf_vlan,
-        .ndo_set_vf_tx_rate     = be_set_vf_tx_rate,
+        .ndo_set_vf_rate        = be_set_vf_tx_rate,
         .ndo_get_vf_config      = be_get_vf_config,
         .ndo_set_vf_link_state  = be_set_vf_link_state,
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index e0e5c6a867b1..96f7fabd8758 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6724,7 +6724,7 @@ static const struct net_device_ops i40e_netdev_ops = {
         .ndo_set_features       = i40e_set_features,
         .ndo_set_vf_mac         = i40e_ndo_set_vf_mac,
         .ndo_set_vf_vlan        = i40e_ndo_set_vf_port_vlan,
-        .ndo_set_vf_tx_rate     = i40e_ndo_set_vf_bw,
+        .ndo_set_vf_rate        = i40e_ndo_set_vf_bw,
         .ndo_get_vf_config      = i40e_ndo_get_vf_config,
         .ndo_set_vf_link_state  = i40e_ndo_set_vf_link_state,
 #ifdef CONFIG_I40E_VXLAN
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 4d219566a04d..8564b0939dc4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2205,7 +2205,8 @@ error_pvid:
  *
  * configure vf tx rate
  **/
-int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate)
+int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
+                       int max_tx_rate)
 {
         struct i40e_netdev_priv *np = netdev_priv(netdev);
         struct i40e_pf *pf = np->vsi->back;
@@ -2221,6 +2222,12 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate)
                 goto error;
         }
 
+        if (min_tx_rate) {
+                dev_err(&pf->pdev->dev, "Invalid min tx rate (%d) (greater than 0) specified for vf %d.\n",
+                        min_tx_rate, vf_id);
+                return -EINVAL;
+        }
+
         vf = &(pf->vf[vf_id]);
         vsi = pf->vsi[vf->lan_vsi_index];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
@@ -2243,23 +2250,23 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate)
                 break;
         }
 
-        if (tx_rate > speed) {
-                dev_err(&pf->pdev->dev, "Invalid tx rate %d specified for vf %d.",
-                        tx_rate, vf->vf_id);
+        if (max_tx_rate > speed) {
+                dev_err(&pf->pdev->dev, "Invalid max tx rate %d specified for vf %d.",
+                        max_tx_rate, vf->vf_id);
                 ret = -EINVAL;
                 goto error;
         }
 
         /* Tx rate credits are in values of 50Mbps, 0 is disabled*/
-        ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, tx_rate / 50, 0,
-                                          NULL);
+        ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, max_tx_rate / 50,
+                                          0, NULL);
         if (ret) {
-                dev_err(&pf->pdev->dev, "Unable to set tx rate, error code %d.\n",
+                dev_err(&pf->pdev->dev, "Unable to set max tx rate, error code %d.\n",
                         ret);
                 ret = -EIO;
                 goto error;
         }
-        vf->tx_rate = tx_rate;
+        vf->tx_rate = max_tx_rate;
 error:
         return ret;
 }
@@ -2301,7 +2308,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
 
         memcpy(&ivi->mac, vf->default_lan_addr.addr, ETH_ALEN);
 
-        ivi->tx_rate = vf->tx_rate;
+        ivi->max_tx_rate = vf->tx_rate;
+        ivi->min_tx_rate = 0;
         ivi->vlan = le16_to_cpu(vsi->info.pvid) & I40E_VLAN_MASK;
         ivi->qos = (le16_to_cpu(vsi->info.pvid) & I40E_PRIORITY_MASK) >>
                    I40E_VLAN_PRIORITY_SHIFT;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index ba3d1f8414be..5a559be4ba2c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -116,7 +116,8 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf);
 int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);
 int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
                               int vf_id, u16 vlan_id, u8 qos);
-int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate);
+int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
+                       int max_tx_rate);
 int i40e_ndo_get_vf_config(struct net_device *netdev,
                            int vf_id, struct ifla_vf_info *ivi);
 int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index bfcda8a455f4..1075b3f8c415 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -169,7 +169,7 @@ static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
 static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
 static int igb_ndo_set_vf_vlan(struct net_device *netdev,
                                int vf, u16 vlan, u8 qos);
-static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+static int igb_ndo_set_vf_bw(struct net_device *, int, int, int);
 static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
                                    bool setting);
 static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
@@ -2084,7 +2084,7 @@ static const struct net_device_ops igb_netdev_ops = {
         .ndo_vlan_rx_kill_vid   = igb_vlan_rx_kill_vid,
         .ndo_set_vf_mac         = igb_ndo_set_vf_mac,
         .ndo_set_vf_vlan        = igb_ndo_set_vf_vlan,
-        .ndo_set_vf_tx_rate     = igb_ndo_set_vf_bw,
+        .ndo_set_vf_rate        = igb_ndo_set_vf_bw,
         .ndo_set_vf_spoofchk    = igb_ndo_set_vf_spoofchk,
         .ndo_get_vf_config      = igb_ndo_get_vf_config,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -7879,7 +7879,8 @@ static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
         }
 }
 
-static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
+static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf,
+                             int min_tx_rate, int max_tx_rate)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -7888,15 +7889,19 @@ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
         if (hw->mac.type != e1000_82576)
                 return -EOPNOTSUPP;
 
+        if (min_tx_rate)
+                return -EINVAL;
+
         actual_link_speed = igb_link_mbps(adapter->link_speed);
         if ((vf >= adapter->vfs_allocated_count) ||
             (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
-            (tx_rate < 0) || (tx_rate > actual_link_speed))
+            (max_tx_rate < 0) ||
+            (max_tx_rate > actual_link_speed))
                 return -EINVAL;
 
         adapter->vf_rate_link_speed = actual_link_speed;
-        adapter->vf_data[vf].tx_rate = (u16)tx_rate;
-        igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
+        adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
+        igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
 
         return 0;
 }
@@ -7936,7 +7941,8 @@ static int igb_ndo_get_vf_config(struct net_device *netdev,
                 return -EINVAL;
         ivi->vf = vf;
         memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
-        ivi->tx_rate = adapter->vf_data[vf].tx_rate;
+        ivi->max_tx_rate = adapter->vf_data[vf].tx_rate;
+        ivi->min_tx_rate = 0;
         ivi->vlan = adapter->vf_data[vf].pf_vlan;
         ivi->qos = adapter->vf_data[vf].pf_qos;
         ivi->spoofchk = adapter->vf_data[vf].spoofchk_enabled;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 8089ea9f2fba..a5332389620a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7926,7 +7926,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_do_ioctl           = ixgbe_ioctl,
         .ndo_set_vf_mac         = ixgbe_ndo_set_vf_mac,
         .ndo_set_vf_vlan        = ixgbe_ndo_set_vf_vlan,
-        .ndo_set_vf_tx_rate     = ixgbe_ndo_set_vf_bw,
+        .ndo_set_vf_rate        = ixgbe_ndo_set_vf_bw,
         .ndo_set_vf_spoofchk    = ixgbe_ndo_set_vf_spoofchk,
         .ndo_get_vf_config      = ixgbe_ndo_get_vf_config,
         .ndo_get_stats64        = ixgbe_get_stats64,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index a01417c06620..3248e208c9dc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -1222,7 +1222,8 @@ void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter)
         }
 }
 
-int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
+int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate,
+                        int max_tx_rate)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int link_speed;
@@ -1240,13 +1241,16 @@ int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
         if (link_speed != 10000)
                 return -EINVAL;
 
+        if (min_tx_rate)
+                return -EINVAL;
+
         /* rate limit cannot be less than 10Mbs or greater than link speed */
-        if (tx_rate && ((tx_rate <= 10) || (tx_rate > link_speed)))
+        if (max_tx_rate && ((max_tx_rate <= 10) || (max_tx_rate > link_speed)))
                 return -EINVAL;
 
         /* store values */
         adapter->vf_rate_link_speed = link_speed;
-        adapter->vfinfo[vf].tx_rate = tx_rate;
+        adapter->vfinfo[vf].tx_rate = max_tx_rate;
 
         /* update hardware configuration */
         ixgbe_set_vf_rate_limit(adapter, vf);
@@ -1288,7 +1292,8 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                 return -EINVAL;
         ivi->vf = vf;
         memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN);
-        ivi->tx_rate = adapter->vfinfo[vf].tx_rate;
+        ivi->max_tx_rate = adapter->vfinfo[vf].tx_rate;
+        ivi->min_tx_rate = 0;
         ivi->vlan = adapter->vfinfo[vf].pf_vlan;
         ivi->qos = adapter->vfinfo[vf].pf_qos;
         ivi->spoofchk = adapter->vfinfo[vf].spoofchk_enabled;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index cea640147604..32c26d586c01 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -44,7 +44,8 @@ void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
 int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);
 int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
                            u8 qos);
-int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate,
+                        int max_tx_rate);
 int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                             int vf, struct ifla_vf_info *ivi);
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 59c7fd406805..ca8e7cb5a8e4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -2486,11 +2486,12 @@ int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_in
         ivf->mac[4] = ((s_info->mac >> (1*8)) & 0xff);
         ivf->mac[5] = ((s_info->mac)  & 0xff);
 
-        ivf->vlan       = s_info->default_vlan;
-        ivf->qos        = s_info->default_qos;
-        ivf->tx_rate    = s_info->tx_rate;
-        ivf->spoofchk   = s_info->spoofchk;
-        ivf->linkstate  = s_info->link_state;
+        ivf->vlan               = s_info->default_vlan;
+        ivf->qos                = s_info->default_qos;
+        ivf->max_tx_rate        = s_info->tx_rate;
+        ivf->min_tx_rate        = 0;
+        ivf->spoofchk           = s_info->spoofchk;
+        ivf->linkstate          = s_info->link_state;
 
         return 0;
 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 6e7527e2b595..41abe6070466 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -1319,6 +1319,7 @@ struct qlcnic_eswitch {
 #define QL_STATUS_INVALID_PARAM -1
 
 #define MAX_BW                  100     /* % of link speed */
+#define MIN_BW                  1       /* % of link speed */
 #define MAX_VLAN_ID             4095
 #define MIN_VLAN_ID             2
 #define DEFAULT_MAC_LEARN       1
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index f0a285359e66..f06ba90b4282 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -525,7 +525,7 @@ static const struct net_device_ops qlcnic_netdev_ops = {
 #endif
 #ifdef CONFIG_QLCNIC_SRIOV
         .ndo_set_vf_mac         = qlcnic_sriov_set_vf_mac,
-        .ndo_set_vf_tx_rate     = qlcnic_sriov_set_vf_tx_rate,
+        .ndo_set_vf_rate        = qlcnic_sriov_set_vf_tx_rate,
         .ndo_get_vf_config      = qlcnic_sriov_get_vf_config,
         .ndo_set_vf_vlan        = qlcnic_sriov_set_vf_vlan,
         .ndo_set_vf_spoofchk    = qlcnic_sriov_set_vf_spoofchk,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
index 335b50f7bd3e..4677b2edccca 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
@@ -233,7 +233,7 @@ bool qlcnic_sriov_soft_flr_check(struct qlcnic_adapter *,
 void qlcnic_sriov_pf_reset(struct qlcnic_adapter *);
 int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *);
 int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *);
-int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int);
+int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int, int);
 int qlcnic_sriov_get_vf_config(struct net_device *, int ,
                                struct ifla_vf_info *);
 int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index 498fa6350c8d..2bdd9deffb38 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -201,6 +201,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
                         sriov->vf_info[i].vp = vp;
                         vp->vlan_mode = QLC_GUEST_VLAN_MODE;
                         vp->max_tx_bw = MAX_BW;
+                        vp->min_tx_bw = MIN_BW;
                         vp->spoofchk = false;
                         random_ether_addr(vp->mac);
                         dev_info(&adapter->pdev->dev,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
index 6d2f72f114f2..a29538b86edf 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@ -1848,7 +1848,8 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
         return 0;
 }
 
-int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf, int tx_rate)
+int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf,
+                                int min_tx_rate, int max_tx_rate)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_sriov *sriov = adapter->ahw->sriov;
@@ -1863,35 +1864,52 @@ int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf, int tx_rate)
         if (vf >= sriov->num_vfs)
                 return -EINVAL;
 
-        if (tx_rate >= 10000 || tx_rate < 100) {
+        vf_info = &sriov->vf_info[vf];
+        vp = vf_info->vp;
+        vpid = vp->handle;
+
+        if (!min_tx_rate)
+                min_tx_rate = QLC_VF_MIN_TX_RATE;
+
+        if (max_tx_rate &&
+            (max_tx_rate >= 10000 || max_tx_rate < min_tx_rate)) {
                 netdev_err(netdev,
-                           "Invalid Tx rate, allowed range is [%d - %d]",
-                           QLC_VF_MIN_TX_RATE, QLC_VF_MAX_TX_RATE);
+                           "Invalid max Tx rate, allowed range is [%d - %d]",
+                           min_tx_rate, QLC_VF_MAX_TX_RATE);
                 return -EINVAL;
         }
 
-        if (tx_rate == 0)
-                tx_rate = 10000;
+        if (!max_tx_rate)
+                max_tx_rate = 10000;
 
-        vf_info = &sriov->vf_info[vf];
-        vp = vf_info->vp;
-        vpid = vp->handle;
+        if (min_tx_rate &&
+            (min_tx_rate > max_tx_rate || min_tx_rate < QLC_VF_MIN_TX_RATE)) {
+                netdev_err(netdev,
+                           "Invalid min Tx rate, allowed range is [%d - %d]",
+                           QLC_VF_MIN_TX_RATE, max_tx_rate);
+                return -EINVAL;
+        }
 
         if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) {
                 if (qlcnic_sriov_get_vf_vport_info(adapter, &nic_info, vpid))
                         return -EIO;
 
-                nic_info.max_tx_bw = tx_rate / 100;
+                nic_info.max_tx_bw = max_tx_rate / 100;
+                nic_info.min_tx_bw = min_tx_rate / 100;
                 nic_info.bit_offsets = BIT_0;
 
                 if (qlcnic_sriov_pf_set_vport_info(adapter, &nic_info, vpid))
                         return -EIO;
         }
 
-        vp->max_tx_bw = tx_rate / 100;
+        vp->max_tx_bw = max_tx_rate / 100;
+        netdev_info(netdev,
+                    "Setting Max Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
+                    max_tx_rate, vp->max_tx_bw, vf);
+        vp->min_tx_bw = min_tx_rate / 100;
         netdev_info(netdev,
-                    "Setting Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
-                    tx_rate, vp->max_tx_bw, vf);
+                    "Setting Min Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
+                    min_tx_rate, vp->min_tx_bw, vf);
         return 0;
 }
 
@@ -1990,9 +2008,13 @@ int qlcnic_sriov_get_vf_config(struct net_device *netdev,
         ivi->qos = vp->qos;
         ivi->spoofchk = vp->spoofchk;
         if (vp->max_tx_bw == MAX_BW)
-                ivi->tx_rate = 0;
+                ivi->max_tx_rate = 0;
+        else
+                ivi->max_tx_rate = vp->max_tx_bw * 100;
+        if (vp->min_tx_bw == MIN_BW)
+                ivi->min_tx_rate = 0;
         else
-                ivi->tx_rate = vp->max_tx_bw * 100;
+                ivi->min_tx_rate = vp->min_tx_bw * 100;
 
         ivi->vf = vf;
         return 0;
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c
index 9a9205e77896..43d2e64546ed 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena_sriov.c
@@ -1633,7 +1633,8 @@ int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
 
         ivi->vf = vf_i;
         ether_addr_copy(ivi->mac, vf->addr.mac_addr);
-        ivi->tx_rate = 0;
+        ivi->max_tx_rate = 0;
+        ivi->min_tx_rate = 0;
         tci = ntohs(vf->addr.tci);
         ivi->vlan = tci & VLAN_VID_MASK;
         ivi->qos = (tci >> VLAN_PRIO_SHIFT) & 0x7;