From patchwork Wed Mar 19 12:05:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 26560 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 790DC20534 for ; Wed, 19 Mar 2014 12:27:48 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id i17sf20456733qcy.3 for ; Wed, 19 Mar 2014 05:27:48 -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=r9QD9CWyAAalFkSTimgjpQ8hWTecrsgwaEwXctOrIzo=; b=PVZvDcC/g+Y9f61e7L4COds5KDJ+DoQqkJ/9CHvd/9cVIV0VaiEfokbTZFwF7ieGt4 8c3QA4JD2SVC0Bm/5VNU6iukGCrH/rExvEL2ox7wJjF/x3N6YsL4dtZpYVVLnoKkrhWK trcf5W/3YJHYEzfziNp6tXFMXhYdO78oz1+e4RvYQIS1cfjIlX9JWnmpSYV8VIhK8vH1 tPaAbzwYX9CIYD7h3ZfHhFQDvpV0tqjOvI7qzvxbcAtVTI0+XRYxF6veRRGjDAXYVW1Y /ZCDm6vA8ARA84Gq4p+aiAkelFTYFjlBs903gEpxAi8EvyfnjzNKcIhQ4YanqZ72mZFu aidg== X-Gm-Message-State: ALoCoQm+a17hajHSYseH/JJjwmW445lvLFNZEfnQXwTTLe+m7LwunxS1mMJmzlXJltzwUREw6FRQ X-Received: by 10.58.111.202 with SMTP id ik10mr4803667veb.4.1395232068288; Wed, 19 Mar 2014 05:27:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls2437754qgb.91.gmail; Wed, 19 Mar 2014 05:27:48 -0700 (PDT) X-Received: by 10.52.171.68 with SMTP id as4mr25624913vdc.0.1395232068152; Wed, 19 Mar 2014 05:27:48 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id sj4si2066139vdc.12.2014.03.19.05.27.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 05:27:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id jw12so8900432veb.27 for ; Wed, 19 Mar 2014 05:27:48 -0700 (PDT) X-Received: by 10.220.147.16 with SMTP id j16mr2562425vcv.14.1395232068075; Wed, 19 Mar 2014 05:27:48 -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 i9csp294723vck; Wed, 19 Mar 2014 05:27:47 -0700 (PDT) X-Received: by 10.224.115.142 with SMTP id i14mr42961101qaq.9.1395232067495; Wed, 19 Mar 2014 05:27:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m6si5564577qcg.74.2014.03.19.05.27.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 05:27:47 -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]:40783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQFb1-0003W2-3E for patch@linaro.org; Wed, 19 Mar 2014 08:27:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQFaD-0002i6-MF for qemu-devel@nongnu.org; Wed, 19 Mar 2014 08:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQFaC-0004iv-37 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 08:26:57 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47074) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQFaB-0004ie-Si for qemu-devel@nongnu.org; Wed, 19 Mar 2014 08:26:56 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WQFFj-0005tw-5v; Wed, 19 Mar 2014 12:05:47 +0000 From: Peter Maydell To: Anthony Liguori Date: Wed, 19 Mar 2014 12:05:44 +0000 Message-Id: <1395230746-22643-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395230746-22643-1-git-send-email-peter.maydell@linaro.org> References: <1395230746-22643-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PULL 4/6] 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 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 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 Message-id: 1395166721-15716-4-git-send-email-robherring2@gmail.com Signed-off-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) {