LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
To: Andi Kleen <ak@suse.de>
Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com>,
	Andrew Morton <akpm@osdl.org>,
	linux-kernel@vger.kernel.org, discuss@x86-64.org, "Li,
	Shaohua" <shaohua.li@intel.com>, Ingo Molnar <mingo@elte.hu>
Subject: Re: What was in the x86 merge for .20
Date: Fri, 8 Dec 2006 10:00:04 -0800	[thread overview]
Message-ID: <20061208100004.D31153@unix-os.sc.intel.com> (raw)
In-Reply-To: <200612081810.29792.ak@suse.de>; from ak@suse.de on Fri, Dec 08, 2006 at 06:10:29PM +0100

On Fri, Dec 08, 2006 at 06:10:29PM +0100, Andi Kleen wrote:
> Yes please check the mainline git tree.

Ok. I think I am the culprit :(

Andi, Attached patch should fix the panic issue that Andrew encountered.
Andrew, please confirm.

Andi, if you are applying Ingo's genapic changes and reverting this quirk
changes in git, then there is no need to apply the appended patch.

Personally, I would like to go with Ingo's changes as it cleans up quite 
a bit of code.

thanks,
suresh
--

[patch] i386: Fix the verify_quirk_intel_irqbalance()

Fix the verify_quirk_intel_irqbalance(). genapic checks should really
happen only on affected versions of the E7520/E7320/E7525 based platforms.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>

diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c
index a01320a..34874c3 100644
--- a/arch/i386/kernel/quirks.c
+++ b/arch/i386/kernel/quirks.c
@@ -10,13 +10,38 @@ #include <asm/cpu.h>
 #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
 static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev)
 {
+	u8 config, rev;
+	u32 word;
+
+	/* BIOS may enable hardware IRQ balancing for
+	 * E7520/E7320/E7525(revision ID 0x9 and below)
+	 * based platforms.
+	 * For those platforms, make sure that the genapic is set to 'flat'
+	 */
+	pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
+	if (rev > 0x9)
+		return;
+
+	/* enable access to config space*/
+	pci_read_config_byte(dev, 0xf4, &config);
+	pci_write_config_byte(dev, 0xf4, config|0x2);
+
+	/* read xTPR register */
+	raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
+
+	if (!(word & (1 << 13))) {
 #ifdef CONFIG_X86_64
-	if (genapic !=  &apic_flat)
-		panic("APIC mode must be flat on this system\n");
+		if (genapic !=  &apic_flat)
+			panic("APIC mode must be flat on this system\n");
 #elif defined(CONFIG_X86_GENERICARCH)
-	if (genapic != &apic_default)
-		panic("APIC mode must be default(flat) on this system. Use apic=default\n");
+		if (genapic != &apic_default)
+			panic("APIC mode must be default(flat) on this system. Use apic=default\n");
 #endif
+	}
+
+	/* put back the original value for config space*/
+	if (!(config & 0x2))
+		pci_write_config_byte(dev, 0xf4, config);
 }
 
 void __init quirk_intel_irqbalance(void)

  reply	other threads:[~2006-12-08 18:26 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-08  3:01 Andi Kleen
2006-12-08 10:08 ` Andrew Morton
2006-12-08 10:44   ` Ingo Molnar
2006-12-08 16:41   ` Siddha, Suresh B
2006-12-08 17:10     ` Andi Kleen
2006-12-08 18:00       ` Siddha, Suresh B [this message]
2006-12-08 20:15         ` [discuss] " Andi Kleen
2006-12-09  8:41         ` Andrew Morton
2006-12-09 18:51           ` Andi Kleen
2006-12-08 17:12   ` Andi Kleen
2006-12-08 12:04 ` Arkadiusz Miskiewicz
2006-12-08 12:51   ` Muli Ben-Yehuda
2006-12-08 13:03     ` Arkadiusz Miskiewicz
2006-12-08 16:34       ` Muli Ben-Yehuda
2006-12-08 18:04       ` Andi Kleen
2006-12-08 18:10         ` Arkadiusz Miskiewicz
2006-12-08 20:07           ` Andi Kleen
2006-12-08 20:36             ` Jeremy Fitzhardinge
2006-12-08 20:35   ` Jeremy Fitzhardinge
2006-12-08 21:06     ` proxy_pda was " Andi Kleen
2006-12-08 21:09       ` Jeremy Fitzhardinge
2006-12-08 21:22         ` Andi Kleen
2006-12-08 21:34           ` Jeremy Fitzhardinge
2006-12-08 22:04           ` Arkadiusz Miskiewicz

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=20061208100004.D31153@unix-os.sc.intel.com \
    --to=suresh.b.siddha@intel.com \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=discuss@x86-64.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=shaohua.li@intel.com \
    --subject='Re: What was in the x86 merge for .20' \
    /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

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).