From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 155352461585629.19266365104272;
Mon, 25 Mar 2019 07:36:55 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43502 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8Qic-0003of-Qs
for importer@patchew.org; Mon, 25 Mar 2019 10:36:54 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43529)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdr-0000MW-0g
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdq-00020F-44
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:58 -0400
Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45429)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qdp-0001zu-OV
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:57 -0400
Received: by mail-wr1-x42c.google.com with SMTP id s15so10394016wra.12
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:31:57 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.55
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:31:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=HfvsvheoIJ3OHd3ttrjFYM1nQgTAZ30153WjHlZo3AA=;
b=DTObLpC0RKJpG0ZSBS08O4LcOpwDSHOUzU+6oHLV3Cf36BSdDkxFhr3QR60YRDtFCK
3j9b+OFxu+6NWaHkDO6rGGsyHK5MTJ/4foywXStI1vWbi2Npq/iNLvW1ez0FyfweIW9U
jKyyG5myYdGGWLIlM3yXLbHlU+Jv7+H4Mb9njEa2ipzbpF8t/DPnovV0O33B/Ey/cBIF
BnKoV0OEp9o0x/z7651bFQpOZX0twVLVaBBGJtbEo4fBNgmDM80j6/66PKTk6NYhKljE
RscLI5hthFyzo0QcYgqu0VMsKUhGfbmUSbfE6fJ8a5usGemC1431oit9WMc8w8o903qS
5RTQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=HfvsvheoIJ3OHd3ttrjFYM1nQgTAZ30153WjHlZo3AA=;
b=PMHdoBn1Tc7L79IYN68oGNWOe/HQ5it6aqXrI9bue/VEiSVfHj/77+Dh/DJ/njhdx8
vHiGEYEfTH4pNmBuw/L8p3qbasNTUelWljVv+F5k3EBMCJn49RWXeRrbwnWjjsWGab0x
d45lVs7MhGalvLvOSJjEv6t1biFVWn/rgd4H1PEI954DHVvmbR9TCN2CXRSTy7WNX0zN
i686Pq0AIBNNKiD6ULJG91FftWwFHrHC46R6/6CpYTqOqL33F7Wt4yd3vg7EdOUlJx1j
PWO/x2ewTqCuf8GEWx1IHbU+OdBi2/sUqKIFnUkVCXgXTgiZIpOIu0vBq/R0f9nzNxLt
vpQw==
X-Gm-Message-State: APjAAAXjt5Xr+U0F1yH/16mUHe/8DJXaHj56Y2rtr2whZNwfXLlkG9/E
CrOoYnMMMj2mEJhkxNcdStNUOaYZQFU=
X-Google-Smtp-Source:
APXvYqx4RG3nrK4zp191rtNb2jTYtlexEiqq5bWgOlEZsKphzyIddEfwN85ejJEJn8YwRdDhLFCDIQ==
X-Received: by 2002:adf:f04e:: with SMTP id
t14mr16377548wro.263.1553524316449;
Mon, 25 Mar 2019 07:31:56 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:47 +0000
Message-Id: <20190325143152.9981-2-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::42c
Subject: [Qemu-devel] [PULL 1/6] target/arm: Fix non-parallel expansion of
CASP
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
From: Richard Henderson <richard.henderson@linaro.org>
The second word has been loaded from the unincremented
address since the first commit.
Fixes: 44ac14b06fa
Reported-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Tested-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Message-id: 20190322234302.12770-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/translate-a64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 19590463433..dcdeb80176e 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -2510,7 +2510,7 @@ static void gen_compare_and_swap_pair(DisasContext *s=
, int rs, int rt,
tcg_gen_qemu_ld_i64(d1, clean_addr, memidx,
MO_64 | MO_ALIGN_16 | s->be_data);
tcg_gen_addi_i64(a2, clean_addr, 8);
- tcg_gen_qemu_ld_i64(d2, clean_addr, memidx, MO_64 | s->be_data);
+ tcg_gen_qemu_ld_i64(d2, a2, memidx, MO_64 | s->be_data);
=20
/* Compare the two words, also in memory order. */
tcg_gen_setcond_i64(TCG_COND_EQ, c1, d1, s1);
--=20
2.20.1
From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1553524478457545.5179602274778;
Mon, 25 Mar 2019 07:34:38 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43445 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8QgN-0001Z5-9G
for importer@patchew.org; Mon, 25 Mar 2019 10:34:35 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43545)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qds-0000Mu-KL
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdr-00021U-He
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:00 -0400
Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34405)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qdr-00020U-9A
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:59 -0400
Received: by mail-wr1-x42b.google.com with SMTP id p10so10452240wrq.1
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:31:59 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.56
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:31:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=G+9b/2FCZg8Q2GVJp+K7c4fI7/z1KC/e6TkX+Id3Cr8=;
b=GGzFmjrRMdcUDQEEu3kIR3wtKXhz7xhySVU6V51PrSuw3kHw/rWP8qXFSnmZjL7TFq
4BwEj8xfK0MaIumvnpTrQs+na2dvF7ofc3zG7T2RjOeBH8JeJOFfFY3DlJU2ySPZ8i/r
WTE1JR96j415Cq2qqmXxNJO9ULWpXsxmRgOhIS3IKzSnt3WnMXJG+XaaIcRpXw9MElMj
cpO4wPgfRUUUvZwz1Nvz/KGHkgV2FXP1ixSvG7yVo8ak3KIdVYbvlCTlKI5mryGUrRbi
ofM4CC2FEcxtma86RkQKP91hlnHNJs7kTUUQYR6Pwob0ju5N8E6cKCCs+9uqbLGZAsFN
24zQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=G+9b/2FCZg8Q2GVJp+K7c4fI7/z1KC/e6TkX+Id3Cr8=;
b=npMPXufSianKJHrjom2Jdykriv1v/dzGwy2y1P8QO4wNb/VJ9FFyRjeOqBmP5GzXLu
B+ssOS7cSZ7XG4ZHjAD7+kOnPmnJN7FAe+Y1yFkE/S7P7mptieZVIfrAS2NMIV5oNtF5
UEOXGvF9trzYFIwNtXXUMe/1GABvkCRv/wCYfz9wKG7Tf+AOVahXp5izaiZ1cjnf8zNF
wiObdejqCYzW99ckYgN1Gms8QwuxEDH6RpzP656w31+zdAtxDAbRiFMLmuGjJtGAD2z4
0IKrKFmNOvbDo9qP4blqOfMZesAamFd+psdkK0G63+eiDBG2sY+V1YcvteXdOcjvik99
jcQQ==
X-Gm-Message-State: APjAAAUuMubDz3Tu5ZXAWIf4Wb5A85DVjuibXW6oyOZwkAdqFpUSvrxK
sbNAEwNfHKPxzyuFgY4B5JY7sDqONjg=
X-Google-Smtp-Source:
APXvYqwK/B9wSO0SpjpvFmE8YuVwmqpz9lVEazDOHDRR4XCGlkt9k4jJ/sZFDL2Y2h2fS6PLp82kDw==
X-Received: by 2002:adf:e610:: with SMTP id p16mr15800699wrm.64.1553524317973;
Mon, 25 Mar 2019 07:31:57 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:48 +0000
Message-Id: <20190325143152.9981-3-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::42b
Subject: [Qemu-devel] [PULL 2/6] nrf51_gpio: reflect pull-up/pull-down to
IRQs
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Paolo Bonzini <pbonzini@redhat.com>
Some drivers do I2C bitbanging by keeping the output to 0 and flipping
the GPIO direction between input and output (see for example in Linux
gpio_set_open_drain_value_commit, in drivers/gpio/gpiolib.c).
When the GPIO is set to input, the pull-up resistor brings the output
to 1, while when the GPIO is set to output, the output driver brings
the output to 0.
Implement this for the nRF51 GPIO device model. First, if both input and
output are floating, and there is a pull-up or pull-down resistor
configured, do not just set s->in, but also make any devices listening
on the output qemu_irq receive that value. Second, if the pin is
driven both internally (output pin) and externally you don't get a
short circuit if both sides drive the pin to the same value.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20190317141001.3346-1-pbonzini@redhat.com
[PMM: wrapped long line]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/gpio/nrf51_gpio.c | 65 +++++++++++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 25 deletions(-)
diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c
index 86e047d649f..87a2f2a0dc3 100644
--- a/hw/gpio/nrf51_gpio.c
+++ b/hw/gpio/nrf51_gpio.c
@@ -43,6 +43,17 @@ static bool is_connected(uint32_t config, uint32_t level)
return state;
}
=20
+static int pull_value(uint32_t config)
+{
+ int pull =3D extract32(config, 2, 2);
+ if (pull =3D=3D NRF51_GPIO_PULLDOWN) {
+ return 0;
+ } else if (pull =3D=3D NRF51_GPIO_PULLUP) {
+ return 1;
+ }
+ return -1;
+}
+
static void update_output_irq(NRF51GPIOState *s, size_t i,
bool connected, bool level)
{
@@ -61,43 +72,47 @@ static void update_output_irq(NRF51GPIOState *s, size_t=
i,
=20
static void update_state(NRF51GPIOState *s)
{
- uint32_t pull;
+ int pull;
size_t i;
- bool connected_out, dir, connected_in, out, input;
+ bool connected_out, dir, connected_in, out, in, input;
=20
for (i =3D 0; i < NRF51_GPIO_PINS; i++) {
- pull =3D extract32(s->cnf[i], 2, 2);
+ pull =3D pull_value(s->cnf[i]);
dir =3D extract32(s->cnf[i], 0, 1);
connected_in =3D extract32(s->in_mask, i, 1);
out =3D extract32(s->out, i, 1);
+ in =3D extract32(s->in, i, 1);
input =3D !extract32(s->cnf[i], 1, 1);
connected_out =3D is_connected(s->cnf[i], out) && dir;
=20
- update_output_irq(s, i, connected_out, out);
-
- /* Pin both driven externally and internally */
- if (connected_out && connected_in) {
- qemu_log_mask(LOG_GUEST_ERROR, "GPIO pin %zu short circuited\n=
", i);
- }
-
- /*
- * Input buffer disconnected from internal/external drives, so
- * pull-up/pull-down becomes relevant
- */
- if (!input || (input && !connected_in && !connected_out)) {
- if (pull =3D=3D NRF51_GPIO_PULLDOWN) {
- s->in =3D deposit32(s->in, i, 1, 0);
- } else if (pull =3D=3D NRF51_GPIO_PULLUP) {
- s->in =3D deposit32(s->in, i, 1, 1);
+ if (!input) {
+ if (pull >=3D 0) {
+ /* Input buffer disconnected from external drives */
+ s->in =3D deposit32(s->in, i, 1, pull);
+ }
+ } else {
+ if (connected_out && connected_in && out !=3D in) {
+ /* Pin both driven externally and internally */
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "GPIO pin %zu short circuited\n", i);
+ }
+ if (!connected_in) {
+ /*
+ * Floating input: the output stimulates IN if connected,
+ * otherwise pull-up/pull-down resistors put a value on bo=
th
+ * IN and OUT.
+ */
+ if (pull >=3D 0 && !connected_out) {
+ connected_out =3D true;
+ out =3D pull;
+ }
+ if (connected_out) {
+ s->in =3D deposit32(s->in, i, 1, out);
+ }
}
}
-
- /* Self stimulation through internal output driver */
- if (connected_out && !connected_in && input) {
- s->in =3D deposit32(s->in, i, 1, out);
- }
+ update_output_irq(s, i, connected_out, out);
}
-
}
=20
/*
--=20
2.20.1
From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1553524483842168.75686301345706;
Mon, 25 Mar 2019 07:34:43 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43443 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8QgM-0001YI-KW
for importer@patchew.org; Mon, 25 Mar 2019 10:34:34 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43553)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdt-0000NN-7S
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qds-00021s-Bs
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:01 -0400
Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43371)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qds-00021O-54
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:00 -0400
Received: by mail-wr1-x430.google.com with SMTP id k17so2468830wrx.10
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:32:00 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.58
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:31:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=qmQSzWPEBQ4QyQRdEzkQ+Ob7V/+l6GaSP4pjY4AOx40=;
b=k/ndiAJduicd4SE8383+f0H7RXphAMlCUS6Fzbl0PTf7movMsX6zOisesGUvYWMfBA
WKgupweKOuAaJHHAMS0a5e8LDUWT4Y8VQ9Xq0mqjze5FgngLCjR+5mGddFdeU7dMpI2s
wFIZJI6GZyx1opVJf9q3xNYDE5J4I/ojgynMjYNI1Mrazitl7uNuEebeV7RhjhVgD+pP
xvS8GMVzPS8XSvEO+4nYLDekMtPIkr6bZ5qqgdfbcpmMgAMIZ695jkkcNovnd/dFP7JJ
UejAnJJW2iRVvSGB/XggN6Emx3F0Q1NFUZmjzu9Ky+2k2cT5WI4V/PzwmnG5fLd5DMOz
3hQA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=qmQSzWPEBQ4QyQRdEzkQ+Ob7V/+l6GaSP4pjY4AOx40=;
b=uY7sS2QSK/lYiEU88fP02s4gVWf/hebqYjZy77FXZgydEWJqLXq3HEGi9qlvNyXB9Y
43St88vldK5BE/1kAqW/ofHlnbZp/f56FcnRhQ1e+x7EataFuYKp5cSdpo9no3X7e+Og
SwW2EOL/XRarcb600/Ss+JZIQwF6h6qJD4dR/kytU830SrM1SeIicoONof6sMEn7zRYt
BoBe449EWfEfNfFT0pK/EHjAi5UvkxvMBGpwtoNXVQGeQu70Ag9U2J+Y9jcqZLb2h16y
A7tRyjoiAJJZyt27ffQO94TWtvRyR9dXjOjxzkgB0JAuA4AsJfwLxTtzuVLG8hfeNdJb
ZC+Q==
X-Gm-Message-State: APjAAAXA2jkxVFu5fvrFxL8WfoHxJNCMc3Glq7WIWzSAhEq4fDlaUIgN
SmSQtXS7X/STNOV7Td410bR3rOg/EuU=
X-Google-Smtp-Source:
APXvYqz2QX7WRtFYatEFgZM2i5l76BAPro7BfN5YAoDnW5n8zqXYXGYO+cmC+5Ua9y2l2ct5xjuKmg==
X-Received: by 2002:a5d:4843:: with SMTP id n3mr15910603wrs.256.1553524318966;
Mon, 25 Mar 2019 07:31:58 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:49 +0000
Message-Id: <20190325143152.9981-4-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::430
Subject: [Qemu-devel] [PULL 3/6] target/arm: add PCI_TESTDEV back to default
config
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Andrew Jones <drjones@redhat.com>
In the kconfig shuffle arm lost pci-testdev which is used by
kvm-unit-tests. Let's add it back.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190322163059.9716-1-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
default-configs/arm-softmmu.mak | 1 +
1 file changed, 1 insertion(+)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.=
mak
index 2a7efc11674..613d19a06db 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,6 +2,7 @@
=20
CONFIG_PCI=3Dy
CONFIG_PCI_DEVICES=3Dy
+CONFIG_PCI_TESTDEV=3Dy
CONFIG_VGA=3Dy
CONFIG_NAND=3Dy
CONFIG_ECC=3Dy
--=20
2.20.1
From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 155352449061332.40966012711419;
Mon, 25 Mar 2019 07:34:50 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43447 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8QgZ-0001gD-Ap
for importer@patchew.org; Mon, 25 Mar 2019 10:34:47 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43567)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdu-0000Nw-II
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdt-00022g-Mp
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:02 -0400
Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46907)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qdt-00022D-EY
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:01 -0400
Received: by mail-wr1-x42a.google.com with SMTP id o1so10388620wrs.13
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:32:01 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.59
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:31:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=gWbZaVP3mgHOFctibEYCiGmxb7fmhci6B2Ar678NJ70=;
b=pHo7jAXfa6m64h8RPidhR9NMSRO/RsSBNBQcJJlWj8mrT1eEUNrc1MGBvdj3Ue03WS
WPvQ2ODksG/1N51lJrmZ48cxfBvYPaLvvTm3rTKJd3iLfK/BkJQeUnmZ4DvO+D5u6uYi
EXXS3VxubFtMb8crL/02OU0OnJoaYYynoTQOxKli2CKJ/Ahk0I4DhhcGfRR/U9NiHQcT
U7Depq+Q8chcloIKoFh1gm8Q+8UYBX8hcMoFZGHfGLWHrDkNMqXFTjByJ+nCdq4OwlP6
St6trNYC9DCPTO1my3Uwd20B79zZQEYvMmjOa6wCgXKMArWweBYpLsI6NfqoopGH3Ixz
l4wg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=gWbZaVP3mgHOFctibEYCiGmxb7fmhci6B2Ar678NJ70=;
b=fY3c/sHZ23Jvn3cZfVD7buQuD7gQ6WaDse8QqaPELCzVZeRm17Bguu5KEXcHXwl0y3
6hIyWy3lKNoNgPwEGdlS7Stz/cqWUJvKpCWYryMy2XSC6TWNaf3TM2zMgickJCvSxwXO
U8OeTjs0ghKZtzwQUZwDac+yV0U0cpTyzVwVE94iNpWuAFxjy07RnOmhgVasWsbPzcWX
FCVe5eDFaNVNTQ6q7uKfi+Bv70grtYo3iCk7eKBydrXgZFWVv+Qt/WviUVdx02eD3Z26
dR20cr8MiQrPQLmkWE9+pzqJglNI1a8j1Ae51mLQFlIDd3VAEwOdo9q83DmXMf5MV+XM
85rg==
X-Gm-Message-State: APjAAAUMbU9xg5kztRDYs5aShJM/s5cj4HqyTF0IO7TaaEQk4mDHOKjX
OI+YO7oml5nQnkEIaGqEuz9NLY8T/JE=
X-Google-Smtp-Source:
APXvYqwGLnpPubeTj5sGXrN/WANHrRCXlk4BusYalWJlJRFSBx1SjlGCRVSwXk7rUB05Gbo8mcmcVw==
X-Received: by 2002:adf:fcc5:: with SMTP id f5mr16066053wrs.166.1553524320322;
Mon, 25 Mar 2019 07:32:00 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:50 +0000
Message-Id: <20190325143152.9981-5-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::42a
Subject: [Qemu-devel] [PULL 4/6] target/arm: fix crash on pmu register access
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Andrew Jones <drjones@redhat.com>
Fix a QEMU NULL derefence that occurs when the guest attempts to
enable PMU counters with a non-v8 cpu model or a v8 cpu model
which has not configured a PMU.
Fixes: 4e7beb0cc0f3 ("target/arm: Add a timer to predict PMU counter overfl=
ow")
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190322162333.17159-2-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index c8d3c213b6b..fc73488f6cc 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1259,6 +1259,10 @@ static bool pmu_counter_enabled(CPUARMState *env, ui=
nt8_t counter)
int el =3D arm_current_el(env);
uint8_t hpmn =3D env->cp15.mdcr_el2 & MDCR_HPMN;
=20
+ if (!arm_feature(env, ARM_FEATURE_PMU)) {
+ return false;
+ }
+
if (!arm_feature(env, ARM_FEATURE_EL2) ||
(counter < hpmn || counter =3D=3D 31)) {
e =3D env->cp15.c9_pmcr & PMCRE;
--=20
2.20.1
From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1553524623186631.0018457616015;
Mon, 25 Mar 2019 07:37:03 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43504 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8Qih-0003rQ-7r
for importer@patchew.org; Mon, 25 Mar 2019 10:36:59 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43605)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdz-0000Sa-Ie
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdu-00023J-Pw
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:07 -0400
Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:41217)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qdu-00022p-Hr
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:02 -0400
Received: by mail-wr1-x433.google.com with SMTP id r4so2729178wrq.8
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:32:02 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.32.00
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:32:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=APam0gAPkkPIy3X5xt8ZSMQ77AVw+wdEAQ36/sWjIMs=;
b=c0SCoaU9LB//cnKqQnc6PJUBbnIZV/cFDTIn97vqqeMKRdgI/8mjFpPoZWMGQz1hvO
E4n9xUWV4I6vBt3ofePYHmpBiGxVCTdBptGdgXaRg9HT5Ya+vTfU8dCV666Vf5nC1Xoe
Ds3yTPqDvBAgJLROkkGNELMYtCQcKgw1XfyjO4+mRIYuNyv9aEdVTG2NjHa1sabm9uz8
Rdvgg5MA/oUCyVM7V6AueIxVn9NuEbnBdkbnMfvY1BsPdhrtKdPWKmo25eP9Ari7NIfK
NmQtuu81wb6k7ESm16X15wUWaaogBhYPjwjoO2WWpDEN0xUDCdGt98d6897xCIGMMB9v
Lb2A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=APam0gAPkkPIy3X5xt8ZSMQ77AVw+wdEAQ36/sWjIMs=;
b=PlwuXCA/GJ7eoT/37EJ3wCCLaUchhoZNNDI4jCSTZFx542jfA1yOmSk+WQmHw62KPN
Z7dpDB+7U1YCYTYGK+EUnzFv1PQTBGKav9expPzediCOwLE4uHUt+XkzuIWLFVvCpDRu
GSI+alq16Laf+6ZwwdacH+po0tZczBgz15BUJsNbHWURUG+Mu6TyPw7ZCN0Llf1biwwS
4BqIGxw5neaSMGfQYdID0v3l9Bn9+w+asa33IvyTUIi35+c5Tgb/X8TpDrrH+lsh1o0E
xmPJTIHngAHNNePX4oTz6HP+Gt0SCSL5GFoiue3pnwpthKJF5ioo7LQBY2zIH4GYyey4
POHg==
X-Gm-Message-State: APjAAAWEJeTkB+92JHcA6b0MsLDu8hc1346PzuIPhb/gXR69Ns5jBklW
ajQGa2Dr7soMRxF9ruQFHbWiB8mu8bU=
X-Google-Smtp-Source:
APXvYqzfofKlXbLqabuNmR9p7I6mkRM3vHAkDLbDEsiC/VdG54MdA+rlC/WoGl0bN/zo9F2u50WEIw==
X-Received: by 2002:adf:dcce:: with SMTP id x14mr5682450wrm.315.1553524321389;
Mon, 25 Mar 2019 07:32:01 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:51 +0000
Message-Id: <20190325143152.9981-6-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::433
Subject: [Qemu-devel] [PULL 5/6] target/arm: cortex-a7 and cortex-a15 have
pmus
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Andrew Jones <drjones@redhat.com>
cortex-a7 and cortex-a15 have pmus (PMUv2) and they advertise
them in ID_DFR0. Let's allow them to function. This also enables
the pmu cpu property to work with these cpu types, i.e. we can
now do '-cpu cortex-a15,pmu=3Doff' to remove the pmu.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190322162333.17159-3-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 96f0ff0ec72..504a4771fbd 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1109,6 +1109,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error=
**errp)
#endif
} else {
cpu->id_aa64dfr0 &=3D ~0xf00;
+ cpu->id_dfr0 &=3D ~(0xf << 24);
cpu->pmceid0 =3D 0;
cpu->pmceid1 =3D 0;
}
@@ -1744,6 +1745,7 @@ static void cortex_a7_initfn(Object *obj)
set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
set_feature(&cpu->env, ARM_FEATURE_EL2);
set_feature(&cpu->env, ARM_FEATURE_EL3);
+ set_feature(&cpu->env, ARM_FEATURE_PMU);
cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A7;
cpu->midr =3D 0x410fc075;
cpu->reset_fpsid =3D 0x41023075;
@@ -1789,6 +1791,7 @@ static void cortex_a15_initfn(Object *obj)
set_feature(&cpu->env, ARM_FEATURE_CBAR_RO);
set_feature(&cpu->env, ARM_FEATURE_EL2);
set_feature(&cpu->env, ARM_FEATURE_EL3);
+ set_feature(&cpu->env, ARM_FEATURE_PMU);
cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A15;
cpu->midr =3D 0x412fc0f1;
cpu->reset_fpsid =3D 0x410430f0;
--=20
2.20.1
From nobody Fri May 2 13:33:41 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1553524727350127.89914117394085;
Mon, 25 Mar 2019 07:38:47 -0700 (PDT)
Received: from localhost ([127.0.0.1]:43518 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1h8QkL-0004xp-Bm
for importer@patchew.org; Mon, 25 Mar 2019 10:38:41 -0400
Received: from eggs.gnu.org ([209.51.188.92]:43593)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdw-0000Ps-R5
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1h8Qdv-00023r-R5
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:04 -0400
Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38228)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1h8Qdv-00023N-Ip
for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:03 -0400
Received: by mail-wr1-x435.google.com with SMTP id k11so3017970wro.5
for <qemu-devel@nongnu.org>; Mon, 25 Mar 2019 07:32:03 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.32.01
for <qemu-devel@nongnu.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 25 Mar 2019 07:32:01 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=z/ppXOmLGbyBCPtJUcXjIA53Vpgb3lO8s8SPUJEHazw=;
b=UG3IW9jmPhl4sYtqYvVhmlj3rbOCLlakcP9U1jgqzFfBFzi964GkqxVFzPoFufsdGi
0y9fLzNR+mA4Hx/IinTDd/x0Ah6ov/ypkJ3kfJvJAizMCBiX+/PNBeyMaFW6m0VXeJGS
RR0zM46mvX7wDhJJSNRCXn1AXkaA8KWDL1ZoLBXgAjcG7abX1j3Aeb5hYRHKx4sf8hfN
pejjUNbsfo4MEje4Rnu4HyWKbu9y0TqISHh1xSn3D0e+bKKbvAI5cDJnvpoaMhfehfaT
q924vV5EH+YRamC6vuqlHD8eA6QCMDWJhYthi3L9hr0k8xM7AWLl//wES4fL2O0wHlgN
3ADw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=z/ppXOmLGbyBCPtJUcXjIA53Vpgb3lO8s8SPUJEHazw=;
b=ORS0P3HHVXqG7zSaVG2L5xm5FGuIJyKy+yfUOjrlbtPD4wbNQDk1y9C4+5iYNreBzQ
cSnHAs1cZiKy6laHyvYF3rCti8Hk1SPf0a+sHnluPrpbEJ699DtN/A7oBO2AKRNITMTu
LXdod+2ohk1JD5Q5hlLzXJ+wL2I8nMRYFG2wLehao0sGC/GY3Kjk9zaDbD4OQDQdzW9V
TudbTysnfTwwsv2lgxAyqHpwfH9JOr8jos9jC+t/XKdHCEl2DzQFlYKQXwp41RayEFbJ
HUJ7r5mUhcv8wxh6RCrgiXdeo6RMwqL57rigv9GF6MPkAFw2wZFIoATJq0RqvqpkQK5f
RMBQ==
X-Gm-Message-State: APjAAAXAwHwqLZxdB9Fw6HWEIe/72S2vjgj8qclUDtRGcBcWXEtHWKPe
OBqRnO1Rd/5NPzf4BPBzvVJTX4AVNas=
X-Google-Smtp-Source:
APXvYqwC3vLrbyk8StrYQCg1CL4Q+AKnKUc7ua2DnNIgkOhG2NmmzpYm4o/mDFmlI5Txw1qyOEHvwA==
X-Received: by 2002:adf:e6c6:: with SMTP id y6mr16005979wrm.225.1553524322419;
Mon, 25 Mar 2019 07:32:02 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 25 Mar 2019 14:31:52 +0000
Message-Id: <20190325143152.9981-7-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org>
References: <20190325143152.9981-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::435
Subject: [Qemu-devel] [PULL 6/6] target/arm: make pmccntr_op_start/finish
static
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Andrew Jones <drjones@redhat.com>
These functions are not used outside helper.c
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190322162333.17159-4-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu.h | 11 -----------
target/arm/helper.c | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 5f23c621325..d4d2836923d 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -992,17 +992,6 @@ static inline bool is_a64(CPUARMState *env)
int cpu_arm_signal_handler(int host_signum, void *pinfo,
void *puc);
=20
-/**
- * pmccntr_op_start/finish
- * @env: CPUARMState
- *
- * Convert the counter in the PMCCNTR between its delta form (the typical =
mode
- * when it's enabled) and the guest-visible value. These two calls must al=
ways
- * surround any action which might affect the counter.
- */
-void pmccntr_op_start(CPUARMState *env);
-void pmccntr_op_finish(CPUARMState *env);
-
/**
* pmu_op_start/finish
* @env: CPUARMState
diff --git a/target/arm/helper.c b/target/arm/helper.c
index fc73488f6cc..a36f4b3d699 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1337,7 +1337,7 @@ static void pmu_update_irq(CPUARMState *env)
* etc. can be done logically. This is essentially a no-op if the counter =
is
* not enabled at the time of the call.
*/
-void pmccntr_op_start(CPUARMState *env)
+static void pmccntr_op_start(CPUARMState *env)
{
uint64_t cycles =3D cycles_get_count(env);
=20
@@ -1367,7 +1367,7 @@ void pmccntr_op_start(CPUARMState *env)
* guest-visible count. A call to pmccntr_op_finish should follow every ca=
ll to
* pmccntr_op_start.
*/
-void pmccntr_op_finish(CPUARMState *env)
+static void pmccntr_op_finish(CPUARMState *env)
{
if (pmu_counter_enabled(env, 31)) {
#ifndef CONFIG_USER_ONLY
--=20
2.20.1