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

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

Pull MIPS fixes from Thomas Bogendoerfer:

 - fixed FP register access on Loongsoon-3

 - added missing 1074 cpu handling

 - fixed Loongson2ef build error

* tag 'mips_fixes_5.9_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: BCM47XX: Remove the needless check with the 1074K
  MIPS: Add the missing 'CPU_1074K' into __get_cpu_type()
  MIPS: Loongson2ef: Disable Loongson MMI instructions
  MIPS: Loongson-3: Fix fp register access if MSA enabled
parents 782d1222 be090fa6

arch/mips/bcm47xx/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void __init plat_mem_setup(void) 
{

	struct cpuinfo_mips *c = &current_cpu_data;



	if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K)) {

	if (c->cputype == CPU_74K) {

		pr_info("Using bcma bus\n");

#ifdef CONFIG_BCM47XX_BCMA

		bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;

arch/mips/include/asm/cpu-type.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_34K:

	case CPU_1004K:

	case CPU_74K:

	case CPU_1074K:

	case CPU_M14KC:

	case CPU_M14KEC:

	case CPU_INTERAPTIV:

arch/mips/loongson2ef/Platform

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS 
  endif

endif



# Some -march= flags enable MMI instructions, and GCC complains about that

# support being enabled alongside -msoft-float. Thus explicitly disable MMI.

cflags-y += $(call cc-option,-mno-loongson-mmi)



#

# Loongson Machines' Support

#

arch/mips/loongson64/cop2-ex.c

+8 −16
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
			if (res)

				goto fault;



			set_fpr64(current->thread.fpu.fpr,

				insn.loongson3_lswc2_format.rt, value);

			set_fpr64(current->thread.fpu.fpr,

				insn.loongson3_lswc2_format.rq, value_next);

			set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rt], 0, value);

			set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rq], 0, value_next);

			compute_return_epc(regs);

			own_fpu(1);

		}
@@ -130,15 +128,13 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
				goto sigbus;



			lose_fpu(1);

			value_next = get_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lswc2_format.rq);

			value_next = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rq], 0);



			StoreDW(addr + 8, value_next, res);

			if (res)

				goto fault;



			value = get_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lswc2_format.rt);

			value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lswc2_format.rt], 0);



			StoreDW(addr, value, res);

			if (res)
@@ -204,8 +200,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
			if (res)

				goto fault;



			set_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lsdc2_format.rt, value);

			set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0, value);

			compute_return_epc(regs);

			own_fpu(1);
@@ -221,8 +216,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
			if (res)

				goto fault;



			set_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lsdc2_format.rt, value);

			set_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0, value);

			compute_return_epc(regs);

			own_fpu(1);

			break;
@@ -286,8 +280,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
				goto sigbus;



			lose_fpu(1);

			value = get_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lsdc2_format.rt);

			value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0);



			StoreW(addr, value, res);

			if (res)
@@ -305,8 +298,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action, 
				goto sigbus;



			lose_fpu(1);

			value = get_fpr64(current->thread.fpu.fpr,

					insn.loongson3_lsdc2_format.rt);

			value = get_fpr64(&current->thread.fpu.fpr[insn.loongson3_lsdc2_format.rt], 0);



			StoreDW(addr, value, res);

			if (res)

CRA Git | Maintained and supported by SUSTech CRA and CCSE