qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] edac4d: target-arm: Add CNTVOFF_EL2

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] edac4d: target-arm: Add CNTVOFF_EL2
Date: Thu, 13 Aug 2015 07:30:05 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: edac4d8a168b9c0c4a765bbc5507e46fa5557b78
      
https://github.com/qemu/qemu/commit/edac4d8a168b9c0c4a765bbc5507e46fa5557b78
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/cpu.h
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add CNTVOFF_EL2

Adds support for the virtual timer offset controlled by EL2.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 0b6440afb807a80c6d64dcc987bcfed87e1ace17
      
https://github.com/qemu/qemu/commit/0b6440afb807a80c6d64dcc987bcfed87e1ace17
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/cpu.h
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add CNTHCTL_EL2

Adds control for trapping selected timer and counter accesses to EL2.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: d57b9ee84f6b2786f025712609edb259d0de086d
      
https://github.com/qemu/qemu/commit/d57b9ee84f6b2786f025712609edb259d0de086d
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Rename and move gt_cnt_reset

Rename gt_cnt_reset to gt_timer_reset as the function really
resets the timers and not the counters. Move the registration
from counter regs to timer regs.

Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 0e3eca4c26d6aa4f082db8e63fd81a16df061f3c
      
https://github.com/qemu/qemu/commit/0e3eca4c26d6aa4f082db8e63fd81a16df061f3c
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Pass timeridx as argument to various timer functions

Prepare for adding the Hypervisor timer, no functional change.

Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: b0e66d95e4f587b5818d2760668301ee0871ba5e
      
https://github.com/qemu/qemu/commit/b0e66d95e4f587b5818d2760668301ee0871ba5e
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/cpu-qom.h
    M target-arm/cpu.c
    M target-arm/cpu.h
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add the Hypervisor timer

Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 0e3e858f6a88b3c3befe9c98227aec846c01d9a1
      
https://github.com/qemu/qemu/commit/0e3e858f6a88b3c3befe9c98227aec846c01d9a1
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Replace magic IRQ constants with macros

Replace magic constants with macros from
hw/arm/virt.h and hw/intc/arm_gic_common.h.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: a5c6a584a74c9c66a07a2ce019bbdd3bcf4e4909
      
https://github.com/qemu/qemu/commit/a5c6a584a74c9c66a07a2ce019bbdd3bcf4e4909
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Connect the Hypervisor timer

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: cd0bda20874d65b5ac4ab6e69d3eec4f095a924b
      
https://github.com/qemu/qemu/commit/cd0bda20874d65b5ac4ab6e69d3eec4f095a924b
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/char/imx_serial.c
    A include/hw/char/imx_serial.h

  Log Message:
  -----------
  i.MX: Split UART emulator in a header file and a source file

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: f6c64000f966d17ef1bead1e066f039d0be64d74
      
https://github.com/qemu/qemu/commit/f6c64000f966d17ef1bead1e066f039d0be64d74
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/char/imx_serial.c

  Log Message:
  -----------
  i.MX: Move serial initialization to init/realize of DeviceClass.

Move constructor to DeviceClass methods
 * imx_serial_init
 * imx_serial_realize

imx32_serial_properties is renamed to imx_serial_properties.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: fa2650a37e58877d889a726a47aadbf4578ef87e
      
https://github.com/qemu/qemu/commit/fa2650a37e58877d889a726a47aadbf4578ef87e
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/char/imx_serial.c

  Log Message:
  -----------
  i.MX:Fix Coding style for UART emulator.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: f250c6a7510e0069fdc7fd1fb76700db4daa9ddd
      
https://github.com/qemu/qemu/commit/f250c6a7510e0069fdc7fd1fb76700db4daa9ddd
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/kzm.c
    M hw/intc/imx_avic.c
    A include/hw/intc/imx_avic.h

  Log Message:
  -----------
  i.MX: Split AVIC emulator in a header file and a source file

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: dbeedce78eea56ac4d482722291d6a7ebfd414d2
      
https://github.com/qemu/qemu/commit/dbeedce78eea56ac4d482722291d6a7ebfd414d2
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/intc/imx_avic.c

  Log Message:
  -----------
  i.MX: Fix Coding style for AVIC emulator.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 282e74c83fd8af08d14fb1220a960e34b60e505f
      
https://github.com/qemu/qemu/commit/282e74c83fd8af08d14fb1220a960e34b60e505f
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/kzm.c
    M hw/misc/imx_ccm.c
    M include/hw/arm/imx.h
    A include/hw/misc/imx_ccm.h

  Log Message:
  -----------
  i.MX: Split CCM emulator in a header file and a source file

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: c14875b2e1b70b470492a000e0bc0b19978d34a2
      
https://github.com/qemu/qemu/commit/c14875b2e1b70b470492a000e0bc0b19978d34a2
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/misc/imx_ccm.c

  Log Message:
  -----------
  i.MX: Fix Coding style for CCM emulator

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 951cd00e924ed06a72f4c2831f4cf7be9e6b90ef
      
https://github.com/qemu/qemu/commit/951cd00e924ed06a72f4c2831f4cf7be9e6b90ef
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/timer/imx_epit.c
    A include/hw/timer/imx_epit.h

  Log Message:
  -----------
  i.MX: Split EPIT emulator in a header file and a source file

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 565328fcc35f34242b29182313e4d7cf525d9b1c
      
https://github.com/qemu/qemu/commit/565328fcc35f34242b29182313e4d7cf525d9b1c
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/timer/imx_epit.c

  Log Message:
  -----------
  i.MX: Fix Coding style for EPIT emulator

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: d647b26dc68a71db89a0c431841f1532ef7502e9
      
https://github.com/qemu/qemu/commit/d647b26dc68a71db89a0c431841f1532ef7502e9
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/timer/imx_gpt.c
    A include/hw/timer/imx_gpt.h

  Log Message:
  -----------
  i.MX: Split GPT emulator in a header file and a source file

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 68b85290c7e23cfa159e1a5058d959814c6fa289
      
https://github.com/qemu/qemu/commit/68b85290c7e23cfa159e1a5058d959814c6fa289
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/timer/imx_gpt.c

  Log Message:
  -----------
  i.MX: Fix Coding style for GPT emulator

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 6d6d2abf2c2e52c0f404d0a31a963e945b0cc7ad
      
https://github.com/qemu/qemu/commit/6d6d2abf2c2e52c0f404d0a31a963e945b0cc7ad
  Author: Pavel Fedin <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M include/exec/memory.h
    M memory.c

  Log Message:
  -----------
  Merge memory_region_init_reservation() into memory_region_init_io()

Just specifying ops = NULL in some cases can be more convenient than having
two functions.

Signed-off-by: Pavel Fedin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 7926c210ab0c44fc3612461a50f487d16be98dca
      
https://github.com/qemu/qemu/commit/7926c210ab0c44fc3612461a50f487d16be98dca
  Author: Pavel Fedin <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/intc/arm_gic.c
    M hw/intc/arm_gic_common.c
    M hw/intc/arm_gic_kvm.c
    M include/hw/intc/arm_gic_common.h

  Log Message:
  -----------
  hw/arm/gic: Kill code duplication

Extracted duplicated initialization code from SW-emulated and KVM GIC
implementations and put into gic_init_irqs_and_mmio()

Signed-off-by: Pavel Fedin <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: e6fbcbc4e57322a8de1307556e68a4cd6d0d8c8b
      
https://github.com/qemu/qemu/commit/e6fbcbc4e57322a8de1307556e68a4cd6d0d8c8b
  Author: Pavel Fedin <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/virt.c
    M hw/cpu/a15mpcore.c
    M target-arm/kvm_arm.h

  Log Message:
  -----------
  Introduce gic_class_name() instead of repeating condition

This small inline returns correct GIC class name depending on whether we
use KVM acceleration or not. Avoids duplicating the condition everywhere.

Signed-off-by: Pavel Fedin <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 49a661910c1374858602a3002b67115893673c25
      
https://github.com/qemu/qemu/commit/49a661910c1374858602a3002b67115893673c25
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/cpu.c
    M target-arm/cpu.h
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add debug check for mismatched cpreg resets

It's easy to accidentally define two cpregs which both try
to reset the same underlying state field (for instance a
clash between an AArch64 EL3 definition and an AArch32
banked register definition). if the two definitions disagree
about the reset value then the result is dependent on which
one happened to be reached last in the hashtable enumeration.

Add a consistency check to detect and assert in these cases:
after reset, we run a second pass where we check that the
reset operation doesn't change the value of the register.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden


  Commit: b4d3978c2fdf944e428a46d2850dbd950b6fbe78
      
https://github.com/qemu/qemu/commit/b4d3978c2fdf944e428a46d2850dbd950b6fbe78
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/cpu-qom.h
    M target-arm/cpu.c
    M target-arm/cpu.h
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add the AArch64 view of the Secure physical timer

On CPUs with EL3, there are two physical timers, one for Secure and one
for Non-secure. Implement this extra timer and the AArch64 registers
which access it.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden


  Commit: 9ff9dd3c875956523bb4c19ca712e5d05aab3c65
      
https://github.com/qemu/qemu/commit/9ff9dd3c875956523bb4c19ca712e5d05aab3c65
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add AArch32 banked register access to secure physical timer

If EL3 is AArch32, then the secure physical timer is accessed via
banking of the registers used for the non-secure physical timer.
Implement this banking.

Note that the access controls for the AArch32 banked registers
remain the same as the physical-timer checks; they are not the
same as the controls on the AArch64 secure timer registers.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Edgar E. Iglesias <address@hidden>


  Commit: a007b1f85813ef6450ad3e761e46c189e3f40e04
      
https://github.com/qemu/qemu/commit/a007b1f85813ef6450ad3e761e46c189e3f40e04
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Wire up secure timer interrupt

Wire up the secure timer interrupt. Since we've defined
that the plain old physical timer is the NS timer, we can
drop the now-out-of-date comment about QEMU not having TZ.

Use a data-driven loop to wire up the timer interrupts, since
we now have four of them and the code is the same for each.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Edgar E. Iglesias <address@hidden>


  Commit: 5dfaa75b4d96fe88858a98d947b97e697e2811e6
      
https://github.com/qemu/qemu/commit/5dfaa75b4d96fe88858a98d947b97e697e2811e6
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/cpu/a15mpcore.c

  Log Message:
  -----------
  hw/cpu/a15mpcore: Wire up hyp and secure physical timer interrupts

Since we now support both the hypervisor and the secure physical timer, wire
their interrupt lines up in the a15mpcore wrapper object.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Edgar E. Iglesias <address@hidden>


  Commit: f7a6785e12d834d05200b0595070db453344b25d
      
https://github.com/qemu/qemu/commit/f7a6785e12d834d05200b0595070db453344b25d
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/char/imx_serial.c

  Log Message:
  -----------
  i.MX: Fix UART driver to work with unitialized "chardev" device

The "chardev" property initialization might have failed (for example because
there are not enough chardevs provided by QEMU).

The serial device emulator needs to be able to work with an uninitialized
(NULL) chardev device pointer.

This patch adds some missing tests on the chr pointer value before
using it.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 425591e3effb0bdd4dec2a5b0d092009ee1a8f32
      
https://github.com/qemu/qemu/commit/425591e3effb0bdd4dec2a5b0d092009ee1a8f32
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M hw/arm/kzm.c
    M hw/arm/virt.c
    M hw/char/imx_serial.c
    M hw/cpu/a15mpcore.c
    M hw/intc/arm_gic.c
    M hw/intc/arm_gic_common.c
    M hw/intc/arm_gic_kvm.c
    M hw/intc/imx_avic.c
    M hw/misc/imx_ccm.c
    M hw/timer/imx_epit.c
    M hw/timer/imx_gpt.c
    M include/exec/memory.h
    M include/hw/arm/imx.h
    A include/hw/char/imx_serial.h
    M include/hw/intc/arm_gic_common.h
    A include/hw/intc/imx_avic.h
    A include/hw/misc/imx_ccm.h
    A include/hw/timer/imx_epit.h
    A include/hw/timer/imx_gpt.h
    M memory.c
    M target-arm/cpu-qom.h
    M target-arm/cpu.c
    M target-arm/cpu.h
    M target-arm/helper.c
    M target-arm/kvm_arm.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150813' 
into staging

target-arm queue:
 * i.MX code cleanup/refactorings
 * i.MX UART fix to work with uninitialized chardev
 * minor GIC code refactorings
 * implement the ARM Secure physical timer
 * implement the ARM Hypervisor timer

# gpg: Signature made Thu 13 Aug 2015 11:40:56 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-target-arm-20150813: (27 commits)
  i.MX: Fix UART driver to work with unitialized "chardev" device
  hw/cpu/a15mpcore: Wire up hyp and secure physical timer interrupts
  hw/arm/virt: Wire up secure timer interrupt
  target-arm: Add AArch32 banked register access to secure physical timer
  target-arm: Add the AArch64 view of the Secure physical timer
  target-arm: Add debug check for mismatched cpreg resets
  Introduce gic_class_name() instead of repeating condition
  hw/arm/gic: Kill code duplication
  Merge memory_region_init_reservation() into memory_region_init_io()
  i.MX: Fix Coding style for GPT emulator
  i.MX: Split GPT emulator in a header file and a source file
  i.MX: Fix Coding style for EPIT emulator
  i.MX: Split EPIT emulator in a header file and a source file
  i.MX: Fix Coding style for CCM emulator
  i.MX: Split CCM emulator in a header file and a source file
  i.MX: Fix Coding style for AVIC emulator.
  i.MX: Split AVIC emulator in a header file and a source file
  i.MX:Fix Coding style for UART emulator.
  i.MX: Move serial initialization to init/realize of DeviceClass.
  i.MX: Split UART emulator in a header file and a source file
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ca0e5d8b0d06...425591e3effb
reply via email to
[Prev in Thread] Current Thread [Next in Thread]