Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp346459ybi; Fri, 7 Jun 2019 09:00:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwHQ0giE/oj+1Zj21RBBQb/4DijFVU+LtR0Cv6dbAui8y4BOLDzK7YBFdMxr8ij6TSB01s+ X-Received: by 2002:a63:27c7:: with SMTP id n190mr3474857pgn.250.1559923248585; Fri, 07 Jun 2019 09:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923248; cv=none; d=google.com; s=arc-20160816; b=vjo3In/HafvuXlE13azlFMD58zSiVWLj0PMgEo8a9O7YTSJBXJ22usN+6+KKpuFuJy RbO7bGnX/u5to3Wqq/mGddM859R3iKB64FjwfnTaz1gxzMJhdj/Dcp4UK7n10UzCn1z0 LgUvPaIOpl3K1kP9y82Z0YY4hHPIBrmY9HhQgI0JYIbYhxI9jgBoeoIYwv0La1/apkHE dzARBPLclXL7cHNwpnX9hEWw4EtxcsD2tPCPnZjcgyZSHnlGdk3QMTMcMazWbC3pfXH8 eiiuzFjm3n48RVRWI4wpUA/FriztjLJT7PkAk2eOMsiLE/pv7F/i7A52du4qa9kABnLo mJsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PkAqhxGxHasH9IcE++UEZ8Ay/avfWDmz2JrLDk8TX3E=; b=DCMqgW0LbcrsrAkvnW3dwzs8mSaNd8FbV93XtDDBebMbLuzlDquw+WAXjh0depymvz irMv8Ol6akaZI0r/9TgUhReCyhR8s6r7DjkVJZt/ms/xB4agsLiZnNS0/+iud/BrWOzx fIkDIWCWxQhztKffO11uOh7R2+JEq072FfwDWEInWQj6SewDXOr4AW+9sxX1H5XdJ+Up 4Gs45mH1nF+AT5SGDs50F4AUJGe+PJfdA9Jm4ELXSmGQMNxTV9WCnAI0kNC43mym/yTV KgPeQogHt3lZ5jT39fY92dMFnXU9Bsa6NI/T6y9ZuKK2bvnJMzLke96acqjdpge9D0hh 8TZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pr1dL4kr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si2130503pjv.64.2019.06.07.09.00.30; Fri, 07 Jun 2019 09:00:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pr1dL4kr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730616AbfFGPmf (ORCPT + 99 others); Fri, 7 Jun 2019 11:42:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:53278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730604AbfFGPmd (ORCPT ); Fri, 7 Jun 2019 11:42:33 -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 89132214C6; Fri, 7 Jun 2019 15:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922153; bh=Jf33kmLLFmEOiNWvM0nQgXO0kil+1qKY4cJex/Oqgak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pr1dL4kri3GG4GAjxJHXoADY+SYs7TOMT0salUBXqtThkWAXPChF+CE5YzkbvkPQ2 clxFc1fHu7Fo+itRE2H0r8Tggity5k7Wh4CBI6XV4fesQxHdQ07P0kY7C2ClGa9cEw bvZ5Z4E7ptrgIFI2bqULRr/Kgc+OQnrWGAjt59+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Rodin , Eugeniu Rosca , Simon Horman , Wolfram Sang , Geert Uytterhoeven , "George G. Davis" Subject: [PATCH 4.14 56/69] serial: sh-sci: disable DMA for uart_console Date: Fri, 7 Jun 2019 17:39:37 +0200 Message-Id: <20190607153855.055695580@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: George G. Davis commit 099506cbbc79c0bd52b19cb6b930f256dabc3950 upstream. As noted in commit 84b40e3b57ee ("serial: 8250: omap: Disable DMA for console UART"), UART console lines use low-level PIO only access functions which will conflict with use of the line when DMA is enabled, e.g. when the console line is also used for systemd messages. So disable DMA support for UART console lines. Reported-by: Michael Rodin Link: https://patchwork.kernel.org/patch/10929511/ Tested-by: Eugeniu Rosca Reviewed-by: Simon Horman Reviewed-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven Cc: stable@vger.kernel.org Signed-off-by: George G. Davis Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/sh-sci.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1479,6 +1479,13 @@ static void sci_request_dma(struct uart_ dev_dbg(port->dev, "%s: port %d\n", __func__, port->line); + /* + * DMA on console may interfere with Kernel log messages which use + * plain putchar(). So, simply don't use it with a console. + */ + if (uart_console(port)) + return; + if (!port->dev->of_node) return;