Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fa86f59234919b479b7e8da6b0dc2dad894a5eac
      
https://github.com/qemu/qemu/commit/fa86f59234919b479b7e8da6b0dc2dad894a5eac
  Author: Greg Kurz <gr...@kaod.org>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M hw/ppc/spapr_hcall.c

  Log Message:
  -----------
  spapr: add missing break in h_get_cpu_characteristics()

Detected by Coverity (CID 1385702). This fixes the recently added hypercall
to let guests properly apply Spectre and Meltdown workarounds.

Fixes: c59704b25473 "target/ppc/spapr: Add H-Call H_GET_CPU_CHARACTERISTICS"
Reported-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Greg Kurz <gr...@kaod.org>
Reviewed-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: b472b1a72740c79cd313e0e15bbe7b8440b30b82
      
https://github.com/qemu/qemu/commit/b472b1a72740c79cd313e0e15bbe7b8440b30b82
  Author: Daniel Henrique Barboza <danie...@linux.vnet.ibm.com>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c

  Log Message:
  -----------
  hw/ppc: rename functions in comments

Commit bcb5ce08cf ("spapr: Rename machine init functions for clarity")
renamed ppc_spapr_reset to spapr_machine_reset and ppc_spapr_init
to spapr_machine_init. Let's also rename the references in
comments.

Signed-off-by: Daniel Henrique Barboza <danie...@linux.vnet.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 8d0ef282ed286076355c02610b5b20e379421a43
      
https://github.com/qemu/qemu/commit/8d0ef282ed286076355c02610b5b20e379421a43
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: do not use old_mmio accesses

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: ae14d81757945a8298a34e00e82abe68d90644e7
      
https://github.com/qemu/qemu/commit/ae14d81757945a8298a34e00e82abe68d90644e7
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: don't allow writes to port output pins

Use the direction registers as a mask to ensure that only input pins are
updated upon write.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Laurent Vivier <lviv...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 4ad64cbd0c3f9df15be5f7d1c920285551e802ca
      
https://github.com/qemu/qemu/commit/4ad64cbd0c3f9df15be5f7d1c920285551e802ca
  Author: Laurent Vivier <lviv...@redhat.com>
  Date:   2018-02-10 (Sat, 10 Feb 2018)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: set vsmt to MAX(8, smp_threads)

We ignore silently the value of smp_threads when we set
the default VSMT value, and if smp_threads is greater than VSMT
kernel is going into trouble later.

Fixes: 8904e5a750
("spapr: Adjust default VSMT value for better migration compatibility")

Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Reviewed-by: Greg Kurz <gr...@kaod.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: e9fa3bf81074ab36e30272a5db181ac616012f27
      
https://github.com/qemu/qemu/commit/e9fa3bf81074ab36e30272a5db181ac616012f27
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: introduce CUDAState parameter to get_counter()

This will be required shortly and also happens to match nicely with the
corresponding signature for set_counter().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 27c5cee1c390b6d6ed852dd10d0822cbb91a847e
      
https://github.com/qemu/qemu/commit/27c5cee1c390b6d6ed852dd10d0822cbb91a847e
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c
    M hw/misc/macio/macio.c
    M hw/ppc/mac.h

  Log Message:
  -----------
  cuda: rename frequency property to tb_frequency

This allows us to more easily differentiate between the timebase frequency used
to calibrate the MacOS timers and the actual frequency of the hardware clock as
indicated by CUDA_TIMER_FREQ.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
[dwg: Revert some extraneous changes which break compile]
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 42a0938f92a842ed20b2ed4ce65231fca9b66f41
      
https://github.com/qemu/qemu/commit/42a0938f92a842ed20b2ed4ce65231fca9b66f41
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: minor cosmetic tidy-ups to get_next_irq_time()

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: eb0788cb73a3eda37a97be74d186164b0c0b58d7
      
https://github.com/qemu/qemu/commit/eb0788cb73a3eda37a97be74d186164b0c0b58d7
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: don't call cuda_update() when writing to ACR register

The wire protocol for reading data to/from the VIA is triggered by changing
inputs on port B rather than changing the timer configuration via the ACR.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: a797ec500ae90b201b9098655c8f875303f1d843
      
https://github.com/qemu/qemu/commit/a797ec500ae90b201b9098655c8f875303f1d843
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: set timer 1 frequency property to CUDA_TIMER_FREQ

Now that we have successfully decoupled the timebase frequency and the hardware
timer frequency, set the timer 1 frequency property to CUDA_TIMER_FREQ and alter
get_next_irq_time() to use it rather than the hard-coded constant.

In addition to this we must now switch the tb_diff calculation over to use the
timebase frequency now that the hardware clock frequency and the timebase
frequency are different.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
[dwg: Correct a conflict due to a bug in an earlier patch]
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: ce19480e916fe2f854a98b99149a18d0d78e71e5
      
https://github.com/qemu/qemu/commit/ce19480e916fe2f854a98b99149a18d0d78e71e5
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: factor out timebase-derived counter value and load time

Commit b981289c49 "PPC: Cuda: Use cuda timer to expose tbfreq to guest" altered
the timer calculations from those based upon the hardware CUDA clock frequency
to those based upon the CPU timebase frequency.

In fact we can isolate the differences to 2 simple changes: one to the counter
read value and another to the counter load time. Move these changes into
separate functions so the implementation can be swapped later.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 51f233ec92cdab7030cb7407dd7f009911c805b0
      
https://github.com/qemu/qemu/commit/51f233ec92cdab7030cb7407dd7f009911c805b0
  Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
  Date:   2018-02-11 (Sun, 11 Feb 2018)

  Changed paths:
    M default-configs/ppc-softmmu.mak
    M hw/misc/Makefile.objs
    A hw/misc/mos6522.c
    M hw/misc/trace-events
    A include/hw/misc/mos6522.h

  Log Message:
  -----------
  misc: introduce new mos6522 VIA device and enable it for ppc builds

The MOS6522 VIA forms the bridge part of several Mac devices, including the
Mac via-cuda and via-pmu devices. Introduce a standard mos6522 device that
can be shared amongst multiple implementations.

This is effectively taking the 6522 parts out of cuda.c and turning them
into a separate device whilst also applying some style tidy-ups and including
a conversion to trace-events.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>


  Commit: 7d848450b6e2a3e14a776b4c93704710e7f3d233
      
https://github.com/qemu/qemu/commit/7d848450b6e2a3e14a776b4c93704710e7f3d233
  Author: Peter Maydell <peter.mayd...@linaro.org>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M default-configs/ppc-softmmu.mak
    M hw/misc/Makefile.objs
    M hw/misc/macio/cuda.c
    M hw/misc/macio/macio.c
    A hw/misc/mos6522.c
    M hw/misc/trace-events
    M hw/ppc/mac.h
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c
    A include/hw/misc/mos6522.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180212' 
into staging

ppc patch queue 2018-02-12

Here's the accumulatead ppc and pseries related patches for the last
while.  Highlights are:
    * A number of Macintosh / CUDA cleanups from Mark Cave-Ayland
    * An important bug fix (missing "break;") for
      H_GET_CPU_CHARACTERISTICS
    * Yet another fix for SMT mode handling
    * Assorted other cleanups and fixes

# gpg: Signature made Mon 12 Feb 2018 03:39:30 GMT
# gpg:                using RSA key 6C38CACA20D9B392
# gpg: Good signature from "David Gibson <da...@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgib...@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgib...@ozlabs.org>"
# gpg:                 aka "David Gibson (kernel.org) <d...@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.12-20180212:
  misc: introduce new mos6522 VIA device and enable it for ppc builds
  cuda: factor out timebase-derived counter value and load time
  cuda: set timer 1 frequency property to CUDA_TIMER_FREQ
  cuda: don't call cuda_update() when writing to ACR register
  cuda: minor cosmetic tidy-ups to get_next_irq_time()
  cuda: rename frequency property to tb_frequency
  cuda: introduce CUDAState parameter to get_counter()
  spapr: set vsmt to MAX(8, smp_threads)
  cuda: don't allow writes to port output pins
  cuda: do not use old_mmio accesses
  hw/ppc: rename functions in comments
  spapr: add missing break in h_get_cpu_characteristics()

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


Compare: https://github.com/qemu/qemu/compare/8e3fb8029efa...7d848450b6e2

Reply via email to