From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 27 Apr 2019 20:34:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190426' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ec34ecc97bcd5df04b0f67a774d79ffcd6b0a11;p=qemu.git

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190426' into staging

ppc patch queue 2019-04-26

Here's the first ppc target pull request for qemu-4.1.  This has a
number of things that have accumulated while qemu-4.0 was frozen.

 * A number of emulated MMU improvements from Ben Herrenschmidt

 * Assorted cleanups fro Greg Kurz

 * A large set of mostly mechanical cleanups from me to make target/ppc
   much closer to compliant with the modern coding style

 * Support for passthrough of NVIDIA GPUs using NVLink2

As well as some other assorted fixes.

# gpg: Signature made Fri 26 Apr 2019 07:02:19 BST
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-4.1-20190426: (36 commits)
  target/ppc: improve performance of large BAT invalidations
  ppc/hash32: Rework R and C bit updates
  ppc/hash64: Rework R and C bit updates
  ppc/spapr: Use proper HPTE accessors for H_READ
  target/ppc: Don't check UPRT in radix mode when in HV real mode
  target/ppc/kvm: Convert DPRINTF to traces
  target/ppc/trace-events: Fix trivial typo
  spapr: Drop duplicate PCI swizzle code
  spapr_pci: Get rid of duplicate code for node name creation
  target/ppc: Style fixes for translate/spe-impl.inc.c
  target/ppc: Style fixes for translate/vmx-impl.inc.c
  target/ppc: Style fixes for translate/vsx-impl.inc.c
  target/ppc: Style fixes for translate/fp-impl.inc.c
  target/ppc: Style fixes for translate.c
  target/ppc: Style fixes for translate_init.inc.c
  target/ppc: Style fixes for monitor.c
  target/ppc: Style fixes for mmu_helper.c
  target/ppc: Style fixes for mmu-hash64.[ch]
  target/ppc: Style fixes for mmu-hash32.[ch]
  target/ppc: Style fixes for misc_helper.c
  ...

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

9ec34ecc97bcd5df04b0f67a774d79ffcd6b0a11
diff --cc target/ppc/kvm.c
index 59d92c4275,9e86db0963..02e22e2017
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@@ -2133,10 -2159,12 +2159,12 @@@ uint64_t kvmppc_rma_size(uint64_t curre
      long rampagesize, best_page_shift;
      int i;
  
-     /* Find the largest hardware supported page size that's less than
-      * or equal to the (logical) backing page size of guest RAM */
+     /*
+      * Find the largest hardware supported page size that's less than
+      * or equal to the (logical) backing page size of guest RAM
+      */
      kvm_get_smmu_info(&info, &error_fatal);
 -    rampagesize = qemu_getrampagesize();
 +    rampagesize = qemu_minrampagesize();
      best_page_shift = 0;
  
      for (i = 0; i < KVM_PPC_PAGE_SIZES_MAX_SZ; i++) {