diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-01-13 09:43:48 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-01-13 09:43:48 -0500 |
| commit | e8aa7fdcddfc8589bdc7c973a052e76e8f999455 (patch) | |
| tree | 203ea3f29d5540ad7a8311aaa4ea37f7a2ac0856 /hw | |
| parent | dc26a2cd9cb68152d8528fa907346370d28bd240 (diff) | |
| parent | 435d260e7ec5ff9c79e3e62f1d66ec82d2d691ae (diff) | |
| download | qemu-e8aa7fdcddfc8589bdc7c973a052e76e8f999455.zip qemu-e8aa7fdcddfc8589bdc7c973a052e76e8f999455.tar.gz qemu-e8aa7fdcddfc8589bdc7c973a052e76e8f999455.tar.bz2 | |
Merge tag 'pull-target-arm-20250113' of https://git.linaro.org/people/pmaydell/qemu-arm into staging
target-arm queue:
* hw/arm_sysctl: fix extracting 31th bit of val
* hw/misc: cast rpm to uint64_t
* tests/qtest/boot-serial-test: Improve ASM
* target/arm: Move minor arithmetic helpers out of helper.c
* target/arm: change default pauth algorithm to impdef
# -----BEGIN PGP SIGNATURE-----
#
# iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmeFGuUZHHBldGVyLm1h
# eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3mFPEAChT9DR/+bNSt0Q28TsCv84
# dMMXle7c821NHTNeP/uBQ0i3aopmOJE145wMSoZza8l+EYjOdQwHpinjfu8J/rOS
# mJUgAFRcgUoH77+k0p0x1tqKi7+669TznOMOF4RyudKju5SteVyOGgLNjzJlnItq
# 3QRBiDTS+qXqAUhgQtzcuY6Xl5M2KA/cpSWYxQf/JPpZMX2c37V8AlSF/1GkLo6Z
# 3afrasXUp+U0+03Pe3Ffknzx/LtkLc2hg2LVX8CeqMLRJSA0ohkSwa/xax+2hn+G
# 9fKn92IpQOjEFw6qBTBvkerP2hr6yhDFTVFI9v+lsY4bf7tQGIE75HEGZ1EMr26b
# LCIPSQvez9exZl/usLGkUq9MWAiEkhBMy99ajwg5X4IhcbS+oyFtH2teYpt9rd9N
# 2dVS5qzErN7TCZQza9A7+bt8v5OtbJk2K8Qx9QhMFU/dIUSp0vOA3NwGu+qkciAb
# wNdoXT22Hy0czDiQ/ln3aocmwWeVZN4+AxKNoigQhor+5oIR4lMn1P7yAmsCLeL8
# AaLXJdR4aLnYugh23qzv9wf9kAbxRBMvLbsNTKGG00DYQ0xoY4pQ2CmPAJoVVxpU
# FjRydG9sC/6sMoJiOoDVpPW003VY2If8r0ObzqUd2gkw1HLf12yug+lij0LkcXKC
# Au7ycaoHiTlluNxyQjsgPg==
# =FGfo
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 13 Jan 2025 08:53:41 EST
# gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg: issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg: aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]
# gpg: aka "Peter Maydell <peter@archaic.org.uk>" [unknown]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* tag 'pull-target-arm-20250113' of https://git.linaro.org/people/pmaydell/qemu-arm:
docs/system/arm/virt: mention specific migration information
target/arm: change default pauth algorithm to impdef
tests/tcg/aarch64: force qarma5 for pauth-3 test
target/arm: add new property to select pauth-qarma5
target/arm: Move minor arithmetic helpers out of helper.c
tests/qtest/boot-serial-test: Initialize PL011 Control register
tests/qtest/boot-serial-test: Reorder pair of instructions in PL011 test
tests/qtest/boot-serial-test: Reduce for() loop in PL011 tests
tests/qtest/boot-serial-test: Improve ASM comments of PL011 tests
hw/misc: cast rpm to uint64_t
hw/arm_sysctl: fix extracting 31th bit of val
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/machine.c | 4 | ||||
| -rw-r--r-- | hw/misc/arm_sysctl.c | 2 | ||||
| -rw-r--r-- | hw/misc/npcm7xx_mft.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index c949af9..c23b399 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -36,7 +36,9 @@ #include "hw/virtio/virtio-iommu.h" #include "audio/audio.h" -GlobalProperty hw_compat_9_2[] = {}; +GlobalProperty hw_compat_9_2[] = { + {"arm-cpu", "backcompat-pauth-default-use-qarma5", "true"}, +}; const size_t hw_compat_9_2_len = G_N_ELEMENTS(hw_compat_9_2); GlobalProperty hw_compat_9_1[] = { diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 016a302..0166340 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -520,7 +520,7 @@ static void arm_sysctl_write(void *opaque, hwaddr offset, * as zero. */ s->sys_cfgctrl = val & ~((3 << 18) | (1 << 31)); - if (val & (1 << 31)) { + if (extract64(val, 31, 1)) { /* Start bit set -- actually do something */ unsigned int dcc = extract32(s->sys_cfgctrl, 26, 4); unsigned int function = extract32(s->sys_cfgctrl, 20, 6); diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index 9fcc69f..e565cac 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -172,8 +172,9 @@ static NPCM7xxMFTCaptureState npcm7xx_mft_compute_cnt( * RPM = revolution/min. The time for one revlution (in ns) is * MINUTE_TO_NANOSECOND / RPM. */ - count = clock_ns_to_ticks(clock, (60 * NANOSECONDS_PER_SECOND) / - (rpm * NPCM7XX_MFT_PULSE_PER_REVOLUTION)); + count = clock_ns_to_ticks(clock, + (uint64_t)(60 * NANOSECONDS_PER_SECOND) / + ((uint64_t)rpm * NPCM7XX_MFT_PULSE_PER_REVOLUTION)); } if (count > NPCM7XX_MFT_MAX_CNT) { |