x86/uv fixes
Subsystems (2)
Linus,
Please pull the latest x86/uv fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86/uv
Sending these separately as they only affect x86/UV.
Thanks,
Ingo
------------------>
Cliff Wickman (4):
x86: UV BAU and nodes with no memory
x86: UV BAU messaging timeouts
x86: UV: BAU partition-relative distribution map
x86: UV BAU distribution and payload MMRs
Jack Steiner (2):
x86, UV: Fix for nodes with memory and no cpus x86, uv: add Kconfig dependency on NUMA for UV systems
Russ Anderson (2):
x86, UV: system table in bios accessed after unmap
x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
arch/x86/Kconfig | 1 + arch/x86/include/asm/uv/uv_mmrs.h | 5 + arch/x86/kernel/apic/x2apic_uv_x.c | 16 +++- arch/x86/kernel/bios_uv.c | 3 +- arch/x86/kernel/tlb_uv.c | 189 ++++++++++++++++++++++++------------ arch/x86/kernel/uv_sysfs.c | 4 + 6 files changed, 154 insertions(+), 64 deletions(-)
arch/x86/Kconfig +1 -0
@@ -354,6 +354,7 @@ config X86_UV bool "SGI Ultraviolet" depends on X86_64 depends on X86_EXTENDED_PLATFORM + depends on NUMA select X86_X2APIC ---help--- This option is needed in order to support SGI Ultraviolet systems.
arch/x86/include/asm/uv/uv_mmrs.h +5 -0
@@ -17,6 +17,11 @@/* ========================================================================= */ /* UVH_BAU_DATA_CONFIG */ /* ========================================================================= */ +#define UVH_LB_BAU_MISC_CONTROL 0x320170UL +#define UV_ENABLE_INTD_SOFT_ACK_MODE_SHIFT 15 +#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHIFT 16 +#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD 0x000000000bUL +/* 1011 timebase 7 (168millisec) * 3 ticks -> 500ms */ #define UVH_BAU_DATA_CONFIG 0x61680UL#define UVH_BAU_DATA_CONFIG_32 0x0438
arch/x86/kernel/apic/x2apic_uv_x.c +14 -2
@@ -549,7 +549,8 @@ void __init uv_system_init(void)unsigned long gnode_upper, lowmem_redir_base, lowmem_redir_size;int bytes, nid, cpu, lcpu, pnode, blade, i, j, m_val, n_val;int max_pnode =0 ; -unsigned long mmr_base, present; +unsigned long mmr_base, present, paddr; +unsigned short pnode_mask;map_low_mmrs ();
@@ -592,6 +593,7 @@ void __init uv_system_init(void) } } + pnode_mask = (1 << n_val) -1 ; node_id.v =uv_read_local_mmr (UVH_NODE_ID ); gnode_upper = (((unsigned long )node_id.s.node_id) & ~((1 << n_val) -1 )) << m_val;
@@ -615,7 +617,7 @@ void __init uv_system_init(void)uv_cpu_hub_info (cpu)->numa_blade_id = blade;uv_cpu_hub_info (cpu)->blade_processor_id = lcpu;uv_cpu_hub_info (cpu)->pnode = pnode; -uv_cpu_hub_info (cpu)->pnode_mask = (1 << n_val) -1 ; +uv_cpu_hub_info (cpu)->pnode_mask = pnode_mask;uv_cpu_hub_info (cpu)->gpa_mask = (1 << (m_val + n_val)) -1 ;uv_cpu_hub_info (cpu)->gnode_upper = gnode_upper;uv_cpu_hub_info (cpu)->global_mmr_base = mmr_base;
@@ -631,6 +633,16 @@ void __init uv_system_init(void) lcpu, blade); } +/* Add blade/pnode info for nodes without cpus */ +for_each_online_node (nid) { +if (uv_node_to_blade[nid] >=0 ) +continue ; + paddr =node_start_pfn (nid) <<PAGE_SHIFT ; + pnode = (paddr >> m_val) & pnode_mask; + blade =boot_pnode_to_blade (pnode); + uv_node_to_blade[nid] = blade; + } +map_gru_high (max_pnode);map_mmr_high (max_pnode);map_config_high (max_pnode);
arch/x86/kernel/bios_uv.c +2 -1
@@ -182,7 +182,8 @@ void uv_bios_init(void)memcpy (&uv_systab, tab,sizeof (struct uv_systab ));iounmap (tab); - printk(KERN_INFO "EFI UV System Table Revision %d\n", tab->revision); +printk (KERN_INFO "EFI UV System Table Revision %d\n" , + uv_systab.revision); }#else /* !CONFIG_EFI */
arch/x86/kernel/tlb_uv.c +128 -61
350 lines not on this page · raw message
arch/x86/kernel/uv_sysfs.c +4 -0
@@ -21,6 +21,7 @@#include <linux/sysdev.h> #include <asm/uv/bios.h> +#include <asm/uv/uv.h> struct kobject *sgi_uv_kobj;
@@ -47,6 +48,9 @@ static int __init sgi_uv_sysfs_init(void) {unsigned long ret; +if (!is_uv_system ()) +return -ENODEV ; +if (!sgi_uv_kobj) sgi_uv_kobj =kobject_create_and_add ("sgi_uv" , firmware_kobj);if (!sgi_uv_kobj) {