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

Commit 2a500b41 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Add support to print hardware id info"

parents f57bb090 13914968

arch/arm64/include/asm/system_misc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ extern void __show_regs(struct pt_regs *); 




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

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

extern char* (*arch_read_hardware_id)(void);

extern char* (*arch_read_hardware_id)(void);

extern const char *machine_name;





#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_SYSCALL	(1 << 1)

#define UDBG_SYSCALL	(1 << 1)

arch/arm64/kernel/cpuinfo.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/cpu.h>

#include <asm/cpu.h>

#include <asm/cputype.h>

#include <asm/cputype.h>

#include <asm/cpufeature.h>

#include <asm/cpufeature.h>

#include <asm/system_misc.h>





#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/bug.h>

#include <linux/bug.h>
@@ -152,6 +153,11 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));

		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;

	return 0;

}

}

arch/arm64/kernel/setup.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -61,9 +61,7 @@ 
#include <asm/memblock.h>

#include <asm/memblock.h>

#include <asm/psci.h>

#include <asm/psci.h>

#include <asm/efi.h>

#include <asm/efi.h>



#include <asm/system_misc.h>

char* (*arch_read_hardware_id)(void);

EXPORT_SYMBOL(arch_read_hardware_id);





unsigned int boot_reason;

unsigned int boot_reason;

EXPORT_SYMBOL(boot_reason);

EXPORT_SYMBOL(boot_reason);
@@ -71,7 +69,9 @@ EXPORT_SYMBOL(boot_reason); 
unsigned int cold_boot;

unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);

EXPORT_SYMBOL(cold_boot);





static const char *machine_name;

char* (*arch_read_hardware_id)(void);

const char *machine_name;



phys_addr_t __fdt_pointer __initdata;

phys_addr_t __fdt_pointer __initdata;





/*

/*