1. 23 11月, 2019 4 次提交
    • T
      MIPS: SGI-IP27: Fix crash, when CPUs are disabled via nr_cpus parameter · e3d765a9
      Thomas Bogendoerfer 提交于
      If number of CPUs are limited by the kernel commandline parameter nr_cpus
      assignment of interrupts accourding to numa rules might not be possibe.
      As a fallback use one of the online CPUs as interrupt destination.
      
      Fixes: 69a07a41 ("MIPS: SGI-IP27: rework HUB interrupts")
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      e3d765a9
    • M
      mips: add support for folded p4d page tables · 2bee1b58
      Mike Rapoport 提交于
      Implement primitives necessary for the 4th level folding, add walks of p4d
      level where appropriate, replace 5leve-fixup.h with pgtable-nop4d.h and
      drop usage of __ARCH_USE_5LEVEL_HACK.
      Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mm@kvack.org
      Cc: Mike Rapoport <rppt@kernel.org>
      2bee1b58
    • M
      mips: drop __pXd_offset() macros that duplicate pXd_index() ones · 31168f03
      Mike Rapoport 提交于
      The __pXd_offset() macros are identical to the pXd_index() macros and there
      is no point to keep both of them. All architectures define and use
      pXd_index() so let's keep only those to make mips consistent with the rest
      of the kernel.
      Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mm@kvack.org
      Cc: Mike Rapoport <rppt@kernel.org>
      31168f03
    • M
      mips: fix build when "48 bits virtual memory" is enabled · 3ed6751b
      Mike Rapoport 提交于
      With CONFIG_MIPS_VA_BITS_48=y the build fails miserably:
      
        CC      arch/mips/kernel/asm-offsets.s
      In file included from arch/mips/include/asm/pgtable.h:644,
                       from include/linux/mm.h:99,
                       from arch/mips/kernel/asm-offsets.c:15:
      include/asm-generic/pgtable.h:16:2: error: #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
       #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
        ^~~~~
      include/asm-generic/pgtable.h:390:28: error: unknown type name 'p4d_t'; did you mean 'pmd_t'?
       static inline int p4d_same(p4d_t p4d_a, p4d_t p4d_b)
                                  ^~~~~
                                  pmd_t
      
      [ ... more such errors ... ]
      
      scripts/Makefile.build:99: recipe for target 'arch/mips/kernel/asm-offsets.s' failed
      make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
      
      This happens because when CONFIG_MIPS_VA_BITS_48 enables 4th level of the
      page tables, but neither pgtable-nop4d.h nor 5level-fixup.h are included to
      cope with the 5th level.
      
      Replace #ifdef conditions around includes of the pgtable-nop{m,u}d.h with
      explicit CONFIG_PGTABLE_LEVELS and add include of 5level-fixup.h for the
      case when CONFIG_PGTABLE_LEVELS==4
      Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mm@kvack.org
      Cc: Mike Rapoport <rppt@kernel.org>
      3ed6751b
  2. 12 11月, 2019 9 次提交
  3. 05 11月, 2019 1 次提交
  4. 02 11月, 2019 10 次提交
  5. 01 11月, 2019 1 次提交
  6. 24 10月, 2019 9 次提交
    • T
      MIPS: include: remove unsued header file asm/sgi/sgi.h · 2409839a
      Thomas Bogendoerfer 提交于
      asm/sgi/sgi.h is unused, time to remove it.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      2409839a
    • P
      MIPS: tlbex: Fix build_restore_pagemask KScratch restore · b42aa3fd
      Paul Burton 提交于
      build_restore_pagemask() will restore the value of register $1/$at when
      its restore_scratch argument is non-zero, and aims to do so by filling a
      branch delay slot. Commit 0b24cae4 ("MIPS: Add missing EHB in mtc0
      -> mfc0 sequence.") added an EHB instruction (Execution Hazard Barrier)
      prior to restoring $1 from a KScratch register, in order to resolve a
      hazard that can result in stale values of the KScratch register being
      observed. In particular, P-class CPUs from MIPS with out of order
      execution pipelines such as the P5600 & P6600 are affected.
      
      Unfortunately this EHB instruction was inserted in the branch delay slot
      causing the MFC0 instruction which performs the restoration to no longer
      execute along with the branch. The result is that the $1 register isn't
      actually restored, ie. the TLB refill exception handler clobbers it -
      which is exactly the problem the EHB is meant to avoid for the P-class
      CPUs.
      
      Similarly build_get_pgd_vmalloc() will restore the value of $1/$at when
      its mode argument equals refill_scratch, and suffers from the same
      problem.
      
      Fix this by in both cases moving the EHB earlier in the emitted code.
      There's no reason it needs to immediately precede the MFC0 - it simply
      needs to be between the MTC0 & MFC0.
      
      This bug only affects Cavium Octeon systems which use
      build_fast_tlb_refill_handler().
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Fixes: 0b24cae4 ("MIPS: Add missing EHB in mtc0 -> mfc0 sequence.")
      Cc: Dmitry Korotin <dkorotin@wavecomp.com>
      Cc: stable@vger.kernel.org # v3.15+
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      b42aa3fd
    • T
      MIPS: SGI-IP27: reduce ARC usage to a minimum · e9422427
      Thomas Bogendoerfer 提交于
      IP27 uses ARC prom only for parsing prom arguments and has a hack
      for IP27 to make the ARC code behave. By introducing config symbol
      ARC_CMDLINE_ONLY IP27 only drags in ARC cmdline parsing and does
      everything else in IP27 specific code.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      e9422427
    • T
      MIPS: arc: use function argument for passing argc/argv to prom_init_cmdline · 7b16831d
      Thomas Bogendoerfer 提交于
      prom_argc and prom_argv are only used by prom_init_cmdline(), so
      we could pass them directly as function argument.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      7b16831d
    • T
      MIPS: arc: remove unused stuff · cbd09241
      Thomas Bogendoerfer 提交于
      remove unused _prom_envp and prom_argc macro.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      cbd09241
    • T
      MIPS: SGI-IP27: move registering of smp ops into IP27 specific code · c823f416
      Thomas Bogendoerfer 提交于
      Calling register_smp_ops() in plat_mem_setup() is still early enough.
      So by doing this we could remove the ugly #ifdef CONFIG_SGI_IP27 in
      fw/arc/init.c.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      c823f416
    • T
      MIPS: SGI-IP27: collect externs in new header file · 249be563
      Thomas Bogendoerfer 提交于
      IP27 code has a few externs distributed over .c files. Collect them
      together into one commcon header file.
      Signed-off-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Paul Burton <paul.burton@mips.com>
      Cc: James Hogan <jhogan@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      249be563
    • J
      MIPS: bmips: mark exception vectors as char arrays · e4f5cb1a
      Jonas Gorski 提交于
      The vectors span more than one byte, so mark them as arrays.
      
      Fixes the following build error when building when using GCC 8.3:
      
      In file included from ./include/linux/string.h:19,
                       from ./include/linux/bitmap.h:9,
                       from ./include/linux/cpumask.h:12,
                       from ./arch/mips/include/asm/processor.h:15,
                       from ./arch/mips/include/asm/thread_info.h:16,
                       from ./include/linux/thread_info.h:38,
                       from ./include/asm-generic/preempt.h:5,
                       from ./arch/mips/include/generated/asm/preempt.h:1,
                       from ./include/linux/preempt.h:81,
                       from ./include/linux/spinlock.h:51,
                       from ./include/linux/mmzone.h:8,
                       from ./include/linux/bootmem.h:8,
                       from arch/mips/bcm63xx/prom.c:10:
      arch/mips/bcm63xx/prom.c: In function 'prom_init':
      ./arch/mips/include/asm/string.h:162:11: error: '__builtin_memcpy' forming offset [2, 32] is out of the bounds [0, 1] of object 'bmips_smp_movevec' with type 'char' [-Werror=array-bounds]
         __ret = __builtin_memcpy((dst), (src), __len); \
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      arch/mips/bcm63xx/prom.c:97:3: note: in expansion of macro 'memcpy'
         memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);
         ^~~~~~
      In file included from arch/mips/bcm63xx/prom.c:14:
      ./arch/mips/include/asm/bmips.h:80:13: note: 'bmips_smp_movevec' declared here
       extern char bmips_smp_movevec;
      
      Fixes: 18a1eef9 ("MIPS: BMIPS: Introduce bmips.h")
      Signed-off-by: NJonas Gorski <jonas.gorski@gmail.com>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: linux-mips@vger.kernel.org
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: James Hogan <jhogan@kernel.org>
      e4f5cb1a
    • R
      MIPS: Loongson: Fix GENMASK misuse · e02d026f
      Rikard Falkeborn 提交于
      Arguments are supposed to be ordered high then low.
      
      Fixes: 6a6f9b7d ("MIPS: Loongson: Add CFUCFG&CSR support")
      Signed-off-by: NRikard Falkeborn <rikard.falkeborn@gmail.com>
      Reviewed-by: NHuacai Chen <chenhc@lemote.com>
      Signed-off-by: NPaul Burton <paulburton@kernel.org>
      Cc: chenhuacai@gmail.com
      Cc: jhogan@kernel.org
      Cc: jiaxun.yang@flygoat.com
      Cc: linux-mips@linux-mips.org
      Cc: linux-mips@vger.kernel.org
      Cc: paul.burton@mips.com
      Cc: ralf@linux-mips.org
      Cc: wuzhangjin@gmail.com
      Cc: zhangfx@lemote.com
      e02d026f
  7. 19 10月, 2019 2 次提交
  8. 14 10月, 2019 2 次提交
    • L
      Linux 5.4-rc3 · 4f5cafb5
      Linus Torvalds 提交于
      4f5cafb5
    • L
      Merge tag 'trace-v5.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · d4615e5a
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "A few tracing fixes:
      
         - Remove lockdown from tracefs itself and moved it to the trace
           directory. Have the open functions there do the lockdown checks.
      
         - Fix a few races with opening an instance file and the instance
           being deleted (Discovered during the lockdown updates). Kept
           separate from the clean up code such that they can be backported to
           stable easier.
      
         - Clean up and consolidated the checks done when opening a trace
           file, as there were multiple checks that need to be done, and it
           did not make sense having them done in each open instance.
      
         - Fix a regression in the record mcount code.
      
         - Small hw_lat detector tracer fixes.
      
         - A trace_pipe read fix due to not initializing trace_seq"
      
      * tag 'trace-v5.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Initialize iter->seq after zeroing in tracing_read_pipe()
        tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency
        tracing/hwlat: Report total time spent in all NMIs during the sample
        recordmcount: Fix nop_mcount() function
        tracing: Do not create tracefs files if tracefs lockdown is in effect
        tracing: Add locked_down checks to the open calls of files created for tracefs
        tracing: Add tracing_check_open_get_tr()
        tracing: Have trace events system open call tracing_open_generic_tr()
        tracing: Get trace_array reference for available_tracers files
        ftrace: Get a reference counter for the trace_array on filter files
        tracefs: Revert ccbd54ff ("tracefs: Restrict tracefs when the kernel is locked down")
      d4615e5a
  9. 13 10月, 2019 2 次提交