From patchwork Tue Jun 23 19:57:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF24CC433DF for ; Tue, 23 Jun 2020 20:44:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A25FF21D7A for ; Tue, 23 Jun 2020 20:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945095; bh=IeczXYkkchN1+8AkUnZleqsDX9tLP+Nr4On3KhLpwbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YT31oKbFH6Bh4lFnEo99VcCg2qvyN6XAyeTCdW8OyhNRSqbvgbjgjIWA7qUOqmhYb vuFhZQB7qSrqpZtetnebrnBOJ2wfX0IUmZfOADb9dJM6Ua8WHxcTMxAtfimFBv07V9 NXQIDVIG6b509F9ojEDV3TOAq8IUOxSxdeDa1T6I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392611AbgFWUos (ORCPT ); Tue, 23 Jun 2020 16:44:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:41968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392293AbgFWUom (ORCPT ); Tue, 23 Jun 2020 16:44:42 -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 23F752070E; Tue, 23 Jun 2020 20:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945082; bh=IeczXYkkchN1+8AkUnZleqsDX9tLP+Nr4On3KhLpwbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0ozkUioXIlM9U/B2KY5JZEowkmpmWat7EjVoj9P2vQSmzwz8Kn29hgMsUnGRVwXKi g7kqaSo7X9FTPjccasWuWFlZ3QkP/jk5YQmBUN9fwubba78yg0Rwszv6FhG8Dxq4O4 OdlRRcA/W8p0covRucOL5hVvzmFy+BguRbLjzLbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rikard Falkeborn , Maxime Ripard , Sasha Levin Subject: [PATCH 4.14 004/136] clk: sunxi: Fix incorrect usage of round_down() Date: Tue, 23 Jun 2020 21:57:40 +0200 Message-Id: <20200623195303.836017212@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@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: 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 aa4add580516d..0b5e091742f97 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -98,7 +98,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)