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

Merge tag 'mips-fixes_6.7_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - Fixes for broken Loongson firmware

 - Fix lockdep splat

 - Fix FPU states when creating kernel threads

* tag 'mips-fixes_6.7_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: kernel: Clear FPU states when setting up kernel threads
  MIPS: Loongson64: Handle more memory types passed from firmware
  MIPS: Loongson64: Enable DMA noncoherent support
  MIPS: Loongson64: Reserve vgabios memory on boot
  mips/smp: Call rcutree_report_cpu_starting() earlier
parents 9d3bc457 a58a1734

arch/mips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ config MACH_LOONGSON2EF 


config MACH_LOONGSON64

	bool "Loongson 64-bit family of machines"

	select ARCH_DMA_DEFAULT_COHERENT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO
@@ -1251,6 +1252,7 @@ config CPU_LOONGSON64 
	select CPU_SUPPORTS_MSA

	select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT

	select CPU_MIPSR2_IRQ_VI

	select DMA_NONCOHERENT

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select MIPS_ASID_BITS_VARIABLE

arch/mips/include/asm/mach-loongson64/boot_param.h

+7 −2
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 
#define ADAPTER_ROM		8

#define ACPI_TABLE		9

#define SMBIOS_TABLE		10

#define MAX_MEMORY_TYPE		11

#define UMA_VIDEO_RAM		11

#define VUMA_VIDEO_RAM		12

#define MAX_MEMORY_TYPE		13



#define MEM_SIZE_IS_IN_BYTES	(1 << 31)



#define LOONGSON3_BOOT_MEM_MAP_MAX 128

struct efi_memory_map_loongson {
@@ -117,7 +121,8 @@ struct irq_source_routing_table { 
	u64 pci_io_start_addr;

	u64 pci_io_end_addr;

	u64 pci_config_addr;

	u32 dma_mask_bits;

	u16 dma_mask_bits;

	u16 dma_noncoherent;

} __packed;



struct interface_info {

arch/mips/kernel/process.c

+13 −12
Original line number Diff line number Diff line
@@ -121,6 +121,19 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) 
	/*  Put the stack after the struct pt_regs.  */

	childksp = (unsigned long) childregs;

	p->thread.cp0_status = (read_c0_status() & ~(ST0_CU2|ST0_CU1)) | ST0_KERNEL_CUMASK;



	/*

	 * New tasks lose permission to use the fpu. This accelerates context

	 * switching for most programs since they don't use the fpu.

	 */

	clear_tsk_thread_flag(p, TIF_USEDFPU);

	clear_tsk_thread_flag(p, TIF_USEDMSA);

	clear_tsk_thread_flag(p, TIF_MSA_CTX_LIVE);



#ifdef CONFIG_MIPS_MT_FPAFF

	clear_tsk_thread_flag(p, TIF_FPUBOUND);

#endif /* CONFIG_MIPS_MT_FPAFF */



	if (unlikely(args->fn)) {

		/* kernel thread */

		unsigned long status = p->thread.cp0_status;
@@ -149,20 +162,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) 
	p->thread.reg29 = (unsigned long) childregs;

	p->thread.reg31 = (unsigned long) ret_from_fork;



	/*

	 * New tasks lose permission to use the fpu. This accelerates context

	 * switching for most programs since they don't use the fpu.

	 */

	childregs->cp0_status &= ~(ST0_CU2|ST0_CU1);



	clear_tsk_thread_flag(p, TIF_USEDFPU);

	clear_tsk_thread_flag(p, TIF_USEDMSA);

	clear_tsk_thread_flag(p, TIF_MSA_CTX_LIVE);



#ifdef CONFIG_MIPS_MT_FPAFF

	clear_tsk_thread_flag(p, TIF_FPUBOUND);

#endif /* CONFIG_MIPS_MT_FPAFF */



#ifdef CONFIG_MIPS_FP_SUPPORT

	atomic_set(&p->thread.bd_emu_frame, BD_EMUFRAME_NONE);

#endif

arch/mips/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -351,10 +351,11 @@ early_initcall(mips_smp_ipi_init); 
 */

asmlinkage void start_secondary(void)

{

	unsigned int cpu;

	unsigned int cpu = raw_smp_processor_id();



	cpu_probe();

	per_cpu_trap_init(false);

	rcutree_report_cpu_starting(cpu);

	mips_clockevent_init();

	mp_ops->init_secondary();

	cpu_report();
@@ -366,7 +367,6 @@ asmlinkage void start_secondary(void) 
	 */



	calibrate_delay();

	cpu = smp_processor_id();

	cpu_data[cpu].udelay_val = loops_per_jiffy;



	set_cpu_sibling_map(cpu);

arch/mips/loongson64/env.c

+9 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 * Copyright (C) 2009 Lemote Inc.

 * Author: Wu Zhangjin, wuzhangjin@gmail.com

 */



#include <linux/dma-map-ops.h>

#include <linux/export.h>

#include <linux/pci_ids.h>

#include <asm/bootinfo.h>
@@ -147,8 +149,14 @@ void __init prom_lefi_init_env(void) 


	loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;

	if (loongson_sysconf.dma_mask_bits < 32 ||

		loongson_sysconf.dma_mask_bits > 64)

			loongson_sysconf.dma_mask_bits > 64) {

		loongson_sysconf.dma_mask_bits = 32;

		dma_default_coherent = true;

	} else {

		dma_default_coherent = !eirq_source->dma_noncoherent;

	}



	pr_info("Firmware: Coherent DMA: %s\n", dma_default_coherent ? "on" : "off");



	loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm;

	loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;