diff mbox

[1/1] r8169: reset IntrStatus after chip reset

Message ID 20090401220941.GA22077@electric-eye.fr.zoreil.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Francois Romieu April 1, 2009, 10:09 p.m. UTC 
Original comment (Karsten):
On a MSI MS-6702E mainboard, when in rtl8169_init_one() for the first time
after BIOS has run, IntrStatus reads 5 after chip has been reset.
IntrStatus should equal 0 there, so patch changes IntrStatus reset to happen
after chip reset instead of before.

Remark (Francois):
Assuming that the loglevel of the driver is increased above NETIF_MSG_INTR,
the bug reveals itself with a typical "interrupt 0025 in poll" message
at startup. In retrospect, the message should had been read as an hint of
an unexpected hardware state several months ago :o(

Fixes (at least part of) https://bugzilla.redhat.com/show_bug.cgi?id=460747

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Josep <josep.puigdemont@gmail.com>
---
 drivers/net/r8169.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Comments

David Miller April 2, 2009, 8:06 a.m. UTC | #1 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 2 Apr 2009 00:09:41 +0200

> Original comment (Karsten):
> On a MSI MS-6702E mainboard, when in rtl8169_init_one() for the first time
> after BIOS has run, IntrStatus reads 5 after chip has been reset.
> IntrStatus should equal 0 there, so patch changes IntrStatus reset to happen
> after chip reset instead of before.
> 
> Remark (Francois):
> Assuming that the loglevel of the driver is increased above NETIF_MSG_INTR,
> the bug reveals itself with a typical "interrupt 0025 in poll" message
> at startup. In retrospect, the message should had been read as an hint of
> an unexpected hardware state several months ago :o(
> 
> Fixes (at least part of) https://bugzilla.redhat.com/show_bug.cgi?id=460747
> 
> Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Tested-by: Josep <josep.puigdemont@gmail.com>

Applied, thanks.
--
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
diff mbox

Patch

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 06c5352..e1a638a 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2075,8 +2075,7 @@  rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (!tp->pcie_cap && netif_msg_probe(tp))
 		dev_info(&pdev->dev, "no PCI Express capability\n");
 
-	/* Unneeded ? Don't mess with Mrs. Murphy. */
-	rtl8169_irq_mask_and_ack(ioaddr);
+	RTL_W16(IntrMask, 0x0000);
 
 	/* Soft reset the chip. */
 	RTL_W8(ChipCmd, CmdReset);
@@ -2088,6 +2087,8 @@  rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		msleep_interruptible(1);
 	}
 
+	RTL_W16(IntrStatus, 0xffff);
+
 	/* Identify chip attached to board */
 	rtl8169_get_mac_version(tp, ioaddr);