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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 47F39C2B9F4 for ; Fri, 25 Jun 2021 14:37:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 313D161969 for ; Fri, 25 Jun 2021 14:37:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231931AbhFYOj3 (ORCPT ); Fri, 25 Jun 2021 10:39:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:60390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231738AbhFYOjT (ORCPT ); Fri, 25 Jun 2021 10:39:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D6156197D; Fri, 25 Jun 2021 14:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624631818; bh=TY3iBQKER6Z5ph8zWEWZU/pK1GZsZOyt08z1Cvndgwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tFH2krxAUdnVo2o1eH28xZYBc+sPvoHTPUDNA/jnWE6HQ3sGHzClSguGJVlf4gFnh 7cT6uTLphBArfn1ryGI2KxEyFbTTvtmSAp04YCzckbv0oxSeawYzYq9GWWx3Ku9RY2 NitMEtgrlzzP3mLKe2RGhgy5+x10fMLInO6J8i4NFY+aWcS9SnvbBbu+UxSHAtVDU4 jGtsVy3ZWf+2VX9TCAFJL7vzw54U/rHXou84km2DrwGygTCtDQgO6p+DrWfA9v07Ln GZrpJTnnsmWFrHQ3hOjhcEKQGDMPe5bOk638elEkePEHtUO06NCnRKXMxfNNcGl4ho Rc5G3vV5XmFOA== Received: by pali.im (Postfix) id 64A02A89; Fri, 25 Jun 2021 16:36:56 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Michael Turquette , Stephen Boyd , Rob Herring , Greg Kroah-Hartman Cc: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Vladimir Vid , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Geert Uytterhoeven , linux-clk@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 02/11] serial: mvebu-uart: do not allow changing baudrate when uartclk is not available Date: Fri, 25 Jun 2021 16:36:08 +0200 Message-Id: <20210625143617.12826-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210625143617.12826-1-pali@kernel.org> References: <20210624224909.6350-1-pali@kernel.org> <20210625143617.12826-1-pali@kernel.org> 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 Testing mvuart->clk for non-error is not enough as mvuart->clk may contain valid clk pointer but when clk_prepare_enable(mvuart->clk) failed then port->uartclk is zero. When mvuart->clk is not available then port->uartclk is zero too. Parent clock rate port->uartclk is needed to calculate UART clock divisor and without it is not possible to change baudrate. So fix test condition when it is possible to change baudrate. Signed-off-by: Pali Rohár Fixes: 68a0db1d7da2 ("serial: mvebu-uart: add function to change baudrate") --- drivers/tty/serial/mvebu-uart.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c index f81bfdaa608c..dc0c26824ddb 100644 --- a/drivers/tty/serial/mvebu-uart.c +++ b/drivers/tty/serial/mvebu-uart.c @@ -445,12 +445,11 @@ static void mvebu_uart_shutdown(struct uart_port *port) static int mvebu_uart_baud_rate_set(struct uart_port *port, unsigned int baud) { - struct mvebu_uart *mvuart = to_mvuart(port); unsigned int d_divisor, m_divisor; u32 brdv, osamp; - if (IS_ERR(mvuart->clk)) - return -PTR_ERR(mvuart->clk); + if (!port->uartclk) + return -EOPNOTSUPP; /* * The baudrate is derived from the UART clock thanks to two divisors: -- 2.20.1 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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 6E816C2B9F4 for ; Fri, 25 Jun 2021 14:39:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3C4D56195F for ; Fri, 25 Jun 2021 14:39:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C4D56195F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=p1zOTTwn58A7dm7HUa2/C3OhQM4ihAyGPkKM/Vnr6vc=; b=IXDaqhf1/LeBd4 eXm7H+Zvwq0R+vxAQVxtfca8EzvQrsrVLRbcQhChyIP+eGayEEprG8nQwbGaXNK9xxbj9PTiyawT3 GXyeQesFwjc5fh1KlcmxpnyxwYhDaO/k/6Ia/c9vDegzT8kpsR+JutkdpB503wVsoHqL6IuHhtge5 l5xDxDMLXdWS5+bW2Bcs5q7mSfjCaO6VNVWUeU6MQrwyZG3u3G4GJ7Jnj8SKzwsGVkxBrhciD/4Ki +bRHjLyv08d61qKP3QV9LAPPxa/9F8hnuCcqLIUB1orAfcHTBp7A9jeKAxkaRRcaF4JnkJVuMj68D R7qX23+78X+rgZWR02sQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwmxc-001y9k-8F; Fri, 25 Jun 2021 14:37:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwmx0-001xzW-Lt for linux-arm-kernel@lists.infradead.org; Fri, 25 Jun 2021 14:37:00 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D6156197D; Fri, 25 Jun 2021 14:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624631818; bh=TY3iBQKER6Z5ph8zWEWZU/pK1GZsZOyt08z1Cvndgwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tFH2krxAUdnVo2o1eH28xZYBc+sPvoHTPUDNA/jnWE6HQ3sGHzClSguGJVlf4gFnh 7cT6uTLphBArfn1ryGI2KxEyFbTTvtmSAp04YCzckbv0oxSeawYzYq9GWWx3Ku9RY2 NitMEtgrlzzP3mLKe2RGhgy5+x10fMLInO6J8i4NFY+aWcS9SnvbBbu+UxSHAtVDU4 jGtsVy3ZWf+2VX9TCAFJL7vzw54U/rHXou84km2DrwGygTCtDQgO6p+DrWfA9v07Ln GZrpJTnnsmWFrHQ3hOjhcEKQGDMPe5bOk638elEkePEHtUO06NCnRKXMxfNNcGl4ho Rc5G3vV5XmFOA== Received: by pali.im (Postfix) id 64A02A89; Fri, 25 Jun 2021 16:36:56 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Michael Turquette , Stephen Boyd , Rob Herring , Greg Kroah-Hartman Cc: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Vladimir Vid , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Geert Uytterhoeven , linux-clk@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 02/11] serial: mvebu-uart: do not allow changing baudrate when uartclk is not available Date: Fri, 25 Jun 2021 16:36:08 +0200 Message-Id: <20210625143617.12826-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210625143617.12826-1-pali@kernel.org> References: <20210624224909.6350-1-pali@kernel.org> <20210625143617.12826-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210625_073658_772079_AC69381E X-CRM114-Status: GOOD ( 14.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 VGVzdGluZyBtdnVhcnQtPmNsayBmb3Igbm9uLWVycm9yIGlzIG5vdCBlbm91Z2ggYXMgbXZ1YXJ0 LT5jbGsgbWF5IGNvbnRhaW4KdmFsaWQgY2xrIHBvaW50ZXIgYnV0IHdoZW4gY2xrX3ByZXBhcmVf ZW5hYmxlKG12dWFydC0+Y2xrKSBmYWlsZWQgdGhlbgpwb3J0LT51YXJ0Y2xrIGlzIHplcm8uCgpX aGVuIG12dWFydC0+Y2xrIGlzIG5vdCBhdmFpbGFibGUgdGhlbiBwb3J0LT51YXJ0Y2xrIGlzIHpl cm8gdG9vLgoKUGFyZW50IGNsb2NrIHJhdGUgcG9ydC0+dWFydGNsayBpcyBuZWVkZWQgdG8gY2Fs Y3VsYXRlIFVBUlQgY2xvY2sgZGl2aXNvcgphbmQgd2l0aG91dCBpdCBpcyBub3QgcG9zc2libGUg dG8gY2hhbmdlIGJhdWRyYXRlLgoKU28gZml4IHRlc3QgY29uZGl0aW9uIHdoZW4gaXQgaXMgcG9z c2libGUgdG8gY2hhbmdlIGJhdWRyYXRlLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBh bGlAa2VybmVsLm9yZz4KRml4ZXM6IDY4YTBkYjFkN2RhMiAoInNlcmlhbDogbXZlYnUtdWFydDog YWRkIGZ1bmN0aW9uIHRvIGNoYW5nZSBiYXVkcmF0ZSIpCi0tLQogZHJpdmVycy90dHkvc2VyaWFs L212ZWJ1LXVhcnQuYyB8IDUgKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyks IDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy90dHkvc2VyaWFsL212ZWJ1LXVh cnQuYyBiL2RyaXZlcnMvdHR5L3NlcmlhbC9tdmVidS11YXJ0LmMKaW5kZXggZjgxYmZkYWE2MDhj Li5kYzBjMjY4MjRkZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdHR5L3NlcmlhbC9tdmVidS11YXJ0 LmMKKysrIGIvZHJpdmVycy90dHkvc2VyaWFsL212ZWJ1LXVhcnQuYwpAQCAtNDQ1LDEyICs0NDUs MTEgQEAgc3RhdGljIHZvaWQgbXZlYnVfdWFydF9zaHV0ZG93bihzdHJ1Y3QgdWFydF9wb3J0ICpw b3J0KQogCiBzdGF0aWMgaW50IG12ZWJ1X3VhcnRfYmF1ZF9yYXRlX3NldChzdHJ1Y3QgdWFydF9w b3J0ICpwb3J0LCB1bnNpZ25lZCBpbnQgYmF1ZCkKIHsKLQlzdHJ1Y3QgbXZlYnVfdWFydCAqbXZ1 YXJ0ID0gdG9fbXZ1YXJ0KHBvcnQpOwogCXVuc2lnbmVkIGludCBkX2Rpdmlzb3IsIG1fZGl2aXNv cjsKIAl1MzIgYnJkdiwgb3NhbXA7CiAKLQlpZiAoSVNfRVJSKG12dWFydC0+Y2xrKSkKLQkJcmV0 dXJuIC1QVFJfRVJSKG12dWFydC0+Y2xrKTsKKwlpZiAoIXBvcnQtPnVhcnRjbGspCisJCXJldHVy biAtRU9QTk9UU1VQUDsKIAogCS8qCiAJICogVGhlIGJhdWRyYXRlIGlzIGRlcml2ZWQgZnJvbSB0 aGUgVUFSVCBjbG9jayB0aGFua3MgdG8gdHdvIGRpdmlzb3JzOgotLSAKMi4yMC4xCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5l bCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6 Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=