From patchwork Wed Mar 28 14:37:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Towers X-Patchwork-Id: 149256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6BD81B6FA2 for ; Thu, 29 Mar 2012 01:57:12 +1100 (EST) Received: from localhost ([::1]:43816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCuJA-0007f7-AS for incoming@patchwork.ozlabs.org; Wed, 28 Mar 2012 10:57:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCu1A-00005a-Oe for qemu-devel@nongnu.org; Wed, 28 Mar 2012 10:38:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCu10-0001Kc-VL for qemu-devel@nongnu.org; Wed, 28 Mar 2012 10:38:32 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCu10-0001KE-MZ for qemu-devel@nongnu.org; Wed, 28 Mar 2012 10:38:22 -0400 Received: by pbcuo5 with SMTP id uo5so2167889pbc.4 for ; Wed, 28 Mar 2012 07:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=W16BFQKap/2uDL6qJh5Bd6Ia2t70yl/RuwFRAQn/M9c=; b=Tkawf4LI7u3txH6xim3aHR0yduacnAHZ05Fg9ZGzwTpV2+F0MDxGWQIGJaXrnIWVVe UdS5+FizEx3j4y7PvlXx0OANJYbzmdfydxhd9cVSaoaudQNJQybFzJy8HDql24Rerh0d k3DtICxFUeai4K9sh3oSLxjHsyBPlhwVqsp9G6zql6UnTl7qHJFwghqIv2nYW92OeP64 rR1sPd/UjCiBk2h3exroOOroBZTGs+JsUzM3k3Fqha3XAPwjN5qyW68b6zVbUBq8lI7d 8AkCqYHN/5D2237SdCpqPr/T7BlHokoH4DJlnwqv5A86fa6CmTod5y0gKYldpMdCWfLy kYdA== Received: by 10.68.72.70 with SMTP id b6mr73585501pbv.58.1332945499721; Wed, 28 Mar 2012 07:38:19 -0700 (PDT) Received: from localhost.localdomain (ppp118-209-81-127.lns20.mel4.internode.on.net. [118.209.81.127]) by mx.google.com with ESMTPS id e7sm2828364pbs.21.2012.03.28.07.38.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Mar 2012 07:38:19 -0700 (PDT) From: Andrew Towers To: qemu-devel@nongnu.org Date: Thu, 29 Mar 2012 01:37:28 +1100 Message-Id: <1332945448-31266-1-git-send-email-atowers@gmail.com> X-Mailer: git-send-email 1.7.5.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 X-Mailman-Approved-At: Wed, 28 Mar 2012 10:56:58 -0400 Cc: Peter Maydell , Paul Brook , Andrew Towers Subject: [Qemu-devel] [PATCH] ARM: Permit any ARMv6K CPU to read the MVFR0 and MVFR1 VFP registers. 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 From: Andrew Towers Replaces the ARM_FEATURE_VFP3 check when reading MVFR0/1 with a check for ARM_FEATURE_V6K. Rationale: MVFR0/1 were introduced in the ARM1136 at the same time as ARMv6K, and a survey of TRMs indicates support in later models. According to reference documentation on arm.com, MVFR0 and MVFR1 were introduced in ARM1136JF-S r1p1 (ARMv6K, VFPv2). They are also present in ARM1156T2F-S and ARM1176JZF-S, which contain VFP11 r5, and in ARM11 MPCore r1 which contains VFP11 r4. Reference (ARM DDI 0211H, 0290G, 0301H, 0360E) http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0211h/Ffbefjag.html Without this change, the linux kernel will not boot with VFP support enabled under ARM1176 system emulation, due to the unconditional use of MVFR1 at the end of vfp_init() in arch/arm/vfp/vfpmodule.c in the kernel: VFP support v0.3: implemetor 41 architecture 1 part 20 variant b rev 5 Internal error: Oops - undefined instruction: 0 [#1] Yes, I am slightly abusing the versatilepb hw emulation, but then so is everyone else in the world who is still waiting for their Raspberry Pi ;) Signed-off-by: Andrew Towers --- target-arm/translate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 81725d1..b5861c8 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -2906,7 +2906,7 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn) case ARM_VFP_MVFR0: case ARM_VFP_MVFR1: if (IS_USER(s) - || !arm_feature(env, ARM_FEATURE_VFP3)) + || !arm_feature(env, ARM_FEATURE_V6K)) return 1; tmp = load_cpu_field(vfp.xregs[rn]); break;