From patchwork Fri Mar 14 18:22:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 26279 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 291AE202DD for ; Fri, 14 Mar 2014 18:23:45 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf6657279veb.5 for ; Fri, 14 Mar 2014 11:23:44 -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=B7j0h0ZUEVg/TvX0S1zKW1OydWL+WdGo1EIJWEZbg6k=; b=SZVoIwj4mXI6HDeCfuiesBCYpZRtintRmpjCgUpRAhluaDc/MHaj2Ac5q1E+HUUmD/ jcehGlQoHfTCBLCtda3s7yYC2D5FJpEWQHojof8rVLeSmog3FexDC7cziMAOSSy05Dic NkmHdIdTZzhRA/+gIAjPEmPtLDi3E86cLgcRzeAubP86gJT/+9XqoabJBx6wVSS5VXuM qosIreso5I+6qWecI4PeLYq9VavxEbJo0p4zIH4Tbuo6knGn62X7dMuRTwLrClq3eRuh 2lKO9FGayu9xV6hQuiuX0EEcESIti9eBYDIZK3wkKZ3WxQJNnYxgYt3JY8dHB1LFmMmF Ao7g== X-Gm-Message-State: ALoCoQlPFhO26LSH6nA0GdPjW4zV5aU3OSE7Yc0lKFmAWUYvNAdmvXJsL5tl4Rl14QCeDjFj4l/2 X-Received: by 10.58.155.3 with SMTP id vs3mr3934383veb.16.1394821424638; Fri, 14 Mar 2014 11:23:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.146 with SMTP id 18ls743452qgx.6.gmail; Fri, 14 Mar 2014 11:23:44 -0700 (PDT) X-Received: by 10.58.134.101 with SMTP id pj5mr383413veb.38.1394821424442; Fri, 14 Mar 2014 11:23:44 -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 sv2si2398584vdc.42.2014.03.14.11.23.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:23:44 -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 la4so3214570vcb.3 for ; Fri, 14 Mar 2014 11:23:44 -0700 (PDT) X-Received: by 10.220.247.68 with SMTP id mb4mr376598vcb.37.1394821424372; Fri, 14 Mar 2014 11:23:44 -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 i9csp42343vck; Fri, 14 Mar 2014 11:23:44 -0700 (PDT) X-Received: by 10.140.97.37 with SMTP id l34mr11201258qge.56.1394821423932; Fri, 14 Mar 2014 11:23:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b42si3905824qgd.43.2014.03.14.11.23.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:23:43 -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]:46422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWlj-0004I8-Ey for patch@linaro.org; Fri, 14 Mar 2014 14:23:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWks-0003HP-JQ 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 1WOWkn-0004ke-8s for qemu-devel@nongnu.org; Fri, 14 Mar 2014 14:22:50 -0400 Received: from mail-oa0-x232.google.com ([2607:f8b0:4003:c02::232]:36869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOWkn-0004kT-4M for qemu-devel@nongnu.org; Fri, 14 Mar 2014 14:22:45 -0400 Received: by mail-oa0-f50.google.com with SMTP id i7so3036154oag.9 for ; Fri, 14 Mar 2014 11:22:44 -0700 (PDT) X-Received: by 10.60.233.227 with SMTP id tz3mr8061804oec.3.1394821364708; Fri, 14 Mar 2014 11:22:44 -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.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Mar 2014 11:22:44 -0700 (PDT) From: Rob Herring To: qemu-devel@nongnu.org, Peter Maydell Date: Fri, 14 Mar 2014 13:22:30 -0500 Message-Id: <1394821351-21477-4-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::232 Cc: Rob Herring Subject: [Qemu-devel] [PATCH v2 3/4] pl011: fix incorrect logic to set the RXFF flag 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 The receive fifo full bit should be set when 1 character is received and the fifo is disabled or when 16 characters are in the fifo. Signed-off-by: Rob Herring Reviewed-by: Peter Maydell --- hw/char/pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 920ba3f..5e664f4 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -220,7 +220,7 @@ static void pl011_put_fifo(void *opaque, uint32_t value) s->read_fifo[slot] = value; s->read_count++; s->flags &= ~PL011_FLAG_RXFE; - if (s->cr & 0x10 || s->read_count == 16) { + if (!(s->lcr & 0x10) || s->read_count == 16) { s->flags |= PL011_FLAG_RXFF; } if (s->read_count == s->read_trigger) {