From patchwork Fri Sep 24 09:05:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 203942 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8O949ck004600 for ; Fri, 24 Sep 2010 09:04:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896Ab0IXJEJ (ORCPT ); Fri, 24 Sep 2010 05:04:09 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:34234 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752846Ab0IXJEI (ORCPT ); Fri, 24 Sep 2010 05:04:08 -0400 Received: by pwj6 with SMTP id 6so540709pwj.19 for ; Fri, 24 Sep 2010 02:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=PPXaEW16m7BWXZOyCreNLW++bU9zTA3rH6u2sUR7rL4=; b=FfvvVHnhb0mdHxnp2fYhBcB7hXU5nNOitV0eMPQ4LFUQ3ggFIn8bcUUam/Gg81CgIa 5xOD3NRCZXK6jKZpCaTtctFppn+yaA5nj7zNYbGpGScRmoOEqfhULoO1gduvKQWJBl8/ mfpV8cAYKwJV+z/PJpU/0Q3c6QmcH49XLkVlg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=AT6S4VdONX8nMr2SaXBEHZpilKBKifSPIxQ2SFUbw+ZuzvYnk84xUcP77p6dUxWwHM BMVmkd9RsSdhv19xuxo6TWlvgX4urglDzJLCtruQTFRixIc8ah7pLuV0bAUKdh3Z53Ow VdMpk8ukEMU3UVI+/vWC+bLDOd3lQC64V/1P0= Received: by 10.114.89.16 with SMTP id m16mr3119454wab.187.1285319047071; Fri, 24 Sep 2010 02:04:07 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id c24sm3148398wam.7.2010.09.24.02.04.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Sep 2010 02:04:04 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Fri, 24 Sep 2010 18:05:38 +0900 Message-Id: <20100924090538.13826.99190.sendpatchset@t400s> Subject: [PATCH] sh: boot kernel with SR.BL set Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 24 Sep 2010 09:04:10 +0000 (UTC) --- 0001/arch/sh/boot/compressed/head_32.S +++ work/arch/sh/boot/compressed/head_32.S 2010-09-24 17:52:43.000000000 +0900 @@ -91,7 +91,9 @@ bss_start_addr: end_addr: .long _end init_sr: - .long 0x400000F0 /* Privileged mode, Bank=0, Block=0, IMASK=0xF */ + .long 0x500000F0 /* Privileged mode, Bank=0, Block=1, IMASK=0xF */ +kexec_magic: + .long 0x400000F0 /* magic used by kexec to parse zImage format */ init_stack_addr: .long stack_start decompress_kernel_addr: --- 0001/arch/sh/kernel/head_32.S +++ work/arch/sh/kernel/head_32.S 2010-09-24 17:48:10.000000000 +0900 @@ -330,7 +330,7 @@ ENTRY(_stext) #if defined(CONFIG_CPU_SH2) 1: .long 0x000000F0 ! IMASK=0xF #else -1: .long 0x400080F0 ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF +1: .long 0x500080F0 ! MD=1, RB=0, BL=1, FD=1, IMASK=0xF #endif ENTRY(stack_start) 2: .long init_thread_union+THREAD_SIZE --- 0001/arch/sh/kernel/traps_32.c +++ work/arch/sh/kernel/traps_32.c 2010-09-24 17:48:10.000000000 +0900 @@ -802,6 +802,9 @@ void __cpuinit per_cpu_trap_init(void) : /* no output */ : "r" (&vbr_base) : "memory"); + + /* disable exception blocking now when the vbr has been setup */ + clear_bl_bit(); } void *set_exception_table_vec(unsigned int vec, void *handler)