From: Daniel J Blueman <daniel@numascale.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Daniel J Blueman <daniel@numascale.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, Steffen Persvold <sp@numascale.com>
Subject: [PATCH v3 3/5] Numachip: Add safe is-present function
Date: Sun, 2 Nov 2014 16:10:11 +0800 [thread overview]
Message-ID: <1414915813-2462-3-git-send-email-daniel@numascale.com> (raw)
In-Reply-To: <1414915813-2462-1-git-send-email-daniel@numascale.com>
Add safe function to check if Numachip is detected, to be used elsewhere.
Signed-off-by: Daniel J Blueman <daniel@numascale.com>
---
arch/x86/include/asm/numachip/numachip.h | 9 +++++++++
arch/x86/kernel/apic/apic_numachip.c | 9 +++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/numachip/numachip.h b/arch/x86/include/asm/numachip/numachip.h
index 1c6f7f6..3e1f4f9 100644
--- a/arch/x86/include/asm/numachip/numachip.h
+++ b/arch/x86/include/asm/numachip/numachip.h
@@ -16,4 +16,13 @@
extern int __init pci_numachip_init(void);
+#ifdef CONFIG_X86_NUMACHIP
+extern bool is_numachip_system(void);
+#else
+static inline bool is_numachip_system(void)
+{
+ return 0;
+}
+#endif
+
#endif /* _ASM_X86_NUMACHIP_NUMACHIP_H */
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index bd083c0..c965b69 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -30,7 +30,7 @@
#include <asm/apic_flat_64.h>
#include <asm/pgtable.h>
-static int numachip_system __read_mostly;
+static bool numachip_system __read_mostly;
static const struct apic apic_numachip __refconst;
@@ -173,11 +173,16 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
}
}
+bool is_numachip_system(void)
+{
+ return numachip_system;
+}
+
static int __init numachip_system_init(void)
{
unsigned int val;
- if (!numachip_system)
+ if (!is_numachip_system())
return 0;
x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
--
1.9.1
next prev parent reply other threads:[~2014-11-02 8:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-02 8:10 [PATCH v3 1/5] Numachip: Fix 16-bit APIC ID truncation Daniel J Blueman
2014-11-02 8:10 ` [PATCH v3 2/5] Numachip: Elide self-IPI ICR polling Daniel J Blueman
2014-11-02 8:10 ` Daniel J Blueman [this message]
2014-11-03 19:45 ` [PATCH v3 3/5] Numachip: Add safe is-present function Thomas Gleixner
2014-11-03 22:55 ` Daniel J Blueman
2014-11-03 22:58 ` Thomas Gleixner
2014-11-02 8:10 ` [PATCH v3 4/5] Numachip: APIC driver cleanups Daniel J Blueman
2014-11-02 8:10 ` [PATCH v3 5/5] Use 2GB memory block size on large x86-64 systems Daniel J Blueman
2014-11-03 19:38 ` Thomas Gleixner
2014-11-03 23:15 ` Daniel J Blueman
2014-11-03 23:36 ` Thomas Gleixner
2014-11-04 7:30 ` Daniel J Blueman
2014-11-04 7:50 ` Thomas Gleixner
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=1414915813-2462-3-git-send-email-daniel@numascale.com \
--to=daniel@numascale.com \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sp@numascale.com \
--cc=tglx@linutronix.de \
--cc=x86@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).