From patchwork Mon Feb 7 09:39:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 82089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 21560B7088 for ; Mon, 7 Feb 2011 20:39:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 131EB281B6; Mon, 7 Feb 2011 10:39:27 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zfmXauxxFLxV; Mon, 7 Feb 2011 10:39:26 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 510FC281BC; Mon, 7 Feb 2011 10:39:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 795022818E for ; Mon, 7 Feb 2011 10:39:19 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WOQqVdEosANW for ; Mon, 7 Feb 2011 10:39:16 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-fx0-f44.google.com (mail-fx0-f44.google.com [209.85.161.44]) by theia.denx.de (Postfix) with ESMTPS id B4512281A3 for ; Mon, 7 Feb 2011 10:39:16 +0100 (CET) Received: by mail-fx0-f44.google.com with SMTP id 9so5105370fxm.3 for ; Mon, 07 Feb 2011 01:39:16 -0800 (PST) Received: by 10.223.98.200 with SMTP id r8mr7309312fan.30.1297071556600; Mon, 07 Feb 2011 01:39:16 -0800 (PST) Received: from localhost ([178.23.216.97]) by mx.google.com with ESMTPS id e17sm1073241fak.34.2011.02.07.01.39.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 07 Feb 2011 01:39:16 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Mon, 7 Feb 2011 10:39:11 +0100 Message-Id: <1297071551-29295-2-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1297071551-29295-1-git-send-email-monstr@monstr.eu> References: <1297071551-29295-1-git-send-email-monstr@monstr.eu> Subject: [U-Boot] [PATCH] microblaze: Fix msr handling in interrupt_handler X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Fix ancient code which worked with MSR in a bad way. Use rtid instruction which enable IRQs and jump. Signed-off-by: Michal Simek --- arch/microblaze/cpu/irq.S | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/arch/microblaze/cpu/irq.S b/arch/microblaze/cpu/irq.S index 47bba36..8c76a73 100644 --- a/arch/microblaze/cpu/irq.S +++ b/arch/microblaze/cpu/irq.S @@ -60,7 +60,6 @@ _interrupt_handler: addik r1, r1, -124 brlid r15, interrupt_handler nop - nop addik r1, r1, 124 lwi r31, r1, -120 lwi r30, r1, -116 @@ -93,22 +92,6 @@ _interrupt_handler: lwi r3, r1, -8 lwi r2, r1, -4 - /* enable_interrupt */ -#ifdef XILINX_USE_MSR_INSTR - msrset r0, 2 -#else - /* FIXME unstable in stressed mode - two irqs */ - nop - addi r1, r1, -4 - swi r12, r1, 0 - mfs r12, rmsr - ori r12, r12, 2 - mts rmsr, r12 - lwi r12, r1, 0 - addi r1, r1, 4 - nop -#endif - bra r14 - nop + rtid r14, 0 nop .size _interrupt_handler,.-_interrupt_handler