diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2009-04-16 23:35:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-02 10:24:44 -0700 |
| commit | 5e7675e9c311b657bd75bcf7038d3d73e9b8e9e8 (patch) | |
| tree | bc571e34ffbdd1d320007bb45eaef4bda0667760 | |
| parent | 7627613b64210b454164a8dbe6b4681da9ed1bb7 (diff) | |
r8169: reset IntrStatus after chip reset
Upstream as d78ad8cbfe73ad568de38814a75e9c92ad0a907c (post 2.6.29).
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/r8169.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 8ec18edc4da8..a98d31af76ec 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1687,8 +1687,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_free_res_4; } - /* 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); @@ -1700,6 +1699,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); |