From patchwork Fri Mar 23 18:49:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132359 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp950971ljb; Fri, 23 Mar 2018 11:53:38 -0700 (PDT) X-Google-Smtp-Source: AG47ELs+0WHUSPupVhQ+qbvgXGowieBDHnBwI07VdIFP0A7he3Nsj2gTP5qd5NV/OjtX9NaAQkL8 X-Received: by 10.55.46.194 with SMTP id u185mr25575279qkh.63.1521831218857; Fri, 23 Mar 2018 11:53:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521831218; cv=none; d=google.com; s=arc-20160816; b=GAavtrdGBunDhTLtAz8Ldv8Iu21GGBo0wHB9uFkJwjWpx/9qVCEGDhISIqT3mmj0/Q tEyfKmxNYrOQjzzXTHnz6zrzP0dJWCqvhzy9NH3q7it4eRQHP/FCMon0aQTBxT+op9u5 j6W7cboT94l+pVi0R/6KxQSrfleqjOQBqUQpxTq2UhijihGd/py5pXmmEqkKZKlMY7T4 3bKcI/if3WZRO1TW0S2DGdGUuvHqP+p0iVgH8MdGkT0gcql7YyERfkJuKNKMHlUuFgXU JqWsknxlxuA5muPAWxllHu5xl8sAj96Ty7CACBcd5hMjXq66NsYnfAXHiPT/k6sHgbtV CmFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=M60ZGieKX5w0JciJgXcZWYlHLMXstzRMroAno1RCcNU=; b=zvU/LiHYYeESIQvXtGzaxZN3rKzOgK6zd5DeesNUsAAHfKyxxW1sOPH85hOXH7Gmoc M5vyzOYX9jo+3xgN5b6SKdQMg3Agi8r0XYxLR3QMgAja+pXABcSi51A6DAOgsQ2xRNNa RZvGErt7I6Bw0evxQUF6E3FNnlvTeOEh3IawOeRtb+VUs8akhz0008VIuTh5KiF10Dxv dQzNA55VCsdj2o/RoVEMR9IB/76ZSAqYoEayuvdI2gTwQpe8Noq0LlwAj/2fttiBE/67 4lFtxRQEp3o+38/9SxQLmCjewyExRvKKDOEy210UimNrOfDZJpHzQ0FtxxKxznw5EaMj nfuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f4si4037810qkj.329.2018.03.23.11.53.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 23 Mar 2018 11:53:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezRoo-0003ez-C6 for patch@linaro.org; Fri, 23 Mar 2018 14:53:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezRlN-00017i-4y for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezRlM-0004Et-5P for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:05 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ezRlL-0004EB-VW for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:04 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1ezRlK-0007fP-Tu for qemu-devel@nongnu.org; Fri, 23 Mar 2018 18:50:02 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 18:49:53 +0000 Message-Id: <20180323184958.14252-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180323184958.14252-1-peter.maydell@linaro.org> References: <20180323184958.14252-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 05/10] i.MX: Support serial RS-232 break properly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Trent Piepho Linux does not detect a break from this IMX serial driver as a magic sysrq. Nor does it note a break in the port error counts. The former is because the Linux driver uses the BRCD bit in the USR2 register to trigger the RS-232 break handler in the kernel, which is where sysrq hooks in. The emulated UART was not setting this status bit. The latter is because the Linux driver expects, in addition to the BRK bit, that the ERR bit is set when a break is read in the FIFO. A break should also count as a frame error, so add that bit too. Cc: Andrey Smirnov Signed-off-by: Trent Piepho Message-id: 20180320013657.25038-1-tpiepho@impinj.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/char/imx_serial.h | 1 + hw/char/imx_serial.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.16.2 diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h index 5b99cee7cf..ee80da12e6 100644 --- a/include/hw/char/imx_serial.h +++ b/include/hw/char/imx_serial.h @@ -26,6 +26,7 @@ #define URXD_CHARRDY (1<<15) /* character read is valid */ #define URXD_ERR (1<<14) /* Character has error */ +#define URXD_FRMERR (1<<12) /* Character has frame error */ #define URXD_BRK (1<<11) /* Break received */ #define USR1_PARTYER (1<<15) /* Parity Error */ diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 1e5540472b..0747db9f2b 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -308,6 +308,9 @@ static void imx_put_data(void *opaque, uint32_t value) s->usr2 |= USR2_RDR; s->uts1 &= ~UTS1_RXEMPTY; s->readbuff = value; + if (value & URXD_BRK) { + s->usr2 |= USR2_BRCD; + } imx_update(s); } @@ -319,7 +322,7 @@ static void imx_receive(void *opaque, const uint8_t *buf, int size) static void imx_event(void *opaque, int event) { if (event == CHR_EVENT_BREAK) { - imx_put_data(opaque, URXD_BRK); + imx_put_data(opaque, URXD_BRK | URXD_FRMERR | URXD_ERR); } }