[Qemu-commits] [qemu/qemu] 25ff11: hw/arm/mps2-tz: Add new mps3-an524 board

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 25ff112a8ccaac94ea46c12ef6539da18f70c1c5
      
https://github.com/qemu/qemu/commit/25ff112a8ccaac94ea46c12ef6539da18f70c1c5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-06 (Sat, 06 Mar 2021)

  Changed paths:
    M hw/arm/mps2-tz.c

  Log Message:
  -----------
  hw/arm/mps2-tz: Add new mps3-an524 board

Add support for the mps3-an524 board; this is an SSE-200 based FPGA
image, like the existing mps2-an521.  It has a usefully larger amount
of RAM, and a PL031 RTC, as well as some more minor differences.

In real hardware this image runs on a newer generation of the FPGA
board, the MPS3 rather than the older MPS2.  Architecturally the two
boards are similar, so we implement the MPS3 boards in the mps2-tz.c
file as variations of the existing MPS2 boards.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-21-peter.maydell@linaro.org


  Commit: a9597753d1f1dfc944dbfd7a6ad007d79d7944b3
      
https://github.com/qemu/qemu/commit/a9597753d1f1dfc944dbfd7a6ad007d79d7944b3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M hw/arm/mps2-tz.c

  Log Message:
  -----------
  hw/arm/mps2-tz: Stub out USB controller for mps3-an524

The AN524 has a USB controller (an ISP1763); we don't have a model of
it but we should provide a stub "unimplemented-device" for it.  This
is slightly complicated because the USB controller shares a PPC port
with the ethernet controller.

Implement a make_* function which provides creates a container
MemoryRegion with both the ethernet controller and an
unimplemented-device stub for the USB controller.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-22-peter.maydell@linaro.org


  Commit: 41745d2053a4dc0161115480fdce48f8d93fdb24
      
https://github.com/qemu/qemu/commit/41745d2053a4dc0161115480fdce48f8d93fdb24
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M hw/arm/mps2-tz.c

  Log Message:
  -----------
  hw/arm/mps2-tz: Provide PL031 RTC on mps3-an524

The AN524 has a PL031 RTC, which we have a model of; provide it
rather than an unimplemented-device stub.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-23-peter.maydell@linaro.org


  Commit: ced8bb04ae1b41d5aee5a8f782653149fc0b0367
      
https://github.com/qemu/qemu/commit/ced8bb04ae1b41d5aee5a8f782653149fc0b0367
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M docs/system/arm/mps2.rst

  Log Message:
  -----------
  docs/system/arm/mps2.rst: Document the new mps3-an524 board

Add brief documentation of the new mps3-an524 board.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-24-peter.maydell@linaro.org


  Commit: 50b52b18cdb9294ce83dd49bb60b8e55a6526ea0
      
https://github.com/qemu/qemu/commit/50b52b18cdb9294ce83dd49bb60b8e55a6526ea0
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M hw/arm/mps2-tz.c
    M hw/misc/armsse-cpuid.c
    M hw/misc/armsse-mhu.c
    M hw/misc/iotkit-sysctl.c
    M hw/misc/iotkit-sysinfo.c
    M hw/misc/mps2-fpgaio.c
    M hw/misc/mps2-scc.c
    M include/hw/arm/armsse.h
    M include/hw/misc/armsse-cpuid.h
    M include/hw/misc/armsse-mhu.h
    M include/hw/misc/iotkit-secctl.h
    M include/hw/misc/iotkit-sysctl.h
    M include/hw/misc/iotkit-sysinfo.h
    M include/hw/misc/mps2-fpgaio.h

  Log Message:
  -----------
  hw/arm/mps2: Update old infocenter.arm.com URLs

Update old infocenter.arm.com URLs to the equivalent developer.arm.com
ones (the old URLs should redirect, but we might as well avoid the
redirection notice, and the new URLs are pleasantly shorter).

This commit covers the links to the MPS2 board TRM, the various
Application Notes, the IoTKit and SSE-200 documents.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-25-peter.maydell@linaro.org


  Commit: 138d2931979cb7ee4a54a434a54088231f6980ff
      
https://github.com/qemu/qemu/commit/138d2931979cb7ee4a54a434a54088231f6980ff
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M docs/system/arm/mps2.rst
    M docs/system/arm/nuvoton.rst
    M hw/arm/mps2-tz.c
    M hw/arm/mps2.c
    M hw/arm/musicpal.c
    M hw/arm/npcm7xx.c
    M hw/arm/sbsa-ref.c
    M hw/arm/xlnx-zynqmp.c
    R hw/display/omap_lcd_template.h
    M hw/display/omap_lcdc.c
    M hw/display/tc6393xb.c
    R hw/display/tc6393xb_template.h
    M hw/display/tcx.c
    M hw/i2c/npcm7xx_smbus.c
    M hw/misc/armsse-cpuid.c
    M hw/misc/armsse-mhu.c
    M hw/misc/iotkit-sysctl.c
    M hw/misc/iotkit-sysinfo.c
    M hw/misc/mps2-fpgaio.c
    M hw/misc/mps2-scc.c
    M hw/net/meson.build
    A hw/net/npcm7xx_emc.c
    M hw/net/trace-events
    M hw/virtio/virtio-mmio.c
    M include/hw/arm/armsse.h
    M include/hw/arm/npcm7xx.h
    M include/hw/arm/xlnx-zynqmp.h
    M include/hw/misc/armsse-cpuid.h
    M include/hw/misc/armsse-mhu.h
    M include/hw/misc/iotkit-secctl.h
    M include/hw/misc/iotkit-sysctl.h
    M include/hw/misc/iotkit-sysinfo.h
    M include/hw/misc/mps2-fpgaio.h
    M include/hw/misc/mps2-scc.h
    A include/hw/net/npcm7xx_emc.h
    M target/arm/cpu.c
    M target/arm/cpu.h
    M target/arm/cpu64.c
    M target/arm/cpu_tcg.c
    M target/arm/helper-a64.c
    M target/arm/helper-a64.h
    M target/arm/helper.c
    M target/arm/internals.h
    M target/arm/mte_helper.c
    M target/arm/translate-a64.c
    M target/arm/vec_helper.c
    M tests/qtest/meson.build
    A tests/qtest/npcm7xx_emc-test.c

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

target-arm queue:
 * sbsa-ref: remove cortex-a53 from list of supported cpus
 * sbsa-ref: add 'max' to list of allowed cpus
 * target/arm: Add support for FEAT_SSBS, Speculative Store Bypass Safe
 * npcm7xx: add EMC model
 * xlnx-zynqmp: Remove obsolete 'has_rpu' property
 * target/arm: Speed up aarch64 TBL/TBX
 * virtio-mmio: improve virtio-mmio get_dev_path alog
 * target/arm: Use TCF0 and TFSRE0 for unprivileged tag checks
 * target/arm: Restrict v8M IDAU to TCG
 * target/arm/cpu: Update coding style to make checkpatch.pl happy
 * musicpal, tc6393xb, omap_lcdc, tcx: drop dead code for non-32-bit-RGB 
surfaces
 * Add new board: mps3-an524

# gpg: Signature made Mon 08 Mar 2021 11:56:24 GMT
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" 
[ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20210308: (49 commits)
  hw/arm/mps2: Update old infocenter.arm.com URLs
  docs/system/arm/mps2.rst: Document the new mps3-an524 board
  hw/arm/mps2-tz: Provide PL031 RTC on mps3-an524
  hw/arm/mps2-tz: Stub out USB controller for mps3-an524
  hw/arm/mps2-tz: Add new mps3-an524 board
  hw/arm/mps2-tz: Get armv7m_load_kernel() size argument from RAMInfo
  hw/arm/mps2-tz: Support ROMs as well as RAMs
  hw/arm/mps2-tz: Set MachineClass default_ram info from RAMInfo data
  hw/arm/mps2-tz: Make RAM arrangement board-specific
  hw/arm/mps2-tz: Allow boards to have different PPCInfo data
  hw/arm/mps2-tz: Size the uart-irq-orgate based on the number of UARTs
  hw/arm/mps2-tz: Move device IRQ info to data structures
  hw/arm/mps2-tz: Allow PPCPortInfo structures to specify device interrupts
  hw/arm/mps2-tz: Correct wrong interrupt numbers for DMA and SPI
  hw/misc/mps2-scc: Implement CFG_REG5 and CFG_REG6 for MPS3 AN524
  hw/arm/mps2-tz: Make number of IRQs board-specific
  hw/arm/mps2-tz: Condition IRQ splitting on number of CPUs, not board type
  hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board
  hw/misc/mps2-fpgaio: Support SWITCH register
  hw/misc/mps2-fpgaio: Make number of LEDs configurable by board
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/0273df039004...138d2931979c