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

[Qemu-commits] [qemu/qemu] a903c4: target-arm: Break down TLB_LOCKDOWN

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] a903c4: target-arm: Break down TLB_LOCKDOWN
Date: Thu, 04 Jun 2015 04:00:08 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a903c449b41f105aadd5f762a7aede531b4950f0
      
https://github.com/qemu/qemu/commit/a903c449b41f105aadd5f762a7aede531b4950f0
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Break down TLB_LOCKDOWN

Break down the overly broad wildcard definition of TLB_LOCKDOWN
down to v7 level.

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


  Commit: 95f949ac3dc7d4a6ebee512a9d122db18210df64
      
https://github.com/qemu/qemu/commit/95f949ac3dc7d4a6ebee512a9d122db18210df64
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add MAIR_EL2

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


  Commit: 06ec4c8c9f9e21b7671c79296f3a47ab63d50067
      
https://github.com/qemu/qemu/commit/06ec4c8c9f9e21b7671c79296f3a47ab63d50067
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TCR_EL2

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


  Commit: b9cb5323bb671a0f2bfecc36168d3a3763e90261
      
https://github.com/qemu/qemu/commit/b9cb5323bb671a0f2bfecc36168d3a3763e90261
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add SCTLR_EL2

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


  Commit: ff05f37babe7874f28dcead6e9e4f1904d35a13a
      
https://github.com/qemu/qemu/commit/ff05f37babe7874f28dcead6e9e4f1904d35a13a
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TPIDR_EL2

Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
[PMM: reordered fields into preferred opc0/opc1/crn/crm/opc2 order]
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: a57633c08fa861807a0713505785bd4d441d7df8
      
https://github.com/qemu/qemu/commit/a57633c08fa861807a0713505785bd4d441d7df8
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TTBR0_EL2

Signed-off-by: Edgar E. Iglesias <address@hidden>
Message-id: address@hidden
[PMM: Switch to preferred opc1/crm order for 64-bit AArch32 cpregs;
 drop unneeded use of vmsa_ttbr_writefn]
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: bdb9e2d66afbe0571dce48a9430c35ae4d6bbd32
      
https://github.com/qemu/qemu/commit/bdb9e2d66afbe0571dce48a9430c35ae4d6bbd32
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TLBI_ALLE1{IS}

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


  Commit: 51da90140bba4333eeb9c1d8d8d8afc2ca790628
      
https://github.com/qemu/qemu/commit/51da90140bba4333eeb9c1d8d8d8afc2ca790628
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TLBI_ALLE2

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


  Commit: 8742d49d6f2278d353a1623dfa8a5e237dbfd906
      
https://github.com/qemu/qemu/commit/8742d49d6f2278d353a1623dfa8a5e237dbfd906
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Add TLBI_VAE2{IS}

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


  Commit: 57b6d95eb480d66c5bfa4e416d1fbcad0f84fdd2
      
https://github.com/qemu/qemu/commit/57b6d95eb480d66c5bfa4e416d1fbcad0f84fdd2
  Author: Markus Armbruster <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  Revert "target-arm: Avoid g_hash_table_get_keys()"

Since we now require GLib 2.22+ (commit f40685c), we don't have to
work around lack of g_hash_table_get_keys() anymore.

This reverts commit 82a3a11897308b606120f7235001e87809708f85.

Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 747d009dcac37ce7372b58b21c168f0ad66cf7be
      
https://github.com/qemu/qemu/commit/747d009dcac37ce7372b58b21c168f0ad66cf7be
  Author: Christoffer Dall <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  target-arm: Add GIC phandle to VirtBoardInfo

Instead of passing the GIC phandle around between functions, add it to
the VirtBoardInfo just like we do for the clock_phandle.  We are about
to add the v2m phandle as well, and it's easier not having to pass
around a bunch of phandles, return multiple values from functions, etc.

Reviewed-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Christoffer Dall <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 770c58f8d10b61e80a211d87df83670711631530
      
https://github.com/qemu/qemu/commit/770c58f8d10b61e80a211d87df83670711631530
  Author: Christoffer Dall <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/intc/Makefile.objs
    A hw/intc/arm_gicv2m.c

  Log Message:
  -----------
  arm_gicv2m: Add GICv2m widget to support MSIs

The ARM GICv2m widget is a little device that handles MSI interrupt
writes to a trigger register and ties them to a range of interrupt lines
wires to the GIC.  It has a few status/id registers and the interrupt wires,
and that's about it.

A board instantiates the device by setting the base SPI number and
number SPIs for the frame.  The base-spi parameter is indexed in the SPI
number space only, so base-spi == 0, means IRQ number 32.  When a device
(the PCI host controller) writes to the trigger register, the payload is
the GIC IRQ number, so we have to subtract 32 from that and then index
into our frame of SPIs.

When instantiating a GICv2m device, tell PCI that we have instantiated
something that can deal with MSIs.  We rely on the board actually wiring
up the GICv2m to the PCI host controller.

Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: Christoffer Dall <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: dfd90a87155882d92a3efa6da9afc773fd8c6796
      
https://github.com/qemu/qemu/commit/dfd90a87155882d92a3efa6da9afc773fd8c6796
  Author: Christoffer Dall <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  target-arm: Extend the gic node properties

In preparation for adding the GICv2m which requires address specifiers
and is a subnode of the gic, we extend the gic DT definition to specify
the #address-cells and #size-cells properties and add an empty ranges
property properties of the DT node, since this is required to add the
v2m node as a child of the gic node.

Note that we must also expand the irq-map to reference the gic with the
right address-cells as a consequence of this change.

Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: Christoffer Dall <address@hidden>
Message-id: address@hidden
Suggested-by: Shanker Donthineni <address@hidden>
Signed-off-by: Christoffer Dall <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: bd204e63a7ce9d1b5c5903c9033863b179194989
      
https://github.com/qemu/qemu/commit/bd204e63a7ce9d1b5c5903c9033863b179194989
  Author: Christoffer Dall <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/virt.c
    M include/hw/arm/virt.h

  Log Message:
  -----------
  target-arm: Add the GICv2m to the virt board

Add a GICv2m device to the virt board to enable MSIs on the generic PCI
host controller.  We allocate 64 SPIs in the IRQ space for now (this can
be increased/decreased later) and map the GICv2m right after the GIC in
the memory map.

Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: Christoffer Dall <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 0b2ff2ceb8a45cbe51ca13a1a32fc5bdeec71815
      
https://github.com/qemu/qemu/commit/0b2ff2ceb8a45cbe51ca13a1a32fc5bdeec71815
  Author: Victor CLEMENT <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/gpio/pl061.c

  Log Message:
  -----------
  pl061: fix wrong calculation of GPIOMIS register

The masked interrupt status register should be the state of the interrupt
after masking.
There should be a logical AND instead of a logical OR between the
interrupt status and the interrupt mask.

Signed-off-by: Victor CLEMENT <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 1850b6b7d027bb4b45010a7d1da919267fff2cd4
      
https://github.com/qemu/qemu/commit/1850b6b7d027bb4b45010a7d1da919267fff2cd4
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M include/sysemu/kvm.h
    M kvm-all.c
    M target-arm/kvm.c
    M target-i386/kvm.c
    M target-mips/kvm.c
    M target-ppc/kvm.c
    M target-s390x/kvm.c

  Log Message:
  -----------
  kvm: introduce kvm_arch_msi_data_to_gsi

On ARM the MSI data corresponds to the shared peripheral interrupt (SPI)
ID. This latter equals to the SPI index + 32. to retrieve the SPI index,
matching the gsi, an architecture specific function is introduced.

Signed-off-by: Eric Auger <address@hidden>
Acked-by: Christoffer Dall <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 9718e4ae362d2f221ec028cdacefafc593ef1357
      
https://github.com/qemu/qemu/commit/9718e4ae362d2f221ec028cdacefafc593ef1357
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/intc/arm_gicv2m.c

  Log Message:
  -----------
  arm_gicv2m: set kvm_gsi_direct_mapping and kvm_msi_via_irqfd_allowed

After introduction of kvm_arch_msi_data_to_gsi, kvm_gsi_direct_mapping
now can be set on ARM. Also kvm_msi_via_irqfd_allowed can be set,
depending on kernel irqfd support, hence enabling VIRTIO-PCI with
vhost back-end.

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


  Commit: 4771cd01daaccb2a8929fa04c88c608e378cf814
      
https://github.com/qemu/qemu/commit/4771cd01daaccb2a8929fa04c88c608e378cf814
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  target-arm: Remove v8_ prefix from names of non-v8-specific cpreg arrays

The ARMCPRegInfo arrays v8_el3_no_el2_cp_reginfo and v8_el2_cp_reginfo
are actually used on non-v8 CPUs as well. Remove the incorrect v8_
prefix from their names.

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


  Commit: 11d306b9df172faeeb3409deba4083dbe479b23c
      
https://github.com/qemu/qemu/commit/11d306b9df172faeeb3409deba4083dbe479b23c
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/Makefile.objs
    A hw/arm/sysbus-fdt.c
    A include/hw/arm/sysbus-fdt.h

  Log Message:
  -----------
  hw/arm/sysbus-fdt: helpers for platform bus nodes addition

This new C module will be used by ARM machine files to generate
platform bus node and their dynamic sysbus device tree nodes.

Dynamic sysbus device node addition is done in a machine init
done notifier. arm_register_platform_bus_fdt_creator does the
registration of this latter and is supposed to be called by
ARM machine files that support platform bus and their dynamic
sysbus. Addition of dynamic sysbus nodes is done only if the
user did not provide any dtb.

Signed-off-by: Alexander Graf <address@hidden>
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: ac9d32e39664e060cd1b538ff190980d57ad69e4
      
https://github.com/qemu/qemu/commit/ac9d32e39664e060cd1b538ff190980d57ad69e4
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/boot.c
    M include/hw/arm/arm.h

  Log Message:
  -----------
  hw/arm/boot: arm_load_kernel implemented as a machine init done notifier

Device tree nodes for the platform bus and its children dynamic sysbus
devices are added in a machine init done notifier. To load the dtb once,
after those latter nodes are built and before ROM freeze, the actual
arm_load_kernel existing code is moved into a notifier notify function,
arm_load_kernel_notify. arm_load_kernel now only registers the
corresponding notifier.

Machine files that do not support platform bus stay unchanged. Machine
files willing to support dynamic sysbus devices must call arm_load_kernel
before sysbus-fdt arm_register_platform_bus_fdt_creator to make sure
dynamic sysbus device nodes are integrated in the dtb.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 5f7a5a0edc4a2f65293658eb540290ddf9a1988a
      
https://github.com/qemu/qemu/commit/5f7a5a0edc4a2f65293658eb540290ddf9a1988a
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/virt.c
    M include/hw/arm/virt.h

  Log Message:
  -----------
  hw/arm/virt: add dynamic sysbus device support

Allows sysbus devices to be instantiated from command line by
using -device option. Machvirt creates a platform bus at init.
The dynamic sysbus devices are attached to this platform bus device.

The platform bus device registers a machine init done notifier
whose role will be to bind the dynamic sysbus devices. Indeed
dynamic sysbus devices are created after machine init.

machvirt also registers a notifier that will build the device
tree nodes for the platform bus and its children dynamic sysbus
devices.

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 94edf02c4c94781fa777c459fe86b52131b83cb6
      
https://github.com/qemu/qemu/commit/94edf02c4c94781fa777c459fe86b52131b83cb6
  Author: Eric Auger <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: change indentation in a15memmap

Re-indent in a15memmap after VIRT_PLATFORM_BUS introduction

Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: d2ceeb1d68ed8b005892408fcdb533f578aae081
      
https://github.com/qemu/qemu/commit/d2ceeb1d68ed8b005892408fcdb533f578aae081
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M hw/arm/Makefile.objs
    M hw/arm/boot.c
    A hw/arm/sysbus-fdt.c
    M hw/arm/virt.c
    M hw/gpio/pl061.c
    M hw/intc/Makefile.objs
    A hw/intc/arm_gicv2m.c
    M include/hw/arm/arm.h
    A include/hw/arm/sysbus-fdt.h
    M include/hw/arm/virt.h
    M include/sysemu/kvm.h
    M kvm-all.c
    M target-arm/helper.c
    M target-arm/kvm.c
    M target-i386/kvm.c
    M target-mips/kvm.c
    M target-ppc/kvm.c
    M target-s390x/kvm.c

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

target-arm queue:
 * more EL2 preparation patches
 * revert a no-longer-necessary workaround for old glib versions
 * add GICv2m support to virt board (MSI support)
 * pl061: fix wrong calculation of GPIOMIS register
 * support MSI via irqfd
 * remove a confusing v8_ prefix from some variable names
 * add dynamic sysbus device support to the virt board

# gpg: Signature made Tue Jun  2 17:30:38 2015 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-target-arm-20150602: (22 commits)
  hw/arm/virt: change indentation in a15memmap
  hw/arm/virt: add dynamic sysbus device support
  hw/arm/boot: arm_load_kernel implemented as a machine init done notifier
  hw/arm/sysbus-fdt: helpers for platform bus nodes addition
  target-arm: Remove v8_ prefix from names of non-v8-specific cpreg arrays
  arm_gicv2m: set kvm_gsi_direct_mapping and kvm_msi_via_irqfd_allowed
  kvm: introduce kvm_arch_msi_data_to_gsi
  pl061: fix wrong calculation of GPIOMIS register
  target-arm: Add the GICv2m to the virt board
  target-arm: Extend the gic node properties
  arm_gicv2m: Add GICv2m widget to support MSIs
  target-arm: Add GIC phandle to VirtBoardInfo
  Revert "target-arm: Avoid g_hash_table_get_keys()"
  target-arm: Add TLBI_VAE2{IS}
  target-arm: Add TLBI_ALLE2
  target-arm: Add TLBI_ALLE1{IS}
  target-arm: Add TTBR0_EL2
  target-arm: Add TPIDR_EL2
  target-arm: Add SCTLR_EL2
  target-arm: Add TCR_EL2
  ...

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


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