From: Ian Kumlien <pomac@vapor.com>
To: linux-kernel@vger.kernel.org
Subject: Re: Catching NForce2 lockup with NMI watchdog - found?
Date: Sat, 06 Dec 2003 20:33:14 +0100 [thread overview]
Message-ID: <1070739194.1985.4.camel@big.pomac.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 386 bytes --]
Hi, i'm now running this patch and it survived my grep in /usr/src.
It's mainly a correction of the apic patch and the ACPI halt disconnect
patch that was originally done for 2.6...
I'll get back to you about uptime, but i think this is it...
Although i would prefer a not so workaroundish approach =)
--
Ian Kumlien <pomac () vapor ! com> -- http://pomac.netswarm.net
[-- Attachment #1.2: Type: text/x-diff, Size: 1680 bytes --]
--- arch/i386/kernel/mpparse.c.orig 2003-11-28 19:26:19.000000000 +0100
+++ arch/i386/kernel/mpparse.c 2003-12-06 19:35:15.000000000 +0100
@@ -1140,7 +1140,8 @@
*/
for (i = 0; i < mp_irq_entries; i++) {
if ((mp_irqs[i].mpc_dstapic == intsrc.mpc_dstapic)
- && (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)) {
+ && (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)
+ && (mp_irqs[i].mpc_irqtype == intsrc.mpc_irqtype)) {
mp_irqs[i] = intsrc;
found = 1;
break;
--- arch/i386/kernel/pci-pc.c.orig 2003-12-06 19:32:44.000000000 +0100
+++ arch/i386/kernel/pci-pc.c 2003-12-06 19:33:55.000000000 +0100
@@ -1328,6 +1328,18 @@
dev->transparent = 1;
}
+/*
+ * Halt Disconnect and Stop Grant Disconnect (bit 4 at offset 0x6F)
+ * must be disabled when APIC is used (or lockups will happen).
+ */
+static void __devinit pci_fixup_nforce2_disconnect(struct pci_dev *d)
+{
+ u8 t;
+
+ pci_read_config_byte(d, 0x6F, &t);
+ pci_write_config_byte(d, 0x6F, (t & 0xef));
+}
+
struct pci_fixup pcibios_fixups[] = {
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx },
@@ -1343,6 +1355,7 @@
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810 },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_fixup_transparent_bridge },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2_disconnect },
{ 0 }
};
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2003-12-06 19:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-06 19:33 Ian Kumlien [this message]
2003-12-07 0:20 ` Catching NForce2 lockup with NMI watchdog - found? Craig Bradney
2003-12-07 0:29 ` Ian Kumlien
2003-12-07 10:32 ` Craig Bradney
2003-12-07 14:54 ` Ian Kumlien
-- strict thread matches above, loose matches on Subject: below --
2003-12-09 22:57 merged in bk5 " b
2003-12-10 4:48 ` Bob
2003-12-08 3:21 Ross Dickson
2003-12-08 11:36 ` Craig Bradney
2003-12-08 13:34 ` Ross Dickson
2003-12-08 17:40 ` Bob
2003-12-06 2:08 Ian Kumlien
2003-12-06 13:36 ` Craig Bradney
2003-12-06 13:47 ` Bartlomiej Zolnierkiewicz
2003-12-06 14:42 ` Ian Kumlien
2003-12-06 15:33 ` Craig Bradney
2003-12-06 15:58 ` Ian Kumlien
2003-12-06 1:58 Ian Kumlien
2003-12-06 0:55 Ian Kumlien
2003-12-06 1:52 ` Craig Bradney
2003-12-06 4:00 ` Mike Fedyk
2003-12-06 8:23 ` Josh McKinney
2003-12-08 3:12 ` Bob
2003-12-05 20:56 Catching NForce2 lockup with NMI watchdog Allen Martin
2003-12-05 23:49 ` Catching NForce2 lockup with NMI watchdog - found? Prakash K. Cheemplavam
2003-12-05 23:55 ` Prakash K. Cheemplavam
2003-12-06 0:15 ` Craig Bradney
2003-12-06 0:21 ` Prakash K. Cheemplavam
2003-12-06 0:37 ` Craig Bradney
2003-12-08 3:08 ` Bob
2003-12-08 3:06 ` Bartlomiej Zolnierkiewicz
2003-12-08 3:03 ` Bob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1070739194.1985.4.camel@big.pomac.com \
--to=pomac@vapor.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).