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

Commit a9305eb2 authored by Abhimanyu Kapur's avatar Abhimanyu Kapur
Browse files

soc: qcom: socinfo: populate arch_read_hardware_id 



Populate arch_read_hardware_id with msm specific implementation
to report correct hardware id under /proc/cpuinfo.

Change-Id: Ief215bded1eeb42422236d81adeab4df90c0e995
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent eab25833

drivers/soc/qcom/socinfo.c

+31 −3
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@ 
#include <linux/sys_soc.h>

#include <linux/slab.h>

#include <linux/stat.h>

#include <linux/string.h>

#include <linux/types.h>



#include <asm/system_misc.h>



#include <soc/qcom/socinfo.h>

#include <soc/qcom/smem.h>

#include <soc/qcom/boot_stats.h>
@@ -490,6 +493,30 @@ char *socinfo_get_build_id(void) 
	return (socinfo) ? socinfo->v1.build_id : NULL;

}



static char *msm_read_hardware_id(void)

{

	static char msm_soc_str[256] = "Qualcomm Technologies, Inc ";

	static bool string_generated;

	int ret = 0;



	if (string_generated)

		return msm_soc_str;

	if (!socinfo)

		goto err_path;

	if (!cpu_of_id[socinfo->v1.id].soc_id_string)

		goto err_path;



	ret = strlcat(msm_soc_str, cpu_of_id[socinfo->v1.id].soc_id_string,

			sizeof(msm_soc_str));

	if (ret > sizeof(msm_soc_str))

		goto err_path;



	string_generated = true;

	return msm_soc_str;

err_path:

	return "UNKNOWN SOC TYPE";

}



uint32_t socinfo_get_raw_id(void)

{

	return socinfo ?
@@ -1206,14 +1233,15 @@ int __init socinfo_init(void) 
	}



	WARN(!socinfo_get_id(), "Unknown SOC ID!\n");

	WARN(socinfo_get_id() >= ARRAY_SIZE(cpu_of_id),

		"New IDs added! ID => CPU mapping might need an update.\n");



	if (socinfo->v1.id < ARRAY_SIZE(cpu_of_id))

	if (socinfo_get_id() >= ARRAY_SIZE(cpu_of_id))

		BUG_ON("New IDs added! ID => CPU mapping needs an update.\n");

	else

		cur_cpu = cpu_of_id[socinfo->v1.id].generic_soc_type;



	boot_stats_init();

	socinfo_print();

	arch_read_hardware_id = msm_read_hardware_id;

	socinfo_init_done = true;



	return 0;