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

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

soc: qcom: Add support for socinfo v0.15 



Add support for socinfo v0.15 format which adds a field
to show if modem is supported or not.

Change-Id: I4b1212ca1a22ec5bc6ed1d97354b45ee6b456353
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parent 1181ab78

drivers/soc/qcom/socinfo.c

+55 −1
Original line number Original line Diff line number Diff line
@@ -211,6 +211,11 @@ struct socinfo_v0_14 { 
	uint32_t ndefective_parts_array_offset;

	uint32_t ndefective_parts_array_offset;

};

};





struct socinfo_v0_15 {

	struct socinfo_v0_14 v0_14;

	uint32_t nmodem_supported;

};



static union {

static union {

	struct socinfo_v0_1 v0_1;

	struct socinfo_v0_1 v0_1;

	struct socinfo_v0_2 v0_2;

	struct socinfo_v0_2 v0_2;
@@ -226,10 +231,11 @@ static union { 
	struct socinfo_v0_12 v0_12;

	struct socinfo_v0_12 v0_12;

	struct socinfo_v0_13 v0_13;

	struct socinfo_v0_13 v0_13;

	struct socinfo_v0_14 v0_14;

	struct socinfo_v0_14 v0_14;

	struct socinfo_v0_15 v0_15;

} *socinfo;

} *socinfo;





/* max socinfo format version supported */

/* max socinfo format version supported */

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 14)

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 15)





static struct msm_soc_info cpu_of_id[] = {

static struct msm_soc_info cpu_of_id[] = {

	[0]  = {MSM_CPU_UNKNOWN, "Unknown CPU"},

	[0]  = {MSM_CPU_UNKNOWN, "Unknown CPU"},
@@ -497,6 +503,14 @@ static uint32_t socinfo_get_ndefective_parts_array_offset(void) 
		: 0;

		: 0;

}

}





static uint32_t socinfo_get_nmodem_supported(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 15) ?

			socinfo->v0_15.nmodem_supported : 0)

		: 0;

}



enum pmic_model socinfo_get_pmic_model(void)

enum pmic_model socinfo_get_pmic_model(void)

{

{

	return socinfo ?

	return socinfo ?
@@ -727,6 +741,15 @@ msm_get_ndefective_parts_array_offset(struct device *dev, 
		socinfo_get_ndefective_parts_array_offset());

		socinfo_get_ndefective_parts_array_offset());

}

}





static ssize_t

msm_get_nmodem_supported(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

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

		socinfo_get_nmodem_supported());

}



static ssize_t

static ssize_t

msm_get_pmic_model(struct device *dev,

msm_get_pmic_model(struct device *dev,

			struct device_attribute *attr,

			struct device_attribute *attr,
@@ -1001,6 +1024,10 @@ static struct device_attribute msm_soc_attr_ndefective_parts_array_offset = 
	__ATTR(ndefective_parts_array_offset, 0444,

	__ATTR(ndefective_parts_array_offset, 0444,

			msm_get_ndefective_parts_array_offset, NULL);

			msm_get_ndefective_parts_array_offset, NULL);





static struct device_attribute msm_soc_attr_nmodem_supported =

	__ATTR(nmodem_supported, 0444,

			msm_get_nmodem_supported, NULL);



static struct device_attribute msm_soc_attr_pmic_model =

static struct device_attribute msm_soc_attr_pmic_model =

	__ATTR(pmic_model, 0444,

	__ATTR(pmic_model, 0444,

			msm_get_pmic_model, NULL);

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

	device_create_file(msm_soc_device, &images);





	switch (socinfo_format) {

	switch (socinfo_format) {

	case SOCINFO_VERSION(0, 15):

		device_create_file(msm_soc_device,

					&msm_soc_attr_nmodem_supported);

	case SOCINFO_VERSION(0, 14):

	case SOCINFO_VERSION(0, 14):

		device_create_file(msm_soc_device,

		device_create_file(msm_soc_device,

					&msm_soc_attr_num_clusters);

					&msm_soc_attr_num_clusters);
@@ -1330,6 +1360,30 @@ static void socinfo_print(void) 
			socinfo->v0_14.ndefective_parts_array_offset);

			socinfo->v0_14.ndefective_parts_array_offset);

		break;

		break;





	case SOCINFO_VERSION(0, 15):

		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 nmodem_supported=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,

			socinfo->v0_15.nmodem_supported);

		break;



	default:

	default:

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

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

		break;

		break;