Merge tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Paul Burton:
 "The main MIPS changes for 5.5:

   - Atomics-related code sees some rework & cleanup, most notably
     allowing Loongson LL/SC errata workarounds to be more bulletproof &
     their correctness to be checked at build time.

   - Command line setup code is simplified somewhat, resolving various
     corner cases.

   - MIPS kernels can now be built with kcov code coverage support.

   - We can now build with CONFIG_FORTIFY_SOURCE=y.

   - Miscellaneous cleanups.

  And some platform specific changes:

   - We now disable some broken TLB functionality on certain Ingenic
     systems, and JZ4780 systems gain some devicetree nodes to support
     more devices.

   - Loongson support sees a number of cleanups, and we gain initial
     support for Loongson 3A R4 systems.

   - We gain support for MediaTek MT7688-based GARDENA Smart Gateway
     systems.

   - SGI IP27 (Origin 2*) see a number of fixes, cleanups &
     simplifications.

   - SGI IP30 (Octane) systems are now supported"

* tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (107 commits)
  MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module
  MIPS: PCI: Fix fake subdevice ID for IOC3
  MIPS: Ingenic: Disable abandoned HPTLB function.
  MIPS: PCI: remember nasid changed by set interrupt affinity
  MIPS: SGI-IP27: Fix crash, when CPUs are disabled via nr_cpus parameter
  mips: add support for folded p4d page tables
  mips: drop __pXd_offset() macros that duplicate pXd_index() ones
  mips: fix build when "48 bits virtual memory" is enabled
  MIPS: math-emu: Reuse name array in debugfs_fpuemu()
  MIPS: allow building with kcov coverage
  MIPS: Loongson64: Drop setup_pcimap
  MIPS: Loongson2ef: Convert to early_printk_8250
  MIPS: Drop CPU_SUPPORTS_UNCACHED_ACCELERATED
  MIPS: Loongson{2ef, 32, 64} convert to generic fw cmdline
  MIPS: Drop pmon.h
  MIPS: Loongson: Unify LOONGSON3/LOONGSON64 Kconfig usage
  MIPS: Loongson: Rename LOONGSON1 to LOONGSON32
  MIPS: Loongson: Fix return value of loongson_hwmon_init
  MIPS: add support for SGI Octane (IP30)
  MIPS: PCI: make phys_to_dma/dma_to_phys for pci-xtalk-bridge common
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/sgi-ip27/ip27-init.c
index 79a52c4727829224005378906fcc90d274dec669,8fd3505e2b9c25d613e68566fae16be6bc5d7535..f597e1ee2df7a1bf89ad4eeca7d870bf2482fc53
--- 1/arch/mips/sgi-ip27/ip27-init.c
--- 2/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@@ -67,16 -62,25 +62,16 @@@ static void per_hub_init(nasid_t nasid
        REMOTE_HUB_S(nasid, IIO_ICTP, 0x800);
        REMOTE_HUB_S(nasid, IIO_ICTO, 0xff);
  
-       hub_rtc_init(cnode);
+       hub_rtc_init(nasid);
  
 -#ifdef CONFIG_REPLICATE_EXHANDLERS
 -      /*
 -       * If this is not a headless node initialization,
 -       * copy over the caliased exception handlers.
 -       */
 -      if (get_nasid() == nasid) {
 -              extern char except_vec2_generic, except_vec3_generic;
 -              extern void build_tlb_refill_handler(void);
 -
 -              memcpy((void *)(CKSEG0 + 0x100), &except_vec2_generic, 0x80);
 -              memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x80);
 -              build_tlb_refill_handler();
 -              memcpy((void *)(CKSEG0 + 0x100), (void *) CKSEG0, 0x80);
 -              memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x100);
 +      if (nasid) {
 +              /* copy exception handlers from first node to current node */
 +              memcpy((void *)NODE_OFFSET_TO_K0(nasid, 0),
 +                     (void *)CKSEG0, 0x200);
                __flush_cache_all();
 +              /* switch to node local exception handlers */
 +              REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);
        }
 -#endif
  }
  
  void per_cpu_init(void)

diff --cc arch/mips/sgi-ip27/ip27-memory.c
Simple merge