Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3572835pxb; Mon, 24 Jan 2022 12:32:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuRA0N2O+8Bw+Ee6zd4j1QO6iM+GLKgS7yTSyns+2IPR413pLaaZyVhBfm2G6ip4T3Sm3c X-Received: by 2002:a17:90b:1646:: with SMTP id il6mr51140pjb.153.1643056340150; Mon, 24 Jan 2022 12:32:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056340; cv=none; d=google.com; s=arc-20160816; b=fPPq1Si7ZXHAtQmJKw59YWagF0hTwYHIu2GA7FBVfXRsXDHPoW3eDwfeE9XcmTHhfz WHbpXHoiXss7mQiliV4aPdCM0ehfdad3dIhiqfWGcMIre2JKTAoiTLVqy6s0hFAjkRZe atPjdxhaPNo9tLpdvRgb8Vpla4ngeZsWR5koQt932PISLp7yGZTni5VkAD55wevzf9AK Um2lhjJedoXDku4IcXrGl5N85Ifh+SP46M+J419qo0+1IK+hgqtm58tFMUsqwq5OW9hB o/kmXcpUCgDyGhz0JzwoYAj7C2x5qv3oi1TmhnhrZv63IEGiFdML28sYabPsf5w1vJ5d L7wg== 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=sDkm7I56MYaNZSQuhNXCupkfqmwjnpvExrKKHeM5dXc=; b=pjZfQVbkociLr38kSBVyEYPO8c51XEm6hyX/gH5V49rNIeIUnVKJWVp+Mnx0gCX2hu 2PpIu/dJKKxixU5K35cI/LgkwrOhlm7xli++6cJ4genSJFII6+x+XqzqBT2cEVRkoxlW YU4anSEhEcs/dFxr49iNsA+ZFlp8zGDRvkJHkQDtyOzJniqMDGv4Y/WMk30Ov7FO2uMg fr9kgPjzh+QyGeBKuo1P5leNOusaTmZ68dtOAoso4RVf+MecEAfCJU6kSbRtK3U279+R +UNsIvrrIovRYVTH6GbgF7WhF0P8Gmu+ElhzlWIgphr4KyBFGEHPxcuEv/Vi9QHU5AH1 yXiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=L9QzUtzU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 n6si286883pjp.20.2022.01.24.12.32.04; Mon, 24 Jan 2022 12:32:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=L9QzUtzU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1353522AbiAXTey (ORCPT + 99 others); Mon, 24 Jan 2022 14:34:54 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:53914 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351281AbiAXT0S (ORCPT ); Mon, 24 Jan 2022 14:26:18 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 99AB961488; Mon, 24 Jan 2022 19:26:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4F67C340E5; Mon, 24 Jan 2022 19:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643052377; bh=72uVLfWtCUTcy40tSIsRs3Qyj1G0Z5DXq+tMgL7Yfqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9QzUtzUbdFeAz7VdbD1eimFhCqzX0+QveElqTaHnMAu+quz/tE+5LMmQXeYQVSVE wAhlVlUrJeTyQQmdpkRi+S8TXw/XIahpf2w2LkjNXYj/Tc9LxaYvO5HJr/sYZyyMKN tx7LHd+httazakaCBgPOAg3lEH0OVl5ZwUZcPWKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Stephen Boyd , Nicolas Saenz Julienne , Michael Stapelberg , Sasha Levin Subject: [PATCH 5.4 039/320] clk: bcm-2835: Remove rounding up the dividers Date: Mon, 24 Jan 2022 19:40:23 +0100 Message-Id: <20220124183955.088147075@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183953.750177707@linuxfoundation.org> References: <20220124183953.750177707@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maxime Ripard [ Upstream commit 8ca011ef4af48a7af7b15afd8a4a44039dd04cea ] The driver, once it found a divider, tries to round it up by increasing the least significant bit of the fractional part by one when the round_up argument is set and there's a remainder. However, since it increases the divider it will actually reduce the clock rate below what we were asking for, leading to issues with clk_set_min_rate() that will complain that our rounded clock rate is below the minimum of the rate. Since the dividers are fairly precise already, let's remove that part so that we can have clk_set_min_rate() working. This is effectively a revert of 9c95b32ca093 ("clk: bcm2835: add a round up ability to the clock divisor"). Fixes: 9c95b32ca093 ("clk: bcm2835: add a round up ability to the clock divisor") Signed-off-by: Maxime Ripard Acked-by: Stephen Boyd Reviewed-by: Nicolas Saenz Julienne Tested-by: Nicolas Saenz Julienne # boot and basic functionality Tested-by: Michael Stapelberg Link: https://patchwork.freedesktop.org/patch/msgid/20210922125419.4125779-3-maxime@cerno.tech Signed-off-by: Sasha Levin --- drivers/clk/bcm/clk-bcm2835.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index b2af320d1b6c5..e637bd6b295bd 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -932,8 +932,7 @@ static int bcm2835_clock_is_on(struct clk_hw *hw) static u32 bcm2835_clock_choose_div(struct clk_hw *hw, unsigned long rate, - unsigned long parent_rate, - bool round_up) + unsigned long parent_rate) { struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); const struct bcm2835_clock_data *data = clock->data; @@ -945,10 +944,6 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw, rem = do_div(temp, rate); div = temp; - - /* Round up and mask off the unused bits */ - if (round_up && ((div & unused_frac_mask) != 0 || rem != 0)) - div += unused_frac_mask + 1; div &= ~unused_frac_mask; /* different clamping limits apply for a mash clock */ @@ -1079,7 +1074,7 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_cprman *cprman = clock->cprman; const struct bcm2835_clock_data *data = clock->data; - u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate, false); + u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate); u32 ctl; spin_lock(&cprman->regs_lock); @@ -1130,7 +1125,7 @@ static unsigned long bcm2835_clock_choose_div_and_prate(struct clk_hw *hw, if (!(BIT(parent_idx) & data->set_rate_parent)) { *prate = clk_hw_get_rate(parent); - *div = bcm2835_clock_choose_div(hw, rate, *prate, true); + *div = bcm2835_clock_choose_div(hw, rate, *prate); *avgrate = bcm2835_clock_rate_from_divisor(clock, *prate, *div); -- 2.34.1