[Qemu-commits] [qemu/qemu] 3362c5: hw/arm/virt: ARM_VIRT must select ARM_GIC

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 3362c56835cd171e178b754f39d3814c27670f8b
      
https://github.com/qemu/qemu/commit/3362c56835cd171e178b754f39d3814c27670f8b
  Author: Andrew Jones <drjones@redhat.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/arm/Kconfig

  Log Message:
  -----------
  hw/arm/virt: ARM_VIRT must select ARM_GIC

The removal of the selection of A15MPCORE from ARM_VIRT also
removed what A15MPCORE selects, ARM_GIC. We still need ARM_GIC.

Fixes: bec3c97e0cf9 ("hw/arm/virt: Remove dependency on Cortex-A15 MPCore 
peripherals")
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201111143440.112763-1-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 63192565f9f5cc1c82c4213713c0a2764d8242e5
      
https://github.com/qemu/qemu/commit/63192565f9f5cc1c82c4213713c0a2764d8242e5
  Author: Alex Chen <alex.chen@huawei.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/timer/exynos4210_mct.c
    M hw/timer/exynos4210_pwm.c

  Log Message:
  -----------
  exynos: Fix bad printf format specifiers

We should use printf format specifier "%u" instead of "%d" for
argument of type "unsigned int".

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Message-id: 20201111073651.72804-1-alex.chen@huawei.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 019294db68c24d0a3eb9089166caab94217274e1
      
https://github.com/qemu/qemu/commit/019294db68c24d0a3eb9089166caab94217274e1
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  hw/input/ps2.c: Remove remnants of printf debug

In commit 5edab03d4040 we added tracepoints to the ps2 keyboard
and mouse emulation. However we didn't remove all the debug-by-printf
support. In fact there is only one printf() remaining, and it is
redundant with the trace_ps2_write_mouse() event next to it.
Remove the printf() and the now-unused DEBUG* macros.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20201101133258.4240-1-peter.maydell@linaro.org


  Commit: 7b0263cb14c809d1553b7349d5729750651af7d8
      
https://github.com/qemu/qemu/commit/7b0263cb14c809d1553b7349d5729750651af7d8
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M target/openrisc/sys_helper.c

  Log Message:
  -----------
  target/openrisc: Remove dead code attempting to check "is timer disabled"

In the mtspr helper we attempt to check for "is the timer disabled"
with "if (env->ttmr & TIMER_NONE)".  This is wrong because TIMER_NONE
is zero and the condition is always false (Coverity complains about
the dead code.)

The correct check would be to test whether the TTMR_M field in the
register is equal to TIMER_NONE instead.  However, the
cpu_openrisc_timer_update() function checks whether the timer is
enabled (it looks at cpu->env.is_counting, which is set to 0 via
cpu_openrisc_count_stop() when the TTMR_M field is set to
TIMER_NONE), so there's no need to check for "timer disabled" in the
target/openrisc code.  Instead, simply remove the dead code.

Fixes: Coverity CID 1005812
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Stafford Horne <shorne@gmail.com>
Message-id: 20201103114654.18540-1-peter.maydell@linaro.org


  Commit: ea2d7fcf3556bc279922fac08ea990093f1d7923
      
https://github.com/qemu/qemu/commit/ea2d7fcf3556bc279922fac08ea990093f1d7923
  Author: Alistair Francis <alistair.francis@wdc.com>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/core/register.c

  Log Message:
  -----------
  register: Remove unnecessary NULL check

This patch fixes CID 1432800 by removing an unnecessary check.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 6d7ccc576d52fe2e7d965bfdb0e63b997e77975a
      
https://github.com/qemu/qemu/commit/6d7ccc576d52fe2e7d965bfdb0e63b997e77975a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M util/cutils.c

  Log Message:
  -----------
  util/cutils: Fix Coverity array overrun in freq_to_str()

Fix Coverity CID 1435957:  Memory - illegal accesses (OVERRUN):

>>> Overrunning array "suffixes" of 7 8-byte elements at element
    index 7 (byte offset 63) using index "idx" (which evaluates to 7).

Note, the biggest input value freq_to_str() can accept is UINT64_MAX,
which is ~18.446 EHz, less than 1000 EHz.

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Message-id: 20201101215755.2021421-1-f4bug@amsat.org
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 13ceae6663450b6e49483bf0dc7f8362a949802d
      
https://github.com/qemu/qemu/commit/13ceae6663450b6e49483bf0dc7f8362a949802d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Make "does libgio work" test pull in some actual functions

In commit 76346b6264a9b01979 we tried to add a configure check that
the libgio pkg-config data was correct, which builds an executable
linked against it.  Unfortunately this doesn't catch the problem
(missing static library dependency info), because a "do nothing" test
source file doesn't have any symbol references that cause the linker
to pull in .o files from libgio.a, and so we don't see the "missing
symbols from libmount" error that a full QEMU link triggers.

(The ineffective test went unnoticed because of a typo that
effectively disabled libgio unconditionally, but after commit
3569a5dfc11f2 fixed that, a static link of the system emulator on
Ubuntu stopped working again.)

Improve the gio test by having the test source fragment reference a
g_dbus function (which is what is indirectly causing us to end up
wanting functions from libmount).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20201116104617.18333-1-peter.maydell@linaro.org


  Commit: e1919889ef78144811d8520fa25776fa73feee66
      
https://github.com/qemu/qemu/commit/e1919889ef78144811d8520fa25776fa73feee66
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/misc/tmp105.c

  Log Message:
  -----------
  hw/misc/tmp105: reset the T_low and T_High registers

The TMP105 datasheet (https://www.ti.com/lit/gpn/tmp105) says that the
power-up reset values for the T_low and T_high registers are 80 degrees C
and 75 degrees C, which are 0x500 and 0x4B0 hex according to table 5.  These
values are then shifted right by four bits to give the register reset
values, since both registers store the 12 bits of temperature data in bits
[15..4] of a 16 bit register.

We were resetting these registers to zero, which is problematic for Linux
guests which enable the alert interrupt and then immediately take an
unexpected overtemperature alert because the current temperature is above
freezing...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20201110150023.25533-2-peter.maydell@linaro.org


  Commit: ab135622cf478585bdfcb68b85e4a817d74a0c42
      
https://github.com/qemu/qemu/commit/ab135622cf478585bdfcb68b85e4a817d74a0c42
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M hw/misc/tmp105.c
    M hw/misc/tmp105.h

  Log Message:
  -----------
  tmp105: Correct handling of temperature limit checks

The TMP105 datasheet says that in Interrupt Mode (when TM==1) the device
signals an alert when the temperature equals or exceeds the T_high value and
then remains high until a device register is read or the device responds to
the SMBUS Alert Response address, or the device is put into Shutdown Mode.
Thereafter the Alert pin will only be re-signalled when temperature falls
below T_low; alert can then be cleared in the same set of ways, and the
device returns to its initial "alert when temperature goes above T_high"
mode. (If this textual description is confusing, see figure 3 in the
TI datasheet at https://www.ti.com/lit/gpn/tmp105 .)

We were misimplementing this as a simple "always alert if temperature is
above T_high or below T_low" condition, which gives a spurious alert on
startup if using the "T_high = 80 degrees C, T_low = 75 degrees C" reset
limit values.

Implement the correct (hysteresis) behaviour by tracking whether we
are currently looking for the temperature to rise over T_high or
for it to fall below T_low. Our implementation of the comparator
mode (TM==0) wasn't wrong, but rephrase it to match the way that
interrupt mode is now handled for clarity.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20201110150023.25533-3-peter.maydell@linaro.org


  Commit: c446ac37b7e79d971e55b3423981ada0c3db6459
      
https://github.com/qemu/qemu/commit/c446ac37b7e79d971e55b3423981ada0c3db6459
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-17 (Tue, 17 Nov 2020)

  Changed paths:
    M configure
    M hw/arm/Kconfig
    M hw/core/register.c
    M hw/input/ps2.c
    M hw/misc/tmp105.c
    M hw/misc/tmp105.h
    M hw/timer/exynos4210_mct.c
    M hw/timer/exynos4210_pwm.c
    M target/openrisc/sys_helper.c
    M util/cutils.c

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

target-arm queue:
 * hw/arm/virt: ARM_VIRT must select ARM_GIC
 * exynos: Fix bad printf format specifiers
 * hw/input/ps2.c: Remove remnants of printf debug
 * target/openrisc: Remove dead code attempting to check "is timer disabled"
 * register: Remove unnecessary NULL check
 * util/cutils: Fix Coverity array overrun in freq_to_str()
 * configure: Make "does libgio work" test pull in some actual functions
 * tmp105: reset the T_low and T_High registers
 * tmp105: Correct handling of temperature limit checks

# gpg: Signature made Tue 17 Nov 2020 13:47:48 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-20201117:
  tmp105: Correct handling of temperature limit checks
  hw/misc/tmp105: reset the T_low and T_High registers
  configure: Make "does libgio work" test pull in some actual functions
  util/cutils: Fix Coverity array overrun in freq_to_str()
  register: Remove unnecessary NULL check
  target/openrisc: Remove dead code attempting to check "is timer disabled"
  hw/input/ps2.c: Remove remnants of printf debug
  exynos: Fix bad printf format specifiers
  hw/arm/virt: ARM_VIRT must select ARM_GIC

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


Compare: https://github.com/qemu/qemu/compare/c8e5c4b24658...c446ac37b7e7