x86/uv changes for v2.6.34
Subsystems (2)
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-uv-for-linus
Thanks,
Ingo
------------------>
Jack Steiner (1):
x86, uv: uv_global_gru_mmr_address() macro fix
Roel Kluin (1):
x86, uv: Remove recursion in uv_heartbeat_enable()
Russ Anderson (1):
x86, uv: Add serial number parameter to uv_bios_get_sn_info()
arch/x86/include/asm/uv/bios.h | 7 ++++--- arch/x86/include/asm/uv/uv_hub.h | 3 ++- arch/x86/kernel/apic/x2apic_uv_x.c | 15 +++++++-------- arch/x86/kernel/bios_uv.c | 20 ++++++++++++++------ 4 files changed, 27 insertions(+), 18 deletions(-)
arch/x86/include/asm/uv/bios.h +4 -3
@@ -18,8 +18,8 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. -* Copyright (c) Russ Anderson +* Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) Russ Anderson <[email protected]> */ #include <linux/rtc.h>
@@ -89,7 +89,7 @@ extern s64 uv_bios_call(enum uv_bios_cmd, u64, u64, u64, u64, u64);extern s64 uv_bios_call_irqsave (enum uv_bios_cmd ,u64 ,u64 ,u64 ,u64 ,u64 );extern s64 uv_bios_call_reentrant (enum uv_bios_cmd ,u64 ,u64 ,u64 ,u64 ,u64 ); -extern s64 uv_bios_get_sn_info (int ,int *,long *,long *,long *); +extern s64 uv_bios_get_sn_info (int ,int *,long *,long *,long *,long *);extern s64 uv_bios_freq_base (u64 ,u64 *);extern int uv_bios_mq_watchlist_alloc (unsigned long ,unsigned int ,unsigned long *);
@@ -104,6 +104,7 @@ extern int uv_type;extern long sn_partition_id;extern long sn_coherency_id;extern long sn_region_size; +extern long system_serial_number;#define partition_coherence_id () (sn_coherency_id)extern struct kobject *sgi_uv_kobj;/* /sys/firmware/sgi_uv */
arch/x86/include/asm/uv/uv_hub.h +2 -1
@@ -335,7 +335,8 @@ static inline unsigned long uv_read_global_mmr64(int pnode,*/ static inline unsigned long uv_global_gru_mmr_address (int pnode,unsigned long offset) { -return UV_GLOBAL_GRU_MMR_BASE | offset | (pnode << uv_hub_info->m_val); +return UV_GLOBAL_GRU_MMR_BASE | offset | + ((unsigned long )pnode << uv_hub_info->m_val); }/*
arch/x86/kernel/apic/x2apic_uv_x.c +7 -8
@@ -5,7 +5,7 @@* * SGI UV APIC functions (note: not an Intel compatible APIC) * -* Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. +* Copyright (C) 2007-2009 Silicon Graphics, Inc. All rights reserved. */ #include <linux/cpumask.h> #include <linux/hardirq.h>
@@ -475,7 +475,7 @@ static void uv_heartbeat(unsigned long ignored)static void __cpuinit uv_heartbeat_enable (int cpu) { -if (!uv_cpu_hub_info (cpu)->scir.enabled) { +while (!uv_cpu_hub_info (cpu)->scir.enabled) {struct timer_list *timer = &uv_cpu_hub_info (cpu)->scir.timer;uv_set_cpu_scir_bits (cpu,SCIR_CPU_HEARTBEAT |SCIR_CPU_ACTIVITY );
@@ -483,11 +483,10 @@ static void __cpuinit uv_heartbeat_enable(int cpu) timer->expires = jiffies +SCIR_CPU_HB_INTERVAL ;add_timer_on (timer, cpu);uv_cpu_hub_info (cpu)->scir.enabled =1 ; - } -/* check boot cpu */ -if (!uv_cpu_hub_info (0 )->scir.enabled) -uv_heartbeat_enable (0 ); +/* also ensure that boot cpu is enabled */ + cpu =0 ; + } }#ifdef CONFIG_HOTPLUG_CPU
@@ -627,8 +626,8 @@ void __init uv_system_init(void) }uv_bios_init (); -uv_bios_get_sn_info (0 , &uv_type, &sn_partition_id, - &sn_coherency_id, &sn_region_size); +uv_bios_get_sn_info (0 , &uv_type, &sn_partition_id, &sn_coherency_id, + &sn_region_size, &system_serial_number);uv_rtc_init ();for_each_present_cpu (cpu) {
arch/x86/kernel/bios_uv.c +14 -6
@@ -15,8 +15,8 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. -* Copyright (c) Russ Anderson +* Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) Russ Anderson <[email protected]> */ #include <linux/efi.h>
@@ -30,6 +30,7 @@ static struct uv_systab uv_systab;s64 uv_bios_call (enum uv_bios_cmd which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) {struct uv_systab *tab = &uv_systab; +s64 ret;if (!tab->function)/*
@@ -37,9 +38,11 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)*/ return BIOS_STATUS_UNIMPLEMENTED ; -return efi_call6 ((void *)__va (tab->function), - (u64 )which, a1, a2, a3, a4, a5); + ret =efi_call6 ((void *)__va (tab->function), (u64 )which, + a1, a2, a3, a4, a5); +return ret; } +EXPORT_SYMBOL_GPL (uv_bios_call);s64 uv_bios_call_irqsave (enum uv_bios_cmd which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5)
@@ -73,11 +76,14 @@ long sn_coherency_id;EXPORT_SYMBOL_GPL (sn_coherency_id);long sn_region_size;EXPORT_SYMBOL_GPL (sn_region_size); +long system_serial_number; +EXPORT_SYMBOL_GPL (system_serial_number);int uv_type; +EXPORT_SYMBOL_GPL (uv_type);s64 uv_bios_get_sn_info (int fc,int *uvtype,long *partid,long *coher, -long *region) +long *region,long *ssn) {s64 ret;u64 v0, v1;
@@ -97,8 +103,11 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, *coher = part.coherence_id;if (region) *region = part.region_size; +if (ssn) + *ssn = v1;return ret; } +EXPORT_SYMBOL_GPL (uv_bios_get_sn_info); int uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size,
@@ -185,4 +194,3 @@ void uv_bios_init(void)void uv_bios_init (void ) { }#endif -