[Qemu-commits] [qemu/qemu] 37b55d: tpm_tis: fix loop that cancels any seizure by a lo...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 37b55d67c0f001b20b7831db3f9f24f1d453e1de
      
https://github.com/qemu/qemu/commit/37b55d67c0f001b20b7831db3f9f24f1d453e1de
  Author: Liam Merwick <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M hw/tpm/tpm_tis.c

  Log Message:
  -----------
  tpm_tis: fix loop that cancels any seizure by a lower locality

In tpm_tis_mmio_write() if the requesting locality is seizing
access, any seizure by a lower locality is cancelled.  However the
loop doing the seizure had an off-by-one error and the locality
immediately preceding the requesting locality was not being cleared.
This is fixed by adjusting the test in the for loop to check the
localities up to the requesting locality.

Signed-off-by: Liam Merwick <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>


  Commit: cd38cc519b60bbe5dd8d85f6aaa72b2d7902930b
      
https://github.com/qemu/qemu/commit/cd38cc519b60bbe5dd8d85f6aaa72b2d7902930b
  Author: Liam Merwick <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M hw/tpm/tpm_tis.c
    M hw/tpm/trace-events

  Log Message:
  -----------
  tpm_tis: convert tpm_tis_show_buffer() to use trace event

cppcheck reports:

[hw/tpm/tpm_tis.c:113]: (warning) %d in format string (no. 2) requires 'int' 
but the argument type is 'unsigned int'

Rather than just converting the format specifier to use '%u", the
tpm_tis_show_buffer() function is converted to use trace points and
the two debug callers use the trace event infrastructure so that it's
available in production cases also and not just when DEBUG_TIS is enabled.

Signed-off-by: Liam Merwick <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>


  Commit: 88687719c8859bf98ed94ce91612608c99c51c1a
      
https://github.com/qemu/qemu/commit/88687719c8859bf98ed94ce91612608c99c51c1a
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M hw/tpm/tpm_tis.c
    M hw/tpm/trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stefanberger/tags/pull-tpm-2019-02-25-1' into staging

Merge tpm 2029/02/25 v1

# gpg: Signature made Mon 25 Feb 2019 15:05:12 GMT
# gpg:                using RSA key 75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <address@hidden>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2019-02-25-1:
  tpm_tis: convert tpm_tis_show_buffer() to use trace event
  tpm_tis: fix loop that cancels any seizure by a lower locality

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


Compare: https://github.com/qemu/qemu/compare/1ba530a4ecba...88687719c885