net/ixgbe: support VF promiscuous by PF driver

The patch adds the PF counterpart changes to support VF promiscuous
mode by DPDK PF driver.

For ixgbe, in order to support VF VLAN promiscuous or unicast
promiscuous, PF need to set register PFVML2FLT of bit UPE and VPE.
The patch aligned to kernel driver's implementation.

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3bf51ee..97e1021 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1515,6 +1515,7 @@ ixgbevf_negotiate_api(struct ixgbe_hw *hw)
 
        /* start with highest supported, proceed down */
        static const enum ixgbe_pfvf_api_rev sup_ver[] = {
+               ixgbe_mbox_api_13,
                ixgbe_mbox_api_12,
                ixgbe_mbox_api_11,
                ixgbe_mbox_api_10,

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index 99a5077..3fec613 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -266,6 +266,7 @@ struct ixgbe_vf_info {
        uint8_t spoofchk_enabled;
        uint8_t api_version;
        uint16_t switch_domain_id;
+       uint16_t xcast_mode;
 };
 
 /*

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index be0c076..fafff6b 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -407,23 +407,6 @@ ixgbe_vf_reset_msg(struct rte_eth_dev *dev, uint16_t vf)
        ixgbe_vf_reset_event(dev, vf);
 }
 
-static int
-ixgbe_enable_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf)
-{
-       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t vmolr;
-
-       vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
-
-       RTE_LOG(INFO, PMD, "VF %u: enabling multicast promiscuous\n", vf);
-
-       vmolr |= IXGBE_VMOLR_MPE;
-
-       IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
-
-       return 0;
-}
-
 static int
 ixgbe_disable_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf)
 {
@@ -596,6 +579,7 @@ ixgbe_negotiate_vf_api(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        case ixgbe_mbox_api_10:
        case ixgbe_mbox_api_11:
        case ixgbe_mbox_api_12:
+       case ixgbe_mbox_api_13:
                vfinfo[vf].api_version = (uint8_t)api_version;
                return 0;
        default:
@@ -698,19 +682,70 @@ ixgbe_set_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 {
        struct ixgbe_vf_info *vfinfo =
                *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
-       bool enable = !!msgbuf[1];      /* msgbuf contains the flag to enable */
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int xcast_mode = msgbuf[1];     /* msgbuf contains the flag to enable */
+       u32 vmolr, fctrl, disable, enable;
 
        switch (vfinfo[vf].api_version) {
        case ixgbe_mbox_api_12:
+               /* promisc introduced in 1.3 version */
+               if (xcast_mode == IXGBEVF_XCAST_MODE_PROMISC)
+                       return -EOPNOTSUPP;
+               break;
+               /* Fall threw */
+       case ixgbe_mbox_api_13:
                break;
        default:
                return -1;
        }
 
-       if (enable)
-               return ixgbe_enable_vf_mc_promisc(dev, vf);
-       else
-               return ixgbe_disable_vf_mc_promisc(dev, vf);
+       if (vfinfo[vf].xcast_mode == xcast_mode)
+               goto out;
+
+       switch (xcast_mode) {
+       case IXGBEVF_XCAST_MODE_NONE:
+               disable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE |
+                         IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
+               enable = 0;
+               break;
+       case IXGBEVF_XCAST_MODE_MULTI:
+               disable = IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
+               enable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE;
+               break;
+       case IXGBEVF_XCAST_MODE_ALLMULTI:
+               disable = IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
+               enable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE | IXGBE_VMOLR_MPE;
+               break;
+       case IXGBEVF_XCAST_MODE_PROMISC:
+               if (hw->mac.type <= ixgbe_mac_82599EB)
+                       return -1;
+
+               fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+               if (!(fctrl & IXGBE_FCTRL_UPE)) {
+                       /* VF promisc requires PF in promisc */
+                       RTE_LOG(ERR, PMD,
+                              "Enabling VF promisc requires PF in promisc\n");
+                       return -1;
+               }
+
+               disable = 0;
+               enable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE |
+                        IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
+               break;
+       default:
+               return -1;
+       }
+
+       vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
+       vmolr &= ~disable;
+       vmolr |= enable;
+       IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+       vfinfo[vf].xcast_mode = xcast_mode;
+
+out:
+       msgbuf[1] = xcast_mode;
+
+       return 0;
 }
 
 static int