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

Commit a36179a9 authored by Abhimanyu Kapur's avatar Abhimanyu Kapur Committed by Kishan Kumar
Browse files

soc: qcom: socinfo: Add support for socinfo v9 



A new socinfo format version 9 is added with support
for foundry id. Update the socinfo struct to reflect
this change.

CRs-Fixed: 645243
Change-Id: I961958fc08e5a7632e847b1ec2e34dbbe348476a
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
Signed-off-by: default avatarKishan Kumar <kishank@codeaurora.org>
parent 74bceb7c

drivers/soc/qcom/socinfo.c

+53 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ struct socinfo_v8 { 
	uint32_t pmic_die_revision_2;

};



struct socinfo_v9 {

	struct socinfo_v8 v8;



	/* only valid when format==9*/

	uint32_t foundry_id;

};



static union {

	struct socinfo_v1 v1;

	struct socinfo_v2 v2;
@@ -187,6 +194,7 @@ static union { 
	struct socinfo_v6 v6;

	struct socinfo_v7 v7;

	struct socinfo_v8 v8;

	struct socinfo_v9 v9;

} *socinfo;



static enum msm_cpu cpu_of_id[] = {
@@ -532,6 +540,13 @@ uint32_t socinfo_get_platform_subtype(void) 
		: 0;

}



static uint32_t socinfo_get_foundry_id(void)

{

	return socinfo ?

		(socinfo->v1.format >= 9 ? socinfo->v9.foundry_id : 0)

		: 0;

}



enum pmic_model socinfo_get_pmic_model(void)

{

	return socinfo ?
@@ -661,6 +676,15 @@ msm_get_platform_subtype_id(struct device *dev, 
		hw_subtype);

}



static ssize_t

msm_get_foundry_id(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%u\n",

		socinfo_get_foundry_id());

}



static ssize_t

msm_get_pmic_model(struct device *dev,

			struct device_attribute *attr,
@@ -862,6 +886,10 @@ static struct device_attribute msm_soc_attr_platform_subtype_id = 
	__ATTR(platform_subtype_id, S_IRUGO,

			msm_get_platform_subtype_id, NULL);



static struct device_attribute msm_soc_attr_foundry_id =

	__ATTR(foundry_id, S_IRUGO,

			msm_get_foundry_id, NULL);



static struct device_attribute msm_soc_attr_pmic_model =

	__ATTR(pmic_model, S_IRUGO,

			msm_get_pmic_model, NULL);
@@ -938,6 +966,9 @@ static void __init populate_soc_sysfs_files(struct device *msm_soc_device) 
	device_create_file(msm_soc_device, &select_image);



	switch (legacy_format) {

	case 9:

		 device_create_file(msm_soc_device,

					&msm_soc_attr_foundry_id);

	case 8:

	case 7:

		device_create_file(msm_soc_device,
@@ -1095,6 +1126,22 @@ static void socinfo_print(void) 
			socinfo->v7.pmic_model,

			socinfo->v7.pmic_die_revision);

		break;

	case 9:

		pr_info("%s: v%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u\n",

			__func__,

			socinfo->v1.format,

			socinfo->v1.id,

			SOCINFO_VERSION_MAJOR(socinfo->v1.version),

			SOCINFO_VERSION_MINOR(socinfo->v1.version),

			socinfo->v2.raw_id, socinfo->v2.raw_version,

			socinfo->v3.hw_platform, socinfo->v4.platform_version,

			socinfo->v5.accessory_chip,

			socinfo->v6.hw_platform_subtype,

			socinfo->v7.pmic_model,

			socinfo->v7.pmic_die_revision,

			socinfo->v9.foundry_id);

		break;



	default:

		pr_err("%s: Unknown format found\n", __func__);

		break;
@@ -1108,6 +1155,12 @@ int __init socinfo_init(void) 
	if (socinfo_init_done)

		return 0;



	socinfo = smem_find(SMEM_HW_SW_BUILD_ID,

				sizeof(struct socinfo_v9),

				0,

				SMEM_ANY_HOST_FLAG);



	if (IS_ERR_OR_NULL(socinfo))

		socinfo = smem_find(SMEM_HW_SW_BUILD_ID,

				sizeof(struct socinfo_v8),

				0,