Skip to content

Fix Support for ARM CBAR and reset-hivecs

Peter Crosthwaite qemu-devel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest10 patches 1 replyIn review
  2. v412 patches 1 replySuperseded
  3. v39 patches 20 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v28 patches8 repliesSuperseded
v16 patches11 repliesSuperseded

Changes in v5 from the cover letter

Reimplemented using qdev properties
dropped QOM patches
rebased against mainline

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10target-arm/helper.c: Allow cp15.c15 dummy overridetarget-arm/helper.c+2 -10 replies
2/10target-arm: Define and use ARM_FEATURE_CBARtarget-arm/cpu.c target-arm/cpu.h target-arm/helper.c+13 -90 replies
3/10target-arm/cpu: Convert reset CBAR to a propertytarget-arm/cpu.c+17 -00 replies
4/10arm/highbank: Use object_new() rather than cpu_arm_init()hw/arm/highbank.c+9 -30 replies
5/10arm/highbank: Fix CBAR initialisationhw/arm/highbank.c+5 -30 replies
6/10arm/xilinx_zynq: Use object_new() rather than cpu_arm_init()hw/arm/xilinx_zynq.c+9 -30 replies
7/10arm/xilinx_zynq: Implement CBAR initialisationhw/arm/xilinx_zynq.c+8 -10 replies
8/10arm/highbank.c: Fix MPCore periphbase namehw/arm/highbank.c+8 -70 replies
9/10ARM: cpu: add "reset_hivecs" propertytarget-arm/cpu-qom.h target-arm/cpu.c+14 -00 replies
10/10ARM: arm_cpu_reset: make it possible to use high vectors for reset_exctarget-arm/cpu.c+5 -00 replies

Reviews trailers per patch

7 of 10 patches have a Reviewed-by or Acked-by.

PatchPeter Maydell
1/10R-b
2/10R-b
3/10
4/10R-b
5/10R-b
6/10R-b
7/10R-b
8/10R-b
9/10
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [Qemu-devel] [PATCH target-arm v5 00/10] Fix Support for ARM CBAR and reset-hivecs

Hi All,

This patch series adds support for two board configurable ARM CPU properties - Configuration Base Address Register and the hivecs-on-reset.

The CBAR is needed to fix Zynq and Highbank which both were broken for linux boot. This series provides the fixes.

I have added these properties as qdev properties rather than object properties to pick up the desired writable-until-realize semantic.

To test the semantics of these new qdev properties I hacked Highbank to illegally set the property after realize:

hw/arm/highbank.c +0 -0
index c75b425..905483d 100644
@@ -236,13 +236,13 @@ static void calxeda_init(QEMUMachineInitArgs

*args, enum cxmachines machine)

         cpu = ARM_CPU(object_new(object_class_get_name(oc)));

- object_property_set_int(OBJECT(cpu), MPCORE_PERIPHBASE, "reset-cbar",
- &err);

+        object_property_set_bool(OBJECT(cpu), true, "realized", &err);
         if (err) {
             error_report("%s", error_get_pretty(err));
             exit(1);
         }
-        object_property_set_bool(OBJECT(cpu), true, "realized", &err);
+        object_property_set_int(OBJECT(cpu), MPCORE_PERIPHBASE, "reset-cbar",
+                                &err);
         if (err) {
             error_report("%s", error_get_pretty(err));
             exit(1);

Booting with this bug I now get:

$ qemu-system-arm -M highbank ...
qemu-system-arm: Attempt to set property 'reset-cbar' on anonymous device (type 'cortex-a9-arm-cpu') after it was realized

whereas the previous versions would have silent failed.

Regards,
Peter

changed since v4:
Reimplemented using qdev properties
dropped QOM patches
rebased against mainline
changed since v3:
Rebased against target-arm patch queue (2013/12/11) Added Antonys reset hivecs patches
changed since v2:
Fixed comment in p8 (PMM review)
Enabled CBAR for a15 (PMM review)
Typo sweep
Changed since v1:
Fix QOM to support writeable dynamic properties Use dynamic props instead (PMM/AF discussion) Use error_report (AF reivew)
Use reset- prefix on propname (AF review) Fix machine model namings or the MPCore PERIPHBASE

Antony Pavlov (2):
ARM: cpu: add "reset_hivecs" property
ARM: arm_cpu_reset: make it possible to use high vectors for reset_exc

Peter Crosthwaite (8):
target-arm/helper.c: Allow cp15.c15 dummy override
target-arm: Define and use ARM_FEATURE_CBAR target-arm/cpu: Convert reset CBAR to a property arm/highbank: Use object_new() rather than cpu_arm_init() arm/highbank: Fix CBAR initialisation arm/xilinx_zynq: Use object_new() rather than cpu_arm_init() arm/xilinx_zynq: Implement CBAR initialisation arm/highbank.c: Fix MPCore periphbase name

 hw/arm/highbank.c    | 33 +++++++++++++++++++++------------
 hw/arm/xilinx_zynq.c | 21 +++++++++++++++++----
 target-arm/cpu-qom.h |  1 +
 target-arm/cpu.c     | 47 ++++++++++++++++++++++++++++++++++++++---------
 target-arm/cpu.h     |  1 +
 target-arm/helper.c  | 12 +++++++++++-
 6 files changed, 89 insertions(+), 26 deletions(-)
Signature · 1 line
1.8.5.1