From patchwork Fri Mar 14 18:22:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 26282 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 67EB1202DD for ; Fri, 14 Mar 2014 18:26:10 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id cz12sf6654764veb.6 for ; Fri, 14 Mar 2014 11:26:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=bCR/vzbsGNeHxiMPVg2FybYlPRcltO7rM/tcV9DQZCw=; b=KwAzOltSMpYt7jvAlDpi582zE+coBkmxQgG0pb31bcCLNpOiD4I4TDq+zjZKDGULk7 B9Il1i0g46S+Bb8UXwPxGiExqJ3pd8wbn048HLO1NOk6yzHjrMTp+/yKzeGYP/D0AljL r4YV4XCYS3ZjfIPBlB0ROEsz60mPIIThElQrcBZ6heHNdzbnO7o/jmbHF1+2a2zb88b3 LRBc2Em+X38nRC2rpPIuDPM8fUyyplkd+LwkxlXDDiimRy4x4Og0CfMNlvBkHlke83bv WifAK50hgO71dp1lEo/VDEhINLOXLxzsYHzxRG4bL5wslCM5wRy/4DO3Cwrs9rMlMiBo QIrw== X-Gm-Message-State: ALoCoQk8gRn0n8mZU8szN+8YNG/+/jCqk5vymXof8NRUMRpun6Q35JGhg1Qj7cwFu6022DF0e2tG X-Received: by 10.236.69.35 with SMTP id m23mr3392285yhd.6.1394821570061; Fri, 14 Mar 2014 11:26:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.101 with SMTP id f92ls772478qga.61.gmail; Fri, 14 Mar 2014 11:26:10 -0700 (PDT) X-Received: by 10.220.10.2 with SMTP id n2mr2064093vcn.26.1394821569984; Fri, 14 Mar 2014 11:26:09 -0700 (PDT) Received: from mail-vc0-x22c.google.com (mail-vc0-x22c.google.com [2607:f8b0:400c:c03::22c]) by mx.google.com with ESMTPS id fi2si2387489vdb.127.2014.03.14.11.26.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:26:09 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::22c; Received: by mail-vc0-f172.google.com with SMTP id la4so3144161vcb.17 for ; Fri, 14 Mar 2014 11:26:09 -0700 (PDT) X-Received: by 10.58.190.99 with SMTP id gp3mr1355068vec.32.1394821569873; Fri, 14 Mar 2014 11:26:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp42524vck; Fri, 14 Mar 2014 11:26:09 -0700 (PDT) X-Received: by 10.224.79.200 with SMTP id q8mr11578532qak.7.1394821562753; Fri, 14 Mar 2014 11:26:02 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h109si3883746qge.163.2014.03.14.11.26.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:26:02 -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; Received: from localhost ([::1]:46448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWny-0002aI-Ck for patch@linaro.org; Fri, 14 Mar 2014 14:26:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWkr-0003HO-TP for qemu-devel@nongnu.org; Fri, 14 Mar 2014 14:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOWkm-0004kP-HN for qemu-devel@nongnu.org; Fri, 14 Mar 2014 14:22:49 -0400 Received: from mail-oa0-x22e.google.com ([2607:f8b0:4003:c02::22e]:45462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWkm-0004kI-C7 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 14:22:44 -0400 Received: by mail-oa0-f46.google.com with SMTP id i7so3010747oag.33 for ; Fri, 14 Mar 2014 11:22:43 -0700 (PDT) X-Received: by 10.60.116.74 with SMTP id ju10mr7967805oeb.6.1394821363882; Fri, 14 Mar 2014 11:22:43 -0700 (PDT) Received: from localhost.localdomain (72-48-77-163.dyn.grandenetworks.net. [72.48.77.163]) by mx.google.com with ESMTPSA id oz15sm10829740oeb.13.2014.03.14.11.22.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:22:43 -0700 (PDT) From: Rob Herring To: qemu-devel@nongnu.org, Peter Maydell Date: Fri, 14 Mar 2014 13:22:29 -0500 Message-Id: <1394821351-21477-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394821351-21477-1-git-send-email-robherring2@gmail.com> References: <1394821351-21477-1-git-send-email-robherring2@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::22e Cc: Rob Herring Subject: [Qemu-devel] [PATCH v2 2/4] pl011: fix UARTRSR accesses corrupting the UARTCR value X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org X-Original-Sender: robherring2@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=fail header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Rob Herring Offset 4 is UARTRSR/UARTECR, not the UARTCR. The UARTCR would be corrupted if the UARTRSR is ever written. Fix by implementing a correct model of the UARTRSR/UARTECR register. Reads of this register simply reflect the error bits in data register. Only breaks can be triggered in QEMU. With the pl011_can_receive function, we effectively have flow control between the host and the model. Framing and parity errors simply don't make sense in the model and will never occur. Signed-off-by: Rob Herring --- hw/char/pl011.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index f0c3fa3..920ba3f 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -20,6 +20,7 @@ typedef struct PL011State { uint32_t readbuff; uint32_t flags; uint32_t lcr; + uint32_t rsr; uint32_t cr; uint32_t dmacr; uint32_t int_enabled; @@ -81,13 +82,14 @@ static uint64_t pl011_read(void *opaque, hwaddr offset, } if (s->read_count == s->read_trigger - 1) s->int_level &= ~ PL011_INT_RX; + s->rsr = c >> 8; pl011_update(s); if (s->chr) { qemu_chr_accept_input(s->chr); } return c; - case 1: /* UARTCR */ - return 0; + case 1: /* UARTRSR */ + return s->rsr; case 6: /* UARTFR */ return s->flags; case 8: /* UARTILPR */ @@ -146,8 +148,8 @@ static void pl011_write(void *opaque, hwaddr offset, s->int_level |= PL011_INT_TX; pl011_update(s); break; - case 1: /* UARTCR */ - s->cr = value; + case 1: /* UARTRSR/UARTECR */ + s->rsr = 0; break; case 6: /* UARTFR */ /* Writes to Flag register are ignored. */