diff options
Diffstat (limited to 'arch/x86/kernel/bios_uv.c')
| -rw-r--r-- | arch/x86/kernel/bios_uv.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c index b0206a211b09..c918ebab52ab 100644 --- a/arch/x86/kernel/bios_uv.c +++ b/arch/x86/kernel/bios_uv.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | * | 17 | * |
| 18 | * Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. | 18 | * Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. |
| 19 | * Copyright (c) Russ Anderson | 19 | * Copyright (c) Russ Anderson <rja@sgi.com> |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/efi.h> | 22 | #include <linux/efi.h> |
| @@ -30,6 +30,7 @@ static struct uv_systab uv_systab; | |||
| 30 | s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5) | 30 | s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5) |
| 31 | { | 31 | { |
| 32 | struct uv_systab *tab = &uv_systab; | 32 | struct uv_systab *tab = &uv_systab; |
| 33 | s64 ret; | ||
| 33 | 34 | ||
| 34 | if (!tab->function) | 35 | if (!tab->function) |
| 35 | /* | 36 | /* |
| @@ -37,9 +38,11 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5) | |||
| 37 | */ | 38 | */ |
| 38 | return BIOS_STATUS_UNIMPLEMENTED; | 39 | return BIOS_STATUS_UNIMPLEMENTED; |
| 39 | 40 | ||
| 40 | return efi_call6((void *)__va(tab->function), | 41 | ret = efi_call6((void *)__va(tab->function), (u64)which, |
| 41 | (u64)which, a1, a2, a3, a4, a5); | 42 | a1, a2, a3, a4, a5); |
| 43 | return ret; | ||
| 42 | } | 44 | } |
| 45 | EXPORT_SYMBOL_GPL(uv_bios_call); | ||
| 43 | 46 | ||
| 44 | s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, | 47 | s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, |
| 45 | u64 a4, u64 a5) | 48 | u64 a4, u64 a5) |
| @@ -73,11 +76,14 @@ long sn_coherency_id; | |||
| 73 | EXPORT_SYMBOL_GPL(sn_coherency_id); | 76 | EXPORT_SYMBOL_GPL(sn_coherency_id); |
| 74 | long sn_region_size; | 77 | long sn_region_size; |
| 75 | EXPORT_SYMBOL_GPL(sn_region_size); | 78 | EXPORT_SYMBOL_GPL(sn_region_size); |
| 79 | long system_serial_number; | ||
| 80 | EXPORT_SYMBOL_GPL(system_serial_number); | ||
| 76 | int uv_type; | 81 | int uv_type; |
| 82 | EXPORT_SYMBOL_GPL(uv_type); | ||
| 77 | 83 | ||
| 78 | 84 | ||
| 79 | s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, | 85 | s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, |
| 80 | long *region) | 86 | long *region, long *ssn) |
| 81 | { | 87 | { |
| 82 | s64 ret; | 88 | s64 ret; |
| 83 | u64 v0, v1; | 89 | u64 v0, v1; |
| @@ -97,8 +103,11 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, | |||
| 97 | *coher = part.coherence_id; | 103 | *coher = part.coherence_id; |
| 98 | if (region) | 104 | if (region) |
| 99 | *region = part.region_size; | 105 | *region = part.region_size; |
| 106 | if (ssn) | ||
| 107 | *ssn = v1; | ||
| 100 | return ret; | 108 | return ret; |
| 101 | } | 109 | } |
| 110 | EXPORT_SYMBOL_GPL(uv_bios_get_sn_info); | ||
| 102 | 111 | ||
| 103 | int | 112 | int |
| 104 | uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size, | 113 | uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size, |
| @@ -185,4 +194,3 @@ void uv_bios_init(void) | |||
| 185 | 194 | ||
| 186 | void uv_bios_init(void) { } | 195 | void uv_bios_init(void) { } |
| 187 | #endif | 196 | #endif |
| 188 | |||
