From patchwork Thu Sep 25 08:32:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 4973731 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 937F29F1D4 for ; Thu, 25 Sep 2014 08:36:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76B5720295 for ; Thu, 25 Sep 2014 08:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4B7A202AE for ; Thu, 25 Sep 2014 08:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753076AbaIYIga (ORCPT ); Thu, 25 Sep 2014 04:36:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:45071 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751693AbaIYIg2 (ORCPT ); Thu, 25 Sep 2014 04:36:28 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 25 Sep 2014 01:36:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,595,1406617200"; d="scan'208";a="605123668" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.37.18]) by fmsmga002.fm.intel.com with ESMTP; 25 Sep 2014 01:36:22 -0700 From: Lan Tianyu To: peterz@infradead.org, mingo@kernel.org, rafael.j.wysocki@intel.com, toshi.kani@hp.com, akpm@linux-foundation.org, tianyu.lan@intel.com, ktkhai@parallels.com, fabf@skynet.be, laijs@cn.fujitsu.com, srivatsa.bhat@linux.vnet.ibm.com, ego@linux.vnet.ibm.com, srivatsa@mit.edu, viresh.kumar@linaro.org Cc: todd.e.brandt@linux.intel.com, tipbot@zytor.com, wangyun@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [RFC PATCH V3 3/3] Cpufreq: Hold cpu_add_remove_lock before change cpufreq_suspended flag Date: Thu, 25 Sep 2014 16:32:05 +0800 Message-Id: <1411633925-9018-4-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1411633925-9018-1-git-send-email-tianyu.lan@intel.com> References: <1411633925-9018-1-git-send-email-tianyu.lan@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Now, enabling non-boot cpus will parallel with resuming devices. Cpu online may take place after cpufreq resume. But all cpu should be up before clearing cpufreq_suspended flag in the cpufreq_resume(). Cpufreq core uses this flag to decide to do light-weight init or full init. Light -weight init/tear down is dedicated for cpu hotplug during system pm. To keep this rule, hold cpu_add_remove_lock during changing cpufreq_suspended flag. Signed-off-by: Lan Tianyu --- drivers/cpufreq/cpufreq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 37951ec..b03f7dd 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1689,7 +1689,9 @@ void cpufreq_resume(void) if (!cpufreq_driver) return; + cpu_maps_update_begin(); cpufreq_suspended = false; + cpu_maps_update_done(); if (!has_target()) return;