From patchwork Mon Aug 17 15:13:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247847 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2867574ilo; Mon, 17 Aug 2020 11:34:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziE1Y4tGu7jT9vlJZNAMigGBdJMPsppOimFw4O+ZgHEA/sAvjNpAfW5X7odi60D9n9tXCK X-Received: by 2002:a17:907:20f5:: with SMTP id rh21mr16140840ejb.194.1597689246138; Mon, 17 Aug 2020 11:34:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597689246; cv=none; d=google.com; s=arc-20160816; b=rJigpNBJU6tiy489BcFAwOF8K3RLHDsD0oZM1MvSM9ZF52JUwv31tha2YCflWFkVQC t4TFsIzz5hK5kZRjT6URjw9i3swZbbOnp4KP7GbkN5Xjy4U/ocIuURdCL3COcqSsoot6 UFxxdbFch/OW/CVDXNSe6Ge7bv3mfmcbCFhjllZ18kty89T8oDpU+o9k3UYn9evLBHJr /xWtLP/7RQe5aase+xIx9S+9MlVlgxY5fZV/+VW51Mrw8Z6JlXCLikUv/KRSsYP0no3d 6wh30rmP7vWniPOGCdZLwW5SigODnwZygzNQCXY98uBXZ4I2O6rPKAM+8Zm/fCZnyfbt x+jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AqcoBkNstXxfH/KUoNYLyV5CwYAYC2nOjJszcVbQWCs=; b=S9p/lXL5x1bv3NTro8GMsZyWV1bj1s0kONezfdCt9AEu0i8JDe9uXiwIzaVBuRdntJ LxkUYK20Xqs51sNPOa09IUjgbCXrvt2uQ9DMX42T4qkHRvIA+hHNQ88pk7iL3uff72Aw TYKSGdUQHB+fp8i/EiVUxZfRMfMl6yybmXi+YAEfDj45PzXkYsoVsZqlroeSAv/7nm3i bFKJqPE4M0RAOePqGkjhgtR9AKtQd2lQREb8V6ZFpzsEg98Wd0eUMsyXjwFgEPDETvI4 xioWaFRSPI364xqF93bKqCmZU+9ibXpEfe6/c2wq5G2mJURkeMwHGiwFwbPddG4yuHhj yv2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=17UtooQV; 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=fail (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 n6si11432693edi.269.2020.08.17.11.34.05; Mon, 17 Aug 2020 11:34:06 -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=@kernel.org header.s=default header.b=17UtooQV; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391223AbgHQSeE (ORCPT + 15 others); Mon, 17 Aug 2020 14:34:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:47662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731010AbgHQQAW (ORCPT ); Mon, 17 Aug 2020 12:00:22 -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 E8D65208C7; Mon, 17 Aug 2020 16:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680019; bh=mPYpUOLwPa6N6HVe+fte52UqhbZ4u8iZpGJl2gAFN0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=17UtooQVrnP3wH8SBWMV+NeTEZ09lre//UZwJYZBhLRjAUgINWiOIPzK1GdJs9ykG rU0hqTS/jB+O3JkSnszNHQGwLE0pyZGVv3o+TffXUQ5imGPJwc91rM8iJKVVS3xV9X iQ9MzXJT5VXdK0weWL1xsR6qY3Xkd8pki+PFPb+s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Boyd , Sudeep Holla , Sasha Levin , Dien Pham Subject: [PATCH 5.4 021/270] clk: scmi: Fix min and max rate when registering clocks with discrete rates Date: Mon, 17 Aug 2020 17:13:42 +0200 Message-Id: <20200817143756.840496842@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla [ Upstream commit fcd2e0deae50bce48450f14c8fc5611b08d7438c ] Currently we are not initializing the scmi clock with discrete rates correctly. We fetch the min_rate and max_rate value only for clocks with ranges and ignore the ones with discrete rates. This will lead to wrong initialization of rate range when clock supports discrete rate. Fix this by using the first and the last rate in the sorted list of the discrete clock rates while registering the clock. Link: https://lore.kernel.org/r/20200709081705.46084-2-sudeep.holla@arm.com Fixes: 6d6a1d82eaef7 ("clk: add support for clocks provided by SCMI") Reviewed-by: Stephen Boyd Reported-and-tested-by: Dien Pham Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/clk/clk-scmi.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 886f7c5df51a9..e3cdb4a282fea 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -103,6 +103,8 @@ static const struct clk_ops scmi_clk_ops = { static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk) { int ret; + unsigned long min_rate, max_rate; + struct clk_init_data init = { .flags = CLK_GET_RATE_NOCACHE, .num_parents = 0, @@ -112,9 +114,23 @@ static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk) sclk->hw.init = &init; ret = devm_clk_hw_register(dev, &sclk->hw); - if (!ret) - clk_hw_set_rate_range(&sclk->hw, sclk->info->range.min_rate, - sclk->info->range.max_rate); + if (ret) + return ret; + + if (sclk->info->rate_discrete) { + int num_rates = sclk->info->list.num_rates; + + if (num_rates <= 0) + return -EINVAL; + + min_rate = sclk->info->list.rates[0]; + max_rate = sclk->info->list.rates[num_rates - 1]; + } else { + min_rate = sclk->info->range.min_rate; + max_rate = sclk->info->range.max_rate; + } + + clk_hw_set_rate_range(&sclk->hw, min_rate, max_rate); return ret; }