From owner-svn-src-all@freebsd.org Fri Oct 23 15:24:01 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BABDA1D4DF; Fri, 23 Oct 2015 15:24:01 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 279361B31; Fri, 23 Oct 2015 15:24:01 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NFO0Gl015052; Fri, 23 Oct 2015 15:24:00 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NFO0K7015051; Fri, 23 Oct 2015 15:24:00 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201510231524.t9NFO0K7015051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 23 Oct 2015 15:24:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289833 - head/sys/arm64/arm64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2015 15:24:01 -0000 Author: emaste Date: Fri Oct 23 15:24:00 2015 New Revision: 289833 URL: https://svnweb.freebsd.org/changeset/base/289833 Log: arm64: remove exception instruction length assertion From the (now removed) comment: * It is unclear in some cases if the bit is implementation defined. * The Foundation Model and QEMU disagree on if the IL bit should * be set when we are in a data fault from the same EL and the ISV * bit (bit 24) is also set. Instead of adding even more special cases just remove the assertion. Approved by: andrew Sponsored by: The FreeBSD Foundation Modified: head/sys/arm64/arm64/trap.c Modified: head/sys/arm64/arm64/trap.c ============================================================================== --- head/sys/arm64/arm64/trap.c Fri Oct 23 15:14:37 2015 (r289832) +++ head/sys/arm64/arm64/trap.c Fri Oct 23 15:24:00 2015 (r289833) @@ -263,20 +263,6 @@ do_el1h_sync(struct trapframe *frame) return; #endif - /* - * Sanity check we are in an exception er can handle. The IL bit - * is used to indicate the instruction length, except in a few - * exceptions described in the ARMv8 ARM. - * - * It is unclear in some cases if the bit is implementation defined. - * The Foundation Model and QEMU disagree on if the IL bit should - * be set when we are in a data fault from the same EL and the ISV - * bit (bit 24) is also set. - */ - KASSERT((esr & ESR_ELx_IL) == ESR_ELx_IL || - (exception == EXCP_DATA_ABORT && ((esr & ISS_DATA_ISV) == 0)), - ("Invalid instruction length in exception, esr %lx", esr)); - CTR4(KTR_TRAP, "do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", curthread, esr, frame->tf_elr, frame);