dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

[net-next-2.6.git] / drivers / net / cxgb3 / cxgb3_main.c

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index d8be89621bf746779d2b9961201f5a6d8c504bdb..ab0e5febef83302f1b19fdda095a8e54e7029a60 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -602,7 +602,6 @@ static int setup_sge_qsets(struct adapter *adap)
                                &adap->params.sge.qset[qset_idx], ntxq, dev,
                                netdev_get_tx_queue(dev, j));
                        if (err) {
-                               t3_stop_sge_timers(adap);
                                t3_free_sge_resources(adap);
                                return err;
                        }
@@ -1046,6 +1045,8 @@ static int cxgb_up(struct adapter *adap)
                setup_rss(adap);
                if (!(adap->flags & NAPI_INIT))
                        init_napi(adap);
+
+               t3_start_sge_timers(adap);
                adap->flags |= FULL_INIT_DONE;
        }
 
@@ -2870,6 +2871,9 @@ static void t3_io_resume(struct pci_dev *pdev)
 {
        struct adapter *adapter = pci_get_drvdata(pdev);
 
+       CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n",
+                t3_read_reg(adapter, A_PCIE_PEX_ERR));
+
        t3_resume_ports(adapter);
 }
 
@@ -3002,7 +3006,7 @@ static int __devinit init_one(struct pci_dev *pdev,
        static int version_printed;
 
        int i, err, pci_using_dac = 0;
-       unsigned long mmio_start, mmio_len;
+       resource_size_t mmio_start, mmio_len;
        const struct adapter_info *ai;
        struct adapter *adapter = NULL;
        struct port_info *pi;
@@ -3034,15 +3038,15 @@ static int __devinit init_one(struct pci_dev *pdev,
                goto out_release_regions;
        }
 
-       if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+       if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                pci_using_dac = 1;
-               err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                if (err) {
                        dev_err(&pdev->dev, "unable to obtain 64-bit DMA for "
                               "coherent allocations\n");
                        goto out_disable_device;
                }
-       } else if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+       } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                dev_err(&pdev->dev, "no usable DMA configuration\n");
                goto out_disable_device;
        }
@@ -3082,7 +3086,7 @@ static int __devinit init_one(struct pci_dev *pdev,
        INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task);
        INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task);
 
-       for (i = 0; i < ai->nports; ++i) {
+       for (i = 0; i < ai->nports0 + ai->nports1; ++i) {
                struct net_device *netdev;
 
                netdev = alloc_etherdev_mq(sizeof(struct port_info), SGE_QSETS);
@@ -3172,7 +3176,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
 out_free_dev:
        iounmap(adapter->regs);
-       for (i = ai->nports - 1; i >= 0; --i)
+       for (i = ai->nports0 + ai->nports1 - 1; i >= 0; --i)
                if (adapter->port[i])
                        free_netdev(adapter->port[i]);