Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc0e65f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

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

   - Fix a silly typo in virt_addr_valid which led to completely bogus
     behavior (that happened to stop tripping up hardened usercopy
     despite being broken).

   - Fix UART parity setup on AR933x systems.

   - A build fix for non-Linux build machines.

   - Have the 'all' make target build DTBs, primarily to fit in with the
     behavior of scripts/package/builddeb.

   - Handle an execution hazard in TLB exceptions that use KScratch
     registers, which could inadvertently clobber the $1 register on
     some generally higher-end out-of-order CPUs.

   - A MAINTAINERS update to fix the path to the NAND driver for Ingenic
     systems"

* tag 'mips_fixes_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MAINTAINERS: Correct path to moved files
  MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
  MIPS: have "plain" make calls build dtbs for selected platforms
  MIPS: fix build on non-linux hosts
  MIPS: ath79: fix ar933x uart parity mode
  MIPS: Fix bounds check virt_addr_valid
parents 2692982b f2ff671f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7810,7 +7810,7 @@ INGENIC JZ4780 NAND DRIVER 
M:	Harvey Hunt <harveyhuntnexus@gmail.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/nand/raw/jz4780_*

F:	drivers/mtd/nand/raw/ingenic/



INOTIFY

M:	Jan Kara <jack@suse.cz>

arch/mips/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ archscripts: scripts_basic 
	$(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs



KBUILD_DEFCONFIG := 32r2el_defconfig

KBUILD_DTBS      := dtbs



#

# Select the object file format to substitute into the linker script.
@@ -384,7 +385,7 @@ quiet_cmd_64 = OBJCOPY $@ 
vmlinux.64: vmlinux

	$(call cmd,64)



all:	$(all-y)

all:	$(all-y) $(KBUILD_DTBS)



# boot

$(boot-y): $(vmlinux-32) FORCE

arch/mips/boot/compressed/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ 
$(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE

	$(call if_changed,objcopy)



HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE)



# Calculate the load address of the compressed kernel image

hostprogs-y := calc_vmlinuz_load_addr

arch/mips/boot/compressed/calc_vmlinuz_load_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

#include "../../../../include/linux/sizes.h"

#include <linux/sizes.h>



int main(int argc, char *argv[])

{

arch/mips/include/asm/mach-ath79/ar933x_uart.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#define AR933X_UART_CS_PARITY_S		0

#define AR933X_UART_CS_PARITY_M		0x3

#define	  AR933X_UART_CS_PARITY_NONE	0

#define	  AR933X_UART_CS_PARITY_ODD	1

#define	  AR933X_UART_CS_PARITY_EVEN	2

#define	  AR933X_UART_CS_PARITY_ODD	2

#define	  AR933X_UART_CS_PARITY_EVEN	3

#define AR933X_UART_CS_IF_MODE_S	2

#define AR933X_UART_CS_IF_MODE_M	0x3

#define	  AR933X_UART_CS_IF_MODE_NONE	0