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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 3A7E6C433E9 for ; Wed, 20 Jan 2021 16:19:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06589233EA for ; Wed, 20 Jan 2021 16:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391335AbhATQT2 (ORCPT ); Wed, 20 Jan 2021 11:19:28 -0500 Received: from guitar.tcltek.co.il ([192.115.133.116]:55123 "EHLO mx.tkos.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391507AbhATQRk (ORCPT ); Wed, 20 Jan 2021 11:17:40 -0500 Received: from tarshish.tkos.co.il (unknown [10.0.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id DC4A2440DAA; Wed, 20 Jan 2021 18:16:41 +0200 (IST) From: Baruch Siach To: Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Lee Jones , Linus Walleij , Bartosz Golaszewski Cc: Baruch Siach , Russell King , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Thomas Petazzoni , Chris Packham , Sascha Hauer , Ralph Sennhauser , linux-pwm@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/4] gpio: mvebu: improve handling of pwm zero on/off values Date: Wed, 20 Jan 2021 18:16:28 +0200 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Hardware appears to treat zero value as 2^32. Take advantage of this fact to support on/off values of up to UINT_MAX+1 == 2^32. Adjust both .apply and .get_state to handle zero as a special case. Rounded up division result in .get_state can't be zero, since the dividend is now larger than 0. Remove check for this case. Reported-by: Uwe Kleine-König Analyzed-by: Russell King Signed-off-by: Baruch Siach --- drivers/gpio/gpio-mvebu.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 6b017854ce61..75e3c235bd3a 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -667,22 +667,21 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip, spin_lock_irqsave(&mvpwm->lock, flags); regmap_read(mvpwm->regs, mvebu_pwmreg_blink_on_duration(mvpwm), &u); - val = (unsigned long long) u * NSEC_PER_SEC; - val = DIV_ROUND_UP_ULL(val, mvpwm->clk_rate); - if (val) - state->duty_cycle = val; + /* Hardware treats zero as 2^32. See mvebu_pwm_apply(). */ + if (u > 0) + val = u; else - state->duty_cycle = 1; + val = UINT_MAX + 1ULL; + state->duty_cycle = DIV_ROUND_UP_ULL(val * NSEC_PER_SEC, + mvpwm->clk_rate); - val = (unsigned long long) u; /* on duration */ regmap_read(mvpwm->regs, mvebu_pwmreg_blink_off_duration(mvpwm), &u); - val += (unsigned long long) u; /* period = on + off duration */ - val *= NSEC_PER_SEC; - val = DIV_ROUND_UP_ULL(val, mvpwm->clk_rate); - if (val) - state->period = val; + /* period = on + off duration */ + if (u > 0) + val += u; else - state->period = 1; + val += UINT_MAX + 1ULL; + state->period = DIV_ROUND_UP_ULL(val * NSEC_PER_SEC, mvpwm->clk_rate); regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u); if (u) @@ -704,9 +703,15 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, val = (unsigned long long) mvpwm->clk_rate * state->duty_cycle; do_div(val, NSEC_PER_SEC); - if (val > UINT_MAX) + if (val > UINT_MAX + 1ULL) return -EINVAL; - if (val) + /* + * Zero on/off values don't work as expected. Experimentation shows + * that zero value is treated as 2^32. This behavior is not documented. + */ + if (val == UINT_MAX + 1ULL) + on = 0; + else if (val) on = val; else on = 1; @@ -714,9 +719,11 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, val = (unsigned long long) mvpwm->clk_rate * state->period; do_div(val, NSEC_PER_SEC); val -= on; - if (val > UINT_MAX) + if (val > UINT_MAX + 1ULL) return -EINVAL; - if (val) + if (val == UINT_MAX + 1ULL) + off = 0; + else if (val) off = val; else off = 1; -- 2.29.2 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 9E67FC433DB for ; Wed, 20 Jan 2021 16:18:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D063233E2 for ; Wed, 20 Jan 2021 16:18:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D063233E2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UzyWGRCW0hOiHOB/Im/S8UlJLz1yOTXrLVYkxOJmj+I=; b=LVGIkeyXEyvR33ckiysU4tnnt VxvgU/RjFLizTGcNx1p5FFiRHyiMSgpr0mrYnkMNKCSSmTFslTtLX000WprSSRGyqAGuib/yVTXiN iRHB0omp7QuJQDHd1BpUqVm93UOZYyhw6COEJ/qasaGYfVwBYB3rqcoRrIPiXymTMJNwcLArJCHlV rv7ryx563Rh3NEZsoqPXbQaahGb1pYcv6eXJh9iWq9YTAsGj6aWMnsRBU4H49CkBb4UhpRmx+6doR nJ/ERywBFXGSZ5o9B0Tkogt3gybSdf/hlnsmlxWRlvHTNsE+DZxMGzCdlPQ6byVXSzBAzYUu0pssN MM+Zf0X/A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2GAO-00063r-Ir; Wed, 20 Jan 2021 16:17:08 +0000 Received: from guitar.tcltek.co.il ([192.115.133.116] helo=mx.tkos.co.il) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2GA3-0005vj-GA for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 16:16:49 +0000 Received: from tarshish.tkos.co.il (unknown [10.0.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id DC4A2440DAA; Wed, 20 Jan 2021 18:16:41 +0200 (IST) From: Baruch Siach To: Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Lee Jones , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v5 4/4] gpio: mvebu: improve handling of pwm zero on/off values Date: Wed, 20 Jan 2021 18:16:28 +0200 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_111647_929060_6D82A10F X-CRM114-Status: GOOD ( 19.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Baruch Siach , linux-pwm@vger.kernel.org, Gregory Clement , Russell King , linux-gpio@vger.kernel.org, Chris Packham , Thomas Petazzoni , Ralph Sennhauser , Sascha Hauer , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SGFyZHdhcmUgYXBwZWFycyB0byB0cmVhdCB6ZXJvIHZhbHVlIGFzIDJeMzIuIFRha2UgYWR2YW50 YWdlIG9mIHRoaXMKZmFjdCB0byBzdXBwb3J0IG9uL29mZiB2YWx1ZXMgb2YgdXAgdG8gVUlOVF9N QVgrMSA9PSAyXjMyLiBBZGp1c3QgYm90aAouYXBwbHkgYW5kIC5nZXRfc3RhdGUgdG8gaGFuZGxl IHplcm8gYXMgYSBzcGVjaWFsIGNhc2UuCgpSb3VuZGVkIHVwIGRpdmlzaW9uIHJlc3VsdCBpbiAu Z2V0X3N0YXRlIGNhbid0IGJlIHplcm8sIHNpbmNlIHRoZQpkaXZpZGVuZCBpcyBub3cgbGFyZ2Vy IHRoYW4gMC4gUmVtb3ZlIGNoZWNrIGZvciB0aGlzIGNhc2UuCgpSZXBvcnRlZC1ieTogVXdlIEts ZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KQW5hbHl6ZWQtYnk6 IFJ1c3NlbGwgS2luZyA8bGludXhAYXJtbGludXgub3JnLnVrPgpTaWduZWQtb2ZmLWJ5OiBCYXJ1 Y2ggU2lhY2ggPGJhcnVjaEB0a29zLmNvLmlsPgotLS0KIGRyaXZlcnMvZ3Bpby9ncGlvLW12ZWJ1 LmMgfCAzOSArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwaW8vZ3Bpby1tdmVidS5jIGIvZHJpdmVycy9ncGlvL2dwaW8tbXZlYnUuYwppbmRl eCA2YjAxNzg1NGNlNjEuLjc1ZTNjMjM1YmQzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncGlvL2dw aW8tbXZlYnUuYworKysgYi9kcml2ZXJzL2dwaW8vZ3Bpby1tdmVidS5jCkBAIC02NjcsMjIgKzY2 NywyMSBAQCBzdGF0aWMgdm9pZCBtdmVidV9wd21fZ2V0X3N0YXRlKHN0cnVjdCBwd21fY2hpcCAq Y2hpcCwKIAlzcGluX2xvY2tfaXJxc2F2ZSgmbXZwd20tPmxvY2ssIGZsYWdzKTsKIAogCXJlZ21h cF9yZWFkKG12cHdtLT5yZWdzLCBtdmVidV9wd21yZWdfYmxpbmtfb25fZHVyYXRpb24obXZwd20p LCAmdSk7Ci0JdmFsID0gKHVuc2lnbmVkIGxvbmcgbG9uZykgdSAqIE5TRUNfUEVSX1NFQzsKLQl2 YWwgPSBESVZfUk9VTkRfVVBfVUxMKHZhbCwgbXZwd20tPmNsa19yYXRlKTsKLQlpZiAodmFsKQot CQlzdGF0ZS0+ZHV0eV9jeWNsZSA9IHZhbDsKKwkvKiBIYXJkd2FyZSB0cmVhdHMgemVybyBhcyAy XjMyLiBTZWUgbXZlYnVfcHdtX2FwcGx5KCkuICovCisJaWYgKHUgPiAwKQorCQl2YWwgPSB1Owog CWVsc2UKLQkJc3RhdGUtPmR1dHlfY3ljbGUgPSAxOworCQl2YWwgPSBVSU5UX01BWCArIDFVTEw7 CisJc3RhdGUtPmR1dHlfY3ljbGUgPSBESVZfUk9VTkRfVVBfVUxMKHZhbCAqIE5TRUNfUEVSX1NF QywKKwkJCW12cHdtLT5jbGtfcmF0ZSk7CiAKLQl2YWwgPSAodW5zaWduZWQgbG9uZyBsb25nKSB1 OyAvKiBvbiBkdXJhdGlvbiAqLwogCXJlZ21hcF9yZWFkKG12cHdtLT5yZWdzLCBtdmVidV9wd21y ZWdfYmxpbmtfb2ZmX2R1cmF0aW9uKG12cHdtKSwgJnUpOwotCXZhbCArPSAodW5zaWduZWQgbG9u ZyBsb25nKSB1OyAvKiBwZXJpb2QgPSBvbiArIG9mZiBkdXJhdGlvbiAqLwotCXZhbCAqPSBOU0VD X1BFUl9TRUM7Ci0JdmFsID0gRElWX1JPVU5EX1VQX1VMTCh2YWwsIG12cHdtLT5jbGtfcmF0ZSk7 Ci0JaWYgKHZhbCkKLQkJc3RhdGUtPnBlcmlvZCA9IHZhbDsKKwkvKiBwZXJpb2QgPSBvbiArIG9m ZiBkdXJhdGlvbiAqLworCWlmICh1ID4gMCkKKwkJdmFsICs9IHU7CiAJZWxzZQotCQlzdGF0ZS0+ cGVyaW9kID0gMTsKKwkJdmFsICs9IFVJTlRfTUFYICsgMVVMTDsKKwlzdGF0ZS0+cGVyaW9kID0g RElWX1JPVU5EX1VQX1VMTCh2YWwgKiBOU0VDX1BFUl9TRUMsIG12cHdtLT5jbGtfcmF0ZSk7CiAK IAlyZWdtYXBfcmVhZChtdmNoaXAtPnJlZ3MsIEdQSU9fQkxJTktfRU5fT0ZGICsgbXZjaGlwLT5v ZmZzZXQsICZ1KTsKIAlpZiAodSkKQEAgLTcwNCw5ICs3MDMsMTUgQEAgc3RhdGljIGludCBtdmVi dV9wd21fYXBwbHkoc3RydWN0IHB3bV9jaGlwICpjaGlwLCBzdHJ1Y3QgcHdtX2RldmljZSAqcHdt LAogCiAJdmFsID0gKHVuc2lnbmVkIGxvbmcgbG9uZykgbXZwd20tPmNsa19yYXRlICogc3RhdGUt PmR1dHlfY3ljbGU7CiAJZG9fZGl2KHZhbCwgTlNFQ19QRVJfU0VDKTsKLQlpZiAodmFsID4gVUlO VF9NQVgpCisJaWYgKHZhbCA+IFVJTlRfTUFYICsgMVVMTCkKIAkJcmV0dXJuIC1FSU5WQUw7Ci0J aWYgKHZhbCkKKwkvKgorCSAqIFplcm8gb24vb2ZmIHZhbHVlcyBkb24ndCB3b3JrIGFzIGV4cGVj dGVkLiBFeHBlcmltZW50YXRpb24gc2hvd3MKKwkgKiB0aGF0IHplcm8gdmFsdWUgaXMgdHJlYXRl ZCBhcyAyXjMyLiBUaGlzIGJlaGF2aW9yIGlzIG5vdCBkb2N1bWVudGVkLgorCSAqLworCWlmICh2 YWwgPT0gVUlOVF9NQVggKyAxVUxMKQorCQlvbiA9IDA7CisJZWxzZSBpZiAodmFsKQogCQlvbiA9 IHZhbDsKIAllbHNlCiAJCW9uID0gMTsKQEAgLTcxNCw5ICs3MTksMTEgQEAgc3RhdGljIGludCBt dmVidV9wd21fYXBwbHkoc3RydWN0IHB3bV9jaGlwICpjaGlwLCBzdHJ1Y3QgcHdtX2RldmljZSAq cHdtLAogCXZhbCA9ICh1bnNpZ25lZCBsb25nIGxvbmcpIG12cHdtLT5jbGtfcmF0ZSAqIHN0YXRl LT5wZXJpb2Q7CiAJZG9fZGl2KHZhbCwgTlNFQ19QRVJfU0VDKTsKIAl2YWwgLT0gb247Ci0JaWYg KHZhbCA+IFVJTlRfTUFYKQorCWlmICh2YWwgPiBVSU5UX01BWCArIDFVTEwpCiAJCXJldHVybiAt RUlOVkFMOwotCWlmICh2YWwpCisJaWYgKHZhbCA9PSBVSU5UX01BWCArIDFVTEwpCisJCW9mZiA9 IDA7CisJZWxzZSBpZiAodmFsKQogCQlvZmYgPSB2YWw7CiAJZWxzZQogCQlvZmYgPSAxOwotLSAK Mi4yOS4yCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K bGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZy YWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGlu dXgtYXJtLWtlcm5lbAo=