Attachment 149663 Details for Bug 228733 – test patch in kernel kernel-smp-2.6.9-49.EL.bz228733.i686.rpm

[patch] test patch in kernel kernel-smp-2.6.9-49.EL.bz228733.i686.rpm

linux-kernel-test.patch (text/plain), 3.28 KB, created by Neil Horman on 2007-03-09 01:03:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-03-09 01:03:02 UTC

Size: 3.28 KB

patch

obsolete

>--- linux-2.6.9/drivers/net/sky2.h.orig	2007-03-07 11:18:30.000000000 -0500
>+++ linux-2.6.9/drivers/net/sky2.h	2007-03-07 13:15:36.000000000 -0500
>@@ -1887,6 +1887,7 @@
> 	dma_addr_t   	     st_dma;
> 
> 	struct timer_list    idle_timer;
>+	struct work_struct   restart_work;
> 	int		     msi_detected;
> 	wait_queue_head_t    msi_wait;
> 
>--- linux-2.6.9/drivers/net/sky2.c.orig	2007-03-07 11:18:30.000000000 -0500
>+++ linux-2.6.9/drivers/net/sky2.c	2007-03-07 13:23:32.000000000 -0500
>@@ -1727,41 +1727,17 @@
> {
> 	struct sky2_port *sky2 = netdev_priv(dev);
> 	struct sky2_hw *hw = sky2->hw;
>-	unsigned txq = txqaddr[sky2->port];
>-	u16 report, done;
> 
> 	if (netif_msg_timer(sky2))
> 		printk(KERN_ERR PFX "%s: tx timeout\n", dev->name);
> 
>-	report = sky2_read16(hw, sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX);
>-	done = sky2_read16(hw, Q_ADDR(txq, Q_DONE));
>-
> 	printk(KERN_DEBUG PFX "%s: transmit ring %u .. %u report=%u done=%u\n",
>-	       dev->name,
>-	       sky2->tx_cons, sky2->tx_prod, report, done);
>-
>-	if (report != done) {
>-		printk(KERN_INFO PFX "status burst pending (irq moderation?)\n");
>-
>-		sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
>-		sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
>-	} else if (report != sky2->tx_cons) {
>-		printk(KERN_INFO PFX "status report lost?\n");
>+		dev->name, sky2->tx_cons, sky2->tx_prod,
>+		sky2_read16(hw, sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX),
>+		sky2_read16(hw, Q_ADDR(txqaddr[sky2->port], Q_DONE)));
> 
>-		spin_lock_bh(&sky2->tx_lock);
>-		sky2_tx_complete(sky2, report);
>-		spin_unlock_bh(&sky2->tx_lock);
>-	} else {
>-		printk(KERN_INFO PFX "hardware hung? flushing\n");
>-
>-		sky2_write32(hw, Q_ADDR(txq, Q_CSR), BMU_STOP);
>-		sky2_write32(hw, Y2_QADDR(txq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
>-
>-		sky2_tx_clean(sky2);
>-
>-		sky2_qset(hw, txq);
>-		sky2_prefetch_init(hw, txq, sky2->tx_le_map, TX_RING_SIZE - 1);
>-	}
>+	/* can't restart safely under softirq */
>+	schedule_work(&hw->restart_work);
> }
> 
> 
>@@ -2446,6 +2422,49 @@
> 	return 0;
> }
> 
>+static void sky2_restart(struct work_struct *work)
>+{
>+	struct sky2_hw *hw = container_of(work, struct sky2_hw, restart_work);
>+	struct net_device *dev;
>+	int i, err;
>+
>+	dev_dbg(&hw->pdev->dev, "restarting\n");
>+
>+	del_timer_sync(&hw->idle_timer); 
>+
>+	rtnl_lock();
>+	sky2_write32(hw, B0_IMSK, 0);
>+	sky2_read32(hw, B0_IMSK);
>+
>+	netif_poll_disable(hw->dev[0]);
>+
>+	for (i = 0; i < hw->ports; i++) {
>+		dev = hw->dev[i];
>+		if (netif_running(dev))
>+			sky2_down(dev);
>+	}
>+
>+	sky2_reset(hw);
>+	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
>+	netif_poll_enable(hw->dev[0]);
>+
>+	for (i = 0; i < hw->ports; i++) {
>+		dev = hw->dev[i];
>+		if (netif_running(dev)) {
>+			err = sky2_up(dev);
>+			if (err) {
>+				printk(KERN_INFO PFX "%s: could not restart %d\n",
>+				       dev->name, err);
>+				dev_close(dev);
>+			}
>+		}
>+	}
>+
>+	sky2_idle_start(hw);
>+
>+        rtnl_unlock();
>+}
>+
> static u32 sky2_supported_modes(const struct sky2_hw *hw)
> {
> 	u32 modes;
>@@ -3380,6 +3399,8 @@
> 	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
> 
> 	setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) hw);
>+	INIT_WORK(&hw->restart_work, sky2_restart, &hw->restart_work);
>+
> 	sky2_idle_start(hw);
> 
> 	pci_set_drvdata(pdev, hw);
>@@ -3419,6 +3440,8 @@
> 
> 	del_timer_sync(&hw->idle_timer);
> 
>+	flush_scheduled_work();
>+
> 	sky2_write32(hw, B0_IMSK, 0);
> 	synchronize_irq(hw->pdev->irq);
>

Actions: View | Diff

Attachments on bug 228733: 148077 | 148078 | 149028 | 149410 | 149663 | 150978 | 160831 | 160839 | 160849 | 160924 | 161265 | 302652