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

Commit f7c28d84 authored by Se Wang (Patrick) Oh's avatar Se Wang (Patrick) Oh Committed by Abhimanyu Kapur
Browse files

soc: qcom: add support for the socinfo v0.12 format 



The v0.12 format adds three new fields:
	uint32_t chip_family;
	uint32_t raw_device_family;
	uint32_t raw_device_number;

CRs-Fixed: 995777
Change-Id: I1699ee96c65809a46331f94938c12fc1dd4d5384
Signed-off-by: default avatarSe Wang (Patrick) Oh <sewango@codeaurora.org>
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent d3068532

drivers/soc/qcom/socinfo.c

+97 −1
Original line number Diff line number Diff line
@@ -189,6 +189,13 @@ struct socinfo_v0_11 { 
	uint32_t pmic_array_offset;

};



struct socinfo_v0_12 {

	struct socinfo_v0_11 v0_11;

	uint32_t chip_family;

	uint32_t raw_device_family;

	uint32_t raw_device_number;

};



static union {

	struct socinfo_v0_1 v0_1;

	struct socinfo_v0_2 v0_2;
@@ -201,10 +208,11 @@ static union { 
	struct socinfo_v0_9 v0_9;

	struct socinfo_v0_10 v0_10;

	struct socinfo_v0_11 v0_11;

	struct socinfo_v0_12 v0_12;

} *socinfo;



/* max socinfo format version supported */

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 11)

#define MAX_SOCINFO_FORMAT SOCINFO_VERSION(0, 12)



static struct msm_soc_info cpu_of_id[] = {
@@ -678,6 +686,30 @@ static uint32_t socinfo_get_serial_number(void) 
		: 0;

}



static uint32_t socinfo_get_chip_family(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 12) ?

			socinfo->v0_12.chip_family : 0)

		: 0;

}



static uint32_t socinfo_get_raw_device_family(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 12) ?

			socinfo->v0_12.raw_device_family : 0)

		: 0;

}



static uint32_t socinfo_get_raw_device_number(void)

{

	return socinfo ?

		(socinfo_format >= SOCINFO_VERSION(0, 12) ?

			socinfo->v0_12.raw_device_number : 0)

		: 0;

}



enum pmic_model socinfo_get_pmic_model(void)

{

	return socinfo ?
@@ -824,6 +856,33 @@ msm_get_serial_number(struct device *dev, 
		socinfo_get_serial_number());

}



static ssize_t

msm_get_chip_family(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

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

		socinfo_get_chip_family());

}



static ssize_t

msm_get_raw_device_family(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

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

		socinfo_get_raw_device_family());

}



static ssize_t

msm_get_raw_device_number(struct device *dev,

			struct device_attribute *attr,

			char *buf)

{

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

		socinfo_get_raw_device_number());

}



static ssize_t

msm_get_pmic_model(struct device *dev,

			struct device_attribute *attr,
@@ -1060,6 +1119,18 @@ static struct device_attribute msm_soc_attr_serial_number = 
	__ATTR(serial_number, S_IRUGO,

			msm_get_serial_number, NULL);



static struct device_attribute msm_soc_attr_chip_family =

	__ATTR(chip_family, S_IRUGO,

			msm_get_chip_family, NULL);



static struct device_attribute msm_soc_attr_raw_device_family =

	__ATTR(raw_device_family, S_IRUGO,

			msm_get_raw_device_family, NULL);



static struct device_attribute msm_soc_attr_raw_device_number =

	__ATTR(raw_device_number, S_IRUGO,

			msm_get_raw_device_number, NULL);



static struct device_attribute msm_soc_attr_pmic_model =

	__ATTR(pmic_model, S_IRUGO,

			msm_get_pmic_model, NULL);
@@ -1186,6 +1257,13 @@ 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, 12):

		device_create_file(msm_soc_device,

					&msm_soc_attr_chip_family);

		device_create_file(msm_soc_device,

					&msm_soc_attr_raw_device_family);

		device_create_file(msm_soc_device,

					&msm_soc_attr_raw_device_number);

	case SOCINFO_VERSION(0, 11):

	case SOCINFO_VERSION(0, 10):

		 device_create_file(msm_soc_device,
@@ -1383,6 +1461,24 @@ static void socinfo_print(void) 
			socinfo->v0_10.serial_number,

			socinfo->v0_11.num_pmics);

		break;

	case SOCINFO_VERSION(0, 12):

		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\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);

		break;



	default:

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

		break;