From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2930DC3B1B2 for ; Fri, 14 Feb 2020 18:02:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC71F2168B for ; Fri, 14 Feb 2020 18:02:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mhVWUbZC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC71F2168B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2fI4-00005i-21 for qemu-devel@archiver.kernel.org; Fri, 14 Feb 2020 13:02:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56217) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2f7w-00064v-Cn for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2f7u-0000yV-4l for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:43 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2f7t-0000vY-UJ for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:42 -0500 Received: by mail-wr1-x444.google.com with SMTP id k11so11876547wrd.9 for ; Fri, 14 Feb 2020 09:51:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5mQrhAitCaw5RJP1dOPrlxLmDz4jgnDL2MRmgAJnH5M=; b=mhVWUbZC1r417E2WBJRppYnXh+oa3UhaBZaPXQ2um10Xhq0mDR/gQIll9X5WyBzlyA jzGcm33iRJu6CIaab75gZ03feDNF9W8K393MpXCTzbcLdfXX+hhuSZpHxoROw2ffwufs 7fzQQtXtXuKtSaVoJLOhpaZzQ9BrNlZW0C7PN0HV7n3sn3WZnZOUZaYyLSAq1MtCUQ90 iFFlmy7l/Fu82NEDs6qN3vlDB1RHw7/Pf2m+sm4oZZx1fE0Szpp09uoMmhpHaLG/hHZD cz5HvdcAcehr74vmH+TXhtzgrXkKq9wjUU2jZA+VzlKn6Ozxi9MSssUJb54/ZVeR9+Ex 03wQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5mQrhAitCaw5RJP1dOPrlxLmDz4jgnDL2MRmgAJnH5M=; b=H9m6IgsvP6REkKkp50kLTmvRGJRujsOpgUMt/Pqhr26OJYCYm+tzxwJk4VCnhvzNv2 fCsr7jeVdpKeo0qzfy4AdjYf+uDuZvT+0M13fZfYefW/AKjVQDC/6qWWpVpTfzsKDrx9 jvTSfj0cxd6LqRK7hKJIresclbGY6zUNSnHSqwQvdvWooaxi6AsA+Ic19oKrdxCVTXaY YT/DZrNUPKoT4zIfaVVAWbInQlkufY3s5dRLZLj5Q4LUcMF6Y3Ro0ID9dAUl3miH17QV BMR+ujA/201AUxdYruPLxSL7jRfDpKD08bz0D1gRSOQR8xbU4eQQ0odgh5xzZZ/I9me0 A32w== X-Gm-Message-State: APjAAAUZcGCjkYn3cXAAQcwxHCOiaKv4KNndCKN0MX6ul6OEYZIU2LNo RZLWD5npqlKbMlcji9sT63kHpghL1I4= X-Google-Smtp-Source: APXvYqz3gYgWNr/GT/bTIJCoA3+GqfVcQNpY6DAOrtW7VGOn3P0MYHWrvWmZ8b0Vdah47HB0lkiEDQ== X-Received: by 2002:a5d:474b:: with SMTP id o11mr5342789wrs.255.1581702701013; Fri, 14 Feb 2020 09:51:41 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v8sm8001857wrw.2.2020.02.14.09.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2020 09:51:40 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 16/21] target/arm: Correct definition of PMCRDP Date: Fri, 14 Feb 2020 17:51:11 +0000 Message-Id: <20200214175116.9164-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214175116.9164-1-peter.maydell@linaro.org> References: <20200214175116.9164-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Auger , Aaron Lindsay , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The PMCR_EL0.DP bit is bit 5, which is 0x20, not 0x10. 0x10 is 'X'. Correct our #define of PMCRDP and add the missing PMCRX. We do have the correct behaviour for handling the DP bit being set, so this fixes a guest-visible bug. Fixes: 033614c47de Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- target/arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 2feded1518c..2ebfa6c6545 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1017,7 +1017,8 @@ static const ARMCPRegInfo v6_cp_reginfo[] = { #define PMCRN_MASK 0xf800 #define PMCRN_SHIFT 11 #define PMCRLC 0x40 -#define PMCRDP 0x10 +#define PMCRDP 0x20 +#define PMCRX 0x10 #define PMCRD 0x8 #define PMCRC 0x4 #define PMCRP 0x2 -- 2.20.1