From patchwork Wed May 2 17:48:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 134860 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp964058lji; Wed, 2 May 2018 10:51:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpXkHCLDtLiBnlLmNa/j0P9Sv318Vbte5WE77INn94oQFeNkbqW5omNkOixRbuM0ciweB1K X-Received: by 2002:a25:af8b:: with SMTP id g11-v6mr13504628ybh.47.1525283519449; Wed, 02 May 2018 10:51:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525283519; cv=none; d=google.com; s=arc-20160816; b=sp2Ye69+Xckj5HTLbgAPnQxWUVvR7U8J8bOAl1RUE4bfD5d460kOWvMJkqFID12tZd iX8XNsdSZvHP0oJB2YMfG7cEuV5eHKURBck9O9DdCfoeUxsqqK5vdWZlSm+14Uieh3t4 VC+mN6d+rramA6qNGyMoZlKBlW8DdMq0bBhUfv1chQj13OziAQxoqDtHyGGL77u6uV4+ J0ZSwL17Sxq2XDSbdxalnIC+xIp8Dc42kkTKNLXS683e5DUMmAQyGHE6KlPaQemr1ial hnNsFpQaEGID67AK9PTFnfr4BsYNIb5PcO7oTwgO78MvhPE/TQPI2fPSoDni2vBhKsZJ 5ezQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=JwG5fnPfvfkPAI/+Dgh6fhLl16VBeooZ50HvBg3Ow5s=; b=Otq3cAOLUpG0yhPvA2IZfw/e/TOGuT3hSGQXoDDyVFFqW/OYO4WS0VJeJI+sjIqjOD zeGdNSWn4xq8oi3iNhzlj8HhWbrUgMJ+veVhOlqTgrkC6WqgR1eQhslJI1P+Pih0sfgk FqlyoGLad9uSIF98466OCliCGFJwHkl4EzQV+rfaXbQs5Vr8yAVvpNtIE2xJPsihHxDH Pzco3AQnFrryWDWMl/iqwbMGocoGV4UqWXazm/CJFd2AmxO34VwrDteMefTgFEJt3e4h UCzO7zyK24PDXxVvUnx6bNFrazQDaWZLjpilngaUPJlxBJD7yNteXm2Pp54XGE4gm5HJ a4PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fU4ZJk40; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s83-v6si6140232vke.315.2018.05.02.10.51.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 02 May 2018 10:51:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fU4ZJk40; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDvv4-00008q-Sk for patch@linaro.org; Wed, 02 May 2018 13:51:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDvs1-0005WS-CF for qemu-devel@nongnu.org; Wed, 02 May 2018 13:48:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDvrx-0004B8-Q1 for qemu-devel@nongnu.org; Wed, 02 May 2018 13:48:49 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fDvrx-0004Ae-LH for qemu-devel@nongnu.org; Wed, 02 May 2018 13:48:45 -0400 Received: by mail-pg0-x242.google.com with SMTP id g20-v6so4480729pgv.1 for ; Wed, 02 May 2018 10:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=JwG5fnPfvfkPAI/+Dgh6fhLl16VBeooZ50HvBg3Ow5s=; b=fU4ZJk40SJufNTx6eZcQ/KZRX+KmsAFWC88628+uJJNCq0tHQ6uDPiV4ti08nnX1iR sq4wVWTDxc0nqqfqqW8usXwhGbuTuodgRFcBT3exskL7HoTqsazOoSUusaG1fgUORGb9 argE5wE8B6SDszx8jVJr4yZsMpyULduHXAN3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JwG5fnPfvfkPAI/+Dgh6fhLl16VBeooZ50HvBg3Ow5s=; b=Z2tW6wnJ9wjJuWHPZn4sV52lFnAzBfC8ufl0kj0WCJsJJABA5p7Ewt8FjtXJYcHtFh FDT89OSzJMhwTFiMp125BLzPjFaifPj6WRiezqF4ahvggH39g2VQTdBsYRSI0V/XzmTs UzBxOGlCi9jmaAd3yXMME7SZeV0mq0/g5uTjz0mV82+RxAaTucWqC1rE4VhJORCK6+1P QYubUXaGYNpPGVIU+CMXI3Erz6tIcs4NK/X7sTS3oeVMHVLjdA9GFE/xBJ3e0+Bd6Wdd 6MALLDHBQ3HDPkc7Ihr94eAKmlnAAM35i+X97+uqXWhHrkMaDlNb4vu19eghHUF6P0jt IUwA== X-Gm-Message-State: ALQs6tAGqLYO0pEOgHG3hEsfcIBHRvVdMdyZsoVlUDooWP/lB+lDo+48 cmDdvCQYKbET6Ro4qHUNpoiLKyUi0po= X-Received: by 2002:a63:b746:: with SMTP id w6-v6mr12138757pgt.215.1525283324253; Wed, 02 May 2018 10:48:44 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id w7sm22275533pfn.83.2018.05.02.10.48.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 May 2018 10:48:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 2 May 2018 10:48:39 -0700 Message-Id: <20180502174842.16253-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PULL 2/5] tcg/arm: Fix memory barrier encoding 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: peter.maydell@linaro.org, Henry Wertz , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Henry Wertz I found with qemu 2.11.x or newer that I would get an illegal instruction error running some Intel binaries on my ARM chromebook. On investigation, I found it was quitting on memory barriers. qemu instruction: mb $0x31 was translating as: 0x604050cc: 5bf07ff5 blpl #0x600250a8 After patch it gives: 0x604050cc: f57ff05b dmb ish In short, I found INSN_DMB_ISH (memory barrier for ARMv7) appeared to be correct based on online docs, but due to some endian-related shenanigans it had to be byte-swapped to suit qemu; it appears INSN_DMB_MCR (memory barrier for ARMv6) also should be byte swapped (and this patch does so). I have not checked for correctness of aarch64's barrier instruction. Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Henry Wertz Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.14.3 diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index dc83f3e5be..56a32a470f 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -159,8 +159,8 @@ typedef enum { INSN_STRD_IMM = 0x004000f0, INSN_STRD_REG = 0x000000f0, - INSN_DMB_ISH = 0x5bf07ff5, - INSN_DMB_MCR = 0xba0f07ee, + INSN_DMB_ISH = 0xf57ff05b, + INSN_DMB_MCR = 0xee070fba, /* Architected nop introduced in v6k. */ /* ??? This is an MSR (imm) 0,0,0 insn. Anyone know if this