Commit 6764014b authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify clear_local_APIC 



- Remove redundant masking of APIC_LVTTHMR register in apic_32.c

- Add masking of APIC_LVTTHMR register to apic_64.c. We use a bit
  complicated #ifdef here: CONFIG_X86_MCE_P4THERMAL is 32bit specific
  and X86_MCE_INTEL is 64bit specific so the appropriate config variable
  will be set by Kconfig.

- the APIC_ESR register clearing in apic_64.c now uses not straightforward
  way but this is allowed tradeoff.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 638c0411

arch/x86/kernel/apic_32.c

+1 −5
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ void clear_local_APIC(void) 
	}



	/* lets not touch this if we didn't frob it */

#ifdef CONFIG_X86_MCE_P4THERMAL

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL)

	if (maxlvt >= 5) {

		v = apic_read(APIC_LVTTHMR);

		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);
@@ -771,10 +771,6 @@ void clear_local_APIC(void) 
	if (maxlvt >= 4)

		apic_write(APIC_LVTPC, APIC_LVT_MASKED);



#ifdef CONFIG_X86_MCE_P4THERMAL

	if (maxlvt >= 5)

		apic_write(APIC_LVTTHMR, APIC_LVT_MASKED);

#endif

	/* Integrated APIC (!82489DX) ? */

	if (lapic_is_integrated()) {

		if (maxlvt > 3)

arch/x86/kernel/apic_64.c

+15 −2
Original line number Diff line number Diff line
@@ -630,6 +630,13 @@ void clear_local_APIC(void) 
		apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);

	}



	/* lets not touch this if we didn't frob it */

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL)

	if (maxlvt >= 5) {

		v = apic_read(APIC_LVTTHMR);

		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);

	}

#endif

	/*

	 * Clean APIC state for other OSs:

	 */
@@ -640,9 +647,15 @@ void clear_local_APIC(void) 
		apic_write(APIC_LVTERR, APIC_LVT_MASKED);

	if (maxlvt >= 4)

		apic_write(APIC_LVTPC, APIC_LVT_MASKED);



	/* Integrated APIC (!82489DX) ? */

	if (lapic_is_integrated()) {

		if (maxlvt > 3)

			/* Clear ESR due to Pentium errata 3AP and 11AP */

			apic_write(APIC_ESR, 0);

		apic_read(APIC_ESR);

	}

}



/**

 * disable_local_APIC - clear and disable the local APIC

CRA Git | Maintained and supported by SUSTech CRA and CCSE