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

Commit 22dea776 authored by Abhimanyu Kapur's avatar Abhimanyu Kapur Committed by Matt Wagantall
Browse files

ARM: Introduce arch_read_hardware_id 



Moving towards device tree and arm single binary refering to
machine descriptor name for hardware id information under
/proc/cpuinfo is not suitable for certain soc vendors. Add a
hook for soc vendors to supply a per-soc hardware read method.

Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
(cherry picked from commit eab25833f0d433efd5636ceed506b677438b7cc2)
Signed-off-by: default avatarJosh Cartwright <joshc@codeaurora.org>
parent fc85ef50

arch/arm/include/asm/system_misc.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern void (*arm_pm_idle)(void); 
#define UDBG_BUS	(1 << 4)



extern unsigned int user_debug;

extern char* (*arch_read_hardware_id)(void);



#endif /* !__ASSEMBLY__ */

arch/arm/kernel/setup.c

+6 −1
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ EXPORT_SYMBOL(elf_hwcap); 
unsigned int elf_hwcap2 __read_mostly;

EXPORT_SYMBOL(elf_hwcap2);



char* (*arch_read_hardware_id)(void);

EXPORT_SYMBOL(arch_read_hardware_id);



#ifdef MULTI_CPU

struct processor processor __read_mostly;
@@ -1077,7 +1079,10 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "CPU revision\t: %d\n\n", cpuid & 15);

	}



	if (!arch_read_hardware_id)

		seq_printf(m, "Hardware\t: %s\n", machine_name);

	else

		seq_printf(m, "Hardware\t: %s\n", arch_read_hardware_id());

	seq_printf(m, "Revision\t: %04x\n", system_rev);

	seq_printf(m, "Serial\t\t: %08x%08x\n",

		   system_serial_high, system_serial_low);