qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Leif Lindholm" <quic_llindhol@quicinc.com>,
	"Radoslaw Biernacki" <rad@semihalf.com>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	"Igor Mitsyanko" <i.mitsyanko@gmail.com>,
	"Rob Herring" <robh@kernel.org>,
	"Alistair Francis" <alistair@alistair23.me>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Marcin Juszkiewicz" <marcin.juszkiewicz@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 05/14] hw/arm/armv7m: Always set 'init-nsvtor' property for Cortex-M CPUs
Date: Tue,  9 Jan 2024 19:09:20 +0100	[thread overview]
Message-ID: <20240109180930.90793-6-philmd@linaro.org> (raw)
In-Reply-To: <20240109180930.90793-1-philmd@linaro.org>

All CPUs implementing ARM_FEATURE_M have the 'init-nsvtor' property.
Since setting the property can not fail, replace

   object_property_set_uint(..., "init-nsvtor", ..., &error_abort);

by:
   qdev_prop_set_uint32(..., "init-nsvtor", ...).

which is a one-to-one replacement.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/arm/armv7m.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index b752049add..530729f42e 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -309,6 +309,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
     object_property_set_link(OBJECT(s->cpu), "memory", OBJECT(&s->container),
                              &error_abort);
     qdev_prop_set_bit(cpudev, "start-powered-off", s->start_powered_off);
+    qdev_prop_set_uint32(cpudev, "init-nsvtor", s->init_nsvtor);
+
     if (object_property_find(OBJECT(s->cpu), "idau")) {
         object_property_set_link(OBJECT(s->cpu), "idau", s->idau,
                                  &error_abort);
@@ -319,12 +321,6 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
             return;
         }
     }
-    if (object_property_find(OBJECT(s->cpu), "init-nsvtor")) {
-        if (!object_property_set_uint(OBJECT(s->cpu), "init-nsvtor",
-                                      s->init_nsvtor, errp)) {
-            return;
-        }
-    }
     if (object_property_find(OBJECT(s->cpu), "vfp")) {
         if (!object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, errp)) {
             return;
-- 
2.41.0



  parent reply	other threads:[~2024-01-09 18:11 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-09 18:09 [PATCH v2 00/14] hw/arm: Prefer arm_feature() over object_property_find() Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 01/14] target/arm/cpu: Simplify checking A64_MTE bit in FEATURE_ID register Philippe Mathieu-Daudé
2024-01-10  6:01   ` Richard Henderson
2024-01-10 11:36     ` Peter Maydell
2024-01-09 18:09 ` [PATCH v2 02/14] hw/arm/armv7m: Introduce cpudev variable in armv7m_realize() Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 03/14] hw/arm/armv7m: Ensure requested CPU type implements ARM_FEATURE_M Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 04/14] hw/arm/armv7m: Move code setting 'start-powered-off' property around Philippe Mathieu-Daudé
2024-01-09 18:09 ` Philippe Mathieu-Daudé [this message]
2024-01-09 18:09 ` [PATCH v2 06/14] hw/arm: Prefer arm_feature(M_SECURITY) over object_property_find() Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 07/14] hw/arm: Prefer arm_feature(THUMB_DSP) over object_property_find(dsp) Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 08/14] hw/arm: Prefer arm_feature(V7) over object_property_find(pmsav7-dregion) Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 09/14] hw/arm: Prefer arm_feature(EL3) over object_property_find(has_el3) Philippe Mathieu-Daudé
2024-01-09 18:13   ` Philippe Mathieu-Daudé
2024-01-09 18:17     ` Philippe Mathieu-Daudé
2024-01-09 18:22   ` Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 10/14] hw/arm: Prefer arm_feature(EL2) over object_property_find(has_el2) Philippe Mathieu-Daudé
2024-01-09 18:23   ` Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 11/14] hw/arm: Prefer arm_feature(CBAR*) over object_property_find(reset-cbar) Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 12/14] hw/arm: Prefer arm_feature(PMU) over object_property_find(pmu) Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 13/14] hw/arm: Prefer cpu_isar_feature(aa64_mte) over property_find(tag-memory) Philippe Mathieu-Daudé
2024-01-09 18:09 ` [PATCH v2 14/14] hw/arm: Prefer arm_feature(GENERIC_TMR) over 'kvm-no-adjvtime' property Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240109180930.90793-6-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=alistair@alistair23.me \
    --cc=armbru@redhat.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=i.mitsyanko@gmail.com \
    --cc=kwolf@redhat.com \
    --cc=marcin.juszkiewicz@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quic_llindhol@quicinc.com \
    --cc=rad@semihalf.com \
    --cc=robh@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).