1. 10 8月, 2018 20 次提交
    • A
      powerpc/powernv/idle: Fix build error · ae24ce5e
      Aneesh Kumar K.V 提交于
      Fix the below build error using strlcpy instead of strncpy
      
      In function 'pnv_parse_cpuidle_dt',
          inlined from 'pnv_init_idle_states' at arch/powerpc/platforms/powernv/idle.c:840:7,
          inlined from '__machine_initcall_powernv_pnv_init_idle_states' at arch/powerpc/platforms/powernv/idle.c:870:1:
      arch/powerpc/platforms/powernv/idle.c:820:3: error: 'strncpy' specified bound 16 equals destination size [-Werror=stringop-truncation]
         strncpy(pnv_idle_states[i].name, temp_string[i],
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          PNV_IDLE_NAME_LEN);
      Signed-off-by: NAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      ae24ce5e
    • A
      powerpc/mm/tlbflush: update the mmu_gather page size while iterating address range · 0b6aa1a2
      Aneesh Kumar K.V 提交于
      This patch makes sure we update the mmu_gather page size even if we are
      requesting for a fullmm flush. This avoids triggering VM_WARN_ON in code
      paths like __tlb_remove_page_size that explicitly check for removing range page
      size to be same as mmu gather page size.
      
      Fixes: 5a609934 ("powerpc/64s/radix: tlb do not flush on page size when fullmm")
      Signed-off-by: NAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
      Acked-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      0b6aa1a2
    • M
      powerpc/mm: remove warning about ‘type’ being set · fce278af
      Mathieu Malaterre 提交于
      ‘type’ is only used when CONFIG_DEBUG_HIGHMEM is set. So add a possibly
      unused tag to variable. Remove warning treated as error with W=1:
      
        arch/powerpc/mm/highmem.c:59:6: error: variable ‘type’ set but not used [-Werror=unused-but-set-variable]
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      fce278af
    • M
      powerpc/32: Include setup.h header file to fix warnings · f2c6d0d1
      Mathieu Malaterre 提交于
      Make sure to include setup.h to provide the following prototypes:
      
        - irqstack_early_init
        - setup_power_save
        - initialize_cache_info
      
      Fix the following warnings (treated as error in W=1):
      
        arch/powerpc/kernel/setup_32.c:198:13: error: no previous prototype for ‘irqstack_early_init’
        arch/powerpc/kernel/setup_32.c:238:13: error: no previous prototype for ‘setup_power_save’
        arch/powerpc/kernel/setup_32.c:253:13: error: no previous prototype for ‘initialize_cache_info’
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      f2c6d0d1
    • M
      powerpc: Move `path` variable inside DEBUG_PROM · eab00a20
      Mathieu Malaterre 提交于
      Add gcc attribute unused for two variables. Fix warnings treated as errors
      with W=1:
      
        arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set but not used [-Werror=unused-but-set-variable]
      Suggested-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      eab00a20
    • M
      powerpc/powermac: Make some functions static · 618a89d7
      Mathieu Malaterre 提交于
      These functions can all be static, make it so. Fix warnings treated as
      errors with W=1:
      
        arch/powerpc/platforms/powermac/pci.c:1022:6: error: no previous prototype for ‘pmac_pci_fixup_ohci’
        arch/powerpc/platforms/powermac/pci.c:1057:6: error: no previous prototype for ‘pmac_pci_fixup_cardbus’
        arch/powerpc/platforms/powermac/pci.c:1094:6: error: no previous prototype for ‘pmac_pci_fixup_pciata’
      
      Remove has_address declaration and assignment since it's not used.
      Also add gcc attribute unused to fix a warning treated as error with
      W=1:
      
        arch/powerpc/platforms/powermac/pci.c:784:19: error: variable ‘has_address’ set but not used
        arch/powerpc/platforms/powermac/pci.c:907:22: error: variable ‘ht’ set but not used
      Suggested-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      618a89d7
    • M
      powerpc/powermac: Remove variable x that's never read · 8921305c
      Mathieu Malaterre 提交于
      Since the value of x is never intended to be read, remove it. Fix
      warning treated as error with W=1:
      
        arch/powerpc/platforms/powermac/udbg_scc.c:76:9: error: variable ‘x’ set but not used
      Suggested-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Reviewed-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      8921305c
    • M
      cxl: remove a dead branch · e4ecafb1
      Mathieu Malaterre 提交于
      In commit 14baf4d9 ("cxl: Add guest-specific code") the following code
      was added:
      
      	if (afu->crs_len < 0) {
      		dev_err(&afu->dev, "Unexpected configuration record size value\n");
      		return -EINVAL;
      	}
      
      However the variable `crs_len` is of type u64 and cannot be compared < 0.
      Remove the dead code section. Fix the following warning treated as error
      with W=1:
      
      ../drivers/misc/cxl/guest.c:919:19: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits]
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      e4ecafb1
    • M
      powerpc/powermac: Add missing include of header pmac.h · 2fff0f07
      Mathieu Malaterre 提交于
      The header `pmac.h` was not included, leading to the following warnings,
      treated as error with W=1:
      
        arch/powerpc/platforms/powermac/time.c:69:13: error: no previous prototype for ‘pmac_time_init’ [-Werror=missing-prototypes]
        arch/powerpc/platforms/powermac/time.c:207:15: error: no previous prototype for ‘pmac_get_boot_time’ [-Werror=missing-prototypes]
        arch/powerpc/platforms/powermac/time.c:222:6: error: no previous prototype for ‘pmac_get_rtc_time’ [-Werror=missing-prototypes]
        arch/powerpc/platforms/powermac/time.c:240:5: error: no previous prototype for ‘pmac_set_rtc_time’ [-Werror=missing-prototypes]
        arch/powerpc/platforms/powermac/time.c:259:12: error: no previous prototype for ‘via_calibrate_decr’ [-Werror=missing-prototypes]
        arch/powerpc/platforms/powermac/time.c:311:13: error: no previous prototype for ‘pmac_calibrate_decr’ [-Werror=missing-prototypes]
      
      The function `via_calibrate_decr` was made static to silence a warning.
      Signed-off-by: NMathieu Malaterre <malat@debian.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      2fff0f07
    • M
      powerpc/kexec: Use common error handling code in setup_new_fdt() · baedcdf5
      Markus Elfring 提交于
      Add a jump target so that a bit of exception handling can be better
      reused at the end of this function.
      
      This issue was detected by using the Coccinelle software.
      Signed-off-by: NMarkus Elfring <elfring@users.sourceforge.net>
      Reviewed-by: NThiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      baedcdf5
    • B
      powerpc/xmon: Add address lookup for percpu symbols · 302c7b0c
      Boqun Feng 提交于
      Currently, in xmon, there is no obvious way to get an address for a
      percpu symbol for a particular cpu. Having such an ability would be
      good for debugging the system when percpu variables got involved.
      
      Therefore, this patch introduces a new xmon command "lp" to lookup the
      address for percpu symbols. Usage of "lp" is similar to "ls", except
      that we could add a cpu number to choose the variable of which cpu we
      want to lookup. If no cpu number is given, lookup for current cpu.
      Signed-off-by: NBoqun Feng <boqun.feng@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      302c7b0c
    • C
      powerpc/mm: remove huge_pte_offset_and_shift() prototype · 646dbe40
      Christophe Leroy 提交于
      huge_pte_offset_and_shift() has never existed
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      646dbe40
    • C
      powerpc/lib: Use patch_site to patch copy_32 functions once cache is enabled · fa54a981
      Christophe Leroy 提交于
      The symbol memcpy_nocache_branch defined in order to allow patching
      of memset function once cache is enabled leads to confusing reports
      by perf tool.
      
      Using the new patch_site functionality solves this issue.
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      fa54a981
    • M
      powerpc/pseries: Fix endianness while restoring of r3 in MCE handler. · cd813e1c
      Mahesh Salgaonkar 提交于
      During Machine Check interrupt on pseries platform, register r3 points
      RTAS extended event log passed by hypervisor. Since hypervisor uses r3
      to pass pointer to rtas log, it stores the original r3 value at the
      start of the memory (first 8 bytes) pointed by r3. Since hypervisor
      stores this info and rtas log is in BE format, linux should make
      sure to restore r3 value in correct endian format.
      
      Without this patch when MCE handler, after recovery, returns to code that
      that caused the MCE may end up with Data SLB access interrupt for invalid
      address followed by kernel panic or hang.
      
        Severe Machine check interrupt [Recovered]
          NIP [d00000000ca301b8]: init_module+0x1b8/0x338 [bork_kernel]
          Initiator: CPU
          Error type: SLB [Multihit]
            Effective address: d00000000ca70000
        cpu 0xa: Vector: 380 (Data SLB Access) at [c0000000fc7775b0]
            pc: c0000000009694c0: vsnprintf+0x80/0x480
            lr: c0000000009698e0: vscnprintf+0x20/0x60
            sp: c0000000fc777830
           msr: 8000000002009033
           dar: a803a30c000000d0
          current = 0xc00000000bc9ef00
          paca    = 0xc00000001eca5c00	 softe: 3	 irq_happened: 0x01
            pid   = 8860, comm = insmod
        vscnprintf+0x20/0x60
        vprintk_emit+0xb4/0x4b0
        vprintk_func+0x5c/0xd0
        printk+0x38/0x4c
        init_module+0x1c0/0x338 [bork_kernel]
        do_one_initcall+0x54/0x230
        do_init_module+0x8c/0x248
        load_module+0x12b8/0x15b0
        sys_finit_module+0xa8/0x110
        system_call+0x58/0x6c
        --- Exception: c00 (System Call) at 00007fff8bda0644
        SP (7fffdfbfe980) is in userspace
      
      This patch fixes this issue.
      
      Fixes: a08a53ea ("powerpc/le: Enable RTAS events support")
      Cc: stable@vger.kernel.org # v3.15+
      Reviewed-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      cd813e1c
    • H
      powerpc/fadump: merge adjacent memory ranges to reduce PT_LOAD segements · ced1bf52
      Hari Bathini 提交于
      With dynamic memory allocation support for crash memory ranges array,
      there is no hard limit on the no. of crash memory ranges kernel could
      export, but program headers count could overflow in the /proc/vmcore
      ELF file while exporting each memory range as PT_LOAD segment. Reduce
      the likelihood of a such scenario, by folding adjacent crash memory
      ranges which minimizes the total number of PT_LOAD segments.
      Signed-off-by: NHari Bathini <hbathini@linux.ibm.com>
      Reviewed-by: NMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      ced1bf52
    • H
      powerpc/fadump: handle crash memory ranges array index overflow · 1bd6a1c4
      Hari Bathini 提交于
      Crash memory ranges is an array of memory ranges of the crashing kernel
      to be exported as a dump via /proc/vmcore file. The size of the array
      is set based on INIT_MEMBLOCK_REGIONS, which works alright in most cases
      where memblock memory regions count is less than INIT_MEMBLOCK_REGIONS
      value. But this count can grow beyond INIT_MEMBLOCK_REGIONS value since
      commit 142b45a7 ("memblock: Add array resizing support").
      
      On large memory systems with a few DLPAR operations, the memblock memory
      regions count could be larger than INIT_MEMBLOCK_REGIONS value. On such
      systems, registering fadump results in crash or other system failures
      like below:
      
        task: c00007f39a290010 ti: c00000000b738000 task.ti: c00000000b738000
        NIP: c000000000047df4 LR: c0000000000f9e58 CTR: c00000000010f180
        REGS: c00000000b73b570 TRAP: 0300   Tainted: G          L   X  (4.4.140+)
        MSR: 8000000000009033 <SF,EE,ME,IR,DR,RI,LE>  CR: 22004484  XER: 20000000
        CFAR: c000000000008500 DAR: 000007a450000000 DSISR: 40000000 SOFTE: 0
        ...
        NIP [c000000000047df4] smp_send_reschedule+0x24/0x80
        LR [c0000000000f9e58] resched_curr+0x138/0x160
        Call Trace:
          resched_curr+0x138/0x160 (unreliable)
          check_preempt_curr+0xc8/0xf0
          ttwu_do_wakeup+0x38/0x150
          try_to_wake_up+0x224/0x4d0
          __wake_up_common+0x94/0x100
          ep_poll_callback+0xac/0x1c0
          __wake_up_common+0x94/0x100
          __wake_up_sync_key+0x70/0xa0
          sock_def_readable+0x58/0xa0
          unix_stream_sendmsg+0x2dc/0x4c0
          sock_sendmsg+0x68/0xa0
          ___sys_sendmsg+0x2cc/0x2e0
          __sys_sendmsg+0x5c/0xc0
          SyS_socketcall+0x36c/0x3f0
          system_call+0x3c/0x100
      
      as array index overflow is not checked for while setting up crash memory
      ranges causing memory corruption. To resolve this issue, dynamically
      allocate memory for crash memory ranges and resize it incrementally,
      in units of pagesize, on hitting array size limit.
      
      Fixes: 2df173d9 ("fadump: Initialize elfcore header and add PT_LOAD program headers.")
      Cc: stable@vger.kernel.org # v3.4+
      Signed-off-by: NHari Bathini <hbathini@linux.ibm.com>
      Reviewed-by: NMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
      [mpe: Just use PAGE_SIZE directly, fixup variable placement]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      1bd6a1c4
    • C
      powerpc/cpm1: fix compilation error with CONFIG_PPC_EARLY_DEBUG_CPM · 6bd6d867
      Christophe Leroy 提交于
      commit e8cb7a55 ("powerpc: remove superflous inclusions of
      asm/fixmap.h") removed inclusion of asm/fixmap.h from files not
      including objects from that file.
      
      However, asm/mmu-8xx.h includes  call to __fix_to_virt(). The proper
      way would be to include asm/fixmap.h in asm/mmu-8xx.h but it creates
      an inclusion loop.
      
      So we have to leave asm/fixmap.h in sysdep/cpm_common.c for
      CONFIG_PPC_EARLY_DEBUG_CPM
      
        CC      arch/powerpc/sysdev/cpm_common.o
      In file included from ./arch/powerpc/include/asm/mmu.h:340:0,
                       from ./arch/powerpc/include/asm/reg_8xx.h:8,
                       from ./arch/powerpc/include/asm/reg.h:29,
                       from ./arch/powerpc/include/asm/processor.h:13,
                       from ./arch/powerpc/include/asm/thread_info.h:28,
                       from ./include/linux/thread_info.h:38,
                       from ./arch/powerpc/include/asm/ptrace.h:159,
                       from ./arch/powerpc/include/asm/hw_irq.h:12,
                       from ./arch/powerpc/include/asm/irqflags.h:12,
                       from ./include/linux/irqflags.h:16,
                       from ./include/asm-generic/cmpxchg-local.h:6,
                       from ./arch/powerpc/include/asm/cmpxchg.h:537,
                       from ./arch/powerpc/include/asm/atomic.h:11,
                       from ./include/linux/atomic.h:5,
                       from ./include/linux/mutex.h:18,
                       from ./include/linux/kernfs.h:13,
                       from ./include/linux/sysfs.h:16,
                       from ./include/linux/kobject.h:20,
                       from ./include/linux/device.h:16,
                       from ./include/linux/node.h:18,
                       from ./include/linux/cpu.h:17,
                       from ./include/linux/of_device.h:5,
                       from arch/powerpc/sysdev/cpm_common.c:21:
      arch/powerpc/sysdev/cpm_common.c: In function ‘udbg_init_cpm’:
      ./arch/powerpc/include/asm/mmu-8xx.h:218:25: error: implicit declaration of function ‘__fix_to_virt’ [-Werror=implicit-function-declaration]
       #define VIRT_IMMR_BASE (__fix_to_virt(FIX_IMMR_BASE))
                               ^
      arch/powerpc/sysdev/cpm_common.c:75:7: note: in expansion of macro ‘VIRT_IMMR_BASE’
             VIRT_IMMR_BASE);
             ^
      ./arch/powerpc/include/asm/mmu-8xx.h:218:39: error: ‘FIX_IMMR_BASE’ undeclared (first use in this function)
       #define VIRT_IMMR_BASE (__fix_to_virt(FIX_IMMR_BASE))
                                             ^
      arch/powerpc/sysdev/cpm_common.c:75:7: note: in expansion of macro ‘VIRT_IMMR_BASE’
             VIRT_IMMR_BASE);
             ^
      ./arch/powerpc/include/asm/mmu-8xx.h:218:39: note: each undeclared identifier is reported only once for each function it appears in
       #define VIRT_IMMR_BASE (__fix_to_virt(FIX_IMMR_BASE))
                                             ^
      arch/powerpc/sysdev/cpm_common.c:75:7: note: in expansion of macro ‘VIRT_IMMR_BASE’
             VIRT_IMMR_BASE);
             ^
      cc1: all warnings being treated as errors
      make[1]: *** [arch/powerpc/sysdev/cpm_common.o] Error 1
      
      Fixes: e8cb7a55 ("powerpc: remove superflous inclusions of asm/fixmap.h")
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      6bd6d867
    • D
      powerpc: Fix size calculation using resource_size() · c42d3be0
      Dan Carpenter 提交于
      The problem is the the calculation should be "end - start + 1" but the
      plus one is missing in this calculation.
      
      Fixes: 8626816e ("powerpc: add support for MPIC message register API")
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Reviewed-by: NTyrel Datwyler <tyreld@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      c42d3be0
    • R
      24576a70
    • R
      powerpc/powernv: Allow memory that has been hot-removed to be hot-added · d3da701d
      Rashmica Gupta 提交于
      This patch allows the memory removed by memtrace to be readded to the
      kernel. So now you don't have to reboot your system to add the memory
      back to the kernel or to have a different amount of memory removed.
      Signed-off-by: NRashmica Gupta <rashmica.g@gmail.com>
      Tested-by: NMichael Neuling <mikey@neuling.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      d3da701d
  2. 08 8月, 2018 1 次提交
    • B
      selftests/powerpc: Kill child processes on SIGINT · 7c27a26e
      Breno Leitao 提交于
      There are some powerpc selftests, as tm/tm-unavailable, that run for a long
      period (>120 seconds), and if it is interrupted, as pressing CRTL-C
      (SIGINT), the foreground process (harness) dies but the child process and
      threads continue to execute (with PPID = 1 now) in background.
      
      In this case, you'd think the whole test exited, but there are remaining
      threads and processes being executed in background. Sometimes these
      zombies processes are doing annoying things, as consuming the whole CPU or
      dumping things to STDOUT.
      
      This patch fixes this problem by attaching an empty signal handler to
      SIGINT in the harness process. This handler will interrupt (EINTR) the
      parent process waitpid() call, letting the code to follow through the
      normal flow, which will kill all the processes in the child process group.
      
      This patch also fixes a typo.
      Signed-off-by: NBreno Leitao <leitao@debian.org>
      Signed-off-by: NGustavo Romero <gromero@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      7c27a26e
  3. 07 8月, 2018 19 次提交
    • B
      powerpc/powernv/opal: Use standard interrupts property when available · 77b5f703
      Benjamin Herrenschmidt 提交于
      For (bad) historical reasons, OPAL used to create a non-standard pair
      of properties "opal-interrupts" and "opal-interrupts-names" for
      representing the list of interrupts it wants Linux to request on its
      behalf.
      
      Among other issues, the opal-interrupts doesn't have a way to carry
      the type of interrupts, and they were assumed to be all level
      sensitive.
      
      This is wrong on some recent systems where some of them are edge
      sensitive causing warnings in the XIVE code and possible misbehaviours
      if they need to be retriggered (typically the NPU2 TCE error
      interrupts).
      
      This makes Linux switch to using the standard "interrupts" and
      "interrupt-names" properties instead when they are available, using
      standard of_irq helpers, which can carry all the desired type
      information.
      
      Newer versions of OPAL will generate those properties in addition to
      the legacy ones.
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      [mpe: Fixup prefix logic to check strlen(r->name). Reinstate setting
       of start = 0 in opal_event_shutdown() to avoid double free warnings]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      77b5f703
    • C
      powerpc: Allow CPU selection of e300core variants · d6690b1a
      Christophe Leroy 提交于
      GCC supports -mcpu=e300c2 and -mcpu=e300c3
      
      This patch gives the opportunity to tune kernel to one of
      those two types.
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      d6690b1a
    • C
      powerpc: Allow CPU selection also on PPC32 · 0e00a8c9
      Christophe Leroy 提交于
      This patch extends to PPC32 the capability to select the exact
      CPU type.
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      0e00a8c9
    • C
      powerpc: Make CPU selection logic generic in Makefile · cc62d20c
      Christophe Leroy 提交于
      At the time being, when adding a new CPU for selection, both
      Kconfig.cputype and Makefile have to be modified.
      
      This patch moves into Kconfig.cputype the name of the CPU to me
      passed to the -mcpu= argument.
      Signed-off-by: NChristophe Leroy <christophe.leroy@c-s.fr>
      Reviewed-by: NNicholas Piggin <npiggin@gmail.com>
      [mpe: Rename the option to TARGET_CPU to echo the gcc documentation]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      cc62d20c
    • R
      powerpc/Makefiles: Convert ifeq to ifdef where possible · badf436f
      Rodrigo R. Galvao 提交于
      In Makefiles if we're testing a CONFIG_FOO symbol for equality with 'y'
      we can instead just use ifdef. The latter reads easily, so convert to
      it where possible.
      Signed-off-by: NRodrigo R. Galvao <rosattig@linux.vnet.ibm.com>
      Reviewed-by: NMauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      badf436f
    • P
      powerpc/64: Copy as much as possible in __copy_tofrom_user · f8db2007
      Paul Mackerras 提交于
      In __copy_tofrom_user, if we encounter an exception on a store, we
      stop copying and return the number of bytes not copied.  However,
      if the store is wider than one byte and is to an unaligned address,
      it is possible that the store operand overlaps a page boundary
      and the exception occurred on the latter part of the store operand,
      meaning that it would be possible to copy a few more bytes.  Since
      copy_to_user is generally expected to copy as much as possible,
      it would be better to copy those extra few bytes.  This adds code
      to do that.  Since this edge case is not performance-critical,
      the code has been written to be compact rather than as fast as
      possible.
      Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      f8db2007
    • M
      selftests/powerpc/64: Test exception cases in copy_tofrom_user · 2679f63f
      Michael Ellerman 提交于
      This adds a set of test cases to test the behaviour of
      copy_tofrom_user when exceptions are encountered accessing the
      source or destination.  Currently, copy_tofrom_user does not always
      copy as many bytes as possible when an exception occurs on a store
      to the destination, and that is reflected in failures in these tests.
      
      Based on a test program from Anton Blanchard.
      
      [paulus@ozlabs.org - test all three paths, wrote commit description,
       made EX_TABLE create an exception table.]
      Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      2679f63f
    • P
      selftests/powerpc/64: Test all paths through copy routines · 98c45f51
      Paul Mackerras 提交于
      The hand-coded assembler 64-bit copy routines include feature sections
      that select one code path or another depending on which CPU we are
      executing on.  The self-tests for these copy routines end up testing
      just one path.  This adds a mechanism for selecting any desired code
      path at compile time, and makes 2 or 3 versions of each test, each
      using a different code path, so as to cover all the possible paths.
      Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
      [mpe: Add -mcpu=power4 to CFLAGS for older compilers]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      98c45f51
    • P
      powerpc/64: Make exception table clearer in __copy_tofrom_user_base · a7c81ce3
      Paul Mackerras 提交于
      This aims to make the generation of exception table entries for the
      loads and stores in __copy_tofrom_user_base clearer and easier to
      verify.  Instead of having a series of local labels on the loads and
      stores, with a series of corresponding labels later for the exception
      handlers, we now use macros to generate exception table entries at the
      point of each load and store that could potentially trap.  We do this
      with the macros lex (load exception) and stex (store exception).
      These macros are used right before the load or store to which they
      apply.
      
      Some complexity is introduced by the fact that we have some more work
      to do after hitting an exception, because we need to calculate and
      return the number of bytes not copied.  The code uses r3 as the
      current pointer into the destination buffer, that is, the address of
      the first byte of the destination that has not been modified.
      However, at various points in the copy loops, r3 can be 4, 8, 16 or 24
      bytes behind that point.
      
      To express this offset in an understandable way, we define a symbol
      r3_offset which is updated at various points so that it equal to the
      difference between the address of the first unmodified byte of the
      destination and the value in r3.  (In fact it only needs to be
      accurate at the point of each lex or stex macro invocation.)
      
      The rules for updating r3_offset are as follows:
      
      * It starts out at 0
      * An addi r3,r3,N instruction decreases r3_offset by N
      * A store instruction (stb, sth, stw, std) to N(r3)
        increases r3_offset by the width of the store (1, 2, 4, 8)
      * A store with update instruction (stbu, sthu, stwu, stdu) to N(r3)
        sets r3_offset to the width of the store.
      
      There is some trickiness to the way that the lex and stex macros and
      the associated exception handlers work.  I would have liked to use
      the current value of r3_offset in the name of the symbol used as
      the exception handler, as in ".Lld_exc_$(r3_offset)" and then
      have symbols .Lld_exc_0, .Lld_exc_8, .Lld_exc_16 etc. corresponding
      to the offsets that needed to be added to r3.  However, I couldn't
      see a way to do that with gas.
      
      Instead, the exception handler address is .Lld_exc - r3_offset or
      .Lst_exc - r3_offset, that is, the distance ahead of .Lld_exc/.Lst_exc
      that we start executing is equal to the amount that we need to add to
      r3.  This works because r3_offset is always a small multiple of 4,
      and our instructions are 4 bytes long.  This means that before
      .Lld_exc and .Lst_exc, we have a sequence of instructions that
      increments r3 by 4, 8, 16 or 24 depending on where we start.  The
      sequence increments r3 by 4 per instruction (on average).
      
      We also replace the exception table for the 4k copy loop by a
      macro per load or store.  These loads and stores all use exactly
      the same exception handler, which simply resets the argument registers
      r3, r4 and r5 to there original values and re-does the whole copy
      using the slower loop.
      Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      a7c81ce3
    • Z
      powerpc/powermac: of_node_put() is not needed after iterator · 81d7b08b
      zhong jiang 提交于
      for_each_node_by_name() iterators only exit normally when the loop
      cursor is NULL, So there is no need to call of_node_put().
      Signed-off-by: Nzhong jiang <zhongjiang@huawei.com>
      Reviewed-by: NTyrel Datwyler <tyreld@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      81d7b08b
    • H
      crypto/nx: Initialize 842 high and normal RxFIFO control registers · 656ecc16
      Haren Myneni 提交于
      NX increments readOffset by FIFO size in receive FIFO control register
      when CRB is read. But the index in RxFIFO has to match with the
      corresponding entry in FIFO maintained by VAS in kernel. Otherwise NX
      may be processing incorrect CRBs and can cause CRB timeout.
      
      VAS FIFO offset is 0 when the receive window is opened during
      initialization. When the module is reloaded or in kexec boot, readOffset
      in FIFO control register may not match with VAS entry. This patch adds
      nx_coproc_init OPAL call to reset readOffset and queued entries in FIFO
      control register for both high and normal FIFOs.
      Signed-off-by: NHaren Myneni <haren@us.ibm.com>
      [mpe: Fixup uninitialized variable warning]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      656ecc16
    • H
      powerpc/powernv: Export opal_check_token symbol · 6e708000
      Haren Myneni 提交于
      Export opal_check_token symbol for modules to check the availability
      of OPAL calls before using them.
      Signed-off-by: NHaren Myneni <haren@us.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      6e708000
    • R
      powerpc/platforms/85xx: fix t1042rdb_diu.c build errors & warning · f5daf77a
      Randy Dunlap 提交于
      Fix build errors and warnings in t1042rdb_diu.c by adding header files
      and MODULE_LICENSE().
      
      ../arch/powerpc/platforms/85xx/t1042rdb_diu.c:152:1: warning: data definition has no type or storage class
       early_initcall(t1042rdb_diu_init);
      ../arch/powerpc/platforms/85xx/t1042rdb_diu.c:152:1: error: type defaults to 'int' in declaration of 'early_initcall' [-Werror=implicit-int]
      ../arch/powerpc/platforms/85xx/t1042rdb_diu.c:152:1: warning: parameter names (without types) in function declaration
      
      and
      WARNING: modpost: missing MODULE_LICENSE() in arch/powerpc/platforms/85xx/t1042rdb_diu.o
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Scott Wood <oss@buserror.net>
      Cc: Kumar Gala <galak@kernel.crashing.org>
      Cc: linuxppc-dev@lists.ozlabs.org
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      f5daf77a
    • A
      powerpc/perf: Remove sched_task function defined for thread-imc · 7ccc4fe5
      Anju T Sudhakar 提交于
      Call trace observed while running perf-fuzzer:
      
        CPU: 43 PID: 9088 Comm: perf_fuzzer Not tainted 4.13.0-32-generic #35~lp1746225
        task: c000003f776ac900 task.stack: c000003f77728000
        NIP: c000000000299b70 LR: c0000000002a4534 CTR: c00000000029bb80
        REGS: c000003f7772b760 TRAP: 0700   Not tainted  (4.13.0-32-generic)
        MSR: 900000000282b033 <SF,HV,VEC,VSX,EE,FP,ME,IR,DR,RI,LE>
          CR: 24008822  XER: 00000000
        CFAR: c000000000299a70 SOFTE: 0
        GPR00: c0000000002a4534 c000003f7772b9e0 c000000001606200 c000003fef858908
        GPR04: c000003f776ac900 0000000000000001 ffffffffffffffff 0000003fee730000
        GPR08: 0000000000000000 0000000000000000 c0000000011220d8 0000000000000002
        GPR12: c00000000029bb80 c000000007a3d900 0000000000000000 0000000000000000
        GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
        GPR20: 0000000000000000 0000000000000000 c000003f776ad090 c000000000c71354
        GPR24: c000003fef716780 0000003fee730000 c000003fe69d4200 c000003f776ad330
        GPR28: c0000000011220d8 0000000000000001 c0000000014c6108 c000003fef858900
        NIP [c000000000299b70] perf_pmu_sched_task+0x170/0x180
        LR [c0000000002a4534] __perf_event_task_sched_in+0xc4/0x230
        Call Trace:
          perf_iterate_sb+0x158/0x2a0 (unreliable)
          __perf_event_task_sched_in+0xc4/0x230
          finish_task_switch+0x21c/0x310
          __schedule+0x304/0xb80
          schedule+0x40/0xc0
          do_wait+0x254/0x2e0
          kernel_wait4+0xa0/0x1a0
          SyS_wait4+0x64/0xc0
          system_call+0x58/0x6c
        Instruction dump:
        3beafea0 7faa4800 409eff18 e8010060 eb610028 ebc10040 7c0803a6 38210050
        eb81ffe0 eba1ffe8 ebe1fff8 4e800020 <0fe00000> 4bffffbc 60000000 60420000
        ---[ end trace 8c46856d314c1811 ]---
      
      The context switch call-backs for thread-imc are defined in sched_task function.
      So when thread-imc events are grouped with software pmu events,
      perf_pmu_sched_task hits the WARN_ON_ONCE condition, since software PMUs are
      assumed not to have a sched_task defined.
      
      Patch to move the thread_imc enable/disable opal call back from sched_task to
      event_[add/del] function
      
      Fixes: f74c89bd ("powerpc/perf: Add thread IMC PMU support")
      Signed-off-by: NAnju T Sudhakar <anju@linux.vnet.ibm.com>
      Reviewed-by: NMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
      Tested-by: NJoel Stanley <joel@jms.id.au>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      7ccc4fe5
    • N
      powerpc/64s: Fix page table fragment refcount race vs speculative references · 4231aba0
      Nicholas Piggin 提交于
      The page table fragment allocator uses the main page refcount racily
      with respect to speculative references. A customer observed a BUG due
      to page table page refcount underflow in the fragment allocator. This
      can be caused by the fragment allocator set_page_count stomping on a
      speculative reference, and then the speculative failure handler
      decrements the new reference, and the underflow eventually pops when
      the page tables are freed.
      
      Fix this by using a dedicated field in the struct page for the page
      table fragment allocator.
      
      Fixes: 5c1f6ee9 ("powerpc: Reduce PTE table memory wastage")
      Cc: stable@vger.kernel.org # v3.10+
      Reviewed-by: NAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
      Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      4231aba0
    • P
      misc: cxl: changed asterisk position · a0ac3687
      Parth Y Shah 提交于
      Resolved <"foo* bar" should be "foo *bar"> error
      Signed-off-by: NParth Y Shah <sparth1292@gmail.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      a0ac3687
    • D
      powerpc/pasemi: Use pr_err/pr_warn... for kernel messages · e13606d7
      Darren Stevens 提交于
      Pasemi code still uses printk(KERN_ERR/KERN_WARN ... change these to
      pr_err(, pr_warn(... to match other powerpc arch code.
      
      No functional changes.
      Signed-off-by: NDarren Stevens <darren@stevens-zone.net>
      [mpe: Unsplit some strings while we're at it]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      e13606d7
    • M
      powerpc/traps: Show instructions on exceptions · a99b9c5e
      Murilo Opsfelder Araujo 提交于
      Call show_user_instructions() in arch/powerpc/kernel/traps.c to dump
      instructions at faulty location, useful to debugging.
      
      Before this patch, an unhandled signal message looked like:
      
        pandafault[10524]: segfault (11) at 100007d0 nip 1000061c lr 7fffbd295100 code 2 in pandafault[10000000+10000]
      
      After this patch, it looks like:
      
        pandafault[10524]: segfault (11) at 100007d0 nip 1000061c lr 7fffbd295100 code 2 in pandafault[10000000+10000]
        pandafault[10524]: code: 4bfffeec 4bfffee8 3c401002 38427f00 fbe1fff8 f821ffc1 7c3f0b78 3d22fffe
        pandafault[10524]: code: 392988d0 f93f0020 e93f0020 39400048 <99490000> 39200000 7d234b78 383f0040
      Signed-off-by: NMurilo Opsfelder Araujo <muriloo@linux.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      a99b9c5e
    • M
      powerpc: Add show_user_instructions() · 88b0fe17
      Murilo Opsfelder Araujo 提交于
      show_user_instructions() is a slightly modified version of
      show_instructions() that allows userspace instruction dump.
      
      This will be useful within show_signal_msg() to dump userspace
      instructions of the faulty location.
      
      Here is a sample of what show_user_instructions() outputs:
      
        pandafault[10850]: code: 4bfffeec 4bfffee8 3c401002 38427f00 fbe1fff8 f821ffc1 7c3f0b78 3d22fffe
        pandafault[10850]: code: 392988d0 f93f0020 e93f0020 39400048 <99490000> 39200000 7d234b78 383f0040
      
      The current->comm and current->pid printed can serve as a glue that
      links the instructions dump to its originator, allowing messages to be
      interleaved in the logs.
      Signed-off-by: NMurilo Opsfelder Araujo <muriloo@linux.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      88b0fe17