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

Commit 1181ab78 authored by Kyle Yan's avatar Kyle Yan Committed by Prasad Sodagudi
Browse files

soc: qcom: Add support for socinfo v0.14 



Add support for socinfo v0.14 format which includes fields
to show the number of clusters for PartialGoods to consider
and the number of defective parts supported by PartialGoods.

Change-Id: If7665250b987671d364f171ba0d15fa8032c7aea
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parent 59edc37e

drivers/soc/qcom/socinfo.c

+126 −1
Original line number Diff line number Diff line
@@ -203,6 +203,14 @@ struct socinfo_v0_13 { 
	char chip_name[CHIP_ID_LENGTH];

};



struct socinfo_v0_14 {

	struct socinfo_v0_13 v0_13;

	uint32_t num_clusters;

	uint32_t ncluster_array_offset;

	uint32_t num_defective_parts;

	uint32_t ndefective_parts_array_offset;

};



static union {

	struct socinfo_v0_1 v0_1;

	struct socinfo_v0_2 v0_2;
@@ -217,10 +225,11 @@ static union { 
	struct socinfo_v0_11 v0_11;

	struct socinfo_v0_12 v0_12;

	struct socinfo_v0_13 v0_13;

	struct socinfo_v0_14 v0_14;

} *socinfo;



/* max socinfo format version supported */

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 13)

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 14)



static struct msm_soc_info cpu_of_id[] = {

	[0]  = {MSM_CPU_UNKNOWN, "Unknown CPU"},
@@ -456,6 +465,38 @@ static uint32_t socinfo_get_nproduct_id(void) 
		: 0;

}



static uint32_t socinfo_get_num_clusters(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 14) ?

			socinfo->v0_14.num_clusters : 0)

		: 0;

}



static uint32_t socinfo_get_ncluster_array_offset(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 14) ?

			socinfo->v0_14.ncluster_array_offset : 0)

		: 0;

}



static uint32_t socinfo_get_num_defective_parts(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 14) ?

			socinfo->v0_14.num_defective_parts : 0)

		: 0;

}



static uint32_t socinfo_get_ndefective_parts_array_offset(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 14) ?

			socinfo->v0_14.ndefective_parts_array_offset : 0)

		: 0;

}



enum pmic_model socinfo_get_pmic_model(void)

{

	return socinfo ?
@@ -650,6 +691,42 @@ msm_get_nproduct_id(struct device *dev, 
		socinfo_get_nproduct_id());

}



static ssize_t

msm_get_num_clusters(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "0x%x\n",

		socinfo_get_num_clusters());

}



static ssize_t

msm_get_ncluster_array_offset(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "0x%x\n",

		socinfo_get_ncluster_array_offset());

}



static ssize_t

msm_get_num_defective_parts(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "0x%x\n",

		socinfo_get_num_defective_parts());

}



static ssize_t

msm_get_ndefective_parts_array_offset(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "0x%x\n",

		socinfo_get_ndefective_parts_array_offset());

}



static ssize_t

msm_get_pmic_model(struct device *dev,

			struct device_attribute *attr,
@@ -908,6 +985,22 @@ static struct device_attribute msm_soc_attr_nproduct_id = 
	__ATTR(nproduct_id, 0444,

			msm_get_nproduct_id, NULL);



static struct device_attribute msm_soc_attr_num_clusters =

	__ATTR(num_clusters, 0444,

			msm_get_num_clusters, NULL);



static struct device_attribute msm_soc_attr_ncluster_array_offset =

	__ATTR(ncluster_array_offset, 0444,

			msm_get_ncluster_array_offset, NULL);



static struct device_attribute msm_soc_attr_num_defective_parts =

	__ATTR(num_defective_parts, 0444,

			msm_get_num_defective_parts, NULL);



static struct device_attribute msm_soc_attr_ndefective_parts_array_offset =

	__ATTR(ndefective_parts_array_offset, 0444,

			msm_get_ndefective_parts_array_offset, NULL);



static struct device_attribute msm_soc_attr_pmic_model =

	__ATTR(pmic_model, 0444,

			msm_get_pmic_model, NULL);
@@ -970,6 +1063,15 @@ static void __init populate_soc_sysfs_files(struct device *msm_soc_device) 
	device_create_file(msm_soc_device, &images);



	switch (socinfo_format) {

	case SOCINFO_VERSION(0, 14):

		device_create_file(msm_soc_device,

					&msm_soc_attr_num_clusters);

		device_create_file(msm_soc_device,

					&msm_soc_attr_ncluster_array_offset);

		device_create_file(msm_soc_device,

					&msm_soc_attr_num_defective_parts);

		device_create_file(msm_soc_device,

				&msm_soc_attr_ndefective_parts_array_offset);

	case SOCINFO_VERSION(0, 13):

		 device_create_file(msm_soc_device,

					&msm_soc_attr_nproduct_id);
@@ -1205,6 +1307,29 @@ static void socinfo_print(void) 
			socinfo->v0_13.nproduct_id);

		break;



	case SOCINFO_VERSION(0, 14):

		pr_info("v%u.%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 serial_number=%u num_pmics=%u chip_family=0x%x raw_device_family=0x%x raw_device_number=0x%x nproduct_id=0x%x num_clusters=0x%x ncluster_array_offset=0x%x num_defective_parts=0x%x ndefective_parts_array_offset=0x%x\n",

			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,

			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,

			socinfo->v0_3.hw_platform,

			socinfo->v0_4.platform_version,

			socinfo->v0_5.accessory_chip,

			socinfo->v0_6.hw_platform_subtype,

			socinfo->v0_7.pmic_model,

			socinfo->v0_7.pmic_die_revision,

			socinfo->v0_9.foundry_id,

			socinfo->v0_10.serial_number,

			socinfo->v0_11.num_pmics,

			socinfo->v0_12.chip_family,

			socinfo->v0_12.raw_device_family,

			socinfo->v0_12.raw_device_number,

			socinfo->v0_13.nproduct_id,

			socinfo->v0_14.num_clusters,

			socinfo->v0_14.ncluster_array_offset,

			socinfo->v0_14.num_defective_parts,

			socinfo->v0_14.ndefective_parts_array_offset);

		break;



	default:

		pr_err("Unknown format found: v%u.%u\n", f_maj, f_min);

		break;