From patchwork Mon Aug 17 15:15:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247823 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2763719ilo; Mon, 17 Aug 2020 09:11:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj9kWLijNnhKUTYnJCpATvZ4mzAmsNc6T+Y3LBGijU2YKKkwwXm3rtJZkGTgWwFJjazxwr X-Received: by 2002:a05:6402:22bc:: with SMTP id cx28mr15131941edb.171.1597680695696; Mon, 17 Aug 2020 09:11:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597680695; cv=none; d=google.com; s=arc-20160816; b=yYMUR75TquAqFJM9dLphLS360nmRR8XF6vLU75JqE5hfJfcUHJLXg7bcoPxZhHhtyU t7SKOHiZfBgvQoX1vwg/kYc9WsEdst/5+rkxcPAfotHFi4dRfFVNFVHBV2coW+6uCwAt R2Cl3SirH11SSjViKvFs0ou/L4W2pwJEPMQ8cXPVMEu6bU5DZuj1zNTiUygO2iSZyplI IS9bUVSsLtCarqOl9rvi03VpE6y10xX3Jm9Kn18QA5Mqv+u8csNf5sm1kdvNpsKB1LKE 8sO+md19T/EuC2fXjaW/Py5e2pPP2tzoqCfbW/MUVxoVMg7ppgFI44zBKPZMrNFlnpPe A1Og== 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=H68u8ozVbIZPDZ05Ll1Fy+6OyfGdyrZXml6A7H3wsfM=; b=08hxZoZUTEQAQmPlPMJTUQ/xQ/sLqv5ENRz6aVQMLPu8KEfMg1nd7Mjq92Gax4xTIp yFQn8EC2fK4Mu6ve8nqoEEHHOv5TGaW5wqmmKFR8hHxGNEgLAkRpMmax0DPMqn2mioB3 JVrBlv6C2NLaXLEghPNxDKAEmBsAbx6Ql1BnHgbli2ZAx8HUoaPAmC2edgieVO4kEobV Ms/S8bkHNvsugu73+0GJkm+xZS/0Fy0d1eiy3LZ0q4uEiJelT5+HvrsOT4fe27Gn2ACT qj0qb+E3Q6qyh61O/4I+IKQKcAHDVi0R06JUA1h/gQnRuM+d83QBrjjPvapUm+RkHoTP kDjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ya+asStR; 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 b24si11113879edx.252.2020.08.17.09.11.35; Mon, 17 Aug 2020 09:11:35 -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=Ya+asStR; 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 S2388623AbgHQQLd (ORCPT + 15 others); Mon, 17 Aug 2020 12:11:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:40016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730784AbgHQQLY (ORCPT ); Mon, 17 Aug 2020 12:11:24 -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 C1BD022C9F; Mon, 17 Aug 2020 16:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680683; bh=sYiXg3G94M+HiuTnzDDfRf926aFKFASDQAR01m4WSwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ya+asStRr1qQ8+q6XIEZCK3fBIQhNM1fSm1Wm/ctVlvsALKin0skvGIy2u/s155r7 uvwVcHq3G3uWT5JT7oPnLvERQ91bRLFwhU4YmfMB8M9ggTSFd+GQjkT5JiphwX/UXt ge/QsvVy9YuHri/wPxn//FAanI12EZylN3/QNanU= 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 4.19 015/168] clk: scmi: Fix min and max rate when registering clocks with discrete rates Date: Mon, 17 Aug 2020 17:15:46 +0200 Message-Id: <20200817143734.481261181@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@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 a985bf5e1ac61..c65d30bba7005 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; }