Commit e47b020a authored by Catalin Marinas's avatar Catalin Marinas Committed by Will Deacon
Browse files

arm64: Provide "model name" in /proc/cpuinfo for PER_LINUX32 tasks 



This patch brings the PER_LINUX32 /proc/cpuinfo format more in line with
the 32-bit ARM one by providing an additional line:

model name      : ARMv8 Processor rev X (v8l)

Cc: <stable@vger.kernel.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 604c8e67

arch/arm64/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))

#endif



#ifdef CONFIG_COMPAT



#ifdef __AARCH64EB__

#define COMPAT_ELF_PLATFORM		("v8b")

#else

#define COMPAT_ELF_PLATFORM		("v8l")

#endif



#ifdef CONFIG_COMPAT



#define COMPAT_ELF_ET_DYN_BASE		(2 * TASK_SIZE_32 / 3)



/* AArch32 registers. */

arch/arm64/kernel/cpuinfo.c

+7 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include <linux/bitops.h>

#include <linux/bug.h>

#include <linux/compat.h>

#include <linux/elf.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/personality.h>
@@ -104,6 +106,7 @@ static const char *const compat_hwcap2_str[] = { 
static int c_show(struct seq_file *m, void *v)

{

	int i, j;

	bool compat = personality(current->personality) == PER_LINUX32;



	for_each_online_cpu(i) {

		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
@@ -115,6 +118,9 @@ static int c_show(struct seq_file *m, void *v) 
		 * "processor".  Give glibc what it expects.

		 */

		seq_printf(m, "processor\t: %d\n", i);

		if (compat)

			seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n",

				   MIDR_REVISION(midr), COMPAT_ELF_PLATFORM);



		seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",

			   loops_per_jiffy / (500000UL/HZ),
@@ -127,7 +133,7 @@ static int c_show(struct seq_file *m, void *v) 
		 * software which does already (at least for 32-bit).

		 */

		seq_puts(m, "Features\t:");

		if (personality(current->personality) == PER_LINUX32) {

		if (compat) {

#ifdef CONFIG_COMPAT

			for (j = 0; compat_hwcap_str[j]; j++)

				if (compat_elf_hwcap & (1 << j))

CRA Git | Maintained and supported by SUSTech CRA and CCSE