Commit 5a1e843c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_5.4_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Paul Burton:
 "A few MIPS fixes:

   - Fix VDSO time-related function behavior for systems where we need
     to fall back to syscalls, but were instead returning bogus results.

   - A fix to TLB exception handlers for Cavium Octeon systems where
     they would inadvertently clobber the $1/$at register.

   - A build fix for bcm63xx configurations.

   - Switch to using my @kernel.org email address"

* tag 'mips_fixes_5.4_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: tlbex: Fix build_restore_pagemask KScratch restore
  MIPS: bmips: mark exception vectors as char arrays
  mips: vdso: Fix __arch_get_hw_counter()
  MAINTAINERS: Use @kernel.org address for Paul Burton
parents 29768954 b42aa3fd

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de> 
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>

Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>

Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -3098,7 +3098,7 @@ S: Supported 
F:	arch/arm64/net/















BPF JIT for MIPS (32-BIT AND 64-BIT)













M:	Paul Burton <paul.burton@mips.com>













M:	Paul Burton <paulburton@kernel.org>















L:	netdev@vger.kernel.org















L:	bpf@vger.kernel.org















S:	Maintained










@@ -8002,7 +8002,7 @@ S:	Maintained













F:	drivers/usb/atm/ueagle-atm.c





























IMGTEC ASCII LCD DRIVER













M:	Paul Burton <paul.burton@mips.com>













M:	Paul Burton <paulburton@kernel.org>















S:	Maintained















F:	Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt















F:	drivers/auxdisplay/img-ascii-lcd.c










@@ -10829,7 +10829,7 @@ F:	drivers/usb/image/microtek.*



























MIPS















M:	Ralf Baechle <ralf@linux-mips.org>













M:	Paul Burton <paul.burton@mips.com>













M:	Paul Burton <paulburton@kernel.org>















M:	James Hogan <jhogan@kernel.org>















L:	linux-mips@vger.kernel.org















W:	http://www.linux-mips.org/









@@ -10843,7 +10843,7 @@ F:	arch/mips/













F:	drivers/platform/mips/





























MIPS BOSTON DEVELOPMENT BOARD













M:	Paul Burton <paul.burton@mips.com>













M:	Paul Burton <paulburton@kernel.org>















L:	linux-mips@vger.kernel.org















S:	Maintained















F:	Documentation/devicetree/bindings/clock/img,boston-clock.txt









@@ -10853,7 +10853,7 @@ F:	drivers/clk/imgtec/clk-boston.c













F:	include/dt-bindings/clock/boston-clock.h





























MIPS GENERIC PLATFORM













M:	Paul Burton <paul.burton@mips.com>













M:	Paul Burton <paulburton@kernel.org>















L:	linux-mips@vger.kernel.org















S:	Supported















F:	Documentation/devicetree/bindings/power/mti,mips-cpc.txt

































arch/mips/bcm63xx/prom.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -84,7 +84,7 @@ void __init prom_init(void)













		 * Here we will start up CPU1 in the background and ask it to















		 * reconfigure itself then go back to sleep.















		 */













		memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);













		memcpy((void *)0xa0000200, bmips_smp_movevec, 0x20);















		__sync();















		set_c0_cause(C_SW0);















		cpumask_set_cpu(1, &bmips_booted_mask);

































arch/mips/include/asm/bmips.h



+5
−5






























Original line number
Diff line number
Diff line








@@ -75,11 +75,11 @@ static inline int register_bmips_smp_ops(void)













#endif















}





























extern char bmips_reset_nmi_vec;













extern char bmips_reset_nmi_vec_end;













extern char bmips_smp_movevec;













extern char bmips_smp_int_vec;













extern char bmips_smp_int_vec_end;













extern char bmips_reset_nmi_vec[];













extern char bmips_reset_nmi_vec_end[];













extern char bmips_smp_movevec[];













extern char bmips_smp_int_vec[];













extern char bmips_smp_int_vec_end[];































extern int bmips_smp_enabled;















extern int bmips_cpu_offset;

































arch/mips/include/asm/vdso/gettimeofday.h



+3
−1






























Original line number
Diff line number
Diff line








@@ -24,6 +24,8 @@





























#define VDSO_HAS_CLOCK_GETRES		1





























#define __VDSO_USE_SYSCALL		ULLONG_MAX





























#ifdef CONFIG_MIPS_CLOCK_VSYSCALL































static __always_inline long gettimeofday_fallback(










@@ -205,7 +207,7 @@ static __always_inline u64 __arch_get_hw_counter(s32 clock_mode)













		break;















#endif















	default:













		cycle_now = 0;













		cycle_now = __VDSO_USE_SYSCALL;















		break;















	}

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE