From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 260A4C432C3 for ; Sat, 16 Nov 2019 15:48:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E408620885 for ; Sat, 16 Nov 2019 15:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919314; bh=J1to47OMKRkj9YZVUv1UjENY/JLzYU8gnUrjNEuIuok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1bhqQP6d/rf/uqIbkaUyx+v9Ql+Fegag4E7HfQla/gsKszjGuJR9E2DXuSOtF7JS7 bkGhVarxJufD4LE2od/b57VugY1lWmZ95+arqZwHNUzegv7NVXkcIHpJUNge770Oas FvArWXAcxdGzgHrOnA6yC4kPFwK7Im9vNVXhvnng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730082AbfKPPsc (ORCPT ); Sat, 16 Nov 2019 10:48:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:55346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730014AbfKPPsU (ORCPT ); Sat, 16 Nov 2019 10:48:20 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1BB22208CD; Sat, 16 Nov 2019 15:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919299; bh=J1to47OMKRkj9YZVUv1UjENY/JLzYU8gnUrjNEuIuok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c3lRVnwQcniJuFnm21I8RTGNQevOD9XB3SuFVBfhONmsT8zJFjVR7mGZcCUkKVemR xSkBJzJ268GuxIRNn8XAN0JKcU+BKWevMkHmANCdC1p8pK1yZZYKBOloAFKym7eEpX fF0hsix1M1jbJ+ReSBx0maWb3OENvu16H9Mi9mwU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ulf Hansson , Lina Iyer , "Rafael J . Wysocki" , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 046/150] PM / Domains: Deal with multiple states but no governor in genpd Date: Sat, 16 Nov 2019 10:45:44 -0500 Message-Id: <20191116154729.9573-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Hansson [ Upstream commit 2c9b7f8772033cc8bafbd4eefe2ca605bf3eb094 ] A caller of pm_genpd_init() that provides some states for the genpd via the ->states pointer in the struct generic_pm_domain, should also provide a governor. This because it's the job of the governor to pick a state that satisfies the constraints. Therefore, let's print a warning to inform the user about such bogus configuration and avoid to bail out, by instead picking the shallowest state before genpd invokes the ->power_off() callback. Signed-off-by: Ulf Hansson Reviewed-by: Lina Iyer Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/power/domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index c276ba1c0a19e..e811f24148897 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -369,6 +369,10 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, return -EAGAIN; } + /* Default to shallowest state. */ + if (!genpd->gov) + genpd->state_idx = 0; + if (genpd->power_off) { int ret; @@ -1598,6 +1602,8 @@ int pm_genpd_init(struct generic_pm_domain *genpd, ret = genpd_set_default_power_state(genpd); if (ret) return ret; + } else if (!gov) { + pr_warn("%s : no governor for states\n", genpd->name); } mutex_lock(&gpd_list_lock); -- 2.20.1