x86: Add UV bios call infrastructure
PATCH 2/4 x86: Add UV bios call infrastructure
[PATCH 2/4] Add UV bios call infrastructure
Add the EFI callback function and associated wrapper code. Initialize SAL system table entry info at boot time.
--- arch/x86/kernel/bios_uv.c | 106 +++++++++++++++++++++++++++++++-------- arch/x86/kernel/genx2apic_uv_x.c | 1 include/asm-x86/uv/bios.h | 58 +++++++++++---------- 3 files changed, 117 insertions(+), 48 deletions(-)
arch/x86/kernel/bios_uv.c +85 -21
@@ -1,8 +1,6 @@/* * BIOS run time interface routines. * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -16,33 +14,99 @@* You should have received a copy of the GNU General Public License * 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 */ +#include <linux/efi.h> +#include <linux/io.h> #include <asm/uv/bios.h> -const char * -x86_bios_strerror (long status) +struct sal_systab sal_systab; + +s64 uv_bios_call (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) { -const char *str; -switch (status) { -case 0 : str ="Call completed without error" ;break ; -case -1 : str ="Not implemented" ;break ; -case -2 : str ="Invalid argument" ;break ; -case -3 : str ="Call completed with error" ;break ; -default : str ="Unknown BIOS status code" ;break ; - } -return str; +struct sal_systab *tab = &sal_systab; + +if (tab->function == (unsigned long )NULL ) +/* +* BIOS does not support SAL systab +*/ +return BIOS_STATUS_UNIMPLEMENTED ; + +return efi_call6 ((void *)__va (tab->function), + which, a1, a2, a3, a4, a5); } -long -x86_bios_freq_base (unsigned long which,unsigned long *ticks_per_second, -unsigned long *drift_info) +s64 uv_bios_call_irqsave (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) { -struct uv_bios_retval isrv; +unsigned long bios_flags; +s64 ret; -BIOS_CALL (isrv,BIOS_FREQ_BASE , which,0 ,0 ,0 ,0 ,0 ,0 ); - *ticks_per_second = isrv.v0; - *drift_info = isrv.v1; -return isrv.status; +local_irq_save (bios_flags); + ret =uv_bios_call (which, a1, a2, a3, a4, a5); +local_irq_restore (bios_flags); + +return ret; +} + +s64 uv_bios_call_reentrant (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) +{ +s64 ret; + +preempt_disable (); + ret =uv_bios_call (which, a1, a2, a3, a4, a5); +preempt_enable (); + +return ret; +} + +long +x86_bios_freq_base (unsigned long clock_type,unsigned long *ticks_per_second, +unsigned long *drift_info) +{ +return uv_bios_call (BIOS_FREQ_BASE , clock_type, + (u64 )ticks_per_second,0 ,0 ,0 ); }EXPORT_SYMBOL_GPL (x86_bios_freq_base); + + +#ifdef CONFIG_EFI +void uv_bios_init (void ) +{ +struct sal_systab *tab; + +if ((efi.sal_systab ==EFI_INVALID_TABLE_ADDR ) || + (efi.sal_systab == (unsigned long )NULL )) { +printk (KERN_CRIT "No EFI SAL System Table.\n" ); + sal_systab.function = (unsigned long )NULL ; +return ; + } + + tab = (struct sal_systab *)ioremap (efi.sal_systab, +sizeof (struct sal_systab )); +if (strncmp (tab->signature,"SST_" ,4 ) !=0 ) +printk (KERN_ERR "bad signature in SAL system table!" ); + +/* +* Copy table to permanent spot for later use. +*/ +memcpy (&sal_systab, tab,sizeof (struct sal_systab )); +iounmap (tab); + +printk (KERN_INFO "EFI SAL System Table Revision %d\n" , tab->revision); +} +#else /* !CONFIG_EFI */ +/* +* IF EFI is not configured, have the EFI calls return unimplemented. +*/ +u64 efi_call6 (void *fp,u64 arg1,u64 arg2,u64 arg3, +u64 arg4,u64 arg5,u64 arg6) +{ +return BIOS_STATUS_UNIMPLEMENTED ; +} + +void uv_bios_init (void ) { } +#endif +
arch/x86/kernel/genx2apic_uv_x.c +1 -0
@@ -413,6 +413,7 @@ void __init uv_system_init(void) gnode_upper = (((unsigned long )node_id.s.node_id) & ~((1 << n_val) -1 )) << m_val; +uv_bios_init ();uv_rtc_init ();for_each_present_cpu (cpu) {
include/asm-x86/uv/bios.h +31 -27
84 lines not on this page · raw message
Signature · 2 lines
Russ Anderson, OS RAS/Partitioning Project Lead SGI - Silicon Graphics Inc [email protected]
H. Peter Anvin
reviewerarch/x86/kernel/bios_uv.c line 32
Quoted 1 line · Russ Anderson
arch/x86/kernel/bios_uv.c +1
-0+if (tab->function == (unsigned long )NULL )
Preferred style is:
if (!tab->function) -hpa
Quoted 8 lines · H. Peter Anvin
Review
Quoted 1 line · Russ Anderson
(quoted diff) +1
-0+ if (tab->function == (unsigned long)NULL)Preferred style is:
if (!tab->function) -hpa
Attached is an updated patch.
Signature · 2 lines
Russ Anderson, OS RAS/Partitioning Project Lead SGI - Silicon Graphics Inc [email protected]
[PATCH 2/4] Add UV bios call infrastructure
Add the EFI callback function and associated wrapper code. Initialize SAL system table entry info at boot time.
--- arch/x86/kernel/bios_uv.c | 106 +++++++++++++++++++++++++++++++-------- arch/x86/kernel/genx2apic_uv_x.c | 1 include/asm-x86/uv/bios.h | 58 +++++++++++---------- 3 files changed, 117 insertions(+), 48 deletions(-)
arch/x86/kernel/bios_uv.c +85 -21
@@ -1,8 +1,6 @@/* * BIOS run time interface routines. * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -16,33 +14,99 @@* You should have received a copy of the GNU General Public License * 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 */ +#include <linux/efi.h> +#include <linux/io.h> #include <asm/uv/bios.h> -const char * -x86_bios_strerror (long status) +struct sal_systab sal_systab; + +s64 uv_bios_call (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) { -const char *str; -switch (status) { -case 0 : str ="Call completed without error" ;break ; -case -1 : str ="Not implemented" ;break ; -case -2 : str ="Invalid argument" ;break ; -case -3 : str ="Call completed with error" ;break ; -default : str ="Unknown BIOS status code" ;break ; - } -return str; +struct sal_systab *tab = &sal_systab; + +if (!tab->function) +/* +* BIOS does not support SAL systab +*/ +return BIOS_STATUS_UNIMPLEMENTED ; + +return efi_call6 ((void *)__va (tab->function), + which, a1, a2, a3, a4, a5); } -long -x86_bios_freq_base (unsigned long which,unsigned long *ticks_per_second, -unsigned long *drift_info) +s64 uv_bios_call_irqsave (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) { -struct uv_bios_retval isrv; +unsigned long bios_flags; +s64 ret; -BIOS_CALL (isrv,BIOS_FREQ_BASE , which,0 ,0 ,0 ,0 ,0 ,0 ); - *ticks_per_second = isrv.v0; - *drift_info = isrv.v1; -return isrv.status; +local_irq_save (bios_flags); + ret =uv_bios_call (which, a1, a2, a3, a4, a5); +local_irq_restore (bios_flags); + +return ret; +} + +s64 uv_bios_call_reentrant (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) +{ +s64 ret; + +preempt_disable (); + ret =uv_bios_call (which, a1, a2, a3, a4, a5); +preempt_enable (); + +return ret; +} + +long +x86_bios_freq_base (unsigned long clock_type,unsigned long *ticks_per_second, +unsigned long *drift_info) +{ +return uv_bios_call (BIOS_FREQ_BASE , clock_type, + (u64 )ticks_per_second,0 ,0 ,0 ); }EXPORT_SYMBOL_GPL (x86_bios_freq_base); + + +#ifdef CONFIG_EFI +void uv_bios_init (void ) +{ +struct sal_systab *tab; + +if ((efi.sal_systab ==EFI_INVALID_TABLE_ADDR ) || + (efi.sal_systab == (unsigned long )NULL )) { +printk (KERN_CRIT "No EFI SAL System Table.\n" ); + sal_systab.function = (unsigned long )NULL ; +return ; + } + + tab = (struct sal_systab *)ioremap (efi.sal_systab, +sizeof (struct sal_systab )); +if (strncmp (tab->signature,"SST_" ,4 ) !=0 ) +printk (KERN_ERR "bad signature in SAL system table!" ); + +/* +* Copy table to permanent spot for later use. +*/ +memcpy (&sal_systab, tab,sizeof (struct sal_systab )); +iounmap (tab); + +printk (KERN_INFO "EFI SAL System Table Revision %d\n" , tab->revision); +} +#else /* !CONFIG_EFI */ +/* +* IF EFI is not configured, have the EFI calls return unimplemented. +*/ +u64 efi_call6 (void *fp,u64 arg1,u64 arg2,u64 arg3, +u64 arg4,u64 arg5,u64 arg6) +{ +return BIOS_STATUS_UNIMPLEMENTED ; +} + +void uv_bios_init (void ) { } +#endif +
arch/x86/kernel/genx2apic_uv_x.c +1 -0
@@ -413,6 +413,7 @@ void __init uv_system_init(void) gnode_upper = (((unsigned long )node_id.s.node_id) & ~((1 << n_val) -1 )) << m_val; +uv_bios_init ();uv_rtc_init ();for_each_present_cpu (cpu) {
include/asm-x86/uv/bios.h +31 -27
84 lines not on this page · raw message
arch/x86/kernel/bios_uv.c line 111
Quoted 12 lines · Russ Anderson
arch/x86/kernel/bios_uv.c +11
-0+/* +* IF EFI is not configured, have the EFI calls return unimplemented. +*/ +u64 efi_call6 (void *fp,u64 arg1,u64 arg2,u64 arg3, +u64 arg4,u64 arg5,u64 arg6) +{ +return BIOS_STATUS_UNIMPLEMENTED ; +} +#ifndef CONFIG_EFI +extern u64 efi_call6 (void *,u64 ,u64 ,u64 ,u64 ,u64 ,u64 ); +#endif
shouldnt this be done in include/asm-x86/efi.h and arch/x86/kernel/efi_stub_64.S instead?
Ingo
Hi, Russ,
Quoted 23 lines · Russ Anderson
arch/x86/kernel/bios_uv.c +12
-9+ +s64 uv_bios_call (int which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) { -const char *str; -switch (status) { -case 0 : str ="Call completed without error" ;break ; -case -1 : str ="Not implemented" ;break ; -case -2 : str ="Invalid argument" ;break ; -case -3 : str ="Call completed with error" ;break ; -default : str ="Unknown BIOS status code" ;break ; - } -return str; +struct sal_systab *tab = &sal_systab; + +if (tab->function == (unsigned long )NULL ) +/* +* BIOS does not support SAL systab +*/ +return BIOS_STATUS_UNIMPLEMENTED ; + +return efi_call6 ((void *)__va (tab->function), + which, a1, a2, a3, a4, a5); }
[...]
Quoted 13 lines
arch/x86/kernel/bios_uv.c +13
-0+#else /* !CONFIG_EFI */ +/* +* IF EFI is not configured, have the EFI calls return unimplemented. +*/ +u64 efi_call6 (void *fp,u64 arg1,u64 arg2,u64 arg3, +u64 arg4,u64 arg5,u64 arg6) +{ +return BIOS_STATUS_UNIMPLEMENTED ; +} + +void uv_bios_init (void ) { } +#endif +
[...]
include/asm-x86/uv/bios.h enum { · line 70
Quoted 4 lines
include/asm-x86/uv/bios.h +4
-0+ +#ifndef CONFIG_EFI +extern u64 efi_call6 (void *,u64 ,u64 ,u64 ,u64 ,u64 ,u64 ); +#endif
Either wrap efi_call6() in uv_bios_call() inside #ifdef CONFIG_EFI, or add efi_call<x>() implementation when CONFIG_EFI is undefined into include/asm-x86/efi.h.
Best Regards,
Huang Ying