Skip to content

Commit 656279a

Browse files
lenbKAGA-KOKO
authored andcommitted
x86 smpboot: Re-enable init_udelay=0 by default on modern CPUs
commit f1ccd24 allowed the cmdline "cpu_init_udelay=" to work with all values, including the default of 10000. But in setting the default of 10000, it over-rode the code that sets the delay 0 on modern processors. Also, tidy up use of INT/UINT. Fixes: f1ccd24 "x86/smpboot: Fix cpu_init_udelay=10000 corner case boot parameter misbehavior" Reported-by: Shane <shrybman@teksavvy.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: dparsons@brightdsl.net Cc: stable@kernel.org Link: http://lkml.kernel.org/r/9082eb809ef40dad02db714759c7aaf618c518d4.1448232494.git.len.brown@intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1 parent f107505 commit 656279a

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

arch/x86/kernel/smpboot.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ void __inquire_remote_apic(int apicid)
509509
*/
510510
#define UDELAY_10MS_DEFAULT 10000
511511

512-
static unsigned int init_udelay = INT_MAX;
512+
static unsigned int init_udelay = UINT_MAX;
513513

514514
static int __init cpu_init_udelay(char *str)
515515
{
@@ -522,14 +522,15 @@ early_param("cpu_init_udelay", cpu_init_udelay);
522522
static void __init smp_quirk_init_udelay(void)
523523
{
524524
/* if cmdline changed it from default, leave it alone */
525-
if (init_udelay != INT_MAX)
525+
if (init_udelay != UINT_MAX)
526526
return;
527527

528528
/* if modern processor, use no delay */
529529
if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) ||
530-
((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF)))
530+
((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF))) {
531531
init_udelay = 0;
532-
532+
return;
533+
}
533534
/* else, use legacy delay */
534535
init_udelay = UDELAY_10MS_DEFAULT;
535536
}

0 commit comments

Comments
 (0)