Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 111914
b: refs/heads/master
c: 4b75a44
h: refs/heads/master
v: v3
  • Loading branch information
Scott Feldman authored and Jeff Garzik committed Sep 25, 2008
1 parent 424834c commit fd3db01
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 77 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f4d248cb7c1873275608f267e525e08bcbd543b
refs/heads/master: 4b75a442d2affb2ed20422054b1c640bd3b9c36a
2 changes: 1 addition & 1 deletion trunk/drivers/net/enic/enic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#define DRV_NAME "enic"
#define DRV_DESCRIPTION "Cisco 10G Ethernet Driver"
#define DRV_VERSION "0.0.1.18163.472"
#define DRV_VERSION "0.0.1-18163.472-k1"
#define DRV_COPYRIGHT "Copyright 2008 Cisco Systems, Inc"
#define PFX DRV_NAME ": "

Expand Down
121 changes: 46 additions & 75 deletions trunk/drivers/net/enic/enic_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1250,13 +1250,28 @@ static int enic_open(struct net_device *netdev)
unsigned int i;
int err;

err = enic_request_intr(enic);
if (err) {
printk(KERN_ERR PFX "%s: Unable to request irq.\n",
netdev->name);
return err;
}

err = enic_notify_set(enic);
if (err) {
printk(KERN_ERR PFX
"%s: Failed to alloc notify buffer, aborting.\n",
netdev->name);
goto err_out_free_intr;
}

for (i = 0; i < enic->rq_count; i++) {
err = vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
if (err) {
printk(KERN_ERR PFX
"%s: Unable to alloc receive buffers.\n",
netdev->name);
return err;
goto err_out_notify_unset;
}
}

Expand All @@ -1278,6 +1293,13 @@ static int enic_open(struct net_device *netdev)
enic_notify_timer_start(enic);

return 0;

err_out_notify_unset:
vnic_dev_notify_unset(enic->vdev);
err_out_free_intr:
enic_free_intr(enic);

return err;
}

/* rtnl lock is held, process context */
Expand Down Expand Up @@ -1307,6 +1329,9 @@ static int enic_stop(struct net_device *netdev)
return err;
}

vnic_dev_notify_unset(enic->vdev);
enic_free_intr(enic);

(void)vnic_cq_service(&enic->cq[ENIC_CQ_RQ],
-1, enic_rq_service_drop, NULL);
(void)vnic_cq_service(&enic->cq[ENIC_CQ_WQ],
Expand Down Expand Up @@ -1592,18 +1617,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
return -ENOMEM;
}

/* Set the netdev name early so intr vectors are properly
* named and any error msgs can include netdev->name
*/

rtnl_lock();
err = dev_alloc_name(netdev, netdev->name);
rtnl_unlock();
if (err < 0) {
printk(KERN_ERR PFX "Unable to allocate netdev name.\n");
goto err_out_free_netdev;
}

pci_set_drvdata(pdev, netdev);

SET_NETDEV_DEV(netdev, &pdev->dev);
Expand All @@ -1618,16 +1631,14 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev);
if (err) {
printk(KERN_ERR PFX
"%s: Cannot enable PCI device, aborting.\n",
netdev->name);
"Cannot enable PCI device, aborting.\n");
goto err_out_free_netdev;
}

err = pci_request_regions(pdev, DRV_NAME);
if (err) {
printk(KERN_ERR PFX
"%s: Cannot request PCI regions, aborting.\n",
netdev->name);
"Cannot request PCI regions, aborting.\n");
goto err_out_disable_device;
}

Expand All @@ -1643,25 +1654,22 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
printk(KERN_ERR PFX
"%s: No usable DMA configuration, aborting.\n",
netdev->name);
"No usable DMA configuration, aborting.\n");
goto err_out_release_regions;
}
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
printk(KERN_ERR PFX
"%s: Unable to obtain 32-bit DMA "
"for consistent allocations, aborting.\n",
netdev->name);
"Unable to obtain 32-bit DMA "
"for consistent allocations, aborting.\n");
goto err_out_release_regions;
}
} else {
err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);
if (err) {
printk(KERN_ERR PFX
"%s: Unable to obtain 40-bit DMA "
"for consistent allocations, aborting.\n",
netdev->name);
"Unable to obtain 40-bit DMA "
"for consistent allocations, aborting.\n");
goto err_out_release_regions;
}
using_dac = 1;
Expand All @@ -1672,8 +1680,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,

if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
printk(KERN_ERR PFX
"%s: BAR0 not memory-map'able, aborting.\n",
netdev->name);
"BAR0 not memory-map'able, aborting.\n");
err = -ENODEV;
goto err_out_release_regions;
}
Expand All @@ -1684,8 +1691,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,

if (!enic->bar0.vaddr) {
printk(KERN_ERR PFX
"%s: Cannot memory-map BAR0 res hdr, aborting.\n",
netdev->name);
"Cannot memory-map BAR0 res hdr, aborting.\n");
err = -ENODEV;
goto err_out_release_regions;
}
Expand All @@ -1696,8 +1702,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
enic->vdev = vnic_dev_register(NULL, enic, pdev, &enic->bar0);
if (!enic->vdev) {
printk(KERN_ERR PFX
"%s: vNIC registration failed, aborting.\n",
netdev->name);
"vNIC registration failed, aborting.\n");
err = -ENODEV;
goto err_out_iounmap;
}
Expand All @@ -1708,8 +1713,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = enic_dev_open(enic);
if (err) {
printk(KERN_ERR PFX
"%s: vNIC dev open failed, aborting.\n",
netdev->name);
"vNIC dev open failed, aborting.\n");
goto err_out_vnic_unregister;
}

Expand All @@ -1726,8 +1730,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = vnic_dev_init(enic->vdev, 0);
if (err) {
printk(KERN_ERR PFX
"%s: vNIC dev init failed, aborting.\n",
netdev->name);
"vNIC dev init failed, aborting.\n");
goto err_out_dev_close;
}

Expand All @@ -1737,8 +1740,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = enic_get_vnic_config(enic);
if (err) {
printk(KERN_ERR PFX
"%s: Get vNIC configuration failed, aborting.\n",
netdev->name);
"Get vNIC configuration failed, aborting.\n");
goto err_out_dev_close;
}

Expand All @@ -1754,18 +1756,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = enic_set_intr_mode(enic);
if (err) {
printk(KERN_ERR PFX
"%s: Failed to set intr mode, aborting.\n",
netdev->name);
goto err_out_dev_close;
}

/* Request interrupt vector(s)
*/

err = enic_request_intr(enic);
if (err) {
printk(KERN_ERR PFX "%s: Unable to request irq.\n",
netdev->name);
"Failed to set intr mode, aborting.\n");
goto err_out_dev_close;
}

Expand All @@ -1775,8 +1766,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = enic_alloc_vnic_resources(enic);
if (err) {
printk(KERN_ERR PFX
"%s: Failed to alloc vNIC resources, aborting.\n",
netdev->name);
"Failed to alloc vNIC resources, aborting.\n");
goto err_out_free_vnic_resources;
}

Expand All @@ -1792,19 +1782,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
ig_vlan_strip_en);
if (err) {
printk(KERN_ERR PFX
"%s: Failed to config nic, aborting.\n",
netdev->name);
goto err_out_free_vnic_resources;
}

/* Setup notification buffer area
*/

err = enic_notify_set(enic);
if (err) {
printk(KERN_ERR PFX
"%s: Failed to alloc notify buffer, aborting.\n",
netdev->name);
"Failed to config nic, aborting.\n");
goto err_out_free_vnic_resources;
}

Expand All @@ -1831,9 +1809,8 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = enic_set_mac_addr(netdev, enic->mac_addr);
if (err) {
printk(KERN_ERR PFX
"%s: Invalid MAC address, aborting.\n",
netdev->name);
goto err_out_notify_unset;
"Invalid MAC address, aborting.\n");
goto err_out_free_vnic_resources;
}

netdev->open = enic_open;
Expand Down Expand Up @@ -1887,18 +1864,14 @@ static int __devinit enic_probe(struct pci_dev *pdev,
err = register_netdev(netdev);
if (err) {
printk(KERN_ERR PFX
"%s: Cannot register net device, aborting.\n",
netdev->name);
goto err_out_notify_unset;
"Cannot register net device, aborting.\n");
goto err_out_free_vnic_resources;
}

return 0;

err_out_notify_unset:
vnic_dev_notify_unset(enic->vdev);
err_out_free_vnic_resources:
enic_free_vnic_resources(enic);
enic_free_intr(enic);
err_out_dev_close:
vnic_dev_close(enic->vdev);
err_out_vnic_unregister:
Expand Down Expand Up @@ -1926,9 +1899,7 @@ static void __devexit enic_remove(struct pci_dev *pdev)

flush_scheduled_work();
unregister_netdev(netdev);
vnic_dev_notify_unset(enic->vdev);
enic_free_vnic_resources(enic);
enic_free_intr(enic);
vnic_dev_close(enic->vdev);
enic_clear_intr_mode(enic);
vnic_dev_unregister(enic->vdev);
Expand Down

0 comments on commit fd3db01

Please sign in to comment.