[Qemu-commits] [qemu/qemu] 6e2965: char: cadence: check baud rate generator and divid...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6e29651c5e3a0e0336818574f273b3f6ecea491d
      
https://github.com/qemu/qemu/commit/6e29651c5e3a0e0336818574f273b3f6ecea491d
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M hw/char/cadence_uart.c

  Log Message:
  -----------
  char: cadence: check baud rate generator and divider values

The Cadence UART device emulator calculates speed by dividing the
baud rate by a 'baud rate generator' & 'baud rate divider' value.
The device specification defines these register values to be
non-zero and within certain limits. Add checks for these limits
to avoid errors like divide by zero.

Reported-by: Huawei PSIRT <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 3bc4b52ccd7754de4fb177871f1c5eaaa61ec7ef
      
https://github.com/qemu/qemu/commit/3bc4b52ccd7754de4fb177871f1c5eaaa61ec7ef
  Author: Marcin Krzeminski <address@hidden>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M hw/intc/arm_gic.c

  Log Message:
  -----------
  nvic: set pending status for not active interrupts

According to ARM DUI 0552A 4.2.10. NVIC set pending status
also for disabled interrupts. Correct the logic for
when interrupts are marked pending both on input level
transition and when interrupts are dismissed, to match
the NVIC behaviour rather than the 11MPCore GIC.

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


  Commit: 3823b9db77e753041c04c161ac9f4d4cfc661520
      
https://github.com/qemu/qemu/commit/3823b9db77e753041c04c161ac9f4d4cfc661520
  Author: Julian Brown <address@hidden>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M target-arm/helper.c

  Log Message:
  -----------
  Fix corruption of CPSR when SCTLR.EE is set

Fix a typo in arm_cpu_do_interrupt_aarch32 (OR'ing with ~CPSR_E
instead of CPSR_E) which meant that when we took an interrupt with
SCTLR.EE set we would corrupt the CPSR.

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


  Commit: 9706e0162d2405218fd7376ffdf13baed8569a4b
      
https://github.com/qemu/qemu/commit/9706e0162d2405218fd7376ffdf13baed8569a4b
  Author: Peter Maydell <address@hidden>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M hw/i2c/bitbang_i2c.c

  Log Message:
  -----------
  hw/i2c/bitbang_i2c: Handle NACKs from devices

If the guest attempts to talk to a nonexistent device over i2c,
the i2c_start_transfer() function will return non-zero, indicating
that the bus is signalling a NACK. Similarly, if the i2c_send()
function returns nonzero then the target device returned a NACK.
Handle this possibility in the bitbang_i2c code, by returning
the state machine to the STOPPED state and returning the NACK
bit to the guest.

This bit of missing functionality was spotted by Coverity
(it noticed that we weren't checking the return value from
i2c_start_transfer()).

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


  Commit: 207faf24c58859f5240f66bf6decc33b87a1776e
      
https://github.com/qemu/qemu/commit/207faf24c58859f5240f66bf6decc33b87a1776e
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M hw/char/cadence_uart.c
    M hw/i2c/bitbang_i2c.c
    M hw/intc/arm_gic.c
    M target-arm/helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into 
staging

target-arm queue:
 * bitbang_i2c: Handle NACKs from devices
 * Fix corruption of CPSR when SCTLR.EE is set
 * nvic: set pending status for not active interrupts
 * char: cadence: check baud rate generator and divider values

# gpg: Signature made Mon 07 Nov 2016 10:43:07 AM 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

* pm215/tags/pull-target-arm-20161107:
  hw/i2c/bitbang_i2c: Handle NACKs from devices
  Fix corruption of CPSR when SCTLR.EE is set
  nvic: set pending status for not active interrupts
  char: cadence: check baud rate generator and divider values

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0ea3eb65e84c...207faf24c588