Attachment 160173 Details for Bug 242572 – debug helper

[patch] debug helper

r8169-debug.patch (text/plain), 1.69 KB, created by Francois Romieu on 2007-07-28 19:50:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Romieu

Created: 2007-07-28 19:50:37 UTC

Size: 1.69 KB

patch

obsolete

>diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
>index bb6896a..98f7066 100644
>--- a/drivers/net/r8169.c
>+++ b/drivers/net/r8169.c
>@@ -420,6 +420,7 @@ struct rtl8169_private {
> 	unsigned int (*link_ok)(void __iomem *);
> 	struct delayed_work task;
> 	unsigned wol_enabled : 1;
>+	unsigned irq_ready;
> };
> 
> MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
>@@ -1762,6 +1763,8 @@ static int rtl8169_open(struct net_device *dev)
> 
> 	INIT_DELAYED_WORK(&tp->task, NULL);
> 
>+	tp->irq_ready = 0;
>+
> 	smp_mb();
> 
> 	retval = request_irq(dev->irq, rtl8169_interrupt, IRQF_SHARED,
>@@ -1817,6 +1820,7 @@ static void rtl_hw_start(struct net_device *dev)
> {
> 	struct rtl8169_private *tp = netdev_priv(dev);
> 	void __iomem *ioaddr = tp->mmio_addr;
>+	unsigned long flags;
> 	unsigned int i;
> 
> 	/* Soft reset the chip. */
>@@ -1829,8 +1833,17 @@ static void rtl_hw_start(struct net_device *dev)
> 		msleep_interruptible(1);
> 	}
> 
>+	/* Hackish/bogus but I am chasing an UP bug. */
>+	local_irq_save(flags);
>+
>+	tp->irq_ready = 1;
>+
> 	tp->hw_start(dev);
> 
>+	local_irq_restore(flags);
>+
>+	spin_unlock_irqrestore(&tp->lock, flags);
>+
> 	netif_start_queue(dev);
> }
> 
>@@ -2726,6 +2739,11 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
> 	do {
> 		status = RTL_R16(IntrStatus);
> 
>+		if (!tp->irq_ready) {
>+			printk(KERN_INFO PFX "%s: status = %08x\n",
>+			       dev->name, status);
>+		}
>+
> 		/* hotplug/major error/no more work/shared irq */
> 		if ((status == 0xFFFF) || !status)
> 			break;
>@@ -2889,6 +2907,8 @@ static int rtl8169_close(struct net_device *dev)
> 
> 	free_irq(dev->irq, dev);
> 
>+	tp->irq_ready = 0;
>+
> 	netif_poll_enable(dev);
> 
> 	pci_free_consistent(pdev, R8169_RX_RING_BYTES, tp->RxDescArray,

Actions: View | Diff

Attachments on bug 242572: 156603 | 156759 | 156815 | 156816 | 156817 | 158726 | 159748 | 160162 | 160173 | 160185 | 160277 | 160280 | 160474 | 160507 | 161084