From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.7 317/388] pwm: imx27: Fix rounding behavior Date: Wed, 17 Jun 2020 21:06:54 -0400 Message-ID: <20200618010805.600873-317-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane-mx.org@lists.infradead.org To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-pwm@vger.kernel.org, Thierry Reding , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= List-Id: linux-pwm@vger.kernel.org RnJvbTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4K ClsgVXBzdHJlYW0gY29tbWl0IGFlZjFhMzc5OWI1Y2IzYmE0ODQxZjYwMzQ0OTdiMTc5NjQ2Y2Nj NzAgXQoKVG8gbm90IHRyaWdnZXIgdGhlIHdhcm5pbmdzIHByb3ZpZGVkIGJ5IENPTkZJR19QV01f REVCVUcKCiAtIHVzZSB1cC1yb3VuZGluZyBpbiAuZ2V0X3N0YXRlKCkKIC0gZG9uJ3QgZGl2aWRl IGJ5IHRoZSByZXN1bHQgb2YgYSBkaXZpc2lvbgogLSBkb24ndCB1c2UgdGhlIHJvdW5kZWQgY291 bnRlciB2YWx1ZSBmb3IgdGhlIHBlcmlvZCBsZW5ndGggdG8gY2FsY3VsYXRlCiAgIHRoZSBjb3Vu dGVyIHZhbHVlIGZvciB0aGUgZHV0eSBjeWNsZQoKU2lnbmVkLW9mZi1ieTogVXdlIEtsZWluZS1L w7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KU2lnbmVkLW9mZi1ieTogVGhp ZXJyeSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2Fz aGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvcHdtL3B3bS1pbXgyNy5j IHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3B3bS9wd20taW14Mjcu YyBiL2RyaXZlcnMvcHdtL3B3bS1pbXgyNy5jCmluZGV4IGE2ZTQwZDRjNDg1Zi4uNzMyYTZmMzcw MWU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL3B3bS9wd20taW14MjcuYworKysgYi9kcml2ZXJzL3B3 bS9wd20taW14MjcuYwpAQCAtMTUwLDEzICsxNTAsMTIgQEAgc3RhdGljIHZvaWQgcHdtX2lteDI3 X2dldF9zdGF0ZShzdHJ1Y3QgcHdtX2NoaXAgKmNoaXAsCiAKIAlwcmVzY2FsZXIgPSBNWDNfUFdN Q1JfUFJFU0NBTEVSX0dFVCh2YWwpOwogCXB3bV9jbGsgPSBjbGtfZ2V0X3JhdGUoaW14LT5jbGtf cGVyKTsKLQlwd21fY2xrID0gRElWX1JPVU5EX0NMT1NFU1RfVUxMKHB3bV9jbGssIHByZXNjYWxl cik7CiAJdmFsID0gcmVhZGwoaW14LT5tbWlvX2Jhc2UgKyBNWDNfUFdNUFIpOwogCXBlcmlvZCA9 IHZhbCA+PSBNWDNfUFdNUFJfTUFYID8gTVgzX1BXTVBSX01BWCA6IHZhbDsKIAogCS8qIFBXTU9V VCAoSHopID0gUFdNQ0xLIC8gKFBXTVBSICsgMikgKi8KLQl0bXAgPSBOU0VDX1BFUl9TRUMgKiAo dTY0KShwZXJpb2QgKyAyKTsKLQlzdGF0ZS0+cGVyaW9kID0gRElWX1JPVU5EX0NMT1NFU1RfVUxM KHRtcCwgcHdtX2Nsayk7CisJdG1wID0gTlNFQ19QRVJfU0VDICogKHU2NCkocGVyaW9kICsgMikg KiBwcmVzY2FsZXI7CisJc3RhdGUtPnBlcmlvZCA9IERJVl9ST1VORF9VUF9VTEwodG1wLCBwd21f Y2xrKTsKIAogCS8qCiAJICogUFdNU0FSIGNhbiBiZSByZWFkIG9ubHkgaWYgUFdNIGlzIGVuYWJs ZWQuIElmIHRoZSBQV00gaXMgZGlzYWJsZWQsCkBAIC0xNjcsOCArMTY2LDggQEAgc3RhdGljIHZv aWQgcHdtX2lteDI3X2dldF9zdGF0ZShzdHJ1Y3QgcHdtX2NoaXAgKmNoaXAsCiAJZWxzZQogCQl2 YWwgPSBpbXgtPmR1dHlfY3ljbGU7CiAKLQl0bXAgPSBOU0VDX1BFUl9TRUMgKiAodTY0KSh2YWwp OwotCXN0YXRlLT5kdXR5X2N5Y2xlID0gRElWX1JPVU5EX0NMT1NFU1RfVUxMKHRtcCwgcHdtX2Ns ayk7CisJdG1wID0gTlNFQ19QRVJfU0VDICogKHU2NCkodmFsKSAqIHByZXNjYWxlcjsKKwlzdGF0 ZS0+ZHV0eV9jeWNsZSA9IERJVl9ST1VORF9VUF9VTEwodG1wLCBwd21fY2xrKTsKIAogCXB3bV9p bXgyN19jbGtfZGlzYWJsZV91bnByZXBhcmUoaW14KTsKIH0KQEAgLTIyMCwyMiArMjE5LDIzIEBA IHN0YXRpYyBpbnQgcHdtX2lteDI3X2FwcGx5KHN0cnVjdCBwd21fY2hpcCAqY2hpcCwgc3RydWN0 IHB3bV9kZXZpY2UgKnB3bSwKIAlzdHJ1Y3QgcHdtX2lteDI3X2NoaXAgKmlteCA9IHRvX3B3bV9p bXgyN19jaGlwKGNoaXApOwogCXN0cnVjdCBwd21fc3RhdGUgY3N0YXRlOwogCXVuc2lnbmVkIGxv bmcgbG9uZyBjOworCXVuc2lnbmVkIGxvbmcgbG9uZyBjbGtyYXRlOwogCWludCByZXQ7CiAJdTMy IGNyOwogCiAJcHdtX2dldF9zdGF0ZShwd20sICZjc3RhdGUpOwogCi0JYyA9IGNsa19nZXRfcmF0 ZShpbXgtPmNsa19wZXIpOwotCWMgKj0gc3RhdGUtPnBlcmlvZDsKKwljbGtyYXRlID0gY2xrX2dl dF9yYXRlKGlteC0+Y2xrX3Blcik7CisJYyA9IGNsa3JhdGUgKiBzdGF0ZS0+cGVyaW9kOwogCi0J ZG9fZGl2KGMsIDEwMDAwMDAwMDApOworCWRvX2RpdihjLCBOU0VDX1BFUl9TRUMpOwogCXBlcmlv ZF9jeWNsZXMgPSBjOwogCiAJcHJlc2NhbGUgPSBwZXJpb2RfY3ljbGVzIC8gMHgxMDAwMCArIDE7 CiAKIAlwZXJpb2RfY3ljbGVzIC89IHByZXNjYWxlOwotCWMgPSAodW5zaWduZWQgbG9uZyBsb25n KXBlcmlvZF9jeWNsZXMgKiBzdGF0ZS0+ZHV0eV9jeWNsZTsKLQlkb19kaXYoYywgc3RhdGUtPnBl cmlvZCk7CisJYyA9IGNsa3JhdGUgKiBzdGF0ZS0+ZHV0eV9jeWNsZTsKKwlkb19kaXYoYywgTlNF Q19QRVJfU0VDICogcHJlc2NhbGUpOwogCWR1dHlfY3ljbGVzID0gYzsKIAogCS8qCi0tIAoyLjI1 LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51 eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVh ZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1h cm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 E424DC433DF for ; Thu, 18 Jun 2020 02:24:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1A0E20885 for ; Thu, 18 Jun 2020 02:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447052; bh=dmuvR/xPFusMGiKvEEAwv0PxlMX7akh3AkyTfLZHxdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=alNyoKmFCXAQWWJz6nbwublju1vgqbPHtRktbdJziBPZA+BXUuS2yF9AMlgM4qJ58 vN1ovxznmMdm1Dj1FjW872dsLTll2moS9b/k1j+1IEkLzSEQXWaFqrUliU6JeSgAZw IBBPi+rLG3o+nDQNhMGFS8pzolZ8/F4r/MKoeA3g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729026AbgFRBRp (ORCPT ); Wed, 17 Jun 2020 21:17:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:44762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729402AbgFRBO4 (ORCPT ); Wed, 17 Jun 2020 21:14:56 -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 E624B21D7E; Thu, 18 Jun 2020 01:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442895; bh=dmuvR/xPFusMGiKvEEAwv0PxlMX7akh3AkyTfLZHxdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kkYvzKy1EEX2MwFS6IbrL0L/+dmDe4PLTCZ3bjoAH96bpMoX/t0/wLruDvJWahMg+ fH42410mvcA89CUbK4TyAi9SMVl/UChEMMSH5KUzs35YiXlWA6N4/E0XPi5CSJa2On nZfy/nX+bR7Bn0v0GYglNQH0m8xM9yNzyDvbxlm4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Thierry Reding , Sasha Levin , linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 317/388] pwm: imx27: Fix rounding behavior Date: Wed, 17 Jun 2020 21:06:54 -0400 Message-Id: <20200618010805.600873-317-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 Content-Type: text/plain; charset=UTF-8 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: Uwe Kleine-König [ Upstream commit aef1a3799b5cb3ba4841f6034497b179646ccc70 ] To not trigger the warnings provided by CONFIG_PWM_DEBUG - use up-rounding in .get_state() - don't divide by the result of a division - don't use the rounded counter value for the period length to calculate the counter value for the duty cycle Signed-off-by: Uwe Kleine-König Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/pwm/pwm-imx27.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-imx27.c b/drivers/pwm/pwm-imx27.c index a6e40d4c485f..732a6f3701e8 100644 --- a/drivers/pwm/pwm-imx27.c +++ b/drivers/pwm/pwm-imx27.c @@ -150,13 +150,12 @@ static void pwm_imx27_get_state(struct pwm_chip *chip, prescaler = MX3_PWMCR_PRESCALER_GET(val); pwm_clk = clk_get_rate(imx->clk_per); - pwm_clk = DIV_ROUND_CLOSEST_ULL(pwm_clk, prescaler); val = readl(imx->mmio_base + MX3_PWMPR); period = val >= MX3_PWMPR_MAX ? MX3_PWMPR_MAX : val; /* PWMOUT (Hz) = PWMCLK / (PWMPR + 2) */ - tmp = NSEC_PER_SEC * (u64)(period + 2); - state->period = DIV_ROUND_CLOSEST_ULL(tmp, pwm_clk); + tmp = NSEC_PER_SEC * (u64)(period + 2) * prescaler; + state->period = DIV_ROUND_UP_ULL(tmp, pwm_clk); /* * PWMSAR can be read only if PWM is enabled. If the PWM is disabled, @@ -167,8 +166,8 @@ static void pwm_imx27_get_state(struct pwm_chip *chip, else val = imx->duty_cycle; - tmp = NSEC_PER_SEC * (u64)(val); - state->duty_cycle = DIV_ROUND_CLOSEST_ULL(tmp, pwm_clk); + tmp = NSEC_PER_SEC * (u64)(val) * prescaler; + state->duty_cycle = DIV_ROUND_UP_ULL(tmp, pwm_clk); pwm_imx27_clk_disable_unprepare(imx); } @@ -220,22 +219,23 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm, struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip); struct pwm_state cstate; unsigned long long c; + unsigned long long clkrate; int ret; u32 cr; pwm_get_state(pwm, &cstate); - c = clk_get_rate(imx->clk_per); - c *= state->period; + clkrate = clk_get_rate(imx->clk_per); + c = clkrate * state->period; - do_div(c, 1000000000); + do_div(c, NSEC_PER_SEC); period_cycles = c; prescale = period_cycles / 0x10000 + 1; period_cycles /= prescale; - c = (unsigned long long)period_cycles * state->duty_cycle; - do_div(c, state->period); + c = clkrate * state->duty_cycle; + do_div(c, NSEC_PER_SEC * prescale); duty_cycles = c; /* -- 2.25.1