Skip to contentSkip to conversation

x86: Use x2apic physical mode based on FADT setting

PATCH In review Greg Pearson 2 participants 3 messages Apr 25, 2012 x86

lore
Share & tools
lore

Greg Pearson

author
#0 lore raw

PATCH v2 1/1 x86: Use x2apic physical mode based on FADT setting

Provide systems that do not support x2apic cluster mode a mechanism to select x2apic physical mode using the FADT FORCE_APIC_PHYSICAL_DESTINATION_MODE bit.

Changes from v1: (based on Suresh's comments)
- removed #ifdef CONFIG_ACPI
- removed #include <linux/acpi.h>

Signed-off-by Greg Pearson <[email protected]>
---
 arch/x86/kernel/apic/x2apic_phys.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/x2apic_phys.c +6 -0
index 8a778db..991e315 100644
@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
 	if (x2apic_phys)
 		return x2apic_enabled();
+	else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
+		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
+		x2apic_enabled()) {
+		printk(KERN_DEBUG "System requires x2apic physical mode\n");
+		return 1;
+	}
 	else
 		return 0;
 }
Signature · 1 line
1.7.5.4
Acked-by on v2 1/1
#1 lore raw
Quoted 20 lines · Greg Pearson

Provide systems that do not support x2apic cluster mode a mechanism to select x2apic physical mode using the FADT FORCE_APIC_PHYSICAL_DESTINATION_MODE bit.

Changes from v1: (based on Suresh's comments)
- removed #ifdef CONFIG_ACPI
- removed #include <linux/acpi.h>

Signed-off-by Greg Pearson <[email protected]>
---
 arch/x86/kernel/apic/x2apic_phys.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/x2apic_phys.c +0 -0
index 8a778db..991e315 100644
@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
 	if (x2apic_phys)

arch/x86/kernel/apic/x2apic_phys.c static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) · line 35

Quoted 10 lines
arch/x86/kernel/apic/x2apic_phys.c +6 -0
 		return x2apic_enabled();
+	else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
+		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
+		x2apic_enabled()) {
+		printk(KERN_DEBUG "System requires x2apic physical mode\n");
+		return 1;
+	}
 	else
 		return 0;
 }
Acked-by Suresh Siddha <[email protected]>
author
#2 lore raw

[tip:x86/urgent] x86/apic: Use x2apic physical mode based on FADT setting

In reply to Greg Pearson
Commit-ID:  ea0dcf903e7d76aa5d483d876215fedcfdfe140f
Gitweb:     http://git.kernel.org/tip/ea0dcf903e7d76aa5d483d876215fedcfdfe140f
Author:     Greg Pearson <[email protected]>
AuthorDate: Tue, 24 Apr 2012 18:23:56 -0600
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 25 Apr 2012 12:47:08 +0200

x86/apic: Use x2apic physical mode based on FADT setting

Provide systems that do not support x2apic cluster mode a mechanism to select x2apic physical mode using the FADT FORCE_APIC_PHYSICAL_DESTINATION_MODE bit.

Changes from v1: (based on Suresh's comments)
- removed #ifdef CONFIG_ACPI
- removed #include <linux/acpi.h>

Signed-off-by Greg Pearson <[email protected]>
Acked-by Suresh Siddha <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/apic/x2apic_phys.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/x2apic_phys.c +6 -0
index 8a778db..991e315 100644
@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
 	if (x2apic_phys)
 		return x2apic_enabled();
+	else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
+		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
+		x2apic_enabled()) {
+		printk(KERN_DEBUG "System requires x2apic physical mode\n");
+		return 1;
+	}
 	else
 		return 0;
 }