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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 2B113C32750 for ; Fri, 2 Aug 2019 09:38:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0524D20679 for ; Fri, 2 Aug 2019 09:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738698; bh=aEJf6KCW5crpWfxYJqdtY135r5x4Qx1nMJ6a1u3C6iM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yVLvc8I2ZdAPQOsAymaoU2FYvyFjSGmZI5NTFAtMC9dKaP4nJLhHxfM9B9XElgbyL 6TZL5ZLF/awnJG6FCUTkgtMrxulpgnNsEXXHrJ5uw1T0xj5Nbk+hw9VVRi6mtneXP4 ynL38wkX163zgPDdZkVi9HRdchiSRxhkMwCdlxjQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391577AbfHBJfG (ORCPT ); Fri, 2 Aug 2019 05:35:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:35364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391601AbfHBJfF (ORCPT ); Fri, 2 Aug 2019 05:35:05 -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 6C8C02182B; Fri, 2 Aug 2019 09:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738504; bh=aEJf6KCW5crpWfxYJqdtY135r5x4Qx1nMJ6a1u3C6iM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CAqM0mLUd3mNx9sMMnKTkq/4dwmz39urGKic3wh1u6PKDdNM2iRK9M/WB8Ryx1yq+ PUnNXR8tvNjFvEXt8rp01QJXwyKj2svk2YRYdpr4A6aziGtT998aYWYaBU/FyT2EDB mgn0b0V2iRJbBH3xH071feszpZCvzZhyU46fdGto= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jorge Ramirez-Ortiz , Sasha Levin Subject: [PATCH 4.4 113/158] tty: serial: msm_serial: avoid system lockup condition Date: Fri, 2 Aug 2019 11:28:54 +0200 Message-Id: <20190802092227.032983819@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit ba3684f99f1b25d2a30b6956d02d339d7acb9799 ] The function msm_wait_for_xmitr can be taken with interrupts disabled. In order to avoid a potential system lockup - demonstrated under stress testing conditions on SoC QCS404/5 - make sure we wait for a bounded amount of time. Tested on SoC QCS404. Signed-off-by: Jorge Ramirez-Ortiz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/msm_serial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 5f0ded6fc4e9..eaeb098b5d6a 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -222,10 +222,14 @@ static void msm_request_rx_dma(struct msm_port *msm_port, resource_size_t base) static inline void msm_wait_for_xmitr(struct uart_port *port) { + unsigned int timeout = 500000; + while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) { if (msm_read(port, UART_ISR) & UART_ISR_TX_READY) break; udelay(1); + if (!timeout--) + break; } msm_write(port, UART_CR_CMD_RESET_TX_READY, UART_CR); } -- 2.20.1