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

Commit 54eb3e35 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM/ARM64: Introduce arch_read_hardware_id"

parents fd648e5f b39389c3

arch/arm/include/asm/system_misc.h

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



extern unsigned int user_debug;

extern char* (*arch_read_hardware_id)(void);



static inline int handle_guest_sea(phys_addr_t addr, unsigned int esr)

{

arch/arm/kernel/setup.c

+7 −1
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ 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 __ro_after_init;

#endif
@@ -1283,7 +1286,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: %s\n", system_serial);

arch/arm64/include/asm/system_misc.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ extern void show_pte(unsigned long addr); 
extern void __show_regs(struct pt_regs *);



extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);

extern char* (*arch_read_hardware_id)(void);



int handle_guest_sea(phys_addr_t addr, unsigned int esr);

arch/arm64/kernel/cpuinfo.c

+12 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ 
#include <linux/sched.h>

#include <linux/smp.h>

#include <linux/delay.h>

#include <linux/of_fdt.h>



char* (*arch_read_hardware_id)(void);

EXPORT_SYMBOL(arch_read_hardware_id);



static const char *machine_name;



/*

 * In case the boot CPU is hotpluggable, we record its initial state and
@@ -176,6 +182,11 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));

	}



	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());



	return 0;

}
@@ -382,6 +393,7 @@ void __init cpuinfo_store_boot_cpu(void) 


	boot_cpu_data = *info;

	init_cpu_features(&boot_cpu_data);

	machine_name = of_flat_dt_get_machine_name();

}



device_initcall(cpuinfo_regs_init);