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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 9C6DEC56202 for ; Tue, 27 Oct 2020 14:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61BAB22384 for ; Tue, 27 Oct 2020 14:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809076; bh=iDxgveLN2b0CKm9G7QR9mf/hC+Mj7iydSynSeUUnsA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U3G/zEgY2iK4h5/MxAjdUrjN7zTsP9cwDeOHGzMchR+F6ALlDU2LhvCN2hPvwEwDW eqg5yQoLRNOKNA2LwOF/cXAMElRFAi/eOPiMp7DC15oUzXUuqxAAMjJE4YUXQLy1Os EfJjP12ZNxIdOzSn1MO1A02/kC0axog/zOl0ryp8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2902184AbgJ0ObO (ORCPT ); Tue, 27 Oct 2020 10:31:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:54322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759134AbgJ0O2B (ORCPT ); Tue, 27 Oct 2020 10:28:01 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6CE6320780; Tue, 27 Oct 2020 14:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808881; bh=iDxgveLN2b0CKm9G7QR9mf/hC+Mj7iydSynSeUUnsA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sWKpQcyKIM8ZZpVKud1KwhpAS/lYmEU2SVWC1y03GE44q0cQZpWxeZwCIKbKME3I6 DRfsbtrz/UrAFsrLBfjm4zjcb8kekOvIYDztXmqpRBF3UFoIa8SoOXYbL/N1ewx/7V 6CY/jyJUcwFDeg70jABJHxJRKhV4gjdCDF4pLVe8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fugang Duan , Peng Fan Subject: [PATCH 4.19 260/264] tty: serial: fsl_lpuart: fix lpuart32_poll_get_char Date: Tue, 27 Oct 2020 14:55:18 +0100 Message-Id: <20201027135442.862166404@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peng Fan commit 29788ab1d2bf26c130de8f44f9553ee78a27e8d5 upstream. The watermark is set to 1, so we need to input two chars to trigger RDRF using the original logic. With the new logic, we could always get the char when there is data in FIFO. Suggested-by: Fugang Duan Signed-off-by: Peng Fan Link: https://lore.kernel.org/r/20200929095509.21680-1-peng.fan@nxp.com Cc: stable Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/fsl_lpuart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -563,7 +563,7 @@ static void lpuart32_poll_put_char(struc static int lpuart32_poll_get_char(struct uart_port *port) { - if (!(lpuart32_read(port, UARTSTAT) & UARTSTAT_RDRF)) + if (!(lpuart32_read(port, UARTWATER) >> UARTWATER_RXCNT_OFF)) return NO_POLL_CHAR; return lpuart32_read(port, UARTDATA);