x86: correct saving and restoring of lapic vectors in suspend/resume
PATCH 1/1 x86: correct saving and restoring of lapic vectors in suspend/resume
Saving and restoring lapic vectors in lapic_suspend() and lapic_resume() is not consistent: the thmr vector saving is guarded by a different config option than the restore part. The cmci vector isn't handled at all.
Those inconsistencies are not very critical, as the missing cmci vector will be set via mce resume handling, the wrong config option used for restoring the thmr vector can't be configured differently than the one which should be used.
Nevertheless correct the thmr vector restore and add cmci vector handling.
--- arch/x86/kernel/apic/apic.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +10 -1
@@ -2270,6 +2270,7 @@ static struct {unsigned int apic_tmict;unsigned int apic_tdcr;unsigned int apic_thmr; +unsigned int apic_cmci; } apic_pm_state;static int lapic_suspend (void )
@@ -2299,6 +2300,10 @@ static int lapic_suspend(void)if (maxlvt >=5 ) apic_pm_state.apic_thmr =apic_read (APIC_LVTTHMR );#endif +#ifdef CONFIG_X86_MCE_INTEL +if (maxlvt >=6 ) + apic_pm_state.apic_cmci =apic_read (APIC_LVTCMCI ); +#endif local_irq_save (flags);disable_local_APIC ();
@@ -2355,10 +2360,14 @@ static void lapic_resume(void)apic_write (APIC_SPIV , apic_pm_state.apic_spiv);apic_write (APIC_LVT0 , apic_pm_state.apic_lvt0);apic_write (APIC_LVT1 , apic_pm_state.apic_lvt1); -#if defined(CONFIG_X86_MCE_INTEL ) +#if defined(CONFIG_X86_THERMAL_VECTOR )if (maxlvt >=5 )apic_write (APIC_LVTTHMR , apic_pm_state.apic_thmr);#endif +#if defined(CONFIG_X86_MCE_INTEL ) +if (maxlvt >=6 ) +apic_write (APIC_LVTCMCI , apic_pm_state.apic_cmci); +#endif if (maxlvt >=4 )apic_write (APIC_LVTPC , apic_pm_state.apic_lvtpc);apic_write (APIC_LVTT , apic_pm_state.apic_lvtt);
Signature · 1 line
2.6.2
Quoted 10 lines · Juergen Gross
Saving and restoring lapic vectors in
lapic_suspend()andlapic_resume()is not consistent: the thmr vector saving is guarded by a different config option than the restore part. The cmci vector isn't handled at all.Those inconsistencies are not very critical, as the missing cmci vector will be set via mce resume handling, the wrong config option used for restoring the thmr vector can't be configured differently than the one which should be used.
Quoted 7 lines
Nevertheless correct the thmr vector restore and add cmci vector handling.
Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/apic/apic.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Add Tony to CC and leave in the rest for him to look at:
Quoted 48 lines
arch/x86/kernel/apic/apic.c +10
-1@@ -2270,6 +2270,7 @@ static struct {unsigned int apic_tmict;unsigned int apic_tdcr;unsigned int apic_thmr; +unsigned int apic_cmci; } apic_pm_state;static int lapic_suspend (void )@@ -2299,6 +2300,10 @@ static int lapic_suspend(void)if (maxlvt >=5 ) apic_pm_state.apic_thmr =apic_read (APIC_LVTTHMR );#endif +#ifdef CONFIG_X86_MCE_INTEL +if (maxlvt >=6 ) + apic_pm_state.apic_cmci =apic_read (APIC_LVTCMCI ); +#endif local_irq_save (flags);disable_local_APIC ();@@ -2355,10 +2360,14 @@ static void lapic_resume(void)apic_write (APIC_SPIV , apic_pm_state.apic_spiv);apic_write (APIC_LVT0 , apic_pm_state.apic_lvt0);apic_write (APIC_LVT1 , apic_pm_state.apic_lvt1); -#if defined(CONFIG_X86_MCE_INTEL ) +#if defined(CONFIG_X86_THERMAL_VECTOR )if (maxlvt >=5 )apic_write (APIC_LVTTHMR , apic_pm_state.apic_thmr);#endif +#if defined(CONFIG_X86_MCE_INTEL ) +if (maxlvt >=6 ) +apic_write (APIC_LVTCMCI , apic_pm_state.apic_cmci); +#endif if (maxlvt >=4 )apic_write (APIC_LVTPC , apic_pm_state.apic_lvtpc);apic_write (APIC_LVTT , apic_pm_state.apic_lvtt);Signature · 7 lines
2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Signature · 4 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.tip-bot for Juergen Gross
merge bot[tip:x86/apic] x86/apic: Fix the saving and restoring of lapic vectors during suspend/resume
In reply to Juergen Grossx86/apic: Fix the saving and restoring of lapic vectors during suspend/resume
Commit-ID: 42baa2581c92f8d07e7260506c8d41caf14b0fc3 Gitweb: http://git.kernel.org/tip/42baa2581c92f8d07e7260506c8d41caf14b0fc3 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 23 Nov 2015 11:59:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 24 Nov 2015 09:18:33 +0100
x86/apic: Fix the saving and restoring of lapic vectors during suspend/resume
Saving and restoring lapic vectors in lapic_suspend() and lapic_resume() is not consistent: the thmr vector saving is guarded by a different config option than the restore part. The cmci vector isn't handled at all.
Those inconsistencies are not very critical, as the missing cmci vector will be set via mce resume handling, the wrong config option used for restoring the thmr vector can't be configured differently than the one which should be used.
Nevertheless correct the thmr vector restore and add cmci vector handling.
--- arch/x86/kernel/apic/apic.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +10 -1
@@ -2270,6 +2270,7 @@ static struct {unsigned int apic_tmict;unsigned int apic_tdcr;unsigned int apic_thmr; +unsigned int apic_cmci; } apic_pm_state;static int lapic_suspend (void )
@@ -2299,6 +2300,10 @@ static int lapic_suspend(void)if (maxlvt >=5 ) apic_pm_state.apic_thmr =apic_read (APIC_LVTTHMR );#endif +#ifdef CONFIG_X86_MCE_INTEL +if (maxlvt >=6 ) + apic_pm_state.apic_cmci =apic_read (APIC_LVTCMCI ); +#endif local_irq_save (flags);disable_local_APIC ();
@@ -2355,10 +2360,14 @@ static void lapic_resume(void)apic_write (APIC_SPIV , apic_pm_state.apic_spiv);apic_write (APIC_LVT0 , apic_pm_state.apic_lvt0);apic_write (APIC_LVT1 , apic_pm_state.apic_lvt1); -#if defined(CONFIG_X86_MCE_INTEL ) +#ifdef CONFIG_X86_THERMAL_VECTOR if (maxlvt >=5 )apic_write (APIC_LVTTHMR , apic_pm_state.apic_thmr);#endif +#ifdef CONFIG_X86_MCE_INTEL +if (maxlvt >=6 ) +apic_write (APIC_LVTCMCI , apic_pm_state.apic_cmci); +#endif if (maxlvt >=4 )apic_write (APIC_LVTPC , apic_pm_state.apic_lvtpc);apic_write (APIC_LVTT , apic_pm_state.apic_lvtt);