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

Commit 6c6bd8b6 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: report "Unknown CPU/FPU" for unknown cpu/fpu 



If we cannot determine the CPU or FPU report
"Unknown CPU" or "Unknown FPU" like sparc64 does.

And report with KERN_ERR that we cannot determine the CPU.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a563f01

arch/sparc/kernel/cpu_32.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -152,8 +152,11 @@ void __cpuinit cpu_probe(void) 
	}

	}





	if (i == NSPARCCHIPS)

	if (i == NSPARCCHIPS)

		printk(KERN_DEBUG "psr.impl = 0x%x   psr.vers = 0x%x\n",

	{

		printk(KERN_ERR "CPU: Unknown chip, impl[0x%x] vers[0x%x]\n",

		       psr_impl, psr_vers);

		       psr_impl, psr_vers);

		sparc_cpu_type = "Unknown CPU";

	}





	for (i = 0; i < NSPARCFPU; i++) {

	for (i = 0; i < NSPARCFPU; i++) {

		if (linux_sparc_fpu[i].psr_impl == psr_impl)

		if (linux_sparc_fpu[i].psr_impl == psr_impl)
@@ -164,8 +167,8 @@ void __cpuinit cpu_probe(void) 
	}

	}





	if (i == NSPARCFPU) {

	if (i == NSPARCFPU) {

		printk(KERN_DEBUG "psr.impl = 0x%x  fsr.vers = 0x%x\n",

		printk(KERN_ERR "FPU: Unknown chip, impl[0x%x] vers[0x%x]\n",

		       psr_impl, fpu_vers);

		       psr_impl, fpu_vers);

		sparc_fpu_type = linux_sparc_fpu[31].fp_name;

		sparc_fpu_type = "Unknown FPU";

	}

	}

}
 
}

arch/sparc/kernel/setup_32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -328,8 +328,8 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) 
		   "CPU0ClkTck\t: %ld\n"

		   "CPU0ClkTck\t: %ld\n"

#endif

#endif

		   ,

		   ,

		   sparc_cpu_type ? sparc_cpu_type : "undetermined",

		   sparc_cpu_type,

		   sparc_fpu_type ? sparc_fpu_type : "undetermined",

		   sparc_fpu_type ,

		   romvec->pv_romvers,

		   romvec->pv_romvers,

		   prom_rev,

		   prom_rev,

		   romvec->pv_printrev >> 16,

		   romvec->pv_printrev >> 16,