Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0045ddd2 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86/platform/UV: Create per cpu info structs to replace per hub info structs 



The major portion of the hub info is common to all cpus on that hub.
This is step one of moving the per cpu hub info to a per node hub info
struct.  This patch creates the small per cpu info struct that will
contain only information specific to each CPU.

Tested-by: default avatarJohn Estabrook <estabrook@sgi.com>
Tested-by: default avatarGary Kroening <gfk@sgi.com>
Tested-by: default avatarNathan Zimmer <nzimmer@sgi.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160429215404.282265563@asylum.americas.sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a2f28e69

arch/x86/include/asm/uv/uv_hub.h

+15 −4
Original line number Diff line number Diff line
@@ -139,8 +139,9 @@ struct uv_scir_s { 


/*

 * The following defines attributes of the HUB chip. These attributes are

 * frequently referenced and are kept in the per-cpu data areas of each cpu.

 * They are kept together in a struct to minimize cache misses.

 * frequently referenced and are kept in a common per hub struct.

 * After setup, the struct is read only, so it should be readily

 * available in the L3 cache on the cpu socket for the node.

 */

struct uv_hub_info_s {

	unsigned long		global_mmr_base;
@@ -167,9 +168,19 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); 
#define uv_hub_info		this_cpu_ptr(&__uv_hub_info)

#define uv_cpu_hub_info(cpu)	(&per_cpu(__uv_hub_info, cpu))



/* CPU specific info with a pointer to the hub common info struct */

struct uv_cpu_info_s {

	void			*p_uv_hub_info;

	unsigned char		blade_cpu_id;

	struct uv_scir_s	scir;

};

DECLARE_PER_CPU(struct uv_cpu_info_s, __uv_cpu_info);



#define uv_cpu_info		this_cpu_ptr(&__uv_cpu_info)

#define uv_cpu_info_per(cpu)	(&per_cpu(__uv_cpu_info, cpu))



/*

 * Hub revisions less than UV2_HUB_REVISION_BASE are UV1 hubs. All UV2

 * hubs have revision numbers greater than or equal to UV2_HUB_REVISION_BASE.

 * HUB revision ranges for each UV HUB architecture.

 * This is a software convention - NOT the hardware revision numbers in

 * the hub chip.

 */

arch/x86/kernel/apic/x2apic_uv_x.c

+10 −5
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ EXPORT_SYMBOL_GPL(is_uv_system); 
DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);

EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);



DEFINE_PER_CPU(struct uv_cpu_info_s, __uv_cpu_info);

EXPORT_PER_CPU_SYMBOL_GPL(__uv_cpu_info);



struct uv_blade_info *uv_blade_info;

EXPORT_SYMBOL_GPL(uv_blade_info);
@@ -990,11 +993,10 @@ void __init uv_system_init(void) 
		  hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));



	/* uv_num_possible_blades() is really the hub count */

	pr_info("UV: Found %d blades, %d hubs\n",

			is_uv1_hub() ?

				uv_num_possible_blades() :

				(uv_num_possible_blades() + 1) / 2,

			uv_num_possible_blades());

	pr_info("UV: Found %d hubs, %d nodes, %d cpus\n",

			uv_num_possible_blades(),

			num_possible_nodes(),

			num_possible_cpus());



	bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();

	uv_blade_info = kzalloc(bytes, GFP_KERNEL);
@@ -1057,6 +1059,9 @@ void __init uv_system_init(void) 
		uv_cpu_hub_info(cpu)->blade_processor_id = lcpu;

		uv_node_to_blade[nodeid] = blade;

		uv_cpu_to_blade[cpu] = blade;



		/* Initialize per cpu info list */

		uv_cpu_info_per(cpu)->p_uv_hub_info = uv_cpu_hub_info(cpu);

	}



	/* Add blade/pnode info for nodes without cpus */