From patchwork Fri Jun 7 15:39:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 166156 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp796315ili; Fri, 7 Jun 2019 08:43:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiSNCpHmgcYtpKvxUe6aU/+zwWex/KK1xb7JzlazO+vo03pBe4Ef3KgnR1gjRZqbSJZ5t8 X-Received: by 2002:a17:90a:2247:: with SMTP id c65mr6009345pje.24.1559922216411; Fri, 07 Jun 2019 08:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922216; cv=none; d=google.com; s=arc-20160816; b=aBX1I17K35nRFacycpaxxYpVZOPbVbgFqqJP1Ugbk6d8maElD+wzWRz2Pha46Rwxz6 Brc0FoCKzjPJU+G6xS7apwXqfh25wSsmCY+l+zqbfs3oNYIT3zsRb6tO5Vr7fTnPw8QV uYpxJt4YEE/UzxKaWDmVn8ppQvtlvnpfkS+Fi8zKURqi/MEf4MPnkaNCSJjv+o91gReO +lBkm8vzwhbaP3btaf69VtIEo7r2SxuSXgNj2HAyEFR/zSLE9zsv3a+O/HNq1Hncgmf4 1lGHw2TY2nsv3PHDtlaSQZJAO52qLoLd5w+EXSC/7zH6LcTltMDYxfOTSfTaLjol767c uHTQ== 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=w7c0uN89M1txJb4p63sZ5NNeE5b4c28B+NR33o4WlFE=; b=N1YkPWp+ZyKogdLF5NSs4Lp8hiP6Vi2EuJ/651cZW/NBwWQlULH7c38sZn4ZiJbNrT irZEdai9ZfScb0Uex73tZ2+6HqNlJ+TthV7X4ChMB2sNjmeUtgm7zEEhhlGaaUExUE0F GAlBZoTk9LnWu6kCyGHx6N6eEQPZ3tH/AhrAyx75OjXjKp5FNF2Xk2b2X18PlNC89Plw gE9P70FWI62S2ZbyjVYByFnJRZ94kUgnkwZhrFeUoRgtjjN9Dg6jxWVySMwIr/YzgQbh nMeB2SczH5tkP60QmjpIVTje8Zz+J83qVD1DlbFVLePkerYjdL9bo8+UpeBX6DDkCUVq 2ypw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TRoFRKu6; 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 j16si2110776pfn.225.2019.06.07.08.43.36; Fri, 07 Jun 2019 08:43:36 -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=TRoFRKu6; 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 S1730880AbfFGPna (ORCPT + 30 others); Fri, 7 Jun 2019 11:43:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:54606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729770AbfFGPn1 (ORCPT ); Fri, 7 Jun 2019 11:43:27 -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 B3DC12146E; Fri, 7 Jun 2019 15:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922206; bh=op1gChslQGxNPa936LUqZEqpWuej5GsHZdQxDraDVkw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRoFRKu6TYSDfOQUQCdW4yLfvlFufaKA4B8If+o8u8mrX1VOlGDM+XCyAFv0AEuSt FimCE7BR78l/vJDdIUmFwywaEIOobWC/0hQInQLoHMGoVKuvgrk08T7l69DGwAsQf9 eBXIsfMBaHI6Q5rbn1HXfcy7Yno7huh54nvgbSQI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jorge Ramirez-Ortiz , Bjorn Andersson , Stephen Boyd Subject: [PATCH 4.14 48/69] tty: serial: msm_serial: Fix XON/XOFF Date: Fri, 7 Jun 2019 17:39:29 +0200 Message-Id: <20190607153854.275715769@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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jorge Ramirez-Ortiz commit 61c0e37950b88bad590056286c1d766b1f167f4e upstream. When the tty layer requests the uart to throttle, the current code executing in msm_serial will trigger "Bad mode in Error Handler" and generate an invalid stack frame in pstore before rebooting (that is if pstore is indeed configured: otherwise the user shall just notice a reboot with no further information dumped to the console). This patch replaces the PIO byte accessor with the word accessor already used in PIO mode. Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs") Cc: stable@vger.kernel.org Signed-off-by: Jorge Ramirez-Ortiz Reviewed-by: Bjorn Andersson Reviewed-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/msm_serial.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -868,6 +868,7 @@ static void msm_handle_tx(struct uart_po struct circ_buf *xmit = &msm_port->uart.state->xmit; struct msm_dma *dma = &msm_port->tx_dma; unsigned int pio_count, dma_count, dma_min; + char buf[4] = { 0 }; void __iomem *tf; int err = 0; @@ -877,10 +878,12 @@ static void msm_handle_tx(struct uart_po else tf = port->membase + UART_TF; + buf[0] = port->x_char; + if (msm_port->is_uartdm) msm_reset_dm_count(port, 1); - iowrite8_rep(tf, &port->x_char, 1); + iowrite32_rep(tf, buf, 1); port->icount.tx++; port->x_char = 0; return; From patchwork Fri Jun 7 15:39:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 166154 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp794998ili; Fri, 7 Jun 2019 08:42:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzC5DjTg9JoBIJEDgbwoRmocoN8b30Hs10REoqnESX89f25xpuuVAtR7BKrp/yD6rb8Ms0G X-Received: by 2002:a17:90a:1911:: with SMTP id 17mr6350788pjg.113.1559922146586; Fri, 07 Jun 2019 08:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922146; cv=none; d=google.com; s=arc-20160816; b=lnvMYaMm58Zcm3c4f9cXH7yQ+kFNWqfkLV0aNdP/67FF40ZufTR4PgQPOiFWFoM3NL 6bFD0mVUVmfUxrofSriC92fnn1/oGO4BAoyUcaMizRSs751EbSKQlWqpM5Zzt2jf7vj6 tROfrDwyNGAzSG18WZKIOfs3d4lESNboKLRk/Z0Suxvc9qpqZfOfrxiG21XG2XfzjUIo 3lq3NsClPYerbK2RsILIRtcTvXq0ItfJgg9KZ6yQmCYaMSBjIyLjLaaMRXHC0sXcFpgH ByE0IS+DOfq13EIPqzjz9IirfhkmARKDiLlz7FxHK/VL/6zGAdDmaXG2xNtln7ZNOHNe VR8w== 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=jWVQK34IeXQWR3CxPPcczTFGbYHXrJn54Np5TJUXoR8=; b=e15MxHdtInQwHBCl1GnjSW+ACMp/kvn6+xsBHPKZptKHOFP+T5Di1PrduR5LpM0eVt c5+St6LCzYmzomTIzQtu0vqUkc2ZK5VE/5yCKVXUtgGYCbwGAwv33bonXcLxwQAktmMd trtRZR2NHtM05KLjuzE6b1YWhZ2Nn3N1G0GXl+/I/hjnZ9tNAOUe8O8bt20UUMdCtHGM iUaQZ3FEwoK3GP31RchxiO/xwX0v5wveUMuePp7vfHqj/4dflcvV72jPlXH5ErYs+r6J 3aGbMTKoYnX8azqbl3oALvOS4IpSm0Q1oMe4SdGgpnhmdRvmik3M6F11VGqg1YNWdulT 9otA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0NUzi6cy; 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 p16si2110344pgd.370.2019.06.07.08.42.26; Fri, 07 Jun 2019 08:42:26 -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=0NUzi6cy; 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 S1730569AbfFGPmZ (ORCPT + 30 others); Fri, 7 Jun 2019 11:42:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:52958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730512AbfFGPmW (ORCPT ); Fri, 7 Jun 2019 11:42:22 -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 550E02147A; Fri, 7 Jun 2019 15:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922141; bh=K+5bd6fJvvBu5PYuyR40E8AsVzhI4d5StAL0HDet8hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0NUzi6cy39aTmd9kJoJk5xKLnhrtulT9X2CkRbJG3tPQ5JoNwEqD0p/lI9xa5po3Y CN82v3umW1pwLzfGxzn/pHBkYxmSK0wRd1/7XqX1pZc+ZmZyHg4SFw7w0uj4VyUogZ lrqbDOOBjnQW2yot6cKOE8wRkaIDBR5tOxUHsUBY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 4.14 52/69] docs: Fix conf.py for Sphinx 2.0 Date: Fri, 7 Jun 2019 17:39:33 +0200 Message-Id: <20190607153854.682187993@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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan Corbet commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream. Our version check in Documentation/conf.py never envisioned a world where Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our version check to handle higher version numbers correctly. Cc: stable@vger.kernel.org Signed-off-by: Jonathan Corbet Signed-off-by: Greg Kroah-Hartman --- Documentation/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -37,7 +37,7 @@ needs_sphinx = '1.3' extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure'] # The name of the math extension changed on Sphinx 1.4 -if major == 1 and minor > 3: +if (major == 1 and minor > 3) or (major > 1): extensions.append("sphinx.ext.imgmath") else: extensions.append("sphinx.ext.pngmath") From patchwork Fri Jun 7 15:39:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 166170 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp813452ili; Fri, 7 Jun 2019 08:58:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDv2UfgaBhjaATFm37zoev492elahMHGsT68nnkuWD0bWdPOZrfJnz0WN404DLeKGk55iW X-Received: by 2002:a17:90a:cb97:: with SMTP id a23mr6147516pju.67.1559923126319; Fri, 07 Jun 2019 08:58:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923126; cv=none; d=google.com; s=arc-20160816; b=IlKGC5VYaOGwlKdn9gQpbMaB0hTI5cT7XlPAPxkYoxzE/VTmszJYso0hr057O+5fLQ fk9K3vs/x+oHIGKU/8G/lOedYFDrcbHezz9t4AfoK7OvITr1y/7KQx6GsRtg2QV+aisq Ve0p76qyBTUxT8mBczNpBOcEdj2zcTGZy/cGZDSQSAqL8GiJeJ/KVeWovuINLaSbo36s +L15LybBDzmnXRbhce5I6Q8ffL8oqMVDQfmcZCVOypchQMaiNcUP4KNECQwdeY8nQ89y QwCnb7XJPNsveLxUfVW9SdZwa/O1gJhMTpX/8bat/478joY12vw478ukoqbyXcFQ5Huw B8Ig== 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=9TKJWUo9fsrCabcjKTsQlEz/tNSaaXeHqfHT3Zq/wYE=; b=gNbewepFREBeaWE8kUH0XUX8mALn5MZ1DHNOkygvNUiU/ickk1sIJMjvE8lo1lNj8H lfGSlF7u3g2oerGOb/sW2zrwEFaa3SeKhswmexRqjw4UB9flM4MMXVq1xJFvR2nVaoOQ XWgtHOSOev7ESQ5I8bbEJKcpls9KhYuV44L0GkQUi6HYqms/ZVS3ecyJNTGn1cJ3gF5/ sg61ZqFsZuApVQ9pD8whZvYnF8F/2RPjKVDNjr7o7FoQ+pyAcnAbl/THXC1OpzegvhVb mn6QqWgGfK8etfIdu2pX+IAeaWZwOJGaB8FeXX9ZdVWiy/BcYFsi8iAak/TL+9UQI1Vn 6Vcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="hT72/HQY"; 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 b24si2051535pfd.156.2019.06.07.08.58.46; Fri, 07 Jun 2019 08:58:46 -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="hT72/HQY"; 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 S1730579AbfFGPm2 (ORCPT + 30 others); Fri, 7 Jun 2019 11:42:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:53066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730561AbfFGPmZ (ORCPT ); Fri, 7 Jun 2019 11:42:25 -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 02E162147A; Fri, 7 Jun 2019 15:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922144; bh=Mk5P4fya3KDDGfujSsNIgINShNzGSC6TdI4Mp4kjOcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hT72/HQYU8RzCOYfsRNUECSnZ2QlV+FAevqlXOVNWajyv512lNbzx6KQU3oTOP4yJ hxIRBbz25s0eXsQ2tmKZT/G5MNM913VDPC85GpbHH78V+9Fy9Ydf+OsM36xeVQ8x8I QqrI/nP0A6W1SDC4zbz4YyyzMCv8m/1Ax+5vqYBk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 4.14 53/69] doc: Cope with the deprecation of AutoReporter Date: Fri, 7 Jun 2019 17:39:34 +0200 Message-Id: <20190607153854.768374834@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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan Corbet commit 2404dad1f67f8917e30fc22a85e0dbcc85b99955 upstream. AutoReporter is going away; recent versions of sphinx emit a warning like: Documentation/sphinx/kerneldoc.py:125: RemovedInSphinx20Warning: AutodocReporter is now deprecated. Use sphinx.util.docutils.switch_source_input() instead. Make the switch. But switch_source_input() only showed up in 1.7, so we have to do ugly version checks to keep things working in older versions. Cc: stable@vger.kernel.org Signed-off-by: Jonathan Corbet Signed-off-by: Greg Kroah-Hartman --- Documentation/sphinx/kerneldoc.py | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) --- a/Documentation/sphinx/kerneldoc.py +++ b/Documentation/sphinx/kerneldoc.py @@ -37,7 +37,17 @@ import glob from docutils import nodes, statemachine from docutils.statemachine import ViewList from docutils.parsers.rst import directives, Directive -from sphinx.ext.autodoc import AutodocReporter + +# +# AutodocReporter is only good up to Sphinx 1.7 +# +import sphinx + +Use_SSI = sphinx.__version__[:3] >= '1.7' +if Use_SSI: + from sphinx.util.docutils import switch_source_input +else: + from sphinx.ext.autodoc import AutodocReporter __version__ = '1.0' @@ -117,13 +127,7 @@ class KernelDocDirective(Directive): lineoffset += 1 node = nodes.section() - buf = self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter - self.state.memo.reporter = AutodocReporter(result, self.state.memo.reporter) - self.state.memo.title_styles, self.state.memo.section_level = [], 0 - try: - self.state.nested_parse(result, 0, node, match_titles=1) - finally: - self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = buf + self.do_parse(result, node) return node.children @@ -132,6 +136,20 @@ class KernelDocDirective(Directive): (" ".join(cmd), str(e))) return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))] + def do_parse(self, result, node): + if Use_SSI: + with switch_source_input(self.state, result): + self.state.nested_parse(result, 0, node, match_titles=1) + else: + save = self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter + self.state.memo.reporter = AutodocReporter(result, self.state.memo.reporter) + self.state.memo.title_styles, self.state.memo.section_level = [], 0 + try: + self.state.nested_parse(result, 0, node, match_titles=1) + finally: + self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = save + + def setup(app): app.add_config_value('kerneldoc_bin', None, 'env') app.add_config_value('kerneldoc_srctree', None, 'env')