Home » Mailing list archives » linux-netdev » 2009 » March » 17

[PATCH 28/30] solos: Reset device on unload, free pending skbs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: David Woodhouse
Subject: [PATCH 28/30] solos: Reset device on unload, free pending skbs
Date: Tuesday, March 17, 2009 - 2:29 pm

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 drivers/atm/solos-pci.c |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index eef920a..1ff7304 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1206,10 +1206,28 @@ static void atm_remove(struct solos_card *card)
 
 	for (i = 0; i < card->nr_ports; i++) {
 		if (card->atmdev[i]) {
+			struct sk_buff *skb;
+
 			dev_info(&card->dev->dev, "Unregistering ATM device %d\n", card->atmdev[i]->number);
 
 			sysfs_remove_group(&card->atmdev[i]->class_dev.kobj, &solos_attr_group);
 			atm_dev_deregister(card->atmdev[i]);
+
+			skb = card->rx_skb[i];
+			if (skb) {
+				pci_unmap_single(card->dev, SKB_CB(skb)->dma_addr,
+						 RX_DMA_SIZE, PCI_DMA_FROMDEVICE);
+				dev_kfree_skb(skb);
+			}
+			skb = card->tx_skb[i];
+			if (skb) {
+				pci_unmap_single(card->dev, SKB_CB(skb)->dma_addr,
+						 skb->len, PCI_DMA_TODEVICE);
+				dev_kfree_skb(skb);
+			}
+			while ((skb = skb_dequeue(&card->tx_queue[i])))
+				dev_kfree_skb(skb);
+ 
 		}
 	}
 }
@@ -1217,13 +1235,23 @@ static void atm_remove(struct solos_card *card)
 static void fpga_remove(struct pci_dev *dev)
 {
 	struct solos_card *card = pci_get_drvdata(dev);
+	
+	/* Disable IRQs */
+	iowrite32(0, card->config_regs + IRQ_EN_ADDR);
+
+	/* Reset FPGA */
+	iowrite32(1, card->config_regs + FPGA_MODE);
+	(void)ioread32(card->config_regs + FPGA_MODE); 
 
 	atm_remove(card);
 
-	iowrite32(0, card->config_regs + IRQ_EN_ADDR);
 	free_irq(dev->irq, card);
 	tasklet_kill(&card->tlet);
 
+	/* Release device from reset */
+	iowrite32(0, card->config_regs + FPGA_MODE);
+	(void)ioread32(card->config_regs + FPGA_MODE); 
+
 	pci_iounmap(dev, card->buffers);
 	pci_iounmap(dev, card->config_regs);
 
-- 
1.6.0.6


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 10:19 am)
Re: [GIT *] Solos PCI ADSL card update, David Miller, (Tue Mar 17, 12:23 pm)
Re: [GIT *] Solos PCI ADSL card update, Stephen Hemminger, (Tue Mar 17, 1:41 pm)
[PATCH 01/30] solos: Fix length header in FPGA transfers, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 02/30] solos: Slight debugging improvements, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 03/30] solos: FPGA and firmware update support., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 04/30] solos: Clean up firmware loading code, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 05/30] solos: Kill global 'opens' count., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 06/30] solos: Handle attribute show/store in kernel ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 07/30] solos: Add initial list of parameters, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 08/30] solos: Handle new line status change packets ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 09/30] solos: Kill existing connections on link dow ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 10/30] solos: Reject non-AAL5 connections.... for now, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 11/30] solos: Add SNR and Attn to status packet, fi ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 12/30] solos: Fix under-allocation of skb size for ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 13/30] solos: Remove parameter group from sysfs on ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 14/30] solos: First attempt at DMA support, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 15/30] solos: Tidy up DMA handling a little. Still ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 16/30] solos: Tidy up tx_mask handling for ports wh ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 17/30] solos: Remove unused loopback debug stuff, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 18/30] solos: Remove IRQF_DISABLED, don't frob IRQ ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 19/30] solos: Remove superfluous wait_queue_head_t ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 21/30] solos: Clean up handling of card-&gt;tx_mask a ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 20/30] solos: Fix various bugs in status packet han ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 22/30] solos: Remove debugging, commented-out test code, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 23/30] solos: Add 'reset' module parameter to reset ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 24/30] solos: Tidy up status interrupt handling, co ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 25/30] solos: Don't clear config registers at startup, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 26/30] solos: Set RX empty flag at startup only for ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 27/30] solos: Swap upstream/downstream rates in sta ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 28/30] solos: Reset device on unload, free pending skbs, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 30/30] solos: Disable DMA until we have an FPGA upd ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 29/30] solos: Automatically determine number of ports, David Woodhouse, (Tue Mar 17, 2:29 pm)
Re: [GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 2:33 pm)
Re: [GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 2:36 pm)
Re: [PATCH 06/30] solos: Handle attribute show/store in ke ..., Stephen Hemminger, (Tue Mar 17, 3:44 pm)
Re: [PATCH 06/30] solos: Handle attribute show/store in ke ..., David Woodhouse, (Tue Mar 17, 3:49 pm)
Re: [PATCH 06/30] solos: Handle attribute show/store in ke ..., David Miller, (Sat Mar 21, 1:22 pm)