From patchwork Mon Jul 2 15:10:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 10501927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 11E8C60284 for ; Mon, 2 Jul 2018 15:33:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0239E28C0C for ; Mon, 2 Jul 2018 15:33:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E940328C53; Mon, 2 Jul 2018 15:33:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E52A28A64 for ; Mon, 2 Jul 2018 15:33:19 +0000 (UTC) Received: from localhost ([::1]:33567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0pK-0005FA-MP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Jul 2018 11:33:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0UP-0004eR-UN for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0UP-0008Qc-10 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:41 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:35715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0UO-0008QN-S0 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:40 -0400 Received: by mail-pg0-x243.google.com with SMTP id i7-v6so7283886pgp.2 for ; Mon, 02 Jul 2018 08:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vsPXNhn1H9gcv6Y3Ui8gTd5nIvqvpy28NrTKCozPLdA=; b=goT9r5vETutVudTJx++xPSjti+sIpqcpiIQWY91aR66bcnthO7TX7U62IRYWflwtk5 oVB7Kr2vOPy2ITW7AbsJbzgPx4iSU1TXESA3C+nj8ZSBeRHf3e0XomfVDhrb7yN/g1B/ lsfLuUkNcnkfOTT4imylNBtNUAiBZPt1D77hr/olMLQkPBq49LpshWcgILw9+g4ajydO WfsSDDp5KrZqjSoLmGFaT1Cfr6mVKECUMfaVTzC+IRBJLo9q2IIo6PsFaxDuX+hwBX3w Mp8qH3AlvMeqkuk43P5kYgqFREuuaQUdxDNnIETpNFbFagDdFmsiNVVD5Rsyz3i8IErL WS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vsPXNhn1H9gcv6Y3Ui8gTd5nIvqvpy28NrTKCozPLdA=; b=EtIL4GNUtYBiexVR8zEnGi2315OhHvDDPiR0d2S6a0WXC+HZMlj/BhvEqP+i4JlKbw r2jCSHZrPUsWrEG7PKN7zLupXIuznuychUwSoWOdW9LreL2qHPsQyteJccBHk6Ys6+7a AqPMrHf2c7hf0cIBMVCdzBdlc4HrkjqqUXyt7WjF14jrKrlaj1dRdyXk6JHqcUKvuUJR ELohi9pNXWY1U/SNq1kDle8DVh2ZrInMACRg3T1MDXuXOUWxPESp65abal+uURXYno9F dNdCVTlhe8alLbE6cXQlwO9g+gENJWyFqOB8/UmWeNrhwiScMD8RY2macfeYAhkRoyU3 Z/4Q== X-Gm-Message-State: APt69E1p1LaEMYVaue25ac7uTrkT/k+NGbiQk7Go2hXoi7jd/nH0xsMn s3wqznjGbuVRw/vghLkLUx4= X-Google-Smtp-Source: AAOMgpcpK1lUcTUb8DKSGRgZJUT77YFWBO4ieQakHHOADyYAvDn27uaWU1nvcU8CPeDApQE2IOWyBw== X-Received: by 2002:a62:3481:: with SMTP id b123-v6mr25804174pfa.4.1530544300068; Mon, 02 Jul 2018 08:11:40 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id s27-v6sm39516068pfk.184.2018.07.02.08.11.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:11:39 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:23 +0900 Message-Id: <20180702151023.24532-26-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PULL v2 25/25] target/openrisc: Fix writes to interrupt mask register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stafford Horne , QEMU Development Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The interrupt controller mask register (PICMR) allows writing any value to any of the 32 interrupt mask bits. Writing a 0 masks the interrupt writing a 1 unmasks (enables) the the interrupt. For some reason the old code was or'ing the write values to the PICMR meaning it was not possible to ever mask a interrupt once it was enabled. I have tested this by running linux 4.18 and my regular checks, I don't see any issues. Reported-by: Davidson Francis Reviewed-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 541615bfb3..b66a45c1e0 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -142,7 +142,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) } break; case TO_SPR(9, 0): /* PICMR */ - env->picmr |= rb; + env->picmr = rb; break; case TO_SPR(9, 2): /* PICSR */ env->picsr &= ~rb;