1. 13 5月, 2014 11 次提交
    • R
      MIPS: inst.h: Rename BITFIELD_FIELD to __BITFIELD_FIELD. · 8471ac1b
      Ralf Baechle 提交于
      <uapi/asm/inst.h> is exported to userland so the macro name BITFIELD_FIELD
      pollutes the namespace.  Prefix the name with __ fixes this.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      8471ac1b
    • R
    • A
      MIPS/loongson2_cpufreq: Fix CPU clock rate setting · 8e8acb32
      Aaro Koskinen 提交于
      Loongson2 has been using (incorrectly) kHz for cpu_clk rate. This has
      been unnoticed, as loongson2_cpufreq was the only place where the rate
      was set/get. After commit 652ed95d
      (cpufreq: introduce cpufreq_generic_get() routine) things however broke,
      and now loops_per_jiffy adjustments are incorrect (1000 times too long).
      The patch fixes this by changing cpu_clk rate to Hz.
      Signed-off-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      Cc: stable@vger.kernel.org
      Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
      Cc: Viresh Kumar <viresh.kumar@linaro.org>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: cpufreq@vger.kernel.org
      Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
      Patchwork: https://patchwork.linux-mips.org/patch/6678/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      8e8acb32
    • P
      MIPS: Loongson: No need to select GENERIC_HARDIRQS_NO__DO_IRQ · 3deff253
      Paul Bolle 提交于
      Commit 0e476d91 ("MIPS: Loongson: Add Loongson-3 Kconfig options")
      added "select GENERIC_HARDIRQS_NO__DO_IRQ". But the Kconfig symbol
      GENERIC_HARDIRQS_NO__DO_IRQ was already removed in v2.6.38, so that
      select is a nop. Drop it.
      Signed-off-by: NPaul Bolle <pebolle@tiscali.nl>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/6677/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      3deff253
    • M
      MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix · 44ba138f
      Maciej W. Rozycki 提交于
      This change reverts most of commit
      60724ca5 [MIPS: IP checksums: Remove
      unncessary .set pseudos] that introduced warnings with the
      CPU_DADDI_WORKAROUNDS option set:
      
      arch/mips/lib/csum_partial.S: Assembler messages:
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:467: Warning: used $3 with ".set at=$3"
      [...]
      arch/mips/lib/csum_partial.S:577: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:577: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:577: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:601: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:601: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:601: Warning: used $3 with ".set at=$3"
      arch/mips/lib/csum_partial.S:601: Warning: used $3 with ".set at=$3"
      [and so on, and so on...]
      
      The warnings are benign and good code is produced regardless because no
      macros that'd use the assembler's temporary register are involved, however
      the `.set noat' directives removed by the commit referred are crucial to
      guarantee this is still going to be the case after any changes in the
      future.  Therefore they need to be brought back to place which this
      change does.
      Signed-off-by: NMaciej W. Rozycki <macro@linux-mips.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6686/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      44ba138f
    • M
      MIPS: __strncpy_from_user_asm CPU_DADDI_WORKAROUNDS bug fix · 465ca5d6
      Maciej W. Rozycki 提交于
      This corrects assembler warnings and broken code generated in
      __strncpy_from_user_asm:
      
      arch/mips/lib/strncpy_user.S: Assembler messages:
      arch/mips/lib/strncpy_user.S:52: Warning: Macro instruction expanded into
      multiple instructions in a branch delay slot
      
      with the CPU_DADDI_WORKAROUNDS option set.  The function schedules delay
      slots manually where there is really no need to as GAS is happy to do it
      all itself, so undo it all and remove `.set noreorder'.
      Signed-off-by: NMaciej W. Rozycki <macro@linux-mips.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6685/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      465ca5d6
    • M
      MIPS: __delay CPU_DADDI_WORKAROUNDS bug fix · 2db4bc34
      Maciej W. Rozycki 提交于
      With CPU_DADDI_WORKAROUNDS enabled __delay assembles with a macro in a
      branch delay slot:
      
      {standard input}: Assembler messages:
      {standard input}:18: Warning: Macro instruction expanded into multiple
      instructions in a branch delay slot
      
      and broken code results:
      
      0000000000000000 <__delay>:
         0:	1480ffff 	bnez	a0,0 <__delay>
         4:	24010001 	li	at,1
         8:	0081202f 	dsubu	a0,a0,at
         c:	03e00008 	jr	ra
        10:	00000000 	nop
        14:	00000000 	nop
      
      Consequently the function loops indefinitely, showing up prominently as a
      hang in the delay loop calibration at bootstrap.
      
      This change corrects the problem by forcing the immediate 1 into a
      register while keeping code produced identical where CPU_DADDI_WORKAROUNDS
      is disabled.
      Signed-off-by: NMaciej W. Rozycki <macro@linux-mips.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6669/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      2db4bc34
    • M
      MIPS: DEC/SNI: O32 wrapper stack switching fixes · 824122a3
      Maciej W. Rozycki 提交于
      Commit 231a35d3 [[MIPS] RM: Collected
      changes] broke DECstation support by introducing an incompatible copy of
      arch/mips/dec/prom/call_o32.S in arch/mips/fw/lib/, built unconditionally.
      The copy happens to land earlier of the two among the modules used in the
      link and is therefore chosen for the DECstation rather than the intended
      original.  As a result random kernel data is corrupted because a pointer
      to the "%s" formatted output template is used as a temporary stack pointer
      rather than being passed down to prom_printf.  This also explains why
      prom_printf still works, up to a point -- the next argument is the actual
      string to output so it works just fine as the output template until enough
      kernel data has been corrupted to cause a crash.
      
      This change adjusts the modified wrapper in arch/mips/fw/lib/call_o32.S to
      let callers request no stack switching by passing a null temporary stack
      pointer in $a1, reworks the DECstation callers to work with the updated
      interface and removes the old copy from arch/mips/dec/prom/call_o32.S.  A
      few minor readability adjustments are included as well, most importantly
      O32_SZREG is now used throughout where applicable rather than hardcoded
      multiplies of 4 and $fp is used to access the argument save area as a more
      usual register to operate the stack with rather than $s0.
      
      Finally an update is made to the temporary stack space used by the SNI
      platform to guarantee 8-byte alignment as per o32 requirements.
      Signed-off-by: NMaciej W. Rozycki <macro@linux-mips.org>
      Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6668/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      824122a3
    • M
      MIPS: DEC: Bus error handler <asm/cpu-type.h> fixes · af37530b
      Maciej W. Rozycki 提交于
      Commit 69f24d17 [MIPS: Optimize
      current_cpu_type() for better code.] missed an update for two DECstation
      bus error support files that now do not build, this is a fix.
      Signed-off-by: NMaciej W. Rozycki <macro@linux-mips.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6667/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      af37530b
    • R
      MAINTAINERS: TURBOchannel: Update entry · c406339c
      Ralf Baechle 提交于
      Add mailing list and patchwork URL so patches now have a defined path.
      Also add myself as a TURBOchannel maintainer.  However Maciej is going
      to the the resident TURBOchannel guru.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: N"Maciej W. Rozycki" <macro@linux-mips.org>
      c406339c
    • R
      Revert "MIPS: MT: proc: Add support for printing VPE and TC ids" · 5508d456
      Ralf Baechle 提交于
      Reverts commit 795038a6 because
      d6d3c9af provides the same functionality
      in a more generic way.  Both patches applied however means that the
      VPE and TC IDs get printed twice currently.
      5508d456
  2. 10 5月, 2014 2 次提交
    • L
      Linux 3.15-rc5 · d6d211db
      Linus Torvalds 提交于
      d6d211db
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 181da3c3
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "A somewhat unpleasantly large collection of small fixes.  The big ones
        are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'.  It
        was using __init functions with predictably suboptimal results.
      
        Another key fix is a build fix which would produce output that simply
        would not decompress correctly in some configuration, due to the
        existing Makefiles picking up an unfortunate local label and mistaking
        it for the global symbol _end.
      
        Additional fixes include the handling of 64-bit numbers when setting
        the vdso data page (a latent bug which became manifest when i386
        started exporting a vdso with time functions), a fix to the new MSR
        manipulation accessors which would cause features to not get properly
        unblocked, a build fix for 32-bit userland, and a few new platform
        quirks"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
        x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
        x86: Fix typo preventing msr_set/clear_bit from having an effect
        x86/intel: Add quirk to disable HPET for the Baytrail platform
        x86/hpet: Make boot_hpet_disable extern
        x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
        x86/reboot: Add reboot quirk for Certec BPC600
        asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
        asmlinkage, x86: Add explicit __visible to arch/x86/*
        asmlinkage: Revert "lto: Make asmlinkage __visible"
        x86, build: Don't get confused by local symbols
        x86/efi: earlyprintk=efi,keep fix
      181da3c3
  3. 09 5月, 2014 8 次提交
  4. 08 5月, 2014 10 次提交
  5. 07 5月, 2014 9 次提交