6 files changed, 64 insertions, 22 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index a8efb18e42fa..0ab83708b6a1 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8627,6 +8627,7 @@ bnx2_remove_one(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int
 bnx2_suspend(struct device *device)
 {
@@ -8665,7 +8666,6 @@ bnx2_resume(struct device *device)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static SIMPLE_DEV_PM_OPS(bnx2_pm_ops, bnx2_suspend, bnx2_resume);
 #define BNX2_PM_OPS (&bnx2_pm_ops)
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index a78edaccceee..3b0d43154e67 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10051,8 +10051,8 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
 #define BCM_5710_UNDI_FW_MF_MAJOR       (0x07)
 #define BCM_5710_UNDI_FW_MF_MINOR       (0x08)
 #define BCM_5710_UNDI_FW_MF_VERS        (0x05)
-#define BNX2X_PREV_UNDI_MF_PORT(p)      (0x1a150c + ((p) << 4))
-#define BNX2X_PREV_UNDI_MF_FUNC(f)      (0x1a184c + ((f) << 4))
+#define BNX2X_PREV_UNDI_MF_PORT(p) (BAR_TSTRORM_INTMEM + 0x150c + ((p) << 4))
+#define BNX2X_PREV_UNDI_MF_FUNC(f) (BAR_TSTRORM_INTMEM + 0x184c + ((f) << 4))
 static bool bnx2x_prev_unload_undi_fw_supports_mf(struct bnx2x *bp)
 {
         u8 major, minor, version;
@@ -10352,6 +10352,7 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
         /* Reset should be performed after BRB is emptied */
         if (reset_reg & MISC_REGISTERS_RESET_REG_1_RST_BRB1) {
                 u32 timer_count = 1000;
+                bool need_write = true;
 
                 /* Close the MAC Rx to prevent BRB from filling up */
                 bnx2x_prev_unload_close_mac(bp, &mac_vals);
@@ -10398,7 +10399,10 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
                          * cleaning methods - might be redundant but harmless.
                          */
                         if (bnx2x_prev_unload_undi_fw_supports_mf(bp)) {
-                                bnx2x_prev_unload_undi_mf(bp);
+                                if (need_write) {
+                                        bnx2x_prev_unload_undi_mf(bp);
+                                        need_write = false;
+                                }
                         } else if (prev_undi) {
                                 /* If UNDI resides in memory,
                                  * manually increment it
@@ -13233,6 +13237,8 @@ static void __bnx2x_remove(struct pci_dev *pdev,
                                 iounmap(bp->doorbells);
 
                         bnx2x_release_firmware(bp);
+                } else {
+                        bnx2x_vf_pci_dealloc(bp);
                 }
                 bnx2x_free_mem_bp(bp);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 5c523b32db70..b8078d50261b 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -427,7 +427,9 @@ static int bnx2x_vf_mac_vlan_config(struct bnx2x *bp,
         if (filter->add && filter->type == BNX2X_VF_FILTER_VLAN &&
             (atomic_read(&bnx2x_vfq(vf, qid, vlan_count)) >=
              vf_vlan_rules_cnt(vf))) {
-                BNX2X_ERR("No credits for vlan\n");
+                BNX2X_ERR("No credits for vlan [%d >= %d]\n",
+                          atomic_read(&bnx2x_vfq(vf, qid, vlan_count)),
+                          vf_vlan_rules_cnt(vf));
                 return -ENOMEM;
         }
 
@@ -610,6 +612,7 @@ int bnx2x_vf_mcast(struct bnx2x *bp, struct bnx2x_virtf *vf,
                 }
 
                 /* add new mcasts */
+                mcast.mcast_list_len = mc_num;
                 rc = bnx2x_config_mcast(bp, &mcast, BNX2X_MCAST_CMD_ADD);
                 if (rc)
                         BNX2X_ERR("Faled to add multicasts\n");
@@ -837,6 +840,29 @@ int bnx2x_vf_flr_clnup_epilog(struct bnx2x *bp, u8 abs_vfid)
         return 0;
 }
 
+static void bnx2x_iov_re_set_vlan_filters(struct bnx2x *bp,
+                                          struct bnx2x_virtf *vf,
+                                          int new)
+{
+        int num = vf_vlan_rules_cnt(vf);
+        int diff = new - num;
+        bool rc = true;
+
+        DP(BNX2X_MSG_IOV, "vf[%d] - %d vlan filter credits [previously %d]\n",
+           vf->abs_vfid, new, num);
+
+        if (diff > 0)
+                rc = bp->vlans_pool.get(&bp->vlans_pool, diff);
+        else if (diff < 0)
+                rc = bp->vlans_pool.put(&bp->vlans_pool, -diff);
+
+        if (rc)
+                vf_vlan_rules_cnt(vf) = new;
+        else
+                DP(BNX2X_MSG_IOV, "vf[%d] - Failed to configure vlan filter credits change\n",
+                   vf->abs_vfid);
+}
+
 /* must be called after the number of PF queues and the number of VFs are
  * both known
  */
@@ -854,9 +880,11 @@ bnx2x_iov_static_resc(struct bnx2x *bp, struct bnx2x_virtf *vf)
         resc->num_mac_filters = 1;
 
         /* divvy up vlan rules */
+        bnx2x_iov_re_set_vlan_filters(bp, vf, 0);
         vlan_count = bp->vlans_pool.check(&bp->vlans_pool);
         vlan_count = 1 << ilog2(vlan_count);
-        resc->num_vlan_filters = vlan_count / BNX2X_NR_VIRTFN(bp);
+        bnx2x_iov_re_set_vlan_filters(bp, vf,
+                                      vlan_count / BNX2X_NR_VIRTFN(bp));
 
         /* no real limitation */
         resc->num_mc_filters = 0;
@@ -1478,10 +1506,6 @@ int bnx2x_iov_nic_init(struct bnx2x *bp)
                 bnx2x_iov_static_resc(bp, vf);
 
                 /* queues are initialized during VF-ACQUIRE */
-
-                /* reserve the vf vlan credit */
-                bp->vlans_pool.get(&bp->vlans_pool, vf_vlan_rules_cnt(vf));
-
                 vf->filter_state = 0;
                 vf->sp_cl_id = bnx2x_fp(bp, 0, cl_id);
 
@@ -1912,11 +1936,12 @@ int bnx2x_vf_chk_avail_resc(struct bnx2x *bp, struct bnx2x_virtf *vf,
         u8 rxq_cnt = vf_rxq_count(vf) ? : bnx2x_vf_max_queue_cnt(bp, vf);
         u8 txq_cnt = vf_txq_count(vf) ? : bnx2x_vf_max_queue_cnt(bp, vf);
 
+        /* Save a vlan filter for the Hypervisor */
         return ((req_resc->num_rxqs <= rxq_cnt) &&
                 (req_resc->num_txqs <= txq_cnt) &&
                 (req_resc->num_sbs <= vf_sb_count(vf))   &&
                 (req_resc->num_mac_filters <= vf_mac_rules_cnt(vf)) &&
-                (req_resc->num_vlan_filters <= vf_vlan_rules_cnt(vf)));
+                (req_resc->num_vlan_filters <= vf_vlan_rules_visible_cnt(vf)));
 }
 
 /* CORE VF API */
@@ -1972,14 +1997,14 @@ int bnx2x_vf_acquire(struct bnx2x *bp, struct bnx2x_virtf *vf,
         vf_txq_count(vf) = resc->num_txqs ? : bnx2x_vf_max_queue_cnt(bp, vf);
         if (resc->num_mac_filters)
                 vf_mac_rules_cnt(vf) = resc->num_mac_filters;
-        if (resc->num_vlan_filters)
-                vf_vlan_rules_cnt(vf) = resc->num_vlan_filters;
+        /* Add an additional vlan filter credit for the hypervisor */
+        bnx2x_iov_re_set_vlan_filters(bp, vf, resc->num_vlan_filters + 1);
 
         DP(BNX2X_MSG_IOV,
            "Fulfilling vf request: sb count %d, tx_count %d, rx_count %d, mac_rules_count %d, vlan_rules_count %d\n",
            vf_sb_count(vf), vf_rxq_count(vf),
            vf_txq_count(vf), vf_mac_rules_cnt(vf),
-           vf_vlan_rules_cnt(vf));
+           vf_vlan_rules_visible_cnt(vf));
 
         /* Initialize the queues */
         if (!vf->vfqs) {
@@ -2670,7 +2695,7 @@ out:
                 bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
         }
 
-        return 0;
+        return rc;
 }
 
 int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
@@ -2896,6 +2921,14 @@ void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
         return bp->regview + PXP_VF_ADDR_DB_START;
 }
 
+void bnx2x_vf_pci_dealloc(struct bnx2x *bp)
+{
+        BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->vf2pf_mbox_mapping,
+                       sizeof(struct bnx2x_vf_mbx_msg));
+        BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->pf2vf_bulletin_mapping,
+                       sizeof(union pf_vf_bulletin));
+}
+
 int bnx2x_vf_pci_alloc(struct bnx2x *bp)
 {
         mutex_init(&bp->vf2pf_mutex);
@@ -2915,10 +2948,7 @@ int bnx2x_vf_pci_alloc(struct bnx2x *bp)
         return 0;
 
 alloc_mem_err:
-        BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->vf2pf_mbox_mapping,
-                       sizeof(struct bnx2x_vf_mbx_msg));
-        BNX2X_PCI_FREE(bp->vf2pf_mbox, bp->pf2vf_bulletin_mapping,
-                       sizeof(union pf_vf_bulletin));
+        bnx2x_vf_pci_dealloc(bp);
         return -ENOMEM;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
index 8bf764570eef..6929adba52f9 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
@@ -159,6 +159,8 @@ struct bnx2x_virtf {
 #define vf_mac_rules_cnt(vf)            ((vf)->alloc_resc.num_mac_filters)
 #define vf_vlan_rules_cnt(vf)           ((vf)->alloc_resc.num_vlan_filters)
 #define vf_mc_rules_cnt(vf)             ((vf)->alloc_resc.num_mc_filters)
+        /* Hide a single vlan filter credit for the hypervisor */
+#define vf_vlan_rules_visible_cnt(vf)   (vf_vlan_rules_cnt(vf) - 1)
 
         u8 sb_count;    /* actual number of SBs */
         u8 igu_base_id; /* base igu status block id */
@@ -502,6 +504,7 @@ static inline int bnx2x_vf_ustorm_prods_offset(struct bnx2x *bp,
 enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp);
 void bnx2x_timer_sriov(struct bnx2x *bp);
 void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp);
+void bnx2x_vf_pci_dealloc(struct bnx2x *bp);
 int bnx2x_vf_pci_alloc(struct bnx2x *bp);
 int bnx2x_enable_sriov(struct bnx2x *bp);
 void bnx2x_disable_sriov(struct bnx2x *bp);
@@ -568,6 +571,7 @@ static inline void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
         return NULL;
 }
 
+static inline void bnx2x_vf_pci_dealloc(struct bnx2 *bp) {return 0; }
 static inline int bnx2x_vf_pci_alloc(struct bnx2x *bp) {return 0; }
 static inline void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) {}
 static inline int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs) {return 0; }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 0622884596b2..784c7155b98a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -747,7 +747,7 @@ int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set)
 out:
         bnx2x_vfpf_finalize(bp, &req->first_tlv);
 
-        return 0;
+        return rc;
 }
 
 /* request pf to config rss table for vf queues*/
@@ -1163,7 +1163,7 @@ static void bnx2x_vf_mbx_acquire_resp(struct bnx2x *bp, struct bnx2x_virtf *vf,
                         bnx2x_vf_max_queue_cnt(bp, vf);
                 resc->num_sbs = vf_sb_count(vf);
                 resc->num_mac_filters = vf_mac_rules_cnt(vf);
-                resc->num_vlan_filters = vf_vlan_rules_cnt(vf);
+                resc->num_vlan_filters = vf_vlan_rules_visible_cnt(vf);
                 resc->num_mc_filters = 0;
 
                 if (status == PFVF_STATUS_SUCCESS) {
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index b9f7022f4e81..e5d95c5ce1ad 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -12286,7 +12286,9 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
         if (tg3_flag(tp, MAX_RXPEND_64) &&
             tp->rx_pending > 63)
                 tp->rx_pending = 63;
-        tp->rx_jumbo_pending = ering->rx_jumbo_pending;
+
+        if (tg3_flag(tp, JUMBO_RING_ENABLE))
+                tp->rx_jumbo_pending = ering->rx_jumbo_pending;
 
         for (i = 0; i < tp->irq_max; i++)
                 tp->napi[i].tx_pending = ering->tx_pending;