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

Commit df04cf01 authored by Tejun Heo's avatar Tejun Heo Committed by Ingo Molnar
Browse files

x86: Implement x86_32_early_logical_apicid() for numaq_32 



Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: penberg@kernel.org
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-12-git-send-email-tj@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3b39d937

arch/x86/kernel/apic/es7000_32.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -460,6 +460,12 @@ static unsigned long es7000_check_apicid_present(int bit) 
	return physid_isset(bit, phys_cpu_present_map);

	return physid_isset(bit, phys_cpu_present_map);

}

}





static int es7000_early_logical_apicid(int cpu)

{

	/* on es7000, logical apicid is the same as physical */

	return early_per_cpu(x86_bios_cpu_apicid, cpu);

}



static unsigned long calculate_ldr(int cpu)

static unsigned long calculate_ldr(int cpu)

{

{

	unsigned long id = per_cpu(x86_bios_cpu_apicid, cpu);

	unsigned long id = per_cpu(x86_bios_cpu_apicid, cpu);
@@ -683,7 +689,7 @@ struct apic __refdata apic_es7000_cluster = { 
	.wait_icr_idle			= native_apic_wait_icr_idle,

	.wait_icr_idle			= native_apic_wait_icr_idle,

	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,

	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,





	.x86_32_early_logical_apicid	= noop_x86_32_early_logical_apicid,

	.x86_32_early_logical_apicid	= es7000_early_logical_apicid,

};

};





struct apic __refdata apic_es7000 = {

struct apic __refdata apic_es7000 = {
@@ -747,5 +753,5 @@ struct apic __refdata apic_es7000 = { 
	.wait_icr_idle			= native_apic_wait_icr_idle,

	.wait_icr_idle			= native_apic_wait_icr_idle,

	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,

	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,





	.x86_32_early_logical_apicid	= noop_x86_32_early_logical_apicid,

	.x86_32_early_logical_apicid	= es7000_early_logical_apicid,

};
 
};