Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp983552ybt; Wed, 17 Jun 2020 19:55:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx61DwIFrObB3wDcX/S5voXuTQLSl0jtJBidZVr2xNCdyICMNPh+5yPEfL1qC8ENECvS2+U X-Received: by 2002:a05:6402:1604:: with SMTP id f4mr2052846edv.379.1592448927350; Wed, 17 Jun 2020 19:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448927; cv=none; d=google.com; s=arc-20160816; b=auRFscIeUxpJdfv48/VC3f2zoaVGrUQqvDR0QfvUyZm80vhN4setTO5xvgF1xR50Q2 aqDqI6WaTilbtncBC2zQ7BsIX/brESSbSEO0SVJhHY5wmZzjyESpUShVDrUv99KhYb2Q jDZDnbPAgNzXWaMbgAeuFSIgzYN9B2W4eHq/VIEZwMANkhjAZLyNMYki5eI2HjVXGsHJ HlVV4eZEfScAMCN+pdYdV3I0i/a0OODdUQXtT7dhyNJz2wT9+HazU/OeZycRUzP0jzb3 Yeq20jPFBSkA7BPRU4xTOlAaOSYqq+rlhTvo/RpRCbKR8x3WvjPafTKc+19/8LNfoitd Sjvw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UNe3KN4gtNJ6F0uKiTu7oTMcSlvhTIjHsJghnQiBskc=; b=uJ1iT9d3IemZvp+fQwapu4LQg/72o1NBWi4bqEXHBB156TKwqxTeW31aX10uJuAcxV d+OgBtRko6XzOBV2bMU3Xt20wCzH+bNUgIhepgiRxPBtXV3yTpHka+L2iOg3sVe2WVsd WYpcp4VUnv5mJmEEE5IqqupHLZYwciVRBnxS6ZgiwTJSvWFKwBcBj7NnIa8BwZpmce3J +zu/Qj8xZBZh8FffRCUG8F/5pgxsATBu1WZx2JV2WS/Dpmja6IAYr3/YsCQT0nWkpPSS 8Jb4+awTqykA2rs4dhIdXkUFyGrEARjfp6rIrBIkbESqeFDvfx9e5JHtMteJDgcVX4hS +WBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=apFuvBh2; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ds2si1346311ejc.114.2020.06.17.19.55.05; Wed, 17 Jun 2020 19:55:27 -0700 (PDT) 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=@kernel.org header.s=default header.b=apFuvBh2; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728134AbgFRCxa (ORCPT + 99 others); Wed, 17 Jun 2020 22:53:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:33684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726946AbgFRBIK (ORCPT ); Wed, 17 Jun 2020 21:08:10 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67C8B21D79; Thu, 18 Jun 2020 01:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442490; bh=kCjSyXO6zz3ZUcp39RHJO7Kc3CAczW6G8wj8OXTDw7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=apFuvBh2ch1WGaUlIQmMvh+0o7p2pAJxBPUrS+pYQzTBCeAh8bWPddtXCDxhCa6ot 7Psf/OZzN0vgdbt/h3ygaQzH0eJHPNKkjt+qUxj5PjS0I0QToq4v2vKQxtsqnEp3Nn eqv3R71BHcB5ZdhXUFVLqzrVigwpeFYuh9DmPhyQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rikard Falkeborn , Maxime Ripard , Sasha Levin , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 003/388] clk: sunxi: Fix incorrect usage of round_down() Date: Wed, 17 Jun 2020 21:01:40 -0400 Message-Id: <20200618010805.600873-3-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rikard Falkeborn [ Upstream commit ee25d9742dabed3fd18158b518f846abeb70f319 ] round_down() can only round to powers of 2. If round_down() is asked to round to something that is not a power of 2, incorrect results are produced. The incorrect results can be both too large and too small. Instead, use rounddown() which can round to any number. Fixes: 6a721db180a2 ("clk: sunxi: Add A31 clocks support") Signed-off-by: Rikard Falkeborn Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/clk/sunxi/clk-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 27201fd26e44..e1aa1fbac48a 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -90,7 +90,7 @@ static void sun6i_a31_get_pll1_factors(struct factors_request *req) * Round down the frequency to the closest multiple of either * 6 or 16 */ - u32 round_freq_6 = round_down(freq_mhz, 6); + u32 round_freq_6 = rounddown(freq_mhz, 6); u32 round_freq_16 = round_down(freq_mhz, 16); if (round_freq_6 > round_freq_16) -- 2.25.1