From patchwork Wed Aug 24 21:29:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 662577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sKL830Qg9z9s65; Thu, 25 Aug 2016 07:30:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=YWGp/NzZ; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bcfku-0007xC-4i; Wed, 24 Aug 2016 21:30:40 +0000 Received: from mail-it0-f50.google.com ([209.85.214.50]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bcfkE-0007aq-Ju for kernel-team@lists.ubuntu.com; Wed, 24 Aug 2016 21:29:58 +0000 Received: by mail-it0-f50.google.com with SMTP id x131so235963680ite.0 for ; Wed, 24 Aug 2016 14:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=tdyiIe8vg7YC5aN46ByLIcpi6F5rkiTdAQIGpSVwYy0=; b=YWGp/NzZF9CivjV0gVOtbOT1NWW55Cifj0SnEuP/VJ1ih9KijFx+kxeoVSxjWp5U4r Bw2gMThgxf6g6sc5wY0bc1OQZ7mtVIOx1bDe/BX+Y0N22sldAUouUnuZtXc4yUtv5h4X BWtkgQypgOY+eYRD4WswupoFGeKqqMxPX75GJ9qIJjK3/bpzt0RWMWQ7DwhrQnbhDuAk 6y9mRCsJHqlEo0Xhim0+Q2mi++dKdqMnaG/v6F2qx0aVzsWKsv2RYM3nrntH2cJLXYUm CKEhUg7or2z+QRkbWqFzzxby0o1B7vvyMv++tKeAC62VksBqf0zji7MUQCR9jaBcG3AJ l9dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=tdyiIe8vg7YC5aN46ByLIcpi6F5rkiTdAQIGpSVwYy0=; b=TFLl3dbSrCf78O3H8y4MzQCdBjHN0mwpdxXwN49/SqSx5Xn6IAJmQzTPo6BYGoiMcZ bGZpl9gdkol7NaOI0ItR/ozZv9ck0joAlZH2RJuw0SIB2xJddyinlGxR5J9wq69euaaS 2P92qWb1eflxVKDhfAZwO3WYqZIpaaPqB4XT6kZZMHXGiWFYebYB5cn44TrZDUd2xC7x 1Mnir+5wAh4P/e+ymK+nyIcar9hvyhXETkF5kKWuLRJpIW50ng0EliaQon51BV4Iydmm o2UIj1h5DSSXZe8+e1AoWFRgMI6OwhfZMRnN5wYw0mwb4cper07KK21kYUjPdqGVqUbz Ynlw== X-Gm-Message-State: AEkoouvJcxCICCQm5zbcVpcoZjvfutmBi3B6CYJC0S7JxswnQm8O4RRpsKPUU/OemUqQoOTZ X-Received: by 10.107.6.21 with SMTP id 21mr6387490iog.142.1472074197404; Wed, 24 Aug 2016 14:29:57 -0700 (PDT) Received: from gbyte.rtg.local (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id o5sm12370305ith.20.2016.08.24.14.29.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 14:29:57 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 09/16] intel_idle: Propagate hot plug errors. Date: Wed, 24 Aug 2016 15:29:39 -0600 Message-Id: <1472074186-21406-10-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472074186-21406-1-git-send-email-tim.gardner@canonical.com> References: <1472074186-21406-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Richard Cochran BugLink: http://bugs.launchpad.net/bugs/1591821 If a cpuidle registration error occurs during the hot plug notifier callback, we should really inform the hot plug machinery instead of just ignoring the error. This patch changes the callback to properly return on error. Signed-off-by: Richard Cochran Signed-off-by: Len Brown Signed-off-by: Rafael J. Wysocki (cherry picked from commit 08820546e4c30c84d0a1f1a49df055e1719c07ea) Signed-off-by: Tim Gardner --- drivers/idle/intel_idle.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 4418cfa..8420ba1 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -818,8 +818,11 @@ static int cpu_hotplug_notify(struct notifier_block *n, * driver in this case */ dev = per_cpu_ptr(intel_idle_cpuidle_devices, hotcpu); - if (!dev->registered) - intel_idle_cpu_init(hotcpu); + if (dev->registered) + break; + + if (intel_idle_cpu_init(hotcpu)) + return NOTIFY_BAD; break; }