From patchwork Mon Jul 25 17:22:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 106722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 457F2B6F57 for ; Tue, 26 Jul 2011 03:23:00 +1000 (EST) Received: from localhost ([::1]:58933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlOro-0006OC-SB for incoming@patchwork.ozlabs.org; Mon, 25 Jul 2011 13:22:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlOrf-0006Nu-Lr for qemu-devel@nongnu.org; Mon, 25 Jul 2011 13:22:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlOre-0000Ct-Pj for qemu-devel@nongnu.org; Mon, 25 Jul 2011 13:22:47 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:47942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlOre-0000Cc-LK for qemu-devel@nongnu.org; Mon, 25 Jul 2011 13:22:46 -0400 Received: by ewy24 with SMTP id 24so2968480ewy.4 for ; Mon, 25 Jul 2011 10:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=VQuX9223ZtIFSrd+Lf3cvdc+ByYSo8pOCvG9ANAbeQ8=; b=uchZnccDRuUdv+bV5KC8QyqvgIAQrlC5GXQ3nn/CZdSiPHKl3lcmVsq8uY1/o2SP3e dspdMWCi41c8xyCaBNVxu7SivGAaB87QVIIew/P9Ra1oQpikVB2N+Z3jamTdENSwm1zv eZSZ2rfyd2IK7PII0CpTL5bGQXWVH9xFkwBWA= Received: by 10.204.141.146 with SMTP id m18mr1474086bku.25.1311614565514; Mon, 25 Jul 2011 10:22:45 -0700 (PDT) Received: from localhost (e180216082.adsl.alicedsl.de [85.180.216.82]) by mx.google.com with ESMTPS id d5sm1385664bkt.13.2011.07.25.10.22.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jul 2011 10:22:44 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Mon, 25 Jul 2011 19:22:38 +0200 Message-Id: <316f198de781f7b819456f433d84ead284769a71.1311606610.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.3.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.45 Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH] fix disabling interrupts in sun4u 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org clear interrupt request if the interrupt priority < CPU pil clear hardware interrupt request if interrupts are disabled Signed-off-by: Artyom Tarasenko --- hw/sun4u.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index d7dcaf0..7f95aeb 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -255,7 +255,7 @@ void cpu_check_irqs(CPUState *env) pil |= 1 << 14; } - if (!pil) { + if (pil < (2 << env->psrpil)){ if (env->interrupt_request & CPU_INTERRUPT_HARD) { CPUIRQ_DPRINTF("Reset CPU IRQ (current interrupt %x)\n", env->interrupt_index); @@ -287,10 +287,12 @@ void cpu_check_irqs(CPUState *env) break; } } - } else { + } else if (env->interrupt_request & CPU_INTERRUPT_HARD) { CPUIRQ_DPRINTF("Interrupts disabled, pil=%08x pil_in=%08x softint=%08x " "current interrupt %x\n", pil, env->pil_in, env->softint, env->interrupt_index); + env->interrupt_index = 0; + cpu_reset_interrupt(env, CPU_INTERRUPT_HARD); } }