From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92939342CBC; Mon, 18 Aug 2025 13:21:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523312; cv=none; b=HcGqZZirwc2LMSJK0e+yGoEYV3oTgv/1iusFSjoCOX20NzMeyONYMT0ZfqRaoMr970qw1gEqXjtpYRQb5P05+8Dxi7dDaMoap7xqM37bZKfii2p7cHmIayoOTZqDQ1Ypz+Fodq5v8mPBhPHNQ32NFcbVHD0Wxx3SBzlOvprMrD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523312; c=relaxed/simple; bh=gjIJxyJwmB5eL3Xo0TJuPbG3uBHG2rxQbpFujY3WhPM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GsFRA1ifEBCRt93t34ByyQIic40pzmi0JYaA4l7AXLawNhLjHU0xKYMp2IEHRz3NRuXKPjyjisfGbL0GuhYkquT7wcKHLYFpe9n6C5hBgooonXv9wdc/CG9XGmGR3dfdXnoTw9vNjAeKrvJLk+TG1Bn13+3h/hyMN4fqNIOG8Ps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ng1tcFX0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ng1tcFX0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C39E5C4CEEB; Mon, 18 Aug 2025 13:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523312; bh=gjIJxyJwmB5eL3Xo0TJuPbG3uBHG2rxQbpFujY3WhPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ng1tcFX0hqPTBsGppdbhhDRdRcN7v7swxuSmt3CNw7BGcel4aJ7mbJq4nh+bifJwv jyBWr9L7m3ANLVTWW6gAfKjA0yF+rVVa+eNyVICZxDBn7wu+Q5lBXlASSCj0DvoN29 oZFRYwlneR6Pygo5t25t9d4KekuOzewNd2+EJ9yI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lifeng Zheng , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.15 133/515] cpufreq: Exit governor when failed to start old governor Date: Mon, 18 Aug 2025 14:41:59 +0200 Message-ID: <20250818124503.518950149@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lifeng Zheng [ Upstream commit 0ae204405095abfbc2d694ee0fbb49bcbbe55c57 ] Detect the result of starting old governor in cpufreq_set_policy(). If it fails, exit the governor and clear policy->governor. Signed-off-by: Lifeng Zheng Link: https://patch.msgid.link/20250709104145.2348017-5-zhenglifeng1@huawei.com Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/cpufreq/cpufreq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 5c84d56341e2..50aff4afb422 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2785,10 +2785,12 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, pr_debug("starting governor %s failed\n", policy->governor->name); if (old_gov) { policy->governor = old_gov; - if (cpufreq_init_governor(policy)) + if (cpufreq_init_governor(policy)) { policy->governor = NULL; - else - cpufreq_start_governor(policy); + } else if (cpufreq_start_governor(policy)) { + cpufreq_exit_governor(policy); + policy->governor = NULL; + } } return ret; -- 2.39.5