From patchwork Tue Jun 2 16:33:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49419 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 434BE20BD1 for ; Tue, 2 Jun 2015 16:39:12 +0000 (UTC) Received: by wgv5 with SMTP id 5sf37500811wgv.0 for ; Tue, 02 Jun 2015 09:39:11 -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: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=D89CyyyfFLoaQNTSf3k5l7nOfelPHk6YaJuAwZ+6b6o=; b=f6yWv62SBF73RHOQFVjxY7gzakytts95/sBrBlOHYmNA3BOulR6CLwkd7xlM9on6S/ C4X9PKekY2HhMP0PMy1YKHDTzrPf2Po6euvXhmfa0Q9XxuQnYkricxVi+OBX7Yk9okdb WnKmXU6Rtzn6b5f4cfrclRL8K9cMDCk2wdHJJee80lL+j2umghBNHw813eoHoENDG2eF /v3MsbF6NQLRR24WQXfVIyKZHbr2A3FrSE7+Te6DRV2G7b3WAzRQ2nf+Yv0CKD/Eh3DY /jJLhUa7MNnJ0C5Bd8FA34fAW49yPTI2ArPe1J4ufeGKx9Pev2xXIfLtSD0QvdeuLQYY 68Ig== X-Gm-Message-State: ALoCoQnjFnYGcK9Jz026OIxN8/WKqvih6PSxwi3c8DD/qgXbMjOabK8a35WTKX8tVDjpIp7AnGUt X-Received: by 10.180.83.72 with SMTP id o8mr17199708wiy.3.1433263151613; Tue, 02 Jun 2015 09:39:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.133 with SMTP id y5ls279956laj.19.gmail; Tue, 02 Jun 2015 09:39:11 -0700 (PDT) X-Received: by 10.152.88.5 with SMTP id bc5mr27117501lab.45.1433263151451; Tue, 02 Jun 2015 09:39:11 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id n2si15520102lae.61.2015.06.02.09.39.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 09:39:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbqq2 with SMTP id qq2so108169375lbb.3 for ; Tue, 02 Jun 2015 09:39:11 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr26718174lay.72.1433263151309; Tue, 02 Jun 2015 09:39:11 -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.112.108.230 with SMTP id hn6csp3200967lbb; Tue, 2 Jun 2015 09:39:10 -0700 (PDT) X-Received: by 10.140.102.101 with SMTP id v92mr29510407qge.19.1433263149812; Tue, 02 Jun 2015 09:39:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z105si16271243qgz.67.2015.06.02.09.39.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jun 2015 09:39:09 -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]:59775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzpDY-0001we-Ty for patch@linaro.org; Tue, 02 Jun 2015 12:39:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8Y-0001mB-W2 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzp8X-0000uF-C4 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:33:58 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8X-0000r2-6M for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:33:57 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yzp8T-00031f-FC for qemu-devel@nongnu.org; Tue, 02 Jun 2015 17:33:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 2 Jun 2015 17:33:45 +0100 Message-Id: <1433262832-11527-16-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433262832-11527-1-git-send-email-peter.maydell@linaro.org> References: <1433262832-11527-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 Subject: [Qemu-devel] [PULL 15/22] pl061: fix wrong calculation of GPIOMIS register 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) 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: Victor CLEMENT The masked interrupt status register should be the state of the interrupt after masking. There should be a logical AND instead of a logical OR between the interrupt status and the interrupt mask. Signed-off-by: Victor CLEMENT Reviewed-by: Peter Crosthwaite Message-id: 1433154824-6927-1-git-send-email-victor.clement@openwide.fr Signed-off-by: Peter Maydell --- hw/gpio/pl061.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index bd03e99..4ba730b 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -173,7 +173,7 @@ static uint64_t pl061_read(void *opaque, hwaddr offset, case 0x414: /* Raw interrupt status */ return s->istate; case 0x418: /* Masked interrupt status */ - return s->istate | s->im; + return s->istate & s->im; case 0x420: /* Alternate function select */ return s->afsel; case 0x500: /* 2mA drive */