From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J9nHx-0008GG-E7
	for qemu-devel@nongnu.org; Tue, 01 Jan 2008 15:00:37 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J9nHu-0008Ea-Sc
	for qemu-devel@nongnu.org; Tue, 01 Jan 2008 15:00:37 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J9nHu-0008EQ-KE
	for qemu-devel@nongnu.org; Tue, 01 Jan 2008 15:00:34 -0500
Received: from fk-out-0910.google.com ([209.85.128.190])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <blauwirbel@gmail.com>) id 1J9nHu-0008Ax-AL
	for qemu-devel@nongnu.org; Tue, 01 Jan 2008 15:00:34 -0500
Received: by fk-out-0910.google.com with SMTP id 18so9831901fkq.2
	for <qemu-devel@nongnu.org>; Tue, 01 Jan 2008 12:00:33 -0800 (PST)
Message-ID: <f43fc5580801011200p2c9f39e2k48da5d3f429a3ed4@mail.gmail.com>
Date: Tue, 1 Jan 2008 22:00:32 +0200
From: "Blue Swirl" <blauwirbel@gmail.com>
Subject: Re: [Qemu-devel] qemu/hw slavio_intctl.c slavio_timer.c sun4m.c
In-Reply-To: <20080101192515.GA30183@volta.aurel32.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1J8i0L-0006LI-Sc@cvs.savannah.gnu.org>
	<20080101192515.GA30183@volta.aurel32.net>
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Aurelien Jarno <aurelien@aurel32.net>
Cc: qemu-devel@nongnu.org

On 1/1/08, Aurelien Jarno <aurelien@aurel32.net> wrote:
> On Sat, Dec 29, 2007 at 08:09:57PM +0000, Blue Swirl wrote:
> > CVSROOT:      /cvsroot/qemu
> > Module name:  qemu
> > Changes by:   Blue Swirl <blueswir1>  07/12/29 20:09:57
> >
> > Modified files:
> >       hw             : slavio_intctl.c slavio_timer.c sun4m.c
> >
> > Log message:
> >        Fix CPU timer interrupts
> >
> > CVSWeb URLs:
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/slavio_intctl.c?cvsroot=qemu&r1=1.26&r2=1.27
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/slavio_timer.c?cvsroot=qemu&r1=1.26&r2=1.27
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4m.c?cvsroot=qemu&r1=1.76&r2=1.77
> >
>
> Unfortunately this commit has broken SS-5 running Linux:

Thanks for the report, I can reproduce the bug. What a strange error!

The following patch hides the problem, but it also un-fixes the CPU
timer. I have to think of a better solution.

diff -u -r1.28 slavio_intctl.c
--- hw/slavio_intctl.c  1 Jan 2008 17:06:38 -0000       1.28
+++ hw/slavio_intctl.c  1 Jan 2008 19:52:22 -0000
@@ -257,7 +257,7 @@
                 if (pending & (1 << j))
                     pil_pending |= 1 << s->intbit_to_level[j];
             }
-            pil_pending |= s->intreg_pending[i] & CPU_HARDIRQ_MASK;
+            //pil_pending |= s->intreg_pending[i] & CPU_HARDIRQ_MASK;
         }
         pil_pending |= (s->intreg_pending[i] & CPU_SOFTIRQ_MASK) >> 16;