| 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
| ||
|
Message-ID: <20080822215408.GD143104@sgi.com>
Date: Fri, 22 Aug 2008 16:54:08 -0500
From: Russ Anderson <rja@....com>
To: linux-kernel@...r.kernel.org, mingo@...e.hu, tglx@...utronix.de
Cc: Russ Anderson <rja@....com>, Jack Steiner <steiner@....com>
Subject: [PATCH 3/4] x86: Add UV partition call
[PATCH 3/4] x86: Add UV partition call
Add a bios call to return partitioning related info.
Signed-off-by: Russ Anderson <rja@....com>
---
arch/x86/kernel/bios_uv.c | 52 ++++++++++++++++++++++++++++++++++-----
arch/x86/kernel/genx2apic_uv_x.c | 14 ++++++----
include/asm-x86/uv/bios.h | 30 ++++++++++++++++------
3 files changed, 76 insertions(+), 20 deletions(-)
Index: linux/arch/x86/kernel/bios_uv.c
===================================================================
--- linux.orig/arch/x86/kernel/bios_uv.c 2008-08-22 14:52:00.000000000 -0500
+++ linux/arch/x86/kernel/bios_uv.c 2008-08-22 14:52:08.000000000 -0500
@@ -62,14 +62,54 @@ s64 uv_bios_call_reentrant(int which, u6
return ret;
}
-long
-x86_bios_freq_base(unsigned long clock_type, unsigned long *ticks_per_second,
- unsigned long *drift_info)
+
+u8 sn_partition_id;
+EXPORT_SYMBOL(sn_partition_id);
+u8 uv_coherency_id;
+EXPORT_SYMBOL(uv_coherency_id);
+u8 uv_type;
+EXPORT_SYMBOL(uv_type);
+
+/*
+ * Returns information about the UV HUB.
+ *
+ * Parameters for UV_BIOS_GET_SN_INFO call:
+ * In:
+ * arg0 - UV_BIOS_GET_SN_INFO
+ * arg1 - fc (0 for now, other values reserved for future use)
+ * Out:
+ * v0
+ * [7:0] - uv hub version (0=hub1, 1=hub2)
+ * [31:24] - partition ID
+ * [39:32] - coherency_id
+ */
+s64 uv_bios_get_sn_info(int fc, u8 *uvtype, u8 *partid, u8 *coher)
{
- return uv_bios_call(BIOS_FREQ_BASE, clock_type,
- (u64)ticks_per_second, 0, 0, 0);
+ s64 ret;
+ u64 v0, v1;
+
+ ret = uv_bios_call_irqsave(UV_BIOS_GET_SN_INFO, fc,
+ (u64)(&v0), (u64)(&v1), 0, 0);
+ if (ret != BIOS_STATUS_SUCCESS)
+ return ret;
+
+ if (uvtype)
+ *uvtype = v0 & 0xff;
+ if (partid)
+ *partid = (v0 >> 8) & 0xff;
+ if (coher)
+ *coher = (v0 >> 24) & 0xff;
+ return ret;
}
-EXPORT_SYMBOL_GPL(x86_bios_freq_base);
+
+
+s64
+uv_bios_freq_base(u64 clock_type, u64 *ticks_per_second)
+{
+ return uv_bios_call(UV_BIOS_FREQ_BASE, clock_type,
+ (u64)ticks_per_second, 0, 0, 0);
+}
+EXPORT_SYMBOL_GPL(uv_bios_freq_base);
#ifdef CONFIG_EFI
Index: linux/arch/x86/kernel/genx2apic_uv_x.c
===================================================================
--- linux.orig/arch/x86/kernel/genx2apic_uv_x.c 2008-08-22 14:52:00.000000000 -0500
+++ linux/arch/x86/kernel/genx2apic_uv_x.c 2008-08-22 14:52:08.000000000 -0500
@@ -342,12 +342,12 @@ static __init void map_mmioh_high(int ma
static __init void uv_rtc_init(void)
{
- long status, ticks_per_sec, drift;
+ long status;
+ u64 ticks_per_sec;
- status =
- x86_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec,
- &drift);
- if (status != 0 || ticks_per_sec < 100000) {
+ status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK,
+ &ticks_per_sec);
+ if (status != BIOS_STATUS_SUCCESS || ticks_per_sec < 100000) {
printk(KERN_WARNING
"unable to determine platform RTC clock frequency, "
"guessing.\n");
@@ -412,6 +412,8 @@ static __init void uv_system_init(void)
~((1 << n_val) - 1)) << m_val;
uv_bios_init();
+ uv_bios_get_sn_info(0, &uv_type, &sn_partition_id,
+ &uv_coherency_id);
uv_rtc_init();
for_each_present_cpu(cpu) {
@@ -433,7 +435,7 @@ static __init void uv_system_init(void)
uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;
uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;
uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;
- uv_cpu_hub_info(cpu)->coherency_domain_number = 0;/* ZZZ */
+ uv_cpu_hub_info(cpu)->coherency_domain_number = uv_coherency_id;
uv_node_to_blade[nid] = blade;
uv_cpu_to_blade[cpu] = blade;
max_pnode = max(pnode, max_pnode);
Index: linux/include/asm-x86/uv/bios.h
===================================================================
--- linux.orig/include/asm-x86/uv/bios.h 2008-08-22 14:52:00.000000000 -0500
+++ linux/include/asm-x86/uv/bios.h 2008-08-22 14:52:08.000000000 -0500
@@ -24,12 +24,15 @@
#include <linux/rtc.h>
-#define BIOS_FREQ_BASE 0x01000001
-
+/*
+ * Values for the BIOS calls. It is passed as the first * argument in the
+ * BIOS call. Passing any other value in the first argument will result
+ * in a BIOS_STATUS_UNIMPLEMENTED return status.
+ */
enum {
- BIOS_FREQ_BASE_PLATFORM = 0,
- BIOS_FREQ_BASE_INTERVAL_TIMER = 1,
- BIOS_FREQ_BASE_REALTIME_CLOCK = 2
+ UV_BIOS_COMMON,
+ UV_BIOS_GET_SN_INFO,
+ UV_BIOS_FREQ_BASE
};
/*
@@ -52,6 +55,12 @@ struct sal_systab {
u64 function; /* BIOS runtime callback function ptr */
};
+enum {
+ BIOS_FREQ_BASE_PLATFORM = 0,
+ BIOS_FREQ_BASE_INTERVAL_TIMER = 1,
+ BIOS_FREQ_BASE_REALTIME_CLOCK = 2
+};
+
/*
* bios calls have 6 parameters
*/
@@ -59,11 +68,16 @@ extern s64 uv_bios_call(int, u64, u64, u
extern s64 uv_bios_call_irqsave(int, u64, u64, u64, u64, u64);
extern s64 uv_bios_call_reentrant(int which, u64, u64, u64, u64, u64);
+extern s64 uv_bios_get_sn_info(int, u8 *, u8 *, u8 *);
+extern s64 uv_bios_freq_base(u64, u64 *);
+
extern void uv_bios_init(void);
-extern long
-x86_bios_freq_base(unsigned long which, unsigned long *ticks_per_second,
- unsigned long *drift_info);
+extern u8 uv_type;
+extern u8 sn_partition_id;
+extern u8 uv_coherency_id;
+#define partition_coherence_id() (uv_coherency_id)
+
#ifndef CONFIG_EFI
extern u64 efi_call6(void *, u64, u64, u64, u64, u64, u64);
--
Russ Anderson, OS RAS/Partitioning Project Lead
SGI - Silicon Graphics Inc rja@....com
--
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/
Powered by blists - more mailing lists