net-next: vmxnet3 fixes [5/5] Respect the interrupt type in VM configuration

[net-next-2.6.git] / drivers / net / vmxnet3 / vmxnet3_drv.c

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 90e783a0924598d2e71668595059b045252b816f..9d64186050f3373505f275e7bde9f67eb3429f37 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
 
        for (i = 0; i < adapter->intr.num_intrs; i++)
                vmxnet3_enable_intr(adapter, i);
+       adapter->shared->devRead.intrConf.intrCtrl &=
+                                       cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
 }
 
 
@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
 {
        int i;
 
+       adapter->shared->devRead.intrConf.intrCtrl |=
+                                       cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
        for (i = 0; i < adapter->intr.num_intrs; i++)
                vmxnet3_disable_intr(adapter, i);
 }
@@ -128,7 +132,7 @@ vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter *adapter)
  * Check the link state. This may start or stop the tx queue.
  */
 static void
-vmxnet3_check_link(struct vmxnet3_adapter *adapter)
+vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
        u32 ret;
 
@@ -141,14 +145,16 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter)
                if (!netif_carrier_ok(adapter->netdev))
                        netif_carrier_on(adapter->netdev);
 
-               vmxnet3_tq_start(&adapter->tx_queue, adapter);
+               if (affectTxQueue)
+                       vmxnet3_tq_start(&adapter->tx_queue, adapter);
        } else {
                printk(KERN_INFO "%s: NIC Link is Down\n",
                       adapter->netdev->name);
                if (netif_carrier_ok(adapter->netdev))
                        netif_carrier_off(adapter->netdev);
 
-               vmxnet3_tq_stop(&adapter->tx_queue, adapter);
+               if (affectTxQueue)
+                       vmxnet3_tq_stop(&adapter->tx_queue, adapter);
        }
 }
 
@@ -163,7 +169,7 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 
        /* Check if link state has changed */
        if (events & VMXNET3_ECR_LINK)
-               vmxnet3_check_link(adapter);
+               vmxnet3_check_link(adapter, true);
 
        /* Check if there is an error on xmit/recv queues */
        if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
@@ -992,7 +998,6 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_TXPROD,
                                       tq->tx_ring.next2fill);
        }
-       netdev->trans_start = jiffies;
 
        return NETDEV_TX_OK;
 
@@ -1370,13 +1375,12 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
 
        sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
                                                   rq->rx_ring[1].size);
-       bi = kmalloc(sz, GFP_KERNEL);
+       bi = kzalloc(sz, GFP_KERNEL);
        if (!bi) {
                printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
                       adapter->netdev->name);
                goto err;
        }
-       memset(bi, 0, sz);
        rq->buf_info[0] = bi;
        rq->buf_info[1] = bi + rq->rx_ring[0].size;
 
@@ -1827,6 +1831,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
 
        devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+       devRead->intrConf.intrCtrl |= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
 
        /* rx filter settings */
        devRead->rxFilterConf.rxMode = 0;
@@ -1891,7 +1896,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
         * Check link state when first activating device. It will start the
         * tx queue if the link is up.
         */
-       vmxnet3_check_link(adapter);
+       vmxnet3_check_link(adapter, true);
 
        napi_enable(&adapter->napi);
        vmxnet3_enable_all_intrs(adapter);
@@ -2297,9 +2302,13 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
        adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
        if (adapter->intr.type == VMXNET3_IT_AUTO) {
-               int err;
+               adapter->intr.type = VMXNET3_IT_MSIX;
+       }
 
 #ifdef CONFIG_PCI_MSI
+       if (adapter->intr.type == VMXNET3_IT_MSIX) {
+               int err;
+
                adapter->intr.msix_entries[0].entry = 0;
                err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
                                      VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2308,15 +2317,18 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                        adapter->intr.type = VMXNET3_IT_MSIX;
                        return;
                }
-#endif
+               adapter->intr.type = VMXNET3_IT_MSI;
+       }
 
+       if (adapter->intr.type == VMXNET3_IT_MSI) {
+               int err;
                err = pci_enable_msi(adapter->pdev);
                if (!err) {
                        adapter->intr.num_intrs = 1;
-                       adapter->intr.type = VMXNET3_IT_MSI;
                        return;
                }
        }
+#endif /* CONFIG_PCI_MSI */
 
        adapter->intr.type = VMXNET3_IT_INTX;
 
@@ -2360,6 +2372,7 @@ vmxnet3_reset_work(struct work_struct *data)
                return;
 
        /* if the device is closed, we must leave it alone */
+       rtnl_lock();
        if (netif_running(adapter->netdev)) {
                printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
                vmxnet3_quiesce_dev(adapter);
@@ -2368,6 +2381,7 @@ vmxnet3_reset_work(struct work_struct *data)
        } else {
                printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
        }
+       rtnl_unlock();
 
        clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
 }
@@ -2493,6 +2507,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
        }
 
        set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
+       vmxnet3_check_link(adapter, false);
        atomic_inc(&devices_found);
        return 0;