From patchwork Tue Mar 18 18:18:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 26513 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 02638202FA for ; Tue, 18 Mar 2014 18:19:56 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf28408421obc.8 for ; Tue, 18 Mar 2014 11:19:56 -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=/e2FyWW2slDIqNWBtXIGLgUEnQP277TA5aWMdgEAfkQ=; b=BnEtfJ/pvUDXUAkIXgwPExnPQ2Dop26ZSUmNXt8eh+QSpJHxtYTAcG/B0L4HmszwLp oEsvNeisg+iDGoaflBVWFFzEhCQcSMBDCLZfOZc6EN/vC/HWlprhXRMUGBUPI1J+3WSX GdZNwkkrStLUddsILo33Wim76qcqL4LzK3SeY/MZgHXnoe++jmBZqksCXHWWZ1Mdpr9o hfG9+D/vQc5j3N2a27Ktfw4NL/bzGuiMgZryIvkwYcZ29rpubRG+BeTzKmdD4mRSMQOz KGOk0mqXJQO5AYDCIKvOOYXBHb1uM2aUB4bq5BeiTG/kPxWajOsUlJ7zV0jVSyilG04T aJbw== X-Gm-Message-State: ALoCoQlJvPuZLMXOeEFmJWBicRTSIPFoFhU1SPM2GcUhQRUJoeRcZnDIYE+BQxvlPXTRUY2fvuBJ X-Received: by 10.182.186.105 with SMTP id fj9mr11791811obc.5.1395166796430; Tue, 18 Mar 2014 11:19:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.130 with SMTP id u2ls2234973qga.34.gmail; Tue, 18 Mar 2014 11:19:55 -0700 (PDT) X-Received: by 10.52.179.198 with SMTP id di6mr22381495vdc.7.1395166795900; Tue, 18 Mar 2014 11:19:55 -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 p4si3823716vem.30.2014.03.18.11.19.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:19:55 -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 la4so7790130vcb.31 for ; Tue, 18 Mar 2014 11:19:55 -0700 (PDT) X-Received: by 10.58.161.205 with SMTP id xu13mr5496957veb.4.1395166795805; Tue, 18 Mar 2014 11:19:55 -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 i9csp234606vck; Tue, 18 Mar 2014 11:19:55 -0700 (PDT) X-Received: by 10.140.97.37 with SMTP id l34mr35946343qge.56.1395166794575; Tue, 18 Mar 2014 11:19:54 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 50si11165243qgh.127.2014.03.18.11.19.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:19:54 -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]:36883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPycE-0006vC-1C for patch@linaro.org; Tue, 18 Mar 2014 14:19:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPybN-0005yV-4e for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:19:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPybG-0006yb-KO for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:19:01 -0400 Received: from mail-oa0-x22e.google.com ([2607:f8b0:4003:c02::22e]:59601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPybG-0006yV-F4 for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:18:54 -0400 Received: by mail-oa0-f46.google.com with SMTP id i7so7410033oag.19 for ; Tue, 18 Mar 2014 11:18:54 -0700 (PDT) X-Received: by 10.182.112.130 with SMTP id iq2mr1344138obb.57.1395166733986; Tue, 18 Mar 2014 11:18:53 -0700 (PDT) Received: from localhost.localdomain (72-48-77-163.dyn.grandenetworks.net. [72.48.77.163]) by mx.google.com with ESMTPSA id wj7sm33595445obc.8.2014.03.18.11.18.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:18:53 -0700 (PDT) From: Rob Herring To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 18 Mar 2014 13:18:40 -0500 Message-Id: <1395166721-15716-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395166721-15716-1-git-send-email-robherring2@gmail.com> References: <1395166721-15716-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 v3 2/3] 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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 8103e2e..11c3a75 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. */ @@ -247,13 +249,14 @@ static const MemoryRegionOps pl011_ops = { static const VMStateDescription vmstate_pl011 = { .name = "pl011", - .version_id = 1, - .minimum_version_id = 1, - .minimum_version_id_old = 1, + .version_id = 2, + .minimum_version_id = 2, + .minimum_version_id_old = 2, .fields = (VMStateField[]) { VMSTATE_UINT32(readbuff, PL011State), VMSTATE_UINT32(flags, PL011State), VMSTATE_UINT32(lcr, PL011State), + VMSTATE_UINT32(rsr, PL011State), VMSTATE_UINT32(cr, PL011State), VMSTATE_UINT32(dmacr, PL011State), VMSTATE_UINT32(int_enabled, PL011State),