From patchwork Fri Oct 16 04:14:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 7410481 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6C5A59F36A for ; Fri, 16 Oct 2015 04:15:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95AE220938 for ; Fri, 16 Oct 2015 04:15:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC60B208E1 for ; Fri, 16 Oct 2015 04:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752957AbbJPEPo (ORCPT ); Fri, 16 Oct 2015 00:15:44 -0400 Received: from mail-qg0-f67.google.com ([209.85.192.67]:34384 "EHLO mail-qg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbbJPEPG (ORCPT ); Fri, 16 Oct 2015 00:15:06 -0400 Received: by qgt47 with SMTP id 47so8990523qgt.1; Thu, 15 Oct 2015 21:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :reply-to:organization; bh=onR3pJmMj2V+tBTmjFnjudyGyhmErTIkqew/wyhGr/4=; b=rWitnnBNBgOeEjr9Tn/cOin/9N7+5mQHnSkr+VcC03gXFLXDkQDoPK6XqViUx3w0Qw Rxb76w8o8zJpqhL52s7Siax3XGUl37pAnhX7Naz7rbkA+Wpovam78peneF8JOqvOADG3 DPAd/Z0arDqWiztDHxrkOU6gF3ogDfeOoM1pSd5/xmH5lMI+DT50PybkwLm+W9pa+nfK iZK7oumhIzhxpqkLVtk1YnJAUdL4BKCSwBOJoqZuBu5lb3PZ9ehKbIDpHuLymh12G7Qt BQ7hckq0EgKpGhXERztiOD6vYwBXLZG3cCz3wZMcwgm0Co0rCEndggoPEC+AwLcJhs1P SvTw== X-Received: by 10.140.95.73 with SMTP id h67mr16671252qge.14.1444968905846; Thu, 15 Oct 2015 21:15:05 -0700 (PDT) Received: from z87.localdomain (pool-74-104-152-17.bstnma.fios.verizon.net. [74.104.152.17]) by smtp.gmail.com with ESMTPSA id z196sm6897929qhd.22.2015.10.15.21.15.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 21:15:04 -0700 (PDT) From: Len Brown To: x86@kernel.org, shrybman@teksavvy.com, dparsons@brightdsl.net, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Len Brown Subject: [PATCH 1/2] x86 smpboot: fix cpu_init_udelay=10000 Date: Fri, 16 Oct 2015 00:14:28 -0400 Message-Id: X-Mailer: git-send-email 2.6.1.145.gb27dacc In-Reply-To: <1444968869-21435-1-git-send-email-lenb@kernel.org> References: <1444968869-21435-1-git-send-email-lenb@kernel.org> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Len Brown For legacy machines cpu_init_udelay defaults to 10,000. For modern machines it is set to 0. The user should be able to set cpu_init_udelay to any value on the cmdline, including 10,000. Before this patch, that was seen as "unchanged from default" and thus on a modern machine, the user request was ignored and the delay was set to 0. Signed-off-by: Len Brown --- arch/x86/kernel/smpboot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e0c198e..32267cc 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -509,7 +509,7 @@ void __inquire_remote_apic(int apicid) */ #define UDELAY_10MS_DEFAULT 10000 -static unsigned int init_udelay = UDELAY_10MS_DEFAULT; +static unsigned int init_udelay = INT_MAX; static int __init cpu_init_udelay(char *str) { @@ -522,13 +522,16 @@ early_param("cpu_init_udelay", cpu_init_udelay); static void __init smp_quirk_init_udelay(void) { /* if cmdline changed it from default, leave it alone */ - if (init_udelay != UDELAY_10MS_DEFAULT) + if (init_udelay != INT_MAX) return; /* if modern processor, use no delay */ if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) || ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF))) init_udelay = 0; + + /* else, use legacy delay */ + init_udelay = UDELAY_10MS_DEFAULT; } /*