From patchwork Tue Mar 18 18:18:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 26519 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E601C202FA for ; Tue, 18 Mar 2014 18:21:17 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf18136112veb.4 for ; Tue, 18 Mar 2014 11:21:17 -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=dgJ1eFLs738x4wZPOxmo3K0BPnlEUfEDYydU3i9jdYY=; b=IcWUEU2CDEp3KmqLFL79opHi5gIKyTBu6wF7vxRER0XsHPwF878F19QrDdrOd9UyMK fhXvqxbrechJlv33fSx8InaxErF+aW/q2DEFEYWH0QCmd+EG5lhQX9x/6Wx6gZP03CHg afW4eHT9MHBSJeSmmff8L+UKrS2W11hSoFKUxWVZkP+9962Ib3cpQCzkygjb95J+T6pQ w8NSqS9fuQWrJmRLgPhJ0WMPJet8LB3DSwRD0I/r6mAwxSv+L6jX8c64hnpRB22pCp/F CGijEKZtLEqOcp1+OheaB+64Zb/ewPUWEXPr5N4hjoFq4XKo5U/5U1g3gnyc7QnlLzKt zO2g== X-Gm-Message-State: ALoCoQmWb840euMCGww2doVRx29RinSm8qs+11p6E6qsPzb4Ls/Pvy8bJcbXMdA5iEtG4zjxOFH0 X-Received: by 10.58.151.212 with SMTP id us20mr2650990veb.14.1395166877630; Tue, 18 Mar 2014 11:21:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.138 with SMTP id 10ls1098957qgx.52.gmail; Tue, 18 Mar 2014 11:21:17 -0700 (PDT) X-Received: by 10.58.165.68 with SMTP id yw4mr26563517veb.17.1395166877511; Tue, 18 Mar 2014 11:21:17 -0700 (PDT) Received: from mail-ve0-x22f.google.com (mail-ve0-x22f.google.com [2607:f8b0:400c:c01::22f]) by mx.google.com with ESMTPS id ie18si3794029vec.67.2014.03.18.11.21.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:21:17 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22f 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:c01::22f; Received: by mail-ve0-f175.google.com with SMTP id oz11so7391670veb.6 for ; Tue, 18 Mar 2014 11:21:17 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr25562540vec.15.1395166877439; Tue, 18 Mar 2014 11:21:17 -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 i9csp234744vck; Tue, 18 Mar 2014 11:21:17 -0700 (PDT) X-Received: by 10.140.83.138 with SMTP id j10mr9188174qgd.42.1395166876815; Tue, 18 Mar 2014 11:21:16 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d8si2319196qcd.11.2014.03.18.11.21.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:21:16 -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]:36897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPydY-0000Tc-8Z for patch@linaro.org; Tue, 18 Mar 2014 14:21:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPybO-0005yY-59 for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPybH-0006yk-FA for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:19:02 -0400 Received: from mail-ob0-x235.google.com ([2607:f8b0:4003:c01::235]:61024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPybH-0006yg-AJ for qemu-devel@nongnu.org; Tue, 18 Mar 2014 14:18:55 -0400 Received: by mail-ob0-f181.google.com with SMTP id wp4so7253930obc.40 for ; Tue, 18 Mar 2014 11:18:54 -0700 (PDT) X-Received: by 10.182.18.102 with SMTP id v6mr1332445obd.71.1395166734840; Tue, 18 Mar 2014 11:18:54 -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.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:18:54 -0700 (PDT) From: Rob Herring To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 18 Mar 2014 13:18:41 -0500 Message-Id: <1395166721-15716-4-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:c01::235 Cc: Rob Herring Subject: [Qemu-devel] [PATCH v3 3/3] 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:c01::22f 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 11c3a75..644aad7 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -221,7 +221,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) {