From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZcVn-00024P-CF for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:49:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZcVj-0001Dg-AF for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:49:39 -0400 Received: from v220110690675601.yourvserver.net ([37.221.199.173]:41659) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZcVj-0001CP-0q for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:49:35 -0400 Message-ID: <550E902A.3080202@weilnetz.de> Date: Sun, 22 Mar 2015 10:49:30 +0100 From: Stefan Weil MIME-Version: 1.0 References: <20150322090902.GA8451@waldemar-brodkorb.de> In-Reply-To: <20150322090902.GA8451@waldemar-brodkorb.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qemu-m68k: add support for interrupt masking/unmasking List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Waldemar Brodkorb , qemu-devel@nongnu.org Cc: Thomas Petazzoni Technically this implementation looks reasonable. I added some remarks below. Am 22.03.2015 um 10:09 schrieb Waldemar Brodkorb: > Fixes following problem, when trying to boot linux: > qemu: hardware error: mcf_intc_write: Bad write offset 28 > > CPU #0: > D0 = 000000ff A0 = 402ea5dc F0 = 0000000000000000 ( 0) > D1 = 00000004 A1 = 402ea5e0 F1 = 0000000000000000 ( 0) > D2 = 00000040 A2 = 40040752 F2 = 0000000000000000 ( 0) > D3 = 00000000 A3 = 40040a98 F3 = 0000000000000000 ( 0) > D4 = 00000000 A4 = 400407b4 F4 = 0000000000000000 ( 0) > D5 = 00000000 A5 = 00000000 F5 = 0000000000000000 ( 0) > D6 = 00000000 A6 = 40195ff8 F6 = 0000000000000000 ( 0) > D7 = 00000000 A7 = 40195fd0 F7 = 0000000000000000 ( 0) > PC = 401b2058 SR = 2704 --Z-- FPRESULT = 0 > Aborted > > System started via: > qemu-system-m68k -nographic -nographic -M mcf5208evb -cpu m5208 -kernel kernel > > Patch originally posted here: > http://lists.busybox.net/pipermail/buildroot/2012-April/052585.html > > Signed-off-by: Thomas Petazzoni > Tested-by: Waldemar Brodkorb > Signed-off-by: Waldemar Brodkorb > --- > hw/m68k/mcf_intc.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c > index 621423c..1d161b1 100644 > --- a/hw/m68k/mcf_intc.c > +++ b/hw/m68k/mcf_intc.c > @@ -65,6 +65,10 @@ static uint64_t mcf_intc_read(void *opaque, hwaddr addr, > return (uint32_t)(s->ifr >> 32); > case 0x14: > return (uint32_t)s->ifr; > + /* Reading from SIMR and CIMR return 0 */ Maybe this comment is not needed if the following code is changed (see below). > + case 0x1c: Add /* SIMR */ comment behind case statement like it was done for SWIACK. Then either add a /* fall through */ comment or a return 0 (to satisfy static code analyzers). > + case 0x1d: Dto. for CIMR. > + return 0; > case 0xe0: /* SWIACK. */ > return s->active_vector; > case 0xe1: case 0xe2: case 0xe3: case 0xe4: > @@ -102,6 +106,20 @@ static void mcf_intc_write(void *opaque, hwaddr addr, > case 0x0c: > s->imr = (s->imr & 0xffffffff00000000ull) | (uint32_t)val; > break; > + /* SIMR allows to easily mask interrupts */ > + case 0x1c: > + if (val & 0x40) > + s->imr = ~0ull; UINT64_MAX > + else > + s->imr |= (1 << (val & 0x3f)); The QEMU coding style requires {}. > + break; > + /* CIMR allows to easily unmask interrupts */ > + case 0x1d: > + if (val & 0x40) > + s->imr = 0ull; > + else > + s->imr &= ~(1 << (val & 0x3f)); Dto. > + break; > default: > hw_error("mcf_intc_write: Bad write offset %d\n", offset); > break;