qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4b9774: hw/intc/armv7m: Support byte and half


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 4b9774: hw/intc/armv7m: Support byte and halfword accesses...
Date: Tue, 16 Jan 2018 06:58:36 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4b9774ef482d789d27938d0a7c14936ad706c74f
      
https://github.com/qemu/qemu/commit/4b9774ef482d789d27938d0a7c14936ad706c74f
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/intc/armv7m_nvic.c

  Log Message:
  -----------
  hw/intc/armv7m: Support byte and halfword accesses to CFSR

The Configurable Fault Status Register for ARMv7M and v8M is
supposed to be byte and halfword accessible, but we were only
implementing word accesses. Add support for the other access
sizes, which are used by the Zephyr RTOS.

Signed-off-by: Peter Maydell <address@hidden>
Reported-by: Andy Gross <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: 8638f1ad7403b63db880dadce38e6690b5d82b64
      
https://github.com/qemu/qemu/commit/8638f1ad7403b63db880dadce38e6690b5d82b64
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M target/arm/helper.c

  Log Message:
  -----------
  get_phys_addr_pmsav7: Support AP=0b111 for v7M

For PMSAv7, the v7A/R Arm ARM defines that setting AP to 0b111
is an UNPREDICTABLE reserved combination. However, for v7M
this value is documented as having the same behaviour as 0b110:
read-only for both privileged and unprivileged. Accept this
value on an M profile core rather than treating it as a guest
error and a no-access page.

Reported-by: Andy Gross <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: a2a051591c599172993c07043e13e499736ed193
      
https://github.com/qemu/qemu/commit/a2a051591c599172993c07043e13e499736ed193
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Add virt-2.12 machine type

Add virt-2.12 machine type.

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


  Commit: 3b39d734141a71296d08af3d4c32f872fafd782e
      
https://github.com/qemu/qemu/commit/3b39d734141a71296d08af3d4c32f872fafd782e
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M target/arm/helper.c
    M target/arm/internals.h
    M target/arm/op_helper.c

  Log Message:
  -----------
  target/arm: Handle page table walk load failures correctly

Instead of ignoring the response from address_space_ld*()
(indicating an attempt to read a page table descriptor from
an invalid physical address), use it to report the failure
correctly.

Since this is another couple of locations where we need to
decide the value of the ARMMMUFaultInfo ea bit based on a
MemTxResult, we factor out that operation into a helper
function.

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


  Commit: 0cb57cc701839e7358918d5f2922ccbc04d28d17
      
https://github.com/qemu/qemu/commit/0cb57cc701839e7358918d5f2922ccbc04d28d17
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Reset SD card on controller reset

Since pl181 is still using the legacy SD card API, the SD
card created by sd_init() is not plugged into any bus. This
means that the controller has to reset it manually.

Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but meant that
migration failed because it's only in sd_reset() that we
set up the wpgrps_size field.

Cc: address@hidden
Fixes: https://bugs.launchpad.net/qemu/+bug/1739378
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: 16bf0e0e7aaa8efc0b8ee7e2aecb2fa235f82d38
      
https://github.com/qemu/qemu/commit/16bf0e0e7aaa8efc0b8ee7e2aecb2fa235f82d38
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/milkymist-memcard.c

  Log Message:
  -----------
  hw/sd/milkymist-memcard: Reset SD card on controller reset

Since milkymist-memcard is still using the legacy SD card API,
the SD card created by sd_init() is not plugged into any bus.
This means that the controller has to reset it manually.

Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but meant that
migration failed because it's only in sd_reset() that we
set up the wpgrps_size field.

Cc: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: 8046d44f3c9f67828d3368797d4d314433ee75e9
      
https://github.com/qemu/qemu/commit/8046d44f3c9f67828d3368797d4d314433ee75e9
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/ssi-sd.c

  Log Message:
  -----------
  hw/sd/ssi-sd: Reset SD card on controller reset

Since ssi-sd is still using the legacy SD card API, the SD
card created by sd_init() is not plugged into any bus. This
means that the controller has to reset it manually.

Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but meant that
migration failed because it's only in sd_reset() that we
set up the wpgrps_size field.

In the case of sd-ssi, we have to implement an entire
reset function since there wasn't one previously, and
that requires a QOM cast macro that got omitted when this
device was QOMified.

Cc: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: ecd219f7abbc17b9d9170206410355bba287831f
      
https://github.com/qemu/qemu/commit/ecd219f7abbc17b9d9170206410355bba287831f
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/omap_mmc.c

  Log Message:
  -----------
  hw/sd/omap_mmc: Reset SD card on controller reset

Since omap_mmc is still using the legacy SD card API, the SD
card created by sd_init() is not plugged into any bus. This
means that the controller has to reset it manually.

Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but would mean that
migration fails because it's only in sd_reset() that we
set up the wpgrps_size field.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: e90a99fe6bde9b85bff8c052ade51520f20d9bce
      
https://github.com/qemu/qemu/commit/e90a99fe6bde9b85bff8c052ade51520f20d9bce
  Author: Richard Henderson <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M target/arm/translate-a64.c

  Log Message:
  -----------
  target/arm: Split out vfp_expand_imm

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


  Commit: 8081796a75414f9ed5ec3d97158e543ed45908ec
      
https://github.com/qemu/qemu/commit/8081796a75414f9ed5ec3d97158e543ed45908ec
  Author: Richard Henderson <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M target/arm/translate-a64.c

  Log Message:
  -----------
  target/arm: Add fp16 support to vfp_expand_imm

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


  Commit: f82a0f449b2fdf314900116047ea6d9ee5a2da06
      
https://github.com/qemu/qemu/commit/f82a0f449b2fdf314900116047ea6d9ee5a2da06
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci-internal.h
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: clean up includes

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 03603958a4bdd35b464ee30b9afd6d134cff4cd2
      
https://github.com/qemu/qemu/commit/03603958a4bdd35b464ee30b9afd6d134cff4cd2
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: remove dead code

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: b635d98cf323ec7f9e639d52a0e0d29fa7b33e38
      
https://github.com/qemu/qemu/commit/b635d98cf323ec7f9e639d52a0e0d29fa7b33e38
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: use DEFINE_SDHCI_COMMON_PROPERTIES() for common sysbus/pci properties

Add common/sysbus/pci/sdbus comments to have clearer code blocks separation.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: 1c92c50543332f7432269a9a317c8c7e4c6618ea
      
https://github.com/qemu/qemu/commit/1c92c50543332f7432269a9a317c8c7e4c6618ea
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init()

Now both inherited classes appear as DEVICE_CATEGORY_STORAGE.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 253674981e2449128ab25b35659a55857c60d5c4
      
https://github.com/qemu/qemu/commit/253674981e2449128ab25b35659a55857c60d5c4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: refactor common sysbus/pci realize() into sdhci_common_realize()

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 8b7455c75e9ff506fe979f3e7ef6402b78dd7983
      
https://github.com/qemu/qemu/commit/8b7455c75e9ff506fe979f3e7ef6402b78dd7983
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize()

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 00b004b347f3eab1327112cf446e82b983af5209
      
https://github.com/qemu/qemu/commit/00b004b347f3eab1327112cf446e82b983af5209
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: use qemu_log_mask(UNIMP) instead of fprintf()

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 8be487d8f184f2f721cabeac559fb7a6cba18c95
      
https://github.com/qemu/qemu/commit/8be487d8f184f2f721cabeac559fb7a6cba18c95
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M hw/sd/trace-events

  Log Message:
  -----------
  sdhci: convert the DPRINT() calls into trace events

zero-initialize ADMADescr 'dscr' in sdhci_do_adma() to avoid:

  hw/sd/sdhci.c: In function ‘sdhci_do_adma’:
  hw/sd/sdhci.c:714:29: error: ‘dscr.addr’ may be used uninitialized in this 
function [-Werror=maybe-uninitialized]
       trace_sdhci_adma("link", s->admasysaddr);
                       ^

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 24bddf9d4a278018e38ed7380871a5d1a0c65f34
      
https://github.com/qemu/qemu/commit/24bddf9d4a278018e38ed7380871a5d1a0c65f34
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci-internal.h
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h"

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: cd2094219f2734cb0e759ffe9d5f4a5493ca1cc9
      
https://github.com/qemu/qemu/commit/cd2094219f2734cb0e759ffe9d5f4a5493ca1cc9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci-internal.h
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: rename the SDHC_CAPAB register

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 5efc9016e52596ec054b19bb0ae1d274f77f2a2b
      
https://github.com/qemu/qemu/commit/5efc9016e52596ec054b19bb0ae1d274f77f2a2b
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only

running qtests:

  $ make check-qtest-arm
    GTESTER check-qtest-arm
  SDHC rd_4b @0x44 not implemented
  SDHC wr_4b @0x40 <- 0x89abcdef not implemented
  SDHC wr_4b @0x44 <- 0x01234567 not implemented

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 5d2c0464fa7e3b00ed8eb4791ba1e955e29b685b
      
https://github.com/qemu/qemu/commit/5d2c0464fa7e3b00ed8eb4791ba1e955e29b685b
  Author: Andrey Smirnov <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: Implement write method of ACMD12ERRSTS register

Signed-off-by: Andrey Smirnov <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: dd55c485ec2fcd28c245061b320398d35b92d30d
      
https://github.com/qemu/qemu/commit/dd55c485ec2fcd28c245061b320398d35b92d30d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: fix the PCI device, using the PCI address space for DMA

While SysBus devices can use the get_system_memory() address space,
PCI devices should use the bus master address space for DMA.

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 60765b6ceeb4998a0d4220b3a53f1f185061da77
      
https://github.com/qemu/qemu/commit/60765b6ceeb4998a0d4220b3a53f1f185061da77
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/sd/sdhci.c
    M include/hw/sd/sdhci.h

  Log Message:
  -----------
  sdhci: add a 'dma' property to the sysbus devices

Add a 'dma' property allowing machine creation to provide the address-space
SDHCI DMA operates on.

[based on a patch from Alistair Francis <address@hidden>
 from qemu/xilinx tag xilinx-v2016.1]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: aae39d24a387a273deab3eb930dbf730aa379e22
      
https://github.com/qemu/qemu/commit/aae39d24a387a273deab3eb930dbf730aa379e22
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-16 (Tue, 16 Jan 2018)

  Changed paths:
    M hw/arm/virt.c
    M hw/intc/armv7m_nvic.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/omap_mmc.c
    M hw/sd/pl181.c
    M hw/sd/sdhci-internal.h
    M hw/sd/sdhci.c
    M hw/sd/ssi-sd.c
    M hw/sd/trace-events
    M include/hw/sd/sdhci.h
    M target/arm/helper.c
    M target/arm/internals.h
    M target/arm/op_helper.c
    M target/arm/translate-a64.c

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

target-arm queue:
 * SDHCI: cleanups and minor bug fixes
 * target/arm: minor refactor preparatory to fp16 support
 * omap_ssd, ssi-sd, pl181, milkymist-memcard: reset the SD
   card on controller reset (fixes migration failures)
 * target/arm: Handle page table walk load failures correctly
 * hw/arm/virt: Add virt-2.12 machine type
 * get_phys_addr_pmsav7: Support AP=0b111 for v7M
 * hw/intc/armv7m: Support byte and halfword accesses to CFSR

# gpg: Signature made Tue 16 Jan 2018 13:33:31 GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20180116: (24 commits)
  sdhci: add a 'dma' property to the sysbus devices
  sdhci: fix the PCI device, using the PCI address space for DMA
  sdhci: Implement write method of ACMD12ERRSTS register
  sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only
  sdhci: rename the SDHC_CAPAB register
  sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h"
  sdhci: convert the DPRINT() calls into trace events
  sdhci: use qemu_log_mask(UNIMP) instead of fprintf()
  sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize()
  sdhci: refactor common sysbus/pci realize() into sdhci_common_realize()
  sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init()
  sdhci: use DEFINE_SDHCI_COMMON_PROPERTIES() for common sysbus/pci properties
  sdhci: remove dead code
  sdhci: clean up includes
  target/arm: Add fp16 support to vfp_expand_imm
  target/arm: Split out vfp_expand_imm
  hw/sd/omap_mmc: Reset SD card on controller reset
  hw/sd/ssi-sd: Reset SD card on controller reset
  hw/sd/milkymist-memcard: Reset SD card on controller reset
  hw/sd/pl181: Reset SD card on controller reset
  ...

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


Compare: https://github.com/qemu/qemu/compare/f521eeee3bd0...aae39d24a387

reply via email to

[Prev in Thread] Current Thread [Next in Thread]