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

Commit a934979c authored by Alex Van Brunt's avatar Alex Van Brunt Committed by Stepan Moskovchenko
Browse files

arm64: cpuinfo: ARMv7 compatable cpuinfo option 



To be backwards compatable with the output of cpuinfo on an ARMv7,
print the features that were optional in ARMv7 but are required in
ARMv8.

Change-Id: Ic728f71be4a971adc79ef552f25cfbf95a4dac29
Signed-off-by: default avatarAlex Van Brunt <avanbrunt@nvidia.com>
Reviewed-on: http://git-master/r/366095


Reviewed-by: default avatarRichard Wiley <rwiley@nvidia.com>
Tested-by: default avatarOskari Jaaskelainen <oskarij@nvidia.com>
Git-commit: d7ad37d1c5de8de2326a731428b39f98a5315040
Git-repo: https://android.googlesource.com/kernel/tegra


[stepanm@codeaurora.org: resolve merge conflicts]
Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
parent 27b75b77

arch/arm64/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -293,6 +293,17 @@ config ARMV7_COMPAT 


	 If you want to execute ARMv7 applications, say Y



config ARMV7_COMPAT_CPUINFO

	bool "Report backwards compatible cpu features in /proc/cpuinfo"

	depends on ARMV7_COMPAT

	default y

	help

	 This option makes /proc/cpuinfo list CPU features that an ARMv7 or

	 earlier kernel would report, but are not optional on an ARMv8 or later

	 processor.



	 If you want to execute ARMv7 applications, say Y



source "mm/Kconfig"



config XEN_DOM0

arch/arm64/kernel/setup.c

+6 −1
Original line number Diff line number Diff line
@@ -421,9 +421,14 @@ static int c_show(struct seq_file *m, void *v) 
	for (i = 0; hwcap_str[i]; i++)

		if (elf_hwcap & (1 << i))

			seq_printf(m, "%s ", hwcap_str[i]);

#ifdef CONFIG_ARMV7_COMPAT_CPUINFO

	/* Print out the non-optional ARMv8 HW capabilities */

	seq_printf(m, "wp half thumb fastmult vfp edsp neon vfpv3d16 tlsi ");

	seq_printf(m, "vfpv4 idiva idivt ");

#endif



	seq_printf(m, "\nCPU implementer\t: 0x%02x\n", read_cpuid_id() >> 24);

	seq_printf(m, "CPU architecture: AArch64\n");

	seq_printf(m, "CPU architecture: 8\n");

	seq_printf(m, "CPU variant\t: 0x%x\n", (read_cpuid_id() >> 20) & 15);

	seq_printf(m, "CPU part\t: 0x%03x\n", (read_cpuid_id() >> 4) & 0xfff);

	seq_printf(m, "CPU revision\t: %d\n", read_cpuid_id() & 15);