From patchwork Wed Oct 18 22:03:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 827832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3yHR5G2hwJz9t7W for ; Thu, 19 Oct 2017 09:08:01 +1100 (AEDT) Received: from localhost ([::1]:46691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4wVK-0003xd-8W for incoming@patchwork.ozlabs.org; Wed, 18 Oct 2017 18:07:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4wQf-0001FA-AJ for qemu-devel@nongnu.org; Wed, 18 Oct 2017 18:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4wQe-00059y-KG for qemu-devel@nongnu.org; Wed, 18 Oct 2017 18:03:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:37548) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4wQa-00055Q-CW; Wed, 18 Oct 2017 18:03:04 -0400 Received: from [10.149.184.130] (162-198-228-33.lightspeed.wlfrct.sbcglobal.net [162.198.228.33]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6F3C20C01; Wed, 18 Oct 2017 22:03:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6F3C20C01 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=sstabellini@kernel.org Date: Wed, 18 Oct 2017 15:03:02 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-X260 To: peter.maydell@linaro.org Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.99 Subject: [Qemu-devel] [PATCH] fix WFI/WFE length in syndrome register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, sstabellini@kernel.org, qemu-devel@nongnu.org, julien.grall@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" WFI/E are 4 bytes long: set ARM_EL_IL_SHIFT in the syndrome. Signed-off-by: Stefano Stabellini diff --git a/target/arm/internals.h b/target/arm/internals.h index 1f6efef..cf8c966 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -398,6 +398,7 @@ static inline uint32_t syn_breakpoint(int same_el) static inline uint32_t syn_wfx(int cv, int cond, int ti) { return (EC_WFX_TRAP << ARM_EL_EC_SHIFT) | + (1 << ARM_EL_IL_SHIFT) | (cv << 24) | (cond << 20) | ti; }