Commit 9f471129 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:
 "A fair number of build fixes for various configurations.

  Fixes to BPF, and the BCM47xx platform code, a preemption fix for the
  Loongson core, a syscall auditing fix, wire up the new getrandom and
  memfd_create.  Several patches for EVA"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (30 commits)
  MIPS: SmartMIPS: Disable assembler warnings
  MIPS: Move CPU topology macros to topology.h
  MIPS: Wire up new syscalls getrandom and memfd_create.
  MIPS: Fix a warning for virt_to_page
  arch/mips/net/bpf_jit.c: fix failure check
  MIPS: COP2: CPP macro safety fixes.
  MIPS: Kconfig: Select SMP symbols for CMP
  MIPS: ZBOOT: add missing <linux/string.h> include
  MIPS: IP28: Fix/clean spaces.h
  MIPS: IP28: Select correct L1_CACHE_SHIFT
  MIPS: BCM63xx: delete double assignment
  MIPS: Spelling s/confugrations/configurations/
  MIPS: OCTEON: make get_system_type() thread-safe
  MIPS: CPS: Initialize EVA before bringing up VPEs from secondary cores
  MIPS: Malta: EVA: Rename 'eva_entry' to 'platform_eva_init'
  MIPS: EVA: Add new EVA header
  MIPS: scall64-o32: Fix indirect syscall detection
  MIPS: syscall: Fix AUDIT value for O32 processes on MIPS64
  MIPS: Loongson: Fix COP2 usage for preemptible kernel
  MIPS: NL: Fix nlm_xlp_defconfig build error
  ...
parents d9773cea dab1b445

arch/mips/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ config SGI_IP28 
	# select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select MIPS_L1_CACHE_SHIFT_7

      help

        This is the SGI Indigo2 with R10000 processor.  To compile a Linux

        kernel that runs on these, say Y here.
@@ -2029,7 +2030,9 @@ config MIPS_CMP 
	bool "MIPS CMP framework support (DEPRECATED)"

	depends on SYS_SUPPORTS_MIPS_CMP

	select MIPS_GIC_IPI

	select SMP

	select SYNC_R4K

	select SYS_SUPPORTS_SMP

	select WEAK_ORDERING

	default n

	help

arch/mips/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -113,7 +113,16 @@ predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__ 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))



cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,-msmartmips)

# For smartmips configurations, there are hundreds of warnings due to ISA overrides

# in assembly and header files. smartmips is only supported for MIPS32r1 onwards

# and there is no support for 64-bit. Various '.set mips2' or '.set mips3' or

# similar directives in the kernel will spam the build logs with the following warnings:

# Warning: the `smartmips' extension requires MIPS32 revision 1 or greater

# or

# Warning: the 64-bit MIPS architecture does not support the `smartmips' extension

# Pass -Wa,--no-warn to disable all assembler warnings until the kernel code has

# been fixed properly.

cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,-msmartmips) -Wa,--no-warn

cflags-$(CONFIG_CPU_MICROMIPS) += $(call cc-option,-mmicromips)



cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \

arch/mips/bcm63xx/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void bcm63xx_init_irq(void) 
		irq_stat_addr[0] += PERF_IRQSTAT_3368_REG;

		irq_mask_addr[0] += PERF_IRQMASK_3368_REG;

		irq_stat_addr[1] = 0;

		irq_stat_addr[1] = 0;

		irq_mask_addr[1] = 0;

		irq_bits = 32;

		ext_irq_count = 4;

		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
@@ -443,7 +443,7 @@ static void bcm63xx_init_irq(void) 
		irq_stat_addr[0] += PERF_IRQSTAT_6328_REG(0);

		irq_mask_addr[0] += PERF_IRQMASK_6328_REG(0);

		irq_stat_addr[1] += PERF_IRQSTAT_6328_REG(1);

		irq_stat_addr[1] += PERF_IRQMASK_6328_REG(1);

		irq_mask_addr[1] += PERF_IRQMASK_6328_REG(1);

		irq_bits = 64;

		ext_irq_count = 4;

		is_ext_irq_cascaded = 1;

arch/mips/boot/compressed/decompress.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/string.h>



#include <asm/addrspace.h>

arch/mips/include/asm/cop2.h

+9 −9
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
extern void octeon_cop2_save(struct octeon_cop2_state *);

extern void octeon_cop2_restore(struct octeon_cop2_state *);



#define cop2_save(r)		octeon_cop2_save(r)

#define cop2_restore(r)		octeon_cop2_restore(r)

#define cop2_save(r)		octeon_cop2_save(&(r)->thread.cp2)

#define cop2_restore(r)		octeon_cop2_restore(&(r)->thread.cp2)



#define cop2_present		1

#define cop2_lazy_restore	1
@@ -26,26 +26,26 @@ extern void octeon_cop2_restore(struct octeon_cop2_state *); 


extern void nlm_cop2_save(struct nlm_cop2_state *);

extern void nlm_cop2_restore(struct nlm_cop2_state *);

#define cop2_save(r)		nlm_cop2_save(r)

#define cop2_restore(r)		nlm_cop2_restore(r)



#define cop2_save(r)		nlm_cop2_save(&(r)->thread.cp2)

#define cop2_restore(r)		nlm_cop2_restore(&(r)->thread.cp2)



#define cop2_present		1

#define cop2_lazy_restore	0



#elif defined(CONFIG_CPU_LOONGSON3)



#define cop2_save(r)

#define cop2_restore(r)



#define cop2_present		1

#define cop2_lazy_restore	1

#define cop2_save(r)		do { (r); } while (0)

#define cop2_restore(r)		do { (r); } while (0)



#else



#define cop2_present		0

#define cop2_lazy_restore	0

#define cop2_save(r)

#define cop2_restore(r)

#define cop2_save(r)		do { (r); } while (0)

#define cop2_restore(r)		do { (r); } while (0)

#endif



enum cu2_ops {

CRA Git | Maintained and supported by SUSTech CRA and CCSE