drivers/net: add generic ethdev macro to get PCI device

[dpdk.git] / drivers / net / e1000 / igb_pf.c

diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c
index 1d00dda..6809d30 100644 (file)
--- a/drivers/net/e1000/igb_pf.c
+++ b/drivers/net/e1000/igb_pf.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,9 @@
 static inline uint16_t
 dev_num_vf(struct rte_eth_dev *eth_dev)
 {
-       return eth_dev->pci_dev->max_vfs;
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+
+       return pci_dev->max_vfs;
 }
 
 static inline
@@ -172,8 +174,8 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
        E1000_WRITE_REG(hw, E1000_VT_CTL, vtctl);
 
        /* Enable pools reserved to PF only */
-       E1000_WRITE_REG(hw, E1000_VFRE, (~0) << vf_num);
-       E1000_WRITE_REG(hw, E1000_VFTE, (~0) << vf_num);
+       E1000_WRITE_REG(hw, E1000_VFRE, (~0U) << vf_num);
+       E1000_WRITE_REG(hw, E1000_VFTE, (~0U) << vf_num);
 
        /* PFDMA Tx General Switch Control Enables VMDQ loopback */
        if (hw->mac.type == e1000_i350)
@@ -218,8 +220,7 @@ int igb_pf_host_configure(struct rte_eth_dev *eth_dev)
 static void
 set_rx_mode(struct rte_eth_dev *dev)
 {
-       struct rte_eth_dev_data *dev_data =
-               (struct rte_eth_dev_data*)dev->data->dev_private;
+       struct rte_eth_dev_data *dev_data = dev->data;
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t fctrl, vmolr = E1000_VMOLR_BAM | E1000_VMOLR_AUPE;
        uint16_t vfn = dev_num_vf(dev);
@@ -331,10 +332,16 @@ igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                *(E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        int rar_entry = hw->mac.rar_entry_count - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
+       int rah;
 
-       if (is_valid_assigned_ether_addr((struct ether_addr*)new_mac)) {
-               rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac, 6);
+       if (is_unicast_ether_addr((struct ether_addr *)new_mac)) {
+               if (!is_zero_ether_addr((struct ether_addr *)new_mac))
+                       rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac,
+                               sizeof(vfinfo[vf].vf_mac_addresses));
                hw->mac.ops.rar_set(hw, new_mac, rar_entry);
+               rah = E1000_READ_REG(hw, E1000_RAH(rar_entry));
+               rah |= (0x1 << (E1000_RAH_POOLSEL_SHIFT + vf));
+               E1000_WRITE_REG(hw, E1000_RAH(rar_entry), rah);
                return 0;
        }
        return -1;