From patchwork Thu Nov 1 12:22:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 149949 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp722657ljp; Thu, 1 Nov 2018 05:22:47 -0700 (PDT) X-Received: by 2002:a19:26ce:: with SMTP id m197mr1964839lfm.23.1541074967288; Thu, 01 Nov 2018 05:22:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541074967; cv=none; d=google.com; s=arc-20160816; b=iUO3XOmpxd1qRKNpakhUMNWwDoJfOFpKjs12e0wxltZ7tD/hsgPpsrCPAl8ui7Y7o5 PulIVHHp2KeiHRC14PqRprvkKIH+nGn76XRgWlhw4XZXp0pTWidLjplzU4zD7iS481KY RsY0LSpR/UJx/fYMCS4SAj4cXIU2OcOBUFav1mk7ehGJ4U0x+YmRSJmHjfHiGWE453EP bpSep60o34sGoN6wRN2XscibeEGszJ9rtGvLVMx2hLnKmShI8xI2C8wPGWcqzKrXEh87 SCaIeQ3xB+HTfQxIiN6d6qIc/4R94HxcLxpKWRGiLx/5bNqi8a+sk9kkSGbqBTf6lQWg wYtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=qcWwbwZtVewEzVMNFHBDUWD0Wh6JiYMuWZuUoQUO0FY=; b=Jk+msOqbozkfGwDww/sQSLb/PMULvMJ0l7x3V6uef7xtpfPBWqRZj4t9vs+qZFZR6a mIrbC/Rk/6n8nEyXqn6lEctrkupVUamj1iHvMFnhtlM1c5L9WZEWSKUBTDgrrEj8P7mT 7oNx5mfBjbS2dBDBIigowswzXUYj0dNdENwVy9jpcB1yex39zB6grrfX9on+ydmQPoHT uqpI3Qsl4wS4IOAKP94gHzREso/Z/SPOsHiBOqfSpT5ThD+3dkSDpjZ4nJN9Vjyl6hBU yyqpOPHK8Y33AFF3FmxiefqkqzRxO6gMjx4QXeE3ciaAwcR5j4IUGiGbnU+JBkfDpx0q +taw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QpzGmeQb; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r63-v6sor8568975lfi.3.2018.11.01.05.22.47 for (Google Transport Security); Thu, 01 Nov 2018 05:22:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QpzGmeQb; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=qcWwbwZtVewEzVMNFHBDUWD0Wh6JiYMuWZuUoQUO0FY=; b=QpzGmeQbPqvUiuFCFEnXTLR+LN0et7S3axvoyRfcB67cYRYM1/H6muHHIZbq+4TgDI 8MF5KcNYxzAVYNKrztKZFi+MPcQGgZV1mkLlvnDFxba0ph1kRlFXueLqVSwXZqGF0p/Y JK3QQI8tLLg/crJ2sLLylWmWWv+lTqhc7YuRA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qcWwbwZtVewEzVMNFHBDUWD0Wh6JiYMuWZuUoQUO0FY=; b=XDro7uergfoIiIAvrKjzZEO8MaG0O5YcoSU8IzJ8ZEL/sw7pBTP6p5Cfeb2+tWweE5 8XK9LvSnyMER9fAKyMP8kWWEuhttFATDFpHFI4G5WMLtQ0tsxI5oPrRLOsnn/ndGYAZK 1jODFJxWhIBDlo4idKfo8YtU/lmwPTCr55MagkX1F7OayKyhT83FtPvPr3hpss5X3pJm XQLvWhPIQ2J5Jn+83c8mbkZIzwsHew7ezMpWs6fV+xvuW4WLlWK+WJi55yNIANBRuFap KtBQpWGSsh0kY1j3koYdxk5srCkyK6Be1Zd+Cusiy59IMoBx3ANqfQ9IDp3HjJA0gd6S qibQ== X-Gm-Message-State: AGRZ1gIFGXrOuF0q33NYRc+hEMD/MIRJrVozuYN0TFjIfzwGnW3zU2jB CvLS6MNDQ3Ohw9fJU2+acZg7ISA+ X-Google-Smtp-Source: AJdET5fLWeRWNlprSux34SeX1jeg/R5HrDWIBzc3fltEH8ybfkVfBB/DaR9CZ0RjQqGyc35uIUmp4Q== X-Received: by 2002:a19:5a84:: with SMTP id y4mr4452672lfk.156.1541074966909; Thu, 01 Nov 2018 05:22:46 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id h30-v6sm4591498lfj.34.2018.11.01.05.22.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 05:22:46 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Daniel Lezcano , linux-pm@vger.kernel.org Cc: Sudeep Holla , Lorenzo Pieralisi , Lina Iyer , Ulf Hansson , Vincent Guittot , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/2] ARM: cpuidle: Don't register the driver when back-end init returns -ENXIO Date: Thu, 1 Nov 2018 13:22:38 +0100 Message-Id: <20181101122238.4167-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 There's no point to register the cpuidle driver for the current CPU, when the initialization of the arch specific back-end data fails by returning -ENXIO. Instead, let's re-order the sequence to its original flow, by first trying to initialize the back-end part and then act accordingly on the returned error code. Additionally, let's print the error message, no matter of what error code that was returned. Signed-off-by: Ulf Hansson Fixes: a0d46a3dfdc3 ("ARM: cpuidle: Register per cpuidle device") Cc: # v4.19+ --- Changes in v2: - Added a fixes and a stable tag. --- drivers/cpuidle/cpuidle-arm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- 2.17.1 Reviewed-by: Daniel Lezcano diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index 073557f433eb..df564d783216 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -103,13 +103,6 @@ static int __init arm_idle_init_cpu(int cpu) goto out_kfree_drv; } - ret = cpuidle_register_driver(drv); - if (ret) { - if (ret != -EBUSY) - pr_err("Failed to register cpuidle driver\n"); - goto out_kfree_drv; - } - /* * Call arch CPU operations in order to initialize * idle states suspend back-end specific data @@ -117,15 +110,20 @@ static int __init arm_idle_init_cpu(int cpu) ret = arm_cpuidle_init(cpu); /* - * Skip the cpuidle device initialization if the reported + * Allow the initialization to continue for other CPUs, if the reported * failure is a HW misconfiguration/breakage (-ENXIO). */ - if (ret == -ENXIO) - return 0; - if (ret) { pr_err("CPU %d failed to init idle CPU ops\n", cpu); - goto out_unregister_drv; + ret = ret == -ENXIO ? 0 : ret; + goto out_kfree_drv; + } + + ret = cpuidle_register_driver(drv); + if (ret) { + if (ret != -EBUSY) + pr_err("Failed to register cpuidle driver\n"); + goto out_kfree_drv; } dev = kzalloc(sizeof(*dev), GFP_KERNEL);