From patchwork Mon Sep 13 13:13:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509746 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp562333jao; Mon, 13 Sep 2021 06:35:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxo43v5lEBBlGHXlEjTfUt6+zLQLOZ5Eo10wZANBCx1dT7RQK/ShYkpyy1dKcIVKnRh3s0 X-Received: by 2002:a05:6e02:504:: with SMTP id d4mr8313543ils.316.1631540141150; Mon, 13 Sep 2021 06:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631540141; cv=none; d=google.com; s=arc-20160816; b=G1D2e6QvFXgGYwMkUHXQFocG8NAVnXwXKXz1okmh52yPAZ+/io8hbgqgMpDGwM5OOm nQsMFShy95XO7t9dWthTlMwIyo0h9RFBen4TjQdYzs/tMPzggMxCbQFuafNmVRZIlvBP p668iMIJPIlOFXTFxF0QK0K3IUQc4Eb4VAsE5efOfAbtrTgBmKSdi0KA/WSCwi4Fnuzw 3sLMI1UVmN5pyDxRc6y9xS8qKLi+bH8VvKr0xnXNS1rnhuQQ3uSAEjmOz5K2houpvLCt BouNjhQ66sAAE45+Lr0gzGVCaHKgDRUBrPZvsvxI8uXpD2m+ELTlK6ocEMW7yBXlF36i TOKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LcOi+0fTXVooQaDJ9SpHTHZjG8B6AzZQJHenhVfWpoY=; b=VdQ6bwh06r7n1H5bKkL4Xv25zIHOPhjuKd5gHMFJh1G76N6RP+luDjPHh4BlD/89tA zNqvoRarJDYk2kj3UUaaQUrpDuIt72fLdmLBWAphFdkbxteZoP5bgbgpUmDTA2sUoCPT BIJ+uPzJXFppTSmHxHOR0103b4prQHomN1g4A8rQFEPzS2cVGgSHVhfKNn7vg0MzX9Uu 7eJk+gImMEVuPPLtQsf9SkLAE8PmSIBn5XanWEdcB+bvpu7Oz63UEewPZFSN0Zj0rImB tpq8jjMs+fUCVMI8GYA0nTsMZpSAm5mWsKu/+HjLndqkK4x1qojL+TY/NH3uCFgfSbuv FCww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IUBv54RM; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n14si7315113ilm.165.2021.09.13.06.35.40; Mon, 13 Sep 2021 06:35:41 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IUBv54RM; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242410AbhIMNgy (ORCPT + 11 others); Mon, 13 Sep 2021 09:36:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:58340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242947AbhIMNeg (ORCPT ); Mon, 13 Sep 2021 09:34:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 23F1A60698; Mon, 13 Sep 2021 13:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631539596; bh=CdyYA6fZ3SFJZPNZQPOSTQRVaqVbI4RsIJs7AlyQ/iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IUBv54RMNKEDI0A4o5VCBaIeNnrSgKFon8yokpdiz16GwkzAzlemFAD1TaFtc5bYK CTKgsZ7O6mHMq5JZ1jwi/hYUPoKk+7p5ZzYS9RaB597AQsuADwEfpFG5hMpsICqExW MYHmn39gfPKpd9X5FB9Kc3YHenpKyUNqSNlXN6Co= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rajendra Nayak , Stephen Boyd , Sibi Sankar , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.10 085/236] soc: qcom: rpmhpd: Use corner in power_off Date: Mon, 13 Sep 2021 15:13:10 +0200 Message-Id: <20210913131103.247145517@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131100.316353015@linuxfoundation.org> References: <20210913131100.316353015@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit d43b3a989bc8c06fd4bbb69a7500d180db2d68e8 ] rpmhpd_aggregate_corner() takes a corner as parameter, but in rpmhpd_power_off() the code requests the level of the first corner instead. In all (known) current cases the first corner has level 0, so this change should be a nop, but in case that there's a power domain with a non-zero lowest level this makes sure that rpmhpd_power_off() actually requests the lowest level - which is the closest to "power off" we can get. While touching the code, also skip the unnecessary zero-initialization of "ret". Fixes: 279b7e8a62cc ("soc: qcom: rpmhpd: Add RPMh power domain driver") Reviewed-by: Rajendra Nayak Reviewed-by: Stephen Boyd Reviewed-by: Sibi Sankar Tested-by: Sibi Sankar Link: https://lore.kernel.org/r/20210703005416.2668319-2-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/rpmhpd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/soc/qcom/rpmhpd.c index e72426221a69..c8b584d0c8fb 100644 --- a/drivers/soc/qcom/rpmhpd.c +++ b/drivers/soc/qcom/rpmhpd.c @@ -310,12 +310,11 @@ static int rpmhpd_power_on(struct generic_pm_domain *domain) static int rpmhpd_power_off(struct generic_pm_domain *domain) { struct rpmhpd *pd = domain_to_rpmhpd(domain); - int ret = 0; + int ret; mutex_lock(&rpmhpd_lock); - ret = rpmhpd_aggregate_corner(pd, pd->level[0]); - + ret = rpmhpd_aggregate_corner(pd, 0); if (!ret) pd->enabled = false;