From 81653edd99ee2297ad6ab49a4f91a1d5dce577f1 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 2 Jan 2015 00:40:33 -0200 Subject: microblaze: Add missing PVR version codes PVR version code was missing in the cpu_ver_lookup table for the following versions: 8.50.b 8.50.c 9.2 9.3 This caused /proc/cpuinfo to display "CPU-Ver: Unknown" for these versions. This was detected and the patch tested with MicroBlaze version 8.50.c. The other codes were taken from the Xilinx MicroBlaze Processor Reference Guides UG081 (v14.7) and UG984 (v2014.1). Signed-off-by: Erico Nunes Signed-off-by: Michal Simek --- arch/microblaze/kernel/cpu/cpuinfo.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/microblaze/kernel/cpu/cpuinfo.c') diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index 234acad79b9e..b60442dcdedc 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c @@ -41,8 +41,12 @@ const struct cpu_ver_key cpu_ver_lookup[] = { {"8.40.a", 0x18}, {"8.40.b", 0x19}, {"8.50.a", 0x1a}, + {"8.50.b", 0x1c}, + {"8.50.c", 0x1e}, {"9.0", 0x1b}, {"9.1", 0x1d}, + {"9.2", 0x1f}, + {"9.3", 0x20}, {NULL, 0}, }; -- cgit v1.2.3-59-g8ed1b From ed89466f2368fc15c72ce5344d582c640dcf53a6 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 5 Jan 2015 12:01:17 +0100 Subject: microblaze: Add target architecture Add missing target architectures - virtex7, ultrascale virtex and ultrascale kintex. Signed-off-by: Michal Simek --- arch/microblaze/kernel/cpu/cpuinfo.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/microblaze/kernel/cpu/cpuinfo.c') diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index b60442dcdedc..d1dd6e83d59b 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c @@ -65,11 +65,14 @@ const struct family_string_key family_string_lookup[] = { {"spartan3adsp", 0xc}, {"spartan6", 0xd}, {"virtex6", 0xe}, + {"virtex7", 0xf}, /* FIXME There is no key code defined for spartan2 */ {"spartan2", 0xf0}, {"kintex7", 0x10}, {"artix7", 0x11}, {"zynq7000", 0x12}, + {"UltraScale Virtex", 0x13}, + {"UltraScale Kintex", 0x14}, {NULL, 0}, }; -- cgit v1.2.3-59-g8ed1b