From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Jan 2016 20:50:56 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2464688b59c6ae9928f385dabf5355e30cff298;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for MIPS for 4.5 plus some 4.4 fixes.

  The executive summary:

   - ATH79 platform improvments, use DT bindings for the ATH79 USB PHY.
   - Avoid useless rebuilds for zboot.
   - jz4780: Add NEMC, BCH and NAND device tree nodes
   - Initial support for the MicroChip's DT platform.  As all the device
     drivers are missing this is still of limited use.
   - Some Loongson3 cleanups.
   - The unavoidable whitespace polishing.
   - Reduce clock skew when synchronizing the CPU cycle counters on CPU
     startup.
   - Add MIPS R6 fixes.
   - Lots of cleanups across arch/mips as fallout from KVM.
   - Lots of minor fixes and changes for IEEE 754-2008 support to the
     FPU emulator / fp-assist software.
   - Minor Ralink, BCM47xx and bcm963xx platform support improvments.
   - Support SMP on BCM63168"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (84 commits)
  MIPS: zboot: Add support for serial debug using the PROM
  MIPS: zboot: Avoid useless rebuilds
  MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB
  MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function
  MIPS: bcm963xx: Update bcm_tag field image_sequence
  MIPS: bcm963xx: Move extended flash address to bcm_tag header file
  MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure
  MIPS: bcm63xx: nvram: Use nvram structure definition from header file
  MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
  MAINTAINERS: Add KVM for MIPS entry
  MIPS: KVM: Add missing newline to kvm_err()
  MIPS: Move KVM specific opcodes into asm/inst.h
  MIPS: KVM: Use cacheops.h definitions
  MIPS: Break down cacheops.h definitions
  MIPS: Use EXCCODE_ constants with set_except_vector()
  MIPS: Update trap codes
  MIPS: Move Cause.ExcCode trap codes to mipsregs.h
  MIPS: KVM: Make kvm_mips_{init,exit}() static
  MIPS: KVM: Refactor added offsetof()s
  MIPS: KVM: Convert EXPORT_SYMBOL to _GPL
  ...
---

e2464688b59c6ae9928f385dabf5355e30cff298
diff --cc arch/mips/include/asm/kvm_host.h
index 7c191443c7ea,ba8d9acdba30..f6b12790716c
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@@ -92,18 -92,10 +92,10 @@@
  #define KVM_INVALID_INST		0xdeadbeef
  #define KVM_INVALID_ADDR		0xdeadbeef
  
- #define KVM_MALTA_GUEST_RTC_ADDR	0xb8000070UL
- 
- #define GUEST_TICKS_PER_JIFFY		(40000000/HZ)
- #define MS_TO_NS(x)			(x * 1E6L)
- 
- #define CAUSEB_DC			27
- #define CAUSEF_DC			(_ULCAST_(1) << 27)
- 
  extern atomic_t kvm_mips_instance;
 -extern pfn_t(*kvm_mips_gfn_to_pfn) (struct kvm *kvm, gfn_t gfn);
 -extern void (*kvm_mips_release_pfn_clean) (pfn_t pfn);
 -extern bool(*kvm_mips_is_error_pfn) (pfn_t pfn);
 +extern kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
 +extern void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
 +extern bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
  
  struct kvm_vm_stat {
  	u32 remote_tlb_flush;
diff --cc arch/mips/kvm/tlb.c
index 570479c03bdc,0939b1d6f910..a08c43946247
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@@ -35,17 -35,17 +35,17 @@@
  #define PRIx64 "llx"
  
  atomic_t kvm_mips_instance;
- EXPORT_SYMBOL(kvm_mips_instance);
+ EXPORT_SYMBOL_GPL(kvm_mips_instance);
  
  /* These function pointers are initialized once the KVM module is loaded */
 -pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
 +kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
- EXPORT_SYMBOL(kvm_mips_gfn_to_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_gfn_to_pfn);
  
 -void (*kvm_mips_release_pfn_clean)(pfn_t pfn);
 +void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_release_pfn_clean);
+ EXPORT_SYMBOL_GPL(kvm_mips_release_pfn_clean);
  
 -bool (*kvm_mips_is_error_pfn)(pfn_t pfn);
 +bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_is_error_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_is_error_pfn);
  
  uint32_t kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)
  {
diff --cc arch/mips/mm/tlbex.c
index 482192cc8f2b,29f73e00253d..5a04b6f5c6fb
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@@ -240,8 -240,9 +240,8 @@@ static void output_pgtable_bits_defines
  	pr_define("_PAGE_MODIFIED_SHIFT %d\n", _PAGE_MODIFIED_SHIFT);
  #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
  	pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT);
 -	pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT);
  #endif
- #ifdef CONFIG_CPU_MIPSR2
+ #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
  	if (cpu_has_rixi) {
  #ifdef _PAGE_NO_EXEC_SHIFT
  		pr_define("_PAGE_NO_EXEC_SHIFT %d\n", _PAGE_NO_EXEC_SHIFT);