mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, uv: Remove recursion in uv_heartbeat_enable()
  x86, uv: uv_global_gru_mmr_address() macro fix
  x86, uv: Add serial number parameter to uv_bios_get_sn_info()
This commit is contained in:
Linus Torvalds 2010-02-28 11:00:55 -08:00
parent 6f5621cb16 99659a929d
commit 30ff056c42
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/include/asm/uv/bios.h
View File

@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved.
* Copyright (c) Russ Anderson * Copyright (c) Russ Anderson <rja@sgi.com>
*/ */
#include <linux/rtc.h> #include <linux/rtc.h>
@ -90,7 +90,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_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_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 s64 uv_bios_freq_base(u64, u64 *);
extern int uv_bios_mq_watchlist_alloc(unsigned long, unsigned int, extern int uv_bios_mq_watchlist_alloc(unsigned long, unsigned int,
unsigned long *); unsigned long *);
@ -106,6 +106,7 @@ extern int uv_type;
extern long sn_partition_id; extern long sn_partition_id;
extern long sn_coherency_id; extern long sn_coherency_id;
extern long sn_region_size; extern long sn_region_size;
extern long system_serial_number;
#define partition_coherence_id() (sn_coherency_id) #define partition_coherence_id() (sn_coherency_id)
extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */ extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */

3
arch/x86/include/asm/uv/uv_hub.h
View File

@ -329,7 +329,8 @@ static inline unsigned long uv_read_global_mmr64(int pnode, unsigned long offset
*/ */
static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset) 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);
} }
static inline void uv_write_global_mmr8(int pnode, unsigned long offset, unsigned char val) static inline void uv_write_global_mmr8(int pnode, unsigned long offset, unsigned char val)

15
arch/x86/kernel/apic/x2apic_uv_x.c
View File

@ -5,7 +5,7 @@
* *
* SGI UV APIC functions (note: not an Intel compatible APIC) * 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/cpumask.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
@ -488,7 +488,7 @@ static void uv_heartbeat(unsigned long ignored)
static void __cpuinit uv_heartbeat_enable(int cpu) 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; struct timer_list *timer = &uv_cpu_hub_info(cpu)->scir.timer;
uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY); uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY);
@ -496,11 +496,10 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
timer->expires = jiffies + SCIR_CPU_HB_INTERVAL; timer->expires = jiffies + SCIR_CPU_HB_INTERVAL;
add_timer_on(timer, cpu); add_timer_on(timer, cpu);
uv_cpu_hub_info(cpu)->scir.enabled = 1; uv_cpu_hub_info(cpu)->scir.enabled = 1;
}
/* check boot cpu */ /* also ensure that boot cpu is enabled */
if (!uv_cpu_hub_info(0)->scir.enabled) cpu = 0;
uv_heartbeat_enable(0); }
} }
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
@ -704,8 +703,8 @@ void __init uv_system_init(void)
} }
uv_bios_init(); uv_bios_init();
uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, &sn_coherency_id,
&sn_coherency_id, &sn_region_size); &sn_region_size, &system_serial_number);
uv_rtc_init(); uv_rtc_init();
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {

20
arch/x86/kernel/bios_uv.c
View File

@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved.
* Copyright (c) Russ Anderson * Copyright (c) Russ Anderson <rja@sgi.com>
*/ */
#include <linux/efi.h> #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) 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; struct uv_systab *tab = &uv_systab;
s64 ret;
if (!tab->function) 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 BIOS_STATUS_UNIMPLEMENTED;
return efi_call6((void *)__va(tab->function), ret = efi_call6((void *)__va(tab->function), (u64)which,
(u64)which, a1, a2, a3, a4, a5); 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, s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,
u64 a4, u64 a5) u64 a4, u64 a5)
@ -73,11 +76,14 @@ long sn_coherency_id;
EXPORT_SYMBOL_GPL(sn_coherency_id); EXPORT_SYMBOL_GPL(sn_coherency_id);
long sn_region_size; long sn_region_size;
EXPORT_SYMBOL_GPL(sn_region_size); EXPORT_SYMBOL_GPL(sn_region_size);
long system_serial_number;
EXPORT_SYMBOL_GPL(system_serial_number);
int uv_type; int uv_type;
EXPORT_SYMBOL_GPL(uv_type);
s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher,
long *region) long *region, long *ssn)
{ {
s64 ret; s64 ret;
u64 v0, v1; 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; *coher = part.coherence_id;
if (region) if (region)
*region = part.region_size; *region = part.region_size;
if (ssn)
*ssn = v1;
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(uv_bios_get_sn_info);
int int
uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size, uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size,
@ -204,4 +213,3 @@ void uv_bios_init(void)
void uv_bios_init(void) { } void uv_bios_init(void) { }
#endif #endif