From patchwork Sun Mar 22 09:09:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 453106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 34B07140146 for ; Sun, 22 Mar 2015 20:09:29 +1100 (AEDT) Received: from localhost ([::1]:50217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZbsq-0001pU-NK for incoming@patchwork.ozlabs.org; Sun, 22 Mar 2015 05:09:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZbsa-0001Yx-G7 for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZbsX-0003bz-5k for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:09:08 -0400 Received: from helium.waldemar-brodkorb.de ([89.238.66.15]:47329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZbsW-0003bo-W5 for qemu-devel@nongnu.org; Sun, 22 Mar 2015 05:09:05 -0400 Received: by helium.waldemar-brodkorb.de (Postfix, from userid 1000) id 580661056A; Sun, 22 Mar 2015 10:09:02 +0100 (CET) Date: Sun, 22 Mar 2015 10:09:02 +0100 From: Waldemar Brodkorb To: qemu-devel@nongnu.org Message-ID: <20150322090902.GA8451@waldemar-brodkorb.de> MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 3.2.0-4-amd64 x86_64 User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.238.66.15 Cc: Thomas Petazzoni Subject: [Qemu-devel] [PATCH] qemu-m68k: add support for interrupt masking/unmasking 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 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 */ + case 0x1c: + case 0x1d: + 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; + else + s->imr |= (1 << (val & 0x3f)); + break; + /* CIMR allows to easily unmask interrupts */ + case 0x1d: + if (val & 0x40) + s->imr = 0ull; + else + s->imr &= ~(1 << (val & 0x3f)); + break; default: hw_error("mcf_intc_write: Bad write offset %d\n", offset); break;