3d88cca708
got this on a test-system: calling numaq_tsc_disable+0x0/0x39 NUMAQ: disabling TSC initcall numaq_tsc_disable+0x0/0x39 returned 0 after 0 msecs that's because we should not be using arch_initcall to call numaq_tsc_disable. need to call it in setup_arch before time_init()/tsc_init() and call it in init_intel() to make the cpu feature bits right. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
106 lines
2.7 KiB
C
106 lines
2.7 KiB
C
/*
|
|
* Written by: Patricia Gaughen, IBM Corporation
|
|
*
|
|
* Copyright (C) 2002, IBM Corp.
|
|
*
|
|
* 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
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
* Send feedback to <gone@us.ibm.com>
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/mmzone.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nodemask.h>
|
|
#include <asm/numaq.h>
|
|
#include <asm/topology.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/mpspec.h>
|
|
#include <asm/e820.h>
|
|
|
|
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
|
|
|
|
/*
|
|
* Function: smp_dump_qct()
|
|
*
|
|
* Description: gets memory layout from the quad config table. This
|
|
* function also updates node_online_map with the nodes (quads) present.
|
|
*/
|
|
static void __init smp_dump_qct(void)
|
|
{
|
|
int node;
|
|
struct eachquadmem *eq;
|
|
struct sys_cfg_data *scd =
|
|
(struct sys_cfg_data *)__va(SYS_CFG_DATA_PRIV_ADDR);
|
|
|
|
nodes_clear(node_online_map);
|
|
for_each_node(node) {
|
|
if (scd->quads_present31_0 & (1 << node)) {
|
|
node_set_online(node);
|
|
eq = &scd->eq[node];
|
|
/* Convert to pages */
|
|
node_start_pfn[node] = MB_TO_PAGES(
|
|
eq->hi_shrd_mem_start - eq->priv_mem_size);
|
|
node_end_pfn[node] = MB_TO_PAGES(
|
|
eq->hi_shrd_mem_start + eq->hi_shrd_mem_size);
|
|
|
|
e820_register_active_regions(node, node_start_pfn[node],
|
|
node_end_pfn[node]);
|
|
memory_present(node,
|
|
node_start_pfn[node], node_end_pfn[node]);
|
|
node_remap_size[node] = node_memmap_size_bytes(node,
|
|
node_start_pfn[node],
|
|
node_end_pfn[node]);
|
|
}
|
|
}
|
|
}
|
|
|
|
static __init void early_check_numaq(void)
|
|
{
|
|
/*
|
|
* Find possible boot-time SMP configuration:
|
|
*/
|
|
early_find_smp_config();
|
|
/*
|
|
* get boot-time SMP configuration:
|
|
*/
|
|
if (smp_found_config)
|
|
early_get_smp_config();
|
|
}
|
|
|
|
int __init get_memcfg_numaq(void)
|
|
{
|
|
early_check_numaq();
|
|
if (!found_numaq)
|
|
return 0;
|
|
smp_dump_qct();
|
|
return 1;
|
|
}
|
|
|
|
void __init numaq_tsc_disable(void)
|
|
{
|
|
if (!found_numaq)
|
|
return -1;
|
|
|
|
if (num_online_nodes() > 1) {
|
|
printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
|
|
setup_clear_cpu_cap(X86_FEATURE_TSC);
|
|
}
|
|
}
|