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=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 BA7CDC433DF for ; Mon, 24 Aug 2020 09:46:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97A0F206BE for ; Mon, 24 Aug 2020 09:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598262408; bh=ybOUb89fkrUvjtMnzkgUH+fW2ofcoZCFyNis0q60XQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CfZIRvQqx1bxuFtbGkyPMU2K4winuADAs23mwapciP/lZ6G1TQKqJjYCdeAZnoc4I Dtm5Fkf2+vYpajixeS7jk2dFjnjfCWsnzeiyf7XyJyt/4TnA1rT6mT/d6UgSjyVHg/ voLN49y/pze69SPrnMgYLI5vP14YRvfUyfPBam+c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728080AbgHXIlz (ORCPT ); Mon, 24 Aug 2020 04:41:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:60744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728259AbgHXIlu (ORCPT ); Mon, 24 Aug 2020 04:41:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D1F4F2075B; Mon, 24 Aug 2020 08:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258509; bh=ybOUb89fkrUvjtMnzkgUH+fW2ofcoZCFyNis0q60XQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPRY0Ez9cu+hUd5Z1HwmpovGLoyrraXEC7xqaaoIKHz2urwU3XNE0u9RuK/Q6x/gr eq2efWPzMeorVBu+eIBRbFdMrc2Jvcgg2a3RNgoUn1AYK6Ea6Ne4zqlcWDBQG+RXLI Ea/wn6JJjZ6jsgopo+GfDMfoxhngOY2mGWFW1Zqg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sajida Bhanu , Sibi Sankar , Matthias Kaehlcke , Stephen Boyd , Rajendra Nayak , Viresh Kumar , Sasha Levin Subject: [PATCH 5.7 032/124] opp: Enable resources again if they were disabled earlier Date: Mon, 24 Aug 2020 10:29:26 +0200 Message-Id: <20200824082410.996214352@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082409.368269240@linuxfoundation.org> References: <20200824082409.368269240@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rajendra Nayak [ Upstream commit a4501bac0e553bed117b7e1b166d49731caf7260 ] dev_pm_opp_set_rate() can now be called with freq = 0 in order to either drop performance or bandwidth votes or to disable regulators on platforms which support them. In such cases, a subsequent call to dev_pm_opp_set_rate() with the same frequency ends up returning early because 'old_freq == freq' Instead make it fall through and put back the dropped performance and bandwidth votes and/or enable back the regulators. Cc: v5.3+ # v5.3+ Fixes: cd7ea582866f ("opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes") Reported-by: Sajida Bhanu Reviewed-by: Sibi Sankar Reported-by: Matthias Kaehlcke Tested-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd Signed-off-by: Rajendra Nayak [ Viresh: Don't skip clk_set_rate() and massaged changelog ] Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/opp/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index e4f01e7771a22..195fcaff18448 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -845,10 +845,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) /* Return early if nothing to do */ if (old_freq == freq) { - dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", - __func__, freq); - ret = 0; - goto put_opp_table; + if (!opp_table->required_opp_tables && !opp_table->regulators) { + dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", + __func__, freq); + ret = 0; + goto put_opp_table; + } } /* -- 2.25.1