x86: UV bios calls to support UV hardware performance counter and topology access
Subsystems (2)
PATCH 1/2 x86: UV bios calls to support UV hardware performance counter and topology access
Add UV bios calls to support UV hardware performance counter and topology access.
Signed-off-by Russ Anderson <[email protected]>
Acked-by Cliff Wickman <[email protected]>
---
This patch only effects UV systems.
arch/x86/include/asm/uv/bios.h | 17 ++++++++-- arch/x86/kernel/apic/x2apic_uv_x.c | 6 +-- arch/x86/kernel/bios_uv.c | 59 +++++++++++++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 13 deletions(-)
arch/x86/include/asm/uv/bios.h +13 -4
@@ -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>
@@ -36,7 +36,11 @@ enum uv_bios_cmd {UV_BIOS_WATCHLIST_ALLOC ,UV_BIOS_WATCHLIST_FREE ,UV_BIOS_MEMPROTECT , - UV_BIOS_GET_PARTITION_ADDR +UV_BIOS_GET_PARTITION_ADDR , +UV_BIOS_HWPERF , +UV_BIOS_GET_PCI_TOPOLOGY , +UV_BIOS_GET_PCIBUS_INFO , + UV_BIOS_GET_GEOINFO };/*
@@ -98,13 +102,17 @@ extern s64 uv_bios_call(enum uv_bios_cmdextern 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 (int ,unsigned long ,unsigned int ,unsigned long *);extern int uv_bios_mq_watchlist_free (int ,int );extern s64 uv_bios_change_memprotect (u64 ,u64 ,enum uv_memprotect );extern s64 uv_bios_reserved_page_pa (u64 ,u64 *,u64 *,u64 *); +extern s64 uv_bios_hwperf (u64 ,u64 ,u64 ,u64 ,u64 *,int *); +extern s64 uv_bios_get_pci_topology (u64 ,u64 ); +extern s64 uv_bios_get_hubdev_info (u64 ,u64 ); +extern s64 uv_bios_get_geoinfo (u64 ,u64 ,u64 );extern void uv_bios_init (void );
@@ -113,6 +121,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/kernel/apic/x2apic_uv_x.c +3 -3
@@ -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>
@@ -619,8 +619,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 +53 -6
103 lines not on this page · raw message
Signature · 2 lines
Russ Anderson, OS RAS/Partitioning Project Lead SGI - Silicon Graphics Inc [email protected]