From patchwork Wed Oct 29 16:38:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 5189431 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BEC74C11AC for ; Wed, 29 Oct 2014 16:39:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF5FB2022D for ; Wed, 29 Oct 2014 16:39:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBB53201FA for ; Wed, 29 Oct 2014 16:39:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934561AbaJ2Qiy (ORCPT ); Wed, 29 Oct 2014 12:38:54 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:60504 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934652AbaJ2Qiv (ORCPT ); Wed, 29 Oct 2014 12:38:51 -0400 Received: by mail-wg0-f51.google.com with SMTP id l18so3752970wgh.10 for ; Wed, 29 Oct 2014 09:38:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dsZzBxZ1i6mbqpLu1/etXb3FF+Xrt9HS8H8BBKKbxc8=; b=JFoFx4SgnFIATF8tl7HPHpsd/bD5SSIGMcNUMDHMC9ZtAYmeV6Q6g7p6kd15fbhi71 f/b/9KidSC23Vt3Y4C6dChpLPFuOa10801SAgDzZPk3GuilT9EhSDhmm5hkfHn4ihHxv fRoNsZ+qcHs9uwKf8Eo+8DSsfIiilTBdnHKV3MyO6DDmP94oLYyXIlWnCZIplI582ErL XbRxrBTfimDO3Zf5/mBmUpsvznA//K5sRYa6LK5eb6kKylfYHgxMGyjz/Q6A0ww/u3Ww 5lNambcg+jiZNoZCzMAAUvyTeilY76Yjfop3GuvzrE0K0lZGsvfLUKyA+DYMXISYCq5w M2Qw== X-Gm-Message-State: ALoCoQnacyKe3TczTrEK0XZ8VWdNGYDtR0iTpvfYbTItQjQk5C6pyCT8/meIQdboiouQaX7fLa+K X-Received: by 10.194.235.132 with SMTP id um4mr13597703wjc.91.1414600730505; Wed, 29 Oct 2014 09:38:50 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id s8sm5745523wjx.9.2014.10.29.09.38.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Oct 2014 09:38:49 -0700 (PDT) From: Daniel Thompson To: Greg Kroah-Hartman Cc: Daniel Thompson , David Brown , Daniel Walker , Bryan Huntsman , Jiri Slaby , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal Subject: [PATCH] serial: msm: Add magic SysRq support in dmmode Date: Wed, 29 Oct 2014 16:38:32 +0000 Message-Id: <1414600712-20721-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the _dm RX handler detects breaks but does not pass any characters to uart_handle_sysrq_char(). The _dm optimizations combined with the port's spin lock make if difficult to pass all characters to the sysrq logic because we cannot safely call uart_handle_sysrq_char() when the lock is held without deadlock (the console handler also takes the lock). Rather than passing all characters via uart_handle_sysrq_char() this patch only passes the last few characters in the FIFO. This should include all characters typed as a slow (human) rate. This makes the problem much simpler and allows us to move the handling of these characters outside of the port lock. This makes magic SysRq work if there is a human at the keyboard (or a short delay in a script). Signed-off-by: Daniel Thompson --- drivers/tty/serial/msm_serial.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 4b6c783..24c4fd1 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -104,6 +104,7 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr) unsigned int sr; int count = 0; struct msm_port *msm_port = UART_TO_MSM(port); + unsigned char buf[4]; if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) { port->icount.overrun++; @@ -125,11 +126,10 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr) port->icount.rx += count; while (count > 0) { - unsigned char buf[4]; - sr = msm_read(port, UART_SR); if ((sr & UART_SR_RX_READY) == 0) { msm_port->old_snap_state -= count; + count = 0; break; } ioread32_rep(port->membase + UARTDM_RF, buf, 1); @@ -140,13 +140,33 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr) } else if (sr & UART_SR_PAR_FRAME_ERR) port->icount.frame++; - /* TODO: handle sysrq */ + /* The last few characters receive special processing below. */ + if (count <= 2) + break; + tty_insert_flip_string(tport, buf, min(count, 4)); count -= 4; } spin_unlock(&port->lock); + + /* + * We have deferred the last few characters to be processed + * with the port unlocked. This allows all characters received at + * "human speed" to be passed through the magic SysRq handling. + * The hardware sends us two characters after a break (the second + * of which is \0) so we are forced to process up to two final + * characters rather than just one. + */ + if (count > 0) { + if (!uart_handle_sysrq_char(port, buf[0])) + tty_insert_flip_string(tport, buf, count); + else if (count > 1 && !uart_handle_sysrq_char(port, buf[1])) + tty_insert_flip_char(tport, buf[1], 0); + } + tty_flip_buffer_push(tport); + spin_lock(&port->lock); if (misr & (UART_IMR_RXSTALE))