Skip to content

L
linux
Commit 7243e106 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

x86/platform/UV: Clean up the UV APIC code 

Make it more readable.
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Dimitri Sivanich <sivanich@hpe.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170114082612.GA27842@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1055e0ba
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 256 deletions
arch/x86/kernel/apic/x2apic_uv_x.c
View file @ 7243e106
...@@ -41,15 +41,13 @@ ...@@ -41,15 +41,13 @@
DEFINE_PER_CPU(int, x2apic_extra_bits); DEFINE_PER_CPU(int, x2apic_extra_bits);
#define PR_DEVEL(fmt, args...) pr_devel("%s: " fmt, __func__, args)
static enum uv_system_type uv_system_type; static enum uv_system_type uv_system_type;
static u64 gru_start_paddr, gru_end_paddr; static u64 gru_start_paddr, gru_end_paddr;
static u64 gru_dist_base, gru_first_node_paddr = -1LL, gru_last_node_paddr; static u64 gru_dist_base, gru_first_node_paddr = -1LL, gru_last_node_paddr;
static u64 gru_dist_lmask, gru_dist_umask; static u64 gru_dist_lmask, gru_dist_umask;
static union uvh_apicid uvh_apicid; static union uvh_apicid uvh_apicid;
/* info derived from CPUID */ /* Information derived from CPUID: */
static struct { static struct {
unsigned int apicid_shift; unsigned int apicid_shift;
unsigned int apicid_mask; unsigned int apicid_mask;
...@@ -61,21 +59,25 @@ static struct { ...@@ -61,21 +59,25 @@ static struct {
int uv_min_hub_revision_id; int uv_min_hub_revision_id;
EXPORT_SYMBOL_GPL(uv_min_hub_revision_id); EXPORT_SYMBOL_GPL(uv_min_hub_revision_id);
unsigned int uv_apicid_hibits; unsigned int uv_apicid_hibits;
EXPORT_SYMBOL_GPL(uv_apicid_hibits); EXPORT_SYMBOL_GPL(uv_apicid_hibits);
static struct apic apic_x2apic_uv_x; static struct apic apic_x2apic_uv_x;
static struct uv_hub_info_s uv_hub_info_node0; static struct uv_hub_info_s uv_hub_info_node0;
/* Set this to use hardware error handler instead of kernel panic */ /* Set this to use hardware error handler instead of kernel panic: */
static int disable_uv_undefined_panic = 1; static int disable_uv_undefined_panic = 1;
unsigned long uv_undefined(char *str) unsigned long uv_undefined(char *str)
{ {
if (likely(!disable_uv_undefined_panic)) if (likely(!disable_uv_undefined_panic))
panic("UV: error: undefined MMR: %s\n", str); panic("UV: error: undefined MMR: %s\n", str);
else else
pr_crit("UV: error: undefined MMR: %s\n", str); pr_crit("UV: error: undefined MMR: %s\n", str);
return ~0ul; /* cause a machine fault */
/* Cause a machine fault: */
return ~0ul;
} }
EXPORT_SYMBOL(uv_undefined); EXPORT_SYMBOL(uv_undefined);
...@@ -86,18 +88,19 @@ static unsigned long __init uv_early_read_mmr(unsigned long addr) ...@@ -86,18 +88,19 @@ static unsigned long __init uv_early_read_mmr(unsigned long addr)
mmr = early_ioremap(UV_LOCAL_MMR_BASE | addr, sizeof(*mmr)); mmr = early_ioremap(UV_LOCAL_MMR_BASE | addr, sizeof(*mmr));
val = *mmr; val = *mmr;
early_iounmap(mmr, sizeof(*mmr)); early_iounmap(mmr, sizeof(*mmr));
return val; return val;
} }
static inline bool is_GRU_range(u64 start, u64 end) static inline bool is_GRU_range(u64 start, u64 end)
{ {
if (gru_dist_base) { if (gru_dist_base) {
u64 su = start & gru_dist_umask; /* upper (incl pnode) bits */ u64 su = start & gru_dist_umask; /* Upper (incl pnode) bits */
u64 sl = start & gru_dist_lmask; /* base offset bits */ u64 sl = start & gru_dist_lmask; /* Base offset bits */
u64 eu = end & gru_dist_umask; u64 eu = end & gru_dist_umask;
u64 el = end & gru_dist_lmask; u64 el = end & gru_dist_lmask;
/* Must reside completely within a single GRU range */ /* Must reside completely within a single GRU range: */
return (sl == gru_dist_base && el == gru_dist_base && return (sl == gru_dist_base && el == gru_dist_base &&
su >= gru_first_node_paddr && su >= gru_first_node_paddr &&
su <= gru_last_node_paddr && su <= gru_last_node_paddr &&
...@@ -141,7 +144,7 @@ static int __init early_get_pnodeid(void) ...@@ -141,7 +144,7 @@ static int __init early_get_pnodeid(void)
uv_hub_info->hub_revision = uv_min_hub_revision_id; uv_hub_info->hub_revision = uv_min_hub_revision_id;
uv_cpuid.pnode_mask = (1 << m_n_config.s.n_skt) - 1; uv_cpuid.pnode_mask = (1 << m_n_config.s.n_skt) - 1;
pnode = (node_id.s.node_id >> 1) & uv_cpuid.pnode_mask; pnode = (node_id.s.node_id >> 1) & uv_cpuid.pnode_mask;
uv_cpuid.gpa_shift = 46; /* default unless changed */ uv_cpuid.gpa_shift = 46; /* Default unless changed */
pr_info("UV: rev:%d part#:%x nodeid:%04x n_skt:%d pnmsk:%x pn:%x\n", pr_info("UV: rev:%d part#:%x nodeid:%04x n_skt:%d pnmsk:%x pn:%x\n",
node_id.s.revision, node_id.s.part_number, node_id.s.node_id, node_id.s.revision, node_id.s.part_number, node_id.s.node_id,
...@@ -149,9 +152,10 @@ static int __init early_get_pnodeid(void) ...@@ -149,9 +152,10 @@ static int __init early_get_pnodeid(void)
return pnode; return pnode;
} }
/* [copied from arch/x86/kernel/cpu/topology.c:detect_extended_topology()] */ /* [Copied from arch/x86/kernel/cpu/topology.c:detect_extended_topology()] */
#define SMT_LEVEL 0 /* leaf 0xb SMT level */
#define INVALID_TYPE 0 /* leaf 0xb sub-leaf types */ #define SMT_LEVEL 0 /* Leaf 0xb SMT level */
#define INVALID_TYPE 0 /* Leaf 0xb sub-leaf types */
#define SMT_TYPE 1 #define SMT_TYPE 1
#define CORE_TYPE 2 #define CORE_TYPE 2
#define LEAFB_SUBTYPE(ecx) (((ecx) >> 8) & 0xff) #define LEAFB_SUBTYPE(ecx) (((ecx) >> 8) & 0xff)
...@@ -167,11 +171,13 @@ static void set_x2apic_bits(void) ...@@ -167,11 +171,13 @@ static void set_x2apic_bits(void)
pr_info("UV: CPU does not have CPUID.11\n"); pr_info("UV: CPU does not have CPUID.11\n");
return; return;
} }
cpuid_count(0xb, SMT_LEVEL, &eax, &ebx, &ecx, &edx); cpuid_count(0xb, SMT_LEVEL, &eax, &ebx, &ecx, &edx);
if (ebx == 0 || (LEAFB_SUBTYPE(ecx) != SMT_TYPE)) { if (ebx == 0 || (LEAFB_SUBTYPE(ecx) != SMT_TYPE)) {
pr_info("UV: CPUID.11 not implemented\n"); pr_info("UV: CPUID.11 not implemented\n");
return; return;
} }
sid_shift = BITS_SHIFT_NEXT_LEVEL(eax); sid_shift = BITS_SHIFT_NEXT_LEVEL(eax);
sub_index = 1; sub_index = 1;
do { do {
...@@ -182,6 +188,7 @@ static void set_x2apic_bits(void) ...@@ -182,6 +188,7 @@ static void set_x2apic_bits(void)
} }
sub_index++; sub_index++;
} while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE); } while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE);
uv_cpuid.apicid_shift = 0; uv_cpuid.apicid_shift = 0;
uv_cpuid.apicid_mask = (~(-1 << sid_shift)); uv_cpuid.apicid_mask = (~(-1 << sid_shift));
uv_cpuid.socketid_shift = sid_shift; uv_cpuid.socketid_shift = sid_shift;
...@@ -194,10 +201,8 @@ static void __init early_get_apic_socketid_shift(void) ...@@ -194,10 +201,8 @@ static void __init early_get_apic_socketid_shift(void)
set_x2apic_bits(); set_x2apic_bits();
pr_info("UV: apicid_shift:%d apicid_mask:0x%x\n", pr_info("UV: apicid_shift:%d apicid_mask:0x%x\n", uv_cpuid.apicid_shift, uv_cpuid.apicid_mask);
uv_cpuid.apicid_shift, uv_cpuid.apicid_mask); pr_info("UV: socketid_shift:%d pnode_mask:0x%x\n", uv_cpuid.socketid_shift, uv_cpuid.pnode_mask);
pr_info("UV: socketid_shift:%d pnode_mask:0x%x\n",
uv_cpuid.socketid_shift, uv_cpuid.pnode_mask);
} }
/* /*
...@@ -210,10 +215,8 @@ static void __init uv_set_apicid_hibit(void) ...@@ -210,10 +215,8 @@ static void __init uv_set_apicid_hibit(void)
union uv1h_lb_target_physical_apic_id_mask_u apicid_mask; union uv1h_lb_target_physical_apic_id_mask_u apicid_mask;
if (is_uv1_hub()) { if (is_uv1_hub()) {
apicid_mask.v = apicid_mask.v = uv_early_read_mmr(UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK);
uv_early_read_mmr(UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK); uv_apicid_hibits = apicid_mask.s1.bit_enables & UV_APICID_HIBIT_MASK;
uv_apicid_hibits =
apicid_mask.s1.bit_enables & UV_APICID_HIBIT_MASK;
} }
} }
...@@ -230,7 +233,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) ...@@ -230,7 +233,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return 0; return 0;
} }
/* Setup early hub type field in uv_hub_info for Node 0 */ /* Set up early hub type field in uv_hub_info for Node 0 */
uv_cpu_info->p_uv_hub_info = &uv_hub_info_node0; uv_cpu_info->p_uv_hub_info = &uv_hub_info_node0;
/* /*
...@@ -251,31 +254,32 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) ...@@ -251,31 +254,32 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
pnodeid = early_get_pnodeid(); pnodeid = early_get_pnodeid();
early_get_apic_socketid_shift(); early_get_apic_socketid_shift();
x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range; x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
x86_platform.nmi_init = uv_nmi_init; x86_platform.nmi_init = uv_nmi_init;
if (!strcmp(oem_table_id, "UVX")) { /* most common */ if (!strcmp(oem_table_id, "UVX")) {
/* This is the most common hardware variant: */
uv_system_type = UV_X2APIC; uv_system_type = UV_X2APIC;
uv_apic = 0; uv_apic = 0;
} else if (!strcmp(oem_table_id, "UVH")) { /* only UV1 systems */ } else if (!strcmp(oem_table_id, "UVH")) {
/* Only UV1 systems: */
uv_system_type = UV_NON_UNIQUE_APIC; uv_system_type = UV_NON_UNIQUE_APIC;
__this_cpu_write(x2apic_extra_bits, __this_cpu_write(x2apic_extra_bits, pnodeid << uvh_apicid.s.pnode_shift);
pnodeid << uvh_apicid.s.pnode_shift);
uv_set_apicid_hibit(); uv_set_apicid_hibit();
uv_apic = 1; uv_apic = 1;
} else if (!strcmp(oem_table_id, "UVL")) { /* only used for */ } else if (!strcmp(oem_table_id, "UVL")) {
uv_system_type = UV_LEGACY_APIC; /* very small systems */ /* Only used for very small systems: */
uv_system_type = UV_LEGACY_APIC;
uv_apic = 0; uv_apic = 0;
} else { } else {
goto badbios; goto badbios;
} }
pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", oem_id, oem_table_id, uv_system_type, uv_min_hub_revision_id, uv_apic);
oem_id, oem_table_id, uv_system_type,
uv_min_hub_revision_id, uv_apic);
return uv_apic; return uv_apic;
...@@ -308,7 +312,7 @@ EXPORT_SYMBOL_GPL(uv_possible_blades); ...@@ -308,7 +312,7 @@ EXPORT_SYMBOL_GPL(uv_possible_blades);
unsigned long sn_rtc_cycles_per_second; unsigned long sn_rtc_cycles_per_second;
EXPORT_SYMBOL(sn_rtc_cycles_per_second); EXPORT_SYMBOL(sn_rtc_cycles_per_second);
/* the following values are used for the per node hub info struct */ /* The following values are used for the per node hub info struct */
static __initdata unsigned short *_node_to_pnode; static __initdata unsigned short *_node_to_pnode;
static __initdata unsigned short _min_socket, _max_socket; static __initdata unsigned short _min_socket, _max_socket;
static __initdata unsigned short _min_pnode, _max_pnode, _gr_table_len; static __initdata unsigned short _min_pnode, _max_pnode, _gr_table_len;
...@@ -317,7 +321,9 @@ static __initdata struct uv_gam_parameters *uv_gp_table; ...@@ -317,7 +321,9 @@ static __initdata struct uv_gam_parameters *uv_gp_table;
static __initdata unsigned short *_socket_to_node; static __initdata unsigned short *_socket_to_node;
static __initdata unsigned short *_socket_to_pnode; static __initdata unsigned short *_socket_to_pnode;
static __initdata unsigned short *_pnode_to_socket; static __initdata unsigned short *_pnode_to_socket;
static __initdata struct uv_gam_range_s *_gr_table; static __initdata struct uv_gam_range_s *_gr_table;
#define SOCK_EMPTY ((unsigned short)~0) #define SOCK_EMPTY ((unsigned short)~0)
extern int uv_hub_info_version(void) extern int uv_hub_info_version(void)
...@@ -326,7 +332,7 @@ extern int uv_hub_info_version(void) ...@@ -326,7 +332,7 @@ extern int uv_hub_info_version(void)
} }
EXPORT_SYMBOL(uv_hub_info_version); EXPORT_SYMBOL(uv_hub_info_version);
/* Build GAM range lookup table */ /* Build GAM range lookup table: */
static __init void build_uv_gr_table(void) static __init void build_uv_gr_table(void)
{ {
struct uv_gam_range_entry *gre = uv_gre_table; struct uv_gam_range_entry *gre = uv_gre_table;
...@@ -344,25 +350,24 @@ static __init void build_uv_gr_table(void) ...@@ -344,25 +350,24 @@ static __init void build_uv_gr_table(void)
for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) { for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {
if (gre->type == UV_GAM_RANGE_TYPE_HOLE) { if (gre->type == UV_GAM_RANGE_TYPE_HOLE) {
if (!ram_limit) { /* mark hole between ram/non-ram */ if (!ram_limit) {
/* Mark hole between RAM/non-RAM: */
ram_limit = last_limit; ram_limit = last_limit;
last_limit = gre->limit; last_limit = gre->limit;
lsid++; lsid++;
continue; continue;
} }
last_limit = gre->limit; last_limit = gre->limit;
pr_info("UV: extra hole in GAM RE table @%d\n", pr_info("UV: extra hole in GAM RE table @%d\n", (int)(gre - uv_gre_table));
(int)(gre - uv_gre_table));
continue; continue;
} }
if (_max_socket < gre->sockid) { if (_max_socket < gre->sockid) {
pr_err("UV: GAM table sockid(%d) too large(>%d) @%d\n", pr_err("UV: GAM table sockid(%d) too large(>%d) @%d\n", gre->sockid, _max_socket, (int)(gre - uv_gre_table));
gre->sockid, _max_socket,
(int)(gre - uv_gre_table));
continue; continue;
} }
sid = gre->sockid - _min_socket; sid = gre->sockid - _min_socket;
if (lsid < sid) { /* new range */ if (lsid < sid) {
/* New range: */
grt = &_gr_table[indx]; grt = &_gr_table[indx];
grt->base = lindx; grt->base = lindx;
grt->nasid = gre->nasid; grt->nasid = gre->nasid;
...@@ -371,27 +376,32 @@ static __init void build_uv_gr_table(void) ...@@ -371,27 +376,32 @@ static __init void build_uv_gr_table(void)
lindx = indx++; lindx = indx++;
continue; continue;
} }
if (lsid == sid && !ram_limit) { /* update range */ /* Update range: */
if (grt->limit == last_limit) { /* .. if contiguous */ if (lsid == sid && !ram_limit) {
/* .. if contiguous: */
if (grt->limit == last_limit) {
grt->limit = last_limit = gre->limit; grt->limit = last_limit = gre->limit;
continue; continue;
} }
} }
if (!ram_limit) { /* non-contiguous ram range */ /* Non-contiguous RAM range: */
if (!ram_limit) {
grt++; grt++;
grt->base = lindx; grt->base = lindx;
grt->nasid = gre->nasid; grt->nasid = gre->nasid;
grt->limit = last_limit = gre->limit; grt->limit = last_limit = gre->limit;
continue; continue;
} }
grt++; /* non-contiguous/non-ram */ /* Non-contiguous/non-RAM: */
grt->base = grt - _gr_table; /* base is this entry */ grt++;
/* base is this entry */
grt->base = grt - _gr_table;
grt->nasid = gre->nasid; grt->nasid = gre->nasid;
grt->limit = last_limit = gre->limit; grt->limit = last_limit = gre->limit;
lsid++; lsid++;
} }
/* shorten table if possible */ /* Shorten table if possible */
grt++; grt++;
i = grt - _gr_table; i = grt - _gr_table;
if (i < _gr_table_len) { if (i < _gr_table_len) {
...@@ -405,16 +415,15 @@ static __init void build_uv_gr_table(void) ...@@ -405,16 +415,15 @@ static __init void build_uv_gr_table(void)
} }
} }
/* display resultant gam range table */ /* Display resultant GAM range table: */
for (i = 0, grt = _gr_table; i < _gr_table_len; i++, grt++) { for (i = 0, grt = _gr_table; i < _gr_table_len; i++, grt++) {
unsigned long start, end;
int gb = grt->base; int gb = grt->base;
unsigned long start = gb < 0 ? 0 :
(unsigned long)_gr_table[gb].limit << UV_GAM_RANGE_SHFT;
unsigned long end =
(unsigned long)grt->limit << UV_GAM_RANGE_SHFT;
pr_info("UV: GAM Range %2d %04x 0x%013lx-0x%013lx (%d)\n", start = gb < 0 ? 0 : (unsigned long)_gr_table[gb].limit << UV_GAM_RANGE_SHFT;
i, grt->nasid, start, end, gb); end = (unsigned long)grt->limit << UV_GAM_RANGE_SHFT;
pr_info("UV: GAM Range %2d %04x 0x%013lx-0x%013lx (%d)\n", i, grt->nasid, start, end, gb);
} }
} }
...@@ -425,16 +434,19 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) ...@@ -425,16 +434,19 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
pnode = uv_apicid_to_pnode(phys_apicid); pnode = uv_apicid_to_pnode(phys_apicid);
phys_apicid |= uv_apicid_hibits; phys_apicid |= uv_apicid_hibits;
val = (1UL << UVH_IPI_INT_SEND_SHFT) | val = (1UL << UVH_IPI_INT_SEND_SHFT) |
(phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) | (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) | ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
APIC_DM_INIT; APIC_DM_INIT;
uv_write_global_mmr64(pnode, UVH_IPI_INT, val); uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
val = (1UL << UVH_IPI_INT_SEND_SHFT) | val = (1UL << UVH_IPI_INT_SEND_SHFT) |
(phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) | (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) | ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
APIC_DM_STARTUP; APIC_DM_STARTUP;
uv_write_global_mmr64(pnode, UVH_IPI_INT, val); uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
return 0; return 0;
...@@ -568,7 +580,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = { ...@@ -568,7 +580,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
.apic_id_registered = uv_apic_id_registered, .apic_id_registered = uv_apic_id_registered,
.irq_delivery_mode = dest_Fixed, .irq_delivery_mode = dest_Fixed,
.irq_dest_mode = 0, /* physical */ .irq_dest_mode = 0, /* Physical */
.target_cpus = online_target_cpus, .target_cpus = online_target_cpus,
.disable_esr = 0, .disable_esr = 0,
...@@ -644,8 +656,7 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size) ...@@ -644,8 +656,7 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
if (alias.s.enable && alias.s.base == 0) { if (alias.s.enable && alias.s.base == 0) {
*size = (1UL << alias.s.m_alias); *size = (1UL << alias.s.m_alias);
redirect.v = uv_read_local_mmr(m_redirect); redirect.v = uv_read_local_mmr(m_redirect);
*base = (unsigned long)redirect.s.dest_base *base = (unsigned long)redirect.s.dest_base << DEST_SHIFT;
<< DEST_SHIFT;
return; return;
} }
} }
...@@ -654,8 +665,7 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size) ...@@ -654,8 +665,7 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
enum map_type {map_wb, map_uc}; enum map_type {map_wb, map_uc};
static __init void map_high(char *id, unsigned long base, int pshift, static __init void map_high(char *id, unsigned long base, int pshift, int bshift, int max_pnode, enum map_type map_type)
int bshift, int max_pnode, enum map_type map_type)
{ {
unsigned long bytes, paddr; unsigned long bytes, paddr;
...@@ -680,16 +690,19 @@ static __init void map_gru_distributed(unsigned long c) ...@@ -680,16 +690,19 @@ static __init void map_gru_distributed(unsigned long c)
int nid; int nid;
gru.v = c; gru.v = c;
/* only base bits 42:28 relevant in dist mode */
/* Only base bits 42:28 relevant in dist mode */
gru_dist_base = gru.v & 0x000007fff0000000UL; gru_dist_base = gru.v & 0x000007fff0000000UL;
if (!gru_dist_base) { if (!gru_dist_base) {
pr_info("UV: Map GRU_DIST base address NULL\n"); pr_info("UV: Map GRU_DIST base address NULL\n");
return; return;
} }
bytes = 1UL << UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT; bytes = 1UL << UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT;
gru_dist_lmask = ((1UL << uv_hub_info->m_val) - 1) & ~(bytes - 1); gru_dist_lmask = ((1UL << uv_hub_info->m_val) - 1) & ~(bytes - 1);
gru_dist_umask = ~((1UL << uv_hub_info->m_val) - 1); gru_dist_umask = ~((1UL << uv_hub_info->m_val) - 1);
gru_dist_base &= gru_dist_lmask; /* Clear bits above M */ gru_dist_base &= gru_dist_lmask; /* Clear bits above M */
for_each_online_node(nid) { for_each_online_node(nid) {
paddr = ((u64)uv_node_to_pnode(nid) << uv_hub_info->m_val) | paddr = ((u64)uv_node_to_pnode(nid) << uv_hub_info->m_val) |
gru_dist_base; gru_dist_base;
...@@ -697,11 +710,12 @@ static __init void map_gru_distributed(unsigned long c) ...@@ -697,11 +710,12 @@ static __init void map_gru_distributed(unsigned long c)
gru_first_node_paddr = min(paddr, gru_first_node_paddr); gru_first_node_paddr = min(paddr, gru_first_node_paddr);
gru_last_node_paddr = max(paddr, gru_last_node_paddr); gru_last_node_paddr = max(paddr, gru_last_node_paddr);
} }
/* Save upper (63:M) bits of address only for is_GRU_range */ /* Save upper (63:M) bits of address only for is_GRU_range */
gru_first_node_paddr &= gru_dist_umask; gru_first_node_paddr &= gru_dist_umask;
gru_last_node_paddr &= gru_dist_umask; gru_last_node_paddr &= gru_dist_umask;
pr_debug("UV: Map GRU_DIST base 0x%016llx 0x%016llx - 0x%016llx\n",
gru_dist_base, gru_first_node_paddr, gru_last_node_paddr); pr_debug("UV: Map GRU_DIST base 0x%016llx 0x%016llx - 0x%016llx\n", gru_dist_base, gru_first_node_paddr, gru_last_node_paddr);
} }
static __init void map_gru_high(int max_pnode) static __init void map_gru_high(int max_pnode)
...@@ -721,6 +735,7 @@ static __init void map_gru_high(int max_pnode) ...@@ -721,6 +735,7 @@ static __init void map_gru_high(int max_pnode)
map_gru_distributed(gru.v); map_gru_distributed(gru.v);
return; return;
} }
base = (gru.v & mask) >> shift; base = (gru.v & mask) >> shift;
map_high("GRU", base, shift, shift, max_pnode, map_wb); map_high("GRU", base, shift, shift, max_pnode, map_wb);
gru_start_paddr = ((u64)base << shift); gru_start_paddr = ((u64)base << shift);
...@@ -774,8 +789,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) ...@@ -774,8 +789,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
id = mmiohs[index].id; id = mmiohs[index].id;
overlay.v = uv_read_local_mmr(mmiohs[index].overlay); overlay.v = uv_read_local_mmr(mmiohs[index].overlay);
pr_info("UV: %s overlay 0x%lx base:0x%x m_io:%d\n",
id, overlay.v, overlay.s3.base, overlay.s3.m_io); pr_info("UV: %s overlay 0x%lx base:0x%x m_io:%d\n", id, overlay.v, overlay.s3.base, overlay.s3.m_io);
if (!overlay.s3.enable) { if (!overlay.s3.enable) {
pr_info("UV: %s disabled\n", id); pr_info("UV: %s disabled\n", id);
return; return;
...@@ -786,7 +801,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) ...@@ -786,7 +801,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
m_io = overlay.s3.m_io; m_io = overlay.s3.m_io;
mmr = mmiohs[index].redirect; mmr = mmiohs[index].redirect;
n = UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH; n = UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH;
min_pnode *= 2; /* convert to NASID */ /* Convert to NASID: */
min_pnode *= 2;
max_pnode *= 2; max_pnode *= 2;
max_io = lnasid = fi = li = -1; max_io = lnasid = fi = li = -1;
...@@ -795,16 +811,18 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) ...@@ -795,16 +811,18 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
redirect.v = uv_read_local_mmr(mmr + i * 8); redirect.v = uv_read_local_mmr(mmr + i * 8);
nasid = redirect.s3.nasid; nasid = redirect.s3.nasid;
/* Invalid NASID: */
if (nasid < min_pnode || max_pnode < nasid) if (nasid < min_pnode || max_pnode < nasid)
nasid = -1; /* invalid NASID */ nasid = -1;
if (nasid == lnasid) { if (nasid == lnasid) {
li = i; li = i;
if (i != n-1) /* last entry check */ /* Last entry check: */
if (i != n-1)
continue; continue;
} }
/* check if we have a cached (or last) redirect to print */ /* Check if we have a cached (or last) redirect to print: */
if (lnasid != -1 || (i == n-1 && nasid != -1)) { if (lnasid != -1 || (i == n-1 && nasid != -1)) {
unsigned long addr1, addr2; unsigned long addr1, addr2;
int f, l; int f, l;
...@@ -816,12 +834,9 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) ...@@ -816,12 +834,9 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
f = fi; f = fi;
l = li; l = li;
} }
addr1 = (base << shift) + addr1 = (base << shift) + f * (1ULL << m_io);
f * (1ULL << m_io); addr2 = (base << shift) + (l + 1) * (1ULL << m_io);
addr2 = (base << shift) + pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n", id, fi, li, lnasid, addr1, addr2);
(l + 1) * (1ULL << m_io);
pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n",
id, fi, li, lnasid, addr1, addr2);
if (max_io < l) if (max_io < l)
max_io = l; max_io = l;
} }
...@@ -829,8 +844,7 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) ...@@ -829,8 +844,7 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
lnasid = nasid; lnasid = nasid;
} }
pr_info("UV: %s base:0x%lx shift:%d M_IO:%d MAX_IO:%d\n", pr_info("UV: %s base:0x%lx shift:%d M_IO:%d MAX_IO:%d\n", id, base, shift, m_io, max_io);
id, base, shift, m_io, max_io);
if (max_io >= 0) if (max_io >= 0)
map_high(id, base, shift, m_io, max_io, map_uc); map_high(id, base, shift, m_io, max_io, map_uc);
...@@ -843,7 +857,7 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode) ...@@ -843,7 +857,7 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)
int shift, enable, m_io, n_io; int shift, enable, m_io, n_io;
if (is_uv3_hub() || is_uv4_hub()) { if (is_uv3_hub() || is_uv4_hub()) {
/* Map both MMIOH Regions */ /* Map both MMIOH regions: */
map_mmioh_high_uv3(0, min_pnode, max_pnode); map_mmioh_high_uv3(0, min_pnode, max_pnode);
map_mmioh_high_uv3(1, min_pnode, max_pnode); map_mmioh_high_uv3(1, min_pnode, max_pnode);
return; return;
...@@ -865,14 +879,13 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode) ...@@ -865,14 +879,13 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)
base = mmioh.s2.base; base = mmioh.s2.base;
m_io = mmioh.s2.m_io; m_io = mmioh.s2.m_io;
n_io = mmioh.s2.n_io; n_io = mmioh.s2.n_io;
} else } else {
return; return;
}
if (enable) { if (enable) {
max_pnode &= (1 << n_io) - 1; max_pnode &= (1 << n_io) - 1;
pr_info( pr_info("UV: base:0x%lx shift:%d N_IO:%d M_IO:%d max_pnode:0x%x\n", base, shift, m_io, n_io, max_pnode);
"UV: base:0x%lx shift:%d N_IO:%d M_IO:%d max_pnode:0x%x\n",
base, shift, m_io, n_io, max_pnode);
map_high("MMIOH", base, shift, m_io, max_pnode, map_uc); map_high("MMIOH", base, shift, m_io, max_pnode, map_uc);
} else { } else {
pr_info("UV: MMIOH disabled\n"); pr_info("UV: MMIOH disabled\n");
...@@ -890,16 +903,16 @@ static __init void uv_rtc_init(void) ...@@ -890,16 +903,16 @@ static __init void uv_rtc_init(void)
long status; long status;
u64 ticks_per_sec; u64 ticks_per_sec;
status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK, status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec);
&ticks_per_sec);
if (status != BIOS_STATUS_SUCCESS || ticks_per_sec < 100000) { if (status != BIOS_STATUS_SUCCESS || ticks_per_sec < 100000) {
printk(KERN_WARNING pr_warn("UV: unable to determine platform RTC clock frequency, guessing.\n");
"unable to determine platform RTC clock frequency, "
"guessing.\n"); /* BIOS gives wrong value for clock frequency, so guess: */
/* BIOS gives wrong value for clock freq. so guess */
sn_rtc_cycles_per_second = 1000000000000UL / 30000UL; sn_rtc_cycles_per_second = 1000000000000UL / 30000UL;
} else } else {
sn_rtc_cycles_per_second = ticks_per_sec; sn_rtc_cycles_per_second = ticks_per_sec;
}
} }
/* /*
...@@ -910,19 +923,19 @@ static void uv_heartbeat(unsigned long ignored) ...@@ -910,19 +923,19 @@ static void uv_heartbeat(unsigned long ignored)
struct timer_list *timer = &uv_scir_info->timer; struct timer_list *timer = &uv_scir_info->timer;
unsigned char bits = uv_scir_info->state; unsigned char bits = uv_scir_info->state;
/* flip heartbeat bit */ /* Flip heartbeat bit: */
bits ^= SCIR_CPU_HEARTBEAT; bits ^= SCIR_CPU_HEARTBEAT;
/* is this cpu idle? */ /* Is this CPU idle? */
if (idle_cpu(raw_smp_processor_id())) if (idle_cpu(raw_smp_processor_id()))
bits &= ~SCIR_CPU_ACTIVITY; bits &= ~SCIR_CPU_ACTIVITY;
else else
bits |= SCIR_CPU_ACTIVITY; bits |= SCIR_CPU_ACTIVITY;
/* update system controller interface reg */ /* Update system controller interface reg: */
uv_set_scir_bits(bits); uv_set_scir_bits(bits);
/* enable next timer period */ /* Enable next timer period: */
mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL); mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL);
} }
...@@ -937,7 +950,7 @@ static int uv_heartbeat_enable(unsigned int cpu) ...@@ -937,7 +950,7 @@ static int uv_heartbeat_enable(unsigned int cpu)
add_timer_on(timer, cpu); add_timer_on(timer, cpu);
uv_cpu_scir_info(cpu)->enabled = 1; uv_cpu_scir_info(cpu)->enabled = 1;
/* also ensure that boot cpu is enabled */ /* Also ensure that boot CPU is enabled: */
cpu = 0; cpu = 0;
} }
return 0; return 0;
...@@ -970,9 +983,11 @@ static __init int uv_init_heartbeat(void) ...@@ -970,9 +983,11 @@ static __init int uv_init_heartbeat(void)
{ {
int cpu; int cpu;
if (is_uv_system()) if (is_uv_system()) {
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
uv_heartbeat_enable(cpu); uv_heartbeat_enable(cpu);
}
return 0; return 0;
} }
...@@ -981,14 +996,10 @@ late_initcall(uv_init_heartbeat); ...@@ -981,14 +996,10 @@ late_initcall(uv_init_heartbeat);
#endif /* !CONFIG_HOTPLUG_CPU */ #endif /* !CONFIG_HOTPLUG_CPU */
/* Direct Legacy VGA I/O traffic to designated IOH */ /* Direct Legacy VGA I/O traffic to designated IOH */
int uv_set_vga_state(struct pci_dev *pdev, bool decode, int uv_set_vga_state(struct pci_dev *pdev, bool decode, unsigned int command_bits, u32 flags)
unsigned int command_bits, u32 flags)
{ {
int domain, bus, rc; int domain, bus, rc;
PR_DEVEL("devfn %x decode %d cmd %x flags %d\n",
pdev->devfn, decode, command_bits, flags);
if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE)) if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE))
return 0; return 0;
...@@ -999,13 +1010,12 @@ int uv_set_vga_state(struct pci_dev *pdev, bool decode, ...@@ -999,13 +1010,12 @@ int uv_set_vga_state(struct pci_dev *pdev, bool decode,
bus = pdev->bus->number; bus = pdev->bus->number;
rc = uv_bios_set_legacy_vga_target(decode, domain, bus); rc = uv_bios_set_legacy_vga_target(decode, domain, bus);
PR_DEVEL("vga decode %d %x:%x, rc: %d\n", decode, domain, bus, rc);
return rc; return rc;
} }
/* /*
* Called on each cpu to initialize the per_cpu UV data area. * Called on each CPU to initialize the per_cpu UV data area.
* FIXME: hotplug not supported yet * FIXME: hotplug not supported yet
*/ */
void uv_cpu_init(void) void uv_cpu_init(void)
...@@ -1032,8 +1042,12 @@ static void get_mn(struct mn *mnp) ...@@ -1032,8 +1042,12 @@ static void get_mn(struct mn *mnp)
union uvh_rh_gam_config_mmr_u m_n_config; union uvh_rh_gam_config_mmr_u m_n_config;
union uv3h_gr0_gam_gr_config_u m_gr_config; union uv3h_gr0_gam_gr_config_u m_gr_config;
/* Make sure the whole structure is well initialized: */
memset(mnp, 0, sizeof(*mnp));
m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR); m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR);
mnp->n_val = m_n_config.s.n_skt; mnp->n_val = m_n_config.s.n_skt;
if (is_uv4_hub()) { if (is_uv4_hub()) {
mnp->m_val = 0; mnp->m_val = 0;
mnp->n_lshift = 0; mnp->n_lshift = 0;
...@@ -1051,73 +1065,56 @@ static void get_mn(struct mn *mnp) ...@@ -1051,73 +1065,56 @@ static void get_mn(struct mn *mnp)
mnp->m_shift = mnp->m_val ? 64 - mnp->m_val : 0; mnp->m_shift = mnp->m_val ? 64 - mnp->m_val : 0;
} }
void __init uv_init_hub_info(struct uv_hub_info_s *hub_info) void __init uv_init_hub_info(struct uv_hub_info_s *hi)
{ {
struct mn mn = {0}; /* avoid unitialized warnings */
union uvh_node_id_u node_id; union uvh_node_id_u node_id;
struct mn mn;
get_mn(&mn); get_mn(&mn);
hub_info->m_val = mn.m_val; hi->gpa_mask = mn.m_val ?
hub_info->n_val = mn.n_val;
hub_info->m_shift = mn.m_shift;
hub_info->n_lshift = mn.n_lshift ? mn.n_lshift : 0;
hub_info->hub_revision = uv_hub_info->hub_revision;
hub_info->pnode_mask = uv_cpuid.pnode_mask;
hub_info->min_pnode = _min_pnode;
hub_info->min_socket = _min_socket;
hub_info->pnode_to_socket = _pnode_to_socket;
hub_info->socket_to_node = _socket_to_node;
hub_info->socket_to_pnode = _socket_to_pnode;
hub_info->gr_table_len = _gr_table_len;
hub_info->gr_table = _gr_table;
hub_info->gpa_mask = mn.m_val ?
(1UL << (mn.m_val + mn.n_val)) - 1 : (1UL << (mn.m_val + mn.n_val)) - 1 :
(1UL << uv_cpuid.gpa_shift) - 1; (1UL << uv_cpuid.gpa_shift) - 1;
node_id.v = uv_read_local_mmr(UVH_NODE_ID); hi->m_val = mn.m_val;
uv_cpuid.gnode_shift = max_t(unsigned int, hi->n_val = mn.n_val;
uv_cpuid.gnode_shift, mn.n_val); hi->m_shift = mn.m_shift;
hub_info->gnode_extra = hi->n_lshift = mn.n_lshift ? mn.n_lshift : 0;
(node_id.s.node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1; hi->hub_revision = uv_hub_info->hub_revision;
hi->pnode_mask = uv_cpuid.pnode_mask;
hi->min_pnode = _min_pnode;
hi->min_socket = _min_socket;
hi->pnode_to_socket = _pnode_to_socket;
hi->socket_to_node = _socket_to_node;
hi->socket_to_pnode = _socket_to_pnode;
hi->gr_table_len = _gr_table_len;
hi->gr_table = _gr_table;
hub_info->gnode_upper = node_id.v = uv_read_local_mmr(UVH_NODE_ID);
((unsigned long)hub_info->gnode_extra << mn.m_val); uv_cpuid.gnode_shift = max_t(unsigned int, uv_cpuid.gnode_shift, mn.n_val);
hi->gnode_extra = (node_id.s.node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1;
hi->gnode_upper = (unsigned long)hi->gnode_extra << mn.m_val;
if (uv_gp_table) { if (uv_gp_table) {
hub_info->global_mmr_base = uv_gp_table->mmr_base; hi->global_mmr_base = uv_gp_table->mmr_base;
hub_info->global_mmr_shift = uv_gp_table->mmr_shift; hi->global_mmr_shift = uv_gp_table->mmr_shift;
hub_info->global_gru_base = uv_gp_table->gru_base; hi->global_gru_base = uv_gp_table->gru_base;
hub_info->global_gru_shift = uv_gp_table->gru_shift; hi->global_gru_shift = uv_gp_table->gru_shift;
hub_info->gpa_shift = uv_gp_table->gpa_shift; hi->gpa_shift = uv_gp_table->gpa_shift;
hub_info->gpa_mask = (1UL << hub_info->gpa_shift) - 1; hi->gpa_mask = (1UL << hi->gpa_shift) - 1;
} else { } else {
hub_info->global_mmr_base = hi->global_mmr_base = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) & ~UV_MMR_ENABLE;
uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) & hi->global_mmr_shift = _UV_GLOBAL_MMR64_PNODE_SHIFT;
~UV_MMR_ENABLE;
hub_info->global_mmr_shift = _UV_GLOBAL_MMR64_PNODE_SHIFT;
} }
get_lowmem_redirect( get_lowmem_redirect(&hi->lowmem_remap_base, &hi->lowmem_remap_top);
&hub_info->lowmem_remap_base, &hub_info->lowmem_remap_top);
hub_info->apic_pnode_shift = uv_cpuid.socketid_shift;
/* show system specific info */ hi->apic_pnode_shift = uv_cpuid.socketid_shift;
pr_info("UV: N:%d M:%d m_shift:%d n_lshift:%d\n",
hub_info->n_val, hub_info->m_val,
hub_info->m_shift, hub_info->n_lshift);
pr_info("UV: gpa_mask/shift:0x%lx/%d pnode_mask:0x%x apic_pns:%d\n", /* Show system specific info: */
hub_info->gpa_mask, hub_info->gpa_shift, pr_info("UV: N:%d M:%d m_shift:%d n_lshift:%d\n", hi->n_val, hi->m_val, hi->m_shift, hi->n_lshift);
hub_info->pnode_mask, hub_info->apic_pnode_shift); pr_info("UV: gpa_mask/shift:0x%lx/%d pnode_mask:0x%x apic_pns:%d\n", hi->gpa_mask, hi->gpa_shift, hi->pnode_mask, hi->apic_pnode_shift);
pr_info("UV: mmr_base/shift:0x%lx/%ld gru_base/shift:0x%lx/%ld\n", hi->global_mmr_base, hi->global_mmr_shift, hi->global_gru_base, hi->global_gru_shift);
pr_info("UV: mmr_base/shift:0x%lx/%ld gru_base/shift:0x%lx/%ld\n", pr_info("UV: gnode_upper:0x%lx gnode_extra:0x%x\n", hi->gnode_upper, hi->gnode_extra);
hub_info->global_mmr_base, hub_info->global_mmr_shift,
hub_info->global_gru_base, hub_info->global_gru_shift);
pr_info("UV: gnode_upper:0x%lx gnode_extra:0x%x\n",
hub_info->gnode_upper, hub_info->gnode_extra);
} }
static void __init decode_gam_params(unsigned long ptr) static void __init decode_gam_params(unsigned long ptr)
...@@ -1143,12 +1140,9 @@ static void __init decode_gam_rng_tbl(unsigned long ptr) ...@@ -1143,12 +1140,9 @@ static void __init decode_gam_rng_tbl(unsigned long ptr)
for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) { for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {
if (!index) { if (!index) {
pr_info("UV: GAM Range Table...\n"); pr_info("UV: GAM Range Table...\n");
pr_info("UV: # %20s %14s %5s %4s %5s %3s %2s\n", pr_info("UV: # %20s %14s %5s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN");
"Range", "", "Size", "Type", "NASID",
"SID", "PN");
} }
pr_info( pr_info("UV: %2d: 0x%014lx-0x%014lx %5luG %3d %04x %02x %02x\n",
"UV: %2d: 0x%014lx-0x%014lx %5luG %3d %04x %02x %02x\n",
index++, index++,
(unsigned long)lgre << UV_GAM_RANGE_SHFT, (unsigned long)lgre << UV_GAM_RANGE_SHFT,
(unsigned long)gre->limit << UV_GAM_RANGE_SHFT, (unsigned long)gre->limit << UV_GAM_RANGE_SHFT,
...@@ -1171,9 +1165,8 @@ static void __init decode_gam_rng_tbl(unsigned long ptr) ...@@ -1171,9 +1165,8 @@ static void __init decode_gam_rng_tbl(unsigned long ptr)
_min_pnode = pnode_min; _min_pnode = pnode_min;
_max_pnode = pnode_max; _max_pnode = pnode_max;
_gr_table_len = index; _gr_table_len = index;
pr_info(
"UV: GRT: %d entries, sockets(min:%x,max:%x) pnodes(min:%x,max:%x)\n", pr_info("UV: GRT: %d entries, sockets(min:%x,max:%x) pnodes(min:%x,max:%x)\n", index, _min_socket, _max_socket, _min_pnode, _max_pnode);
index, _min_socket, _max_socket, _min_pnode, _max_pnode);
} }
static int __init decode_uv_systab(void) static int __init decode_uv_systab(void)
...@@ -1188,12 +1181,10 @@ static int __init decode_uv_systab(void) ...@@ -1188,12 +1181,10 @@ static int __init decode_uv_systab(void)
if ((!st) || (st->revision < UV_SYSTAB_VERSION_UV4_LATEST)) { if ((!st) || (st->revision < UV_SYSTAB_VERSION_UV4_LATEST)) {
int rev = st ? st->revision : 0; int rev = st ? st->revision : 0;
pr_err( pr_err("UV: BIOS UVsystab version(%x) mismatch, expecting(%x)\n", rev, UV_SYSTAB_VERSION_UV4_LATEST);
"UV: BIOS UVsystab version(%x) mismatch, expecting(%x)\n", pr_err("UV: Cannot support UV operations, switching to generic PC\n");
rev, UV_SYSTAB_VERSION_UV4_LATEST);
pr_err(
"UV: Cannot support UV operations, switching to generic PC\n");
uv_system_type = UV_NONE; uv_system_type = UV_NONE;
return -EINVAL; return -EINVAL;
} }
...@@ -1219,7 +1210,7 @@ static int __init decode_uv_systab(void) ...@@ -1219,7 +1210,7 @@ static int __init decode_uv_systab(void)
} }
/* /*
* Setup physical blade translations from UVH_NODE_PRESENT_TABLE * Set up physical blade translations from UVH_NODE_PRESENT_TABLE
* .. NB: UVH_NODE_PRESENT_TABLE is going away, * .. NB: UVH_NODE_PRESENT_TABLE is going away,
* .. being replaced by GAM Range Table * .. being replaced by GAM Range Table
*/ */
...@@ -1255,14 +1246,13 @@ static void __init build_socket_tables(void) ...@@ -1255,14 +1246,13 @@ static void __init build_socket_tables(void)
if (!gre) { if (!gre) {
if (is_uv1_hub() || is_uv2_hub() || is_uv3_hub()) { if (is_uv1_hub() || is_uv2_hub() || is_uv3_hub()) {
pr_info("UV: No UVsystab socket table, ignoring\n"); pr_info("UV: No UVsystab socket table, ignoring\n");
return; /* not required */ return;
} }
pr_crit( pr_crit("UV: Error: UVsystab address translations not available!\n");
"UV: Error: UVsystab address translations not available!\n");
BUG(); BUG();
} }
/* build socket id -> node id, pnode */ /* Build socket id -> node id, pnode */
num = maxsock - minsock + 1; num = maxsock - minsock + 1;
bytes = num * sizeof(_socket_to_node[0]); bytes = num * sizeof(_socket_to_node[0]);
_socket_to_node = kmalloc(bytes, GFP_KERNEL); _socket_to_node = kmalloc(bytes, GFP_KERNEL);
...@@ -1279,27 +1269,27 @@ static void __init build_socket_tables(void) ...@@ -1279,27 +1269,27 @@ static void __init build_socket_tables(void)
for (i = 0; i < nump; i++) for (i = 0; i < nump; i++)
_pnode_to_socket[i] = SOCK_EMPTY; _pnode_to_socket[i] = SOCK_EMPTY;
/* fill in pnode/node/addr conversion list values */ /* Fill in pnode/node/addr conversion list values: */
pr_info("UV: GAM Building socket/pnode conversion tables\n"); pr_info("UV: GAM Building socket/pnode conversion tables\n");
for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) { for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {
if (gre->type == UV_GAM_RANGE_TYPE_HOLE) if (gre->type == UV_GAM_RANGE_TYPE_HOLE)
continue; continue;
i = gre->sockid - minsock; i = gre->sockid - minsock;
/* Duplicate: */
if (_socket_to_pnode[i] != SOCK_EMPTY) if (_socket_to_pnode[i] != SOCK_EMPTY)
continue; /* duplicate */ continue;
_socket_to_pnode[i] = gre->pnode; _socket_to_pnode[i] = gre->pnode;
i = gre->pnode - minpnode; i = gre->pnode - minpnode;
_pnode_to_socket[i] = gre->sockid; _pnode_to_socket[i] = gre->sockid;
pr_info( pr_info("UV: sid:%02x type:%d nasid:%04x pn:%02x pn2s:%2x\n",
"UV: sid:%02x type:%d nasid:%04x pn:%02x pn2s:%2x\n",
gre->sockid, gre->type, gre->nasid, gre->sockid, gre->type, gre->nasid,
_socket_to_pnode[gre->sockid - minsock], _socket_to_pnode[gre->sockid - minsock],
_pnode_to_socket[gre->pnode - minpnode]); _pnode_to_socket[gre->pnode - minpnode]);
} }
/* Set socket -> node values */ /* Set socket -> node values: */
lnid = -1; lnid = -1;
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {
int nid = cpu_to_node(cpu); int nid = cpu_to_node(cpu);
...@@ -1315,7 +1305,7 @@ static void __init build_socket_tables(void) ...@@ -1315,7 +1305,7 @@ static void __init build_socket_tables(void)
sockid, apicid, nid); sockid, apicid, nid);
} }
/* Setup physical blade to pnode translation from GAM Range Table */ /* Set up physical blade to pnode translation from GAM Range Table: */
bytes = num_possible_nodes() * sizeof(_node_to_pnode[0]); bytes = num_possible_nodes() * sizeof(_node_to_pnode[0]);
_node_to_pnode = kmalloc(bytes, GFP_KERNEL); _node_to_pnode = kmalloc(bytes, GFP_KERNEL);
BUG_ON(!_node_to_pnode); BUG_ON(!_node_to_pnode);
...@@ -1325,8 +1315,7 @@ static void __init build_socket_tables(void) ...@@ -1325,8 +1315,7 @@ static void __init build_socket_tables(void)
for (sockid = minsock; sockid <= maxsock; sockid++) { for (sockid = minsock; sockid <= maxsock; sockid++) {
if (lnid == _socket_to_node[sockid - minsock]) { if (lnid == _socket_to_node[sockid - minsock]) {
_node_to_pnode[lnid] = _node_to_pnode[lnid] = _socket_to_pnode[sockid - minsock];
_socket_to_pnode[sockid - minsock];
break; break;
} }
} }
...@@ -1343,8 +1332,7 @@ static void __init build_socket_tables(void) ...@@ -1343,8 +1332,7 @@ static void __init build_socket_tables(void)
pr_info("UV: Checking socket->node/pnode for identity maps\n"); pr_info("UV: Checking socket->node/pnode for identity maps\n");
if (minsock == 0) { if (minsock == 0) {
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
if (_socket_to_node[i] == SOCK_EMPTY || if (_socket_to_node[i] == SOCK_EMPTY || i != _socket_to_node[i])
i != _socket_to_node[i])
break; break;
if (i >= num) { if (i >= num) {
kfree(_socket_to_node); kfree(_socket_to_node);
...@@ -1383,9 +1371,13 @@ void __init uv_system_init(void) ...@@ -1383,9 +1371,13 @@ void __init uv_system_init(void)
map_low_mmrs(); map_low_mmrs();
uv_bios_init(); /* get uv_systab for decoding */ /* Get uv_systab for decoding: */
uv_bios_init();
/* If there's an UVsystab problem then abort UV init: */
if (decode_uv_systab() < 0) if (decode_uv_systab() < 0)
return; /* UVsystab problem, abort UV init */ return;
build_socket_tables(); build_socket_tables();
build_uv_gr_table(); build_uv_gr_table();
uv_init_hub_info(&hub_info); uv_init_hub_info(&hub_info);
...@@ -1393,14 +1385,10 @@ void __init uv_system_init(void) ...@@ -1393,14 +1385,10 @@ void __init uv_system_init(void)
if (!_node_to_pnode) if (!_node_to_pnode)
boot_init_possible_blades(&hub_info); boot_init_possible_blades(&hub_info);
/* uv_num_possible_blades() is really the hub count */ /* uv_num_possible_blades() is really the hub count: */
pr_info("UV: Found %d hubs, %d nodes, %d cpus\n", pr_info("UV: Found %d hubs, %d nodes, %d CPUs\n", uv_num_possible_blades(), num_possible_nodes(), num_possible_cpus());
uv_num_possible_blades(),
num_possible_nodes(),
num_possible_cpus());
uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, &sn_coherency_id, uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, &sn_coherency_id, &sn_region_size, &system_serial_number);
&sn_region_size, &system_serial_number);
hub_info.coherency_domain_number = sn_coherency_id; hub_info.coherency_domain_number = sn_coherency_id;
uv_rtc_init(); uv_rtc_init();
...@@ -1413,33 +1401,31 @@ void __init uv_system_init(void) ...@@ -1413,33 +1401,31 @@ void __init uv_system_init(void)
struct uv_hub_info_s *new_hub; struct uv_hub_info_s *new_hub;
if (__uv_hub_info_list[nodeid]) { if (__uv_hub_info_list[nodeid]) {
pr_err("UV: Node %d UV HUB already initialized!?\n", pr_err("UV: Node %d UV HUB already initialized!?\n", nodeid);
nodeid);
BUG(); BUG();
} }
/* Allocate new per hub info list */ /* Allocate new per hub info list */
new_hub = (nodeid == 0) ? new_hub = (nodeid == 0) ? &uv_hub_info_node0 : kzalloc_node(bytes, GFP_KERNEL, nodeid);
&uv_hub_info_node0 :
kzalloc_node(bytes, GFP_KERNEL, nodeid);
BUG_ON(!new_hub); BUG_ON(!new_hub);
__uv_hub_info_list[nodeid] = new_hub; __uv_hub_info_list[nodeid] = new_hub;
new_hub = uv_hub_info_list(nodeid); new_hub = uv_hub_info_list(nodeid);
BUG_ON(!new_hub); BUG_ON(!new_hub);
*new_hub = hub_info; *new_hub = hub_info;
/* Use information from GAM table if available */ /* Use information from GAM table if available: */
if (_node_to_pnode) if (_node_to_pnode)
new_hub->pnode = _node_to_pnode[nodeid]; new_hub->pnode = _node_to_pnode[nodeid];
else /* Fill in during cpu loop */ else /* Or fill in during CPU loop: */
new_hub->pnode = 0xffff; new_hub->pnode = 0xffff;
new_hub->numa_blade_id = uv_node_to_blade_id(nodeid); new_hub->numa_blade_id = uv_node_to_blade_id(nodeid);
new_hub->memory_nid = -1; new_hub->memory_nid = -1;
new_hub->nr_possible_cpus = 0; new_hub->nr_possible_cpus = 0;
new_hub->nr_online_cpus = 0; new_hub->nr_online_cpus = 0;
} }
/* Initialize per cpu info */ /* Initialize per CPU info: */
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
int apicid = per_cpu(x86_cpu_to_apicid, cpu); int apicid = per_cpu(x86_cpu_to_apicid, cpu);
int numa_node_id; int numa_node_id;
...@@ -1450,22 +1436,24 @@ void __init uv_system_init(void) ...@@ -1450,22 +1436,24 @@ void __init uv_system_init(void)
pnode = uv_apicid_to_pnode(apicid); pnode = uv_apicid_to_pnode(apicid);
uv_cpu_info_per(cpu)->p_uv_hub_info = uv_hub_info_list(nodeid); uv_cpu_info_per(cpu)->p_uv_hub_info = uv_hub_info_list(nodeid);
uv_cpu_info_per(cpu)->blade_cpu_id = uv_cpu_info_per(cpu)->blade_cpu_id = uv_cpu_hub_info(cpu)->nr_possible_cpus++;
uv_cpu_hub_info(cpu)->nr_possible_cpus++;
if (uv_cpu_hub_info(cpu)->memory_nid == -1) if (uv_cpu_hub_info(cpu)->memory_nid == -1)
uv_cpu_hub_info(cpu)->memory_nid = cpu_to_node(cpu); uv_cpu_hub_info(cpu)->memory_nid = cpu_to_node(cpu);
if (nodeid != numa_node_id && /* init memoryless node */
/* Init memoryless node: */
if (nodeid != numa_node_id &&
uv_hub_info_list(numa_node_id)->pnode == 0xffff) uv_hub_info_list(numa_node_id)->pnode == 0xffff)
uv_hub_info_list(numa_node_id)->pnode = pnode; uv_hub_info_list(numa_node_id)->pnode = pnode;
else if (uv_cpu_hub_info(cpu)->pnode == 0xffff) else if (uv_cpu_hub_info(cpu)->pnode == 0xffff)
uv_cpu_hub_info(cpu)->pnode = pnode; uv_cpu_hub_info(cpu)->pnode = pnode;
uv_cpu_scir_info(cpu)->offset = uv_scir_offset(apicid); uv_cpu_scir_info(cpu)->offset = uv_scir_offset(apicid);
} }
for_each_node(nodeid) { for_each_node(nodeid) {
unsigned short pnode = uv_hub_info_list(nodeid)->pnode; unsigned short pnode = uv_hub_info_list(nodeid)->pnode;
/* Add pnode info for pre-GAM list nodes without cpus */ /* Add pnode info for pre-GAM list nodes without CPUs: */
if (pnode == 0xffff) { if (pnode == 0xffff) {
unsigned long paddr; unsigned long paddr;
...@@ -1491,12 +1479,12 @@ void __init uv_system_init(void) ...@@ -1491,12 +1479,12 @@ void __init uv_system_init(void)
uv_scir_register_cpu_notifier(); uv_scir_register_cpu_notifier();
proc_mkdir("sgi_uv", NULL); proc_mkdir("sgi_uv", NULL);
/* register Legacy VGA I/O redirection handler */ /* Register Legacy VGA I/O redirection handler: */
pci_register_set_vga_state(uv_set_vga_state); pci_register_set_vga_state(uv_set_vga_state);
/* /*
* For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as
* EFI is not enabled in the kdump kernel. * EFI is not enabled in the kdump kernel:
*/ */
if (is_kdump_kernel()) if (is_kdump_kernel())
reboot_type = BOOT_ACPI; reboot_type = BOOT_ACPI;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7