linux-kernel - [tip:x86/apic] x86: apic: Fixmap apic address even if apic disabled

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-cec6be6d1069d697beb490bbb40a290d5ff554a2@git.kernel.org>
Date:	Mon, 11 May 2009 13:54:29 GMT
From:	tip-bot for Cyrill Gorcunov <gorcunov@...il.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	gorcunov@...nvz.org, tglx@...utronix.de, gorcunov@...il.com,
	mingo@...e.hu
Subject: [tip:x86/apic] x86: apic: Fixmap apic address even if apic disabled

Commit-ID:  cec6be6d1069d697beb490bbb40a290d5ff554a2
Gitweb:     http://git.kernel.org/tip/cec6be6d1069d697beb490bbb40a290d5ff554a2
Author:     Cyrill Gorcunov <gorcunov@...il.com>
AuthorDate: Mon, 11 May 2009 17:41:40 +0400
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 11 May 2009 15:50:58 +0200

x86: apic: Fixmap apic address even if apic disabled

In case if apic were disabled by boot option
we still need read_apic operation. So fixmap
a fake apic area if needed.

[ Impact: fix boot crash ]

Signed-off-by: Cyrill Gorcunov <gorcunov@...nvz.org>
Cc: yinghai@...nel.org
Cc: eswierk@...stanetworks.com
LKML-Reference: <20090511134140.GH4624@...ovo>
Signed-off-by: Ingo Molnar <mingo@...e.hu>


---
 arch/x86/kernel/apic/apic.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 0e6543f..07cffc1 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1587,13 +1587,6 @@ void __init init_apic_mappings(void)
 	} else
 		apic_phys = mp_lapic_addr;
 
-	/* lets check if we may NOP'ify apic operations */
-	if (!cpu_has_apic) {
-		pr_info("APIC: disable apic facility\n");
-		apic_disable();
-		return;
-	}
-
 	/*
 	 * acpi lapic path already maps that address in
 	 * acpi_register_lapic_address()
@@ -1602,7 +1595,15 @@ void __init init_apic_mappings(void)
 		set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
 
 	apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n",
-				APIC_BASE, apic_phys);
+			APIC_BASE, apic_phys);
+
+	/* lets check if we may NOP'ify apic operations */
+	if (!cpu_has_apic) {
+		pr_info("APIC: disable apic facility\n");
+		apic_disable();
+		return;
+	}
+
 	/*
 	 * Fetch the APIC ID of the BSP in case we have a
 	 * default configuration (or the MP table is broken).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/