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

Commit 81b6bd24 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes If7053b20,I33df4633,Iae12fa64 into msm-next 

* changes:
  soc: qcom: Add sdm855 SoC information into socinfo driver
  soc: qcom: socinfo: Protect current_image using semaphore lock.
  soc: qcom: socinfo: Change offset of image OEM attribute
parents 332911ca 7fe466bd

drivers/soc/qcom/socinfo.c

+46 −9
Original line number Diff line number Diff line
@@ -43,10 +43,11 @@ 
#define SMEM_IMAGE_VERSION_NAME_SIZE 75

#define SMEM_IMAGE_VERSION_VARIANT_SIZE 20

#define SMEM_IMAGE_VERSION_VARIANT_OFFSET 75

#define SMEM_IMAGE_VERSION_OEM_SIZE 32

#define SMEM_IMAGE_VERSION_OEM_OFFSET 96

#define SMEM_IMAGE_VERSION_OEM_SIZE 33

#define SMEM_IMAGE_VERSION_OEM_OFFSET 95

#define SMEM_IMAGE_VERSION_PARTITION_APPS 10



static DECLARE_RWSEM(current_image_rwsem);

enum {

	HW_PLATFORM_UNKNOWN = 0,

	HW_PLATFORM_SURF    = 1,
@@ -303,6 +304,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	[305] = {MSM_CPU_8996, "MSM8996pro"},

	[312] = {MSM_CPU_8996, "APQ8096pro"},



	/* sdm855 ID */

	[339] = {MSM_CPU_SDM855, "SDM855"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -780,7 +784,9 @@ msm_get_image_version(struct device *dev, 
		pr_err("Failed to get image version base address");

		return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.75s\n",

			string_address);

}
@@ -793,14 +799,19 @@ msm_set_image_version(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("Failed to get image version base address");

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	snprintf(store_address, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.75s", buf);

	return count;

}
@@ -818,7 +829,9 @@ msm_get_image_variant(struct device *dev, 
		return snprintf(buf, SMEM_IMAGE_VERSION_VARIANT_SIZE,

		"Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	string_address += SMEM_IMAGE_VERSION_VARIANT_OFFSET;

	return snprintf(buf, SMEM_IMAGE_VERSION_VARIANT_SIZE, "%-.20s\n",

			string_address);
@@ -832,14 +845,19 @@ msm_set_image_variant(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("Failed to get image version base address");

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	store_address += SMEM_IMAGE_VERSION_VARIANT_OFFSET;

	snprintf(store_address, SMEM_IMAGE_VERSION_VARIANT_SIZE, "%-.20s", buf);

	return count;
@@ -857,9 +875,11 @@ msm_get_image_crm_version(struct device *dev, 
		pr_err("Failed to get image version base address");

		return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	string_address += SMEM_IMAGE_VERSION_OEM_OFFSET;

	return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.32s\n",

	return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.33s\n",

			string_address);

}
@@ -871,16 +891,21 @@ msm_set_image_crm_version(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("Failed to get image version base address");

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	store_address += SMEM_IMAGE_VERSION_OEM_OFFSET;

	snprintf(store_address, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.32s", buf);

	snprintf(store_address, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.33s", buf);

	return count;

}
@@ -889,8 +914,14 @@ msm_get_image_number(struct device *dev, 
			struct device_attribute *attr,

			char *buf)

{

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

	int ret;



	down_read(&current_image_rwsem);

	ret = snprintf(buf, PAGE_SIZE, "%d\n",

			current_image);

	up_read(&current_image_rwsem);

	return ret;



}



static ssize_t
@@ -902,10 +933,12 @@ msm_select_image(struct device *dev, struct device_attribute *attr, 
	ret = kstrtoint(buf, 10, &digit);

	if (ret)

		return ret;

	down_write(&current_image_rwsem);

	if (digit >= 0 && digit < SMEM_IMAGE_VERSION_BLOCKS_COUNT)

		current_image = digit;

	else

		current_image = 0;

	up_write(&current_image_rwsem);

	return count;

}
@@ -936,7 +969,7 @@ msm_get_images(struct device *dev, 
			"\tVariant:\t%-.20s\n",

			image_address + SMEM_IMAGE_VERSION_VARIANT_OFFSET);

		pos += snprintf(buf + pos, PAGE_SIZE - pos,

			"\tVersion:\t%-.32s\n\n",

			"\tVersion:\t%-.33s\n",

			image_address + SMEM_IMAGE_VERSION_OEM_OFFSET);



		image_address += SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -1073,6 +1106,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 310;

		strlcpy(dummy_socinfo.build_id, "msm8996-auto - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm855()) {

		dummy_socinfo.id = 339;

		strlcpy(dummy_socinfo.build_id, "sdm855 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")

#define early_machine_is_msm8996_auto()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")

#define early_machine_is_sdm855()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm855")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -75,6 +77,7 @@ 
#define early_machine_is_msm8916()	0

#define early_machine_is_apq8084()	0

#define early_machine_is_msm8996()	0

#define early_machine_is_sdm855()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -93,6 +96,7 @@ enum msm_cpu { 
	MSM_CPU_8916,

	MSM_CPU_8084,

	MSM_CPU_8996,

	MSM_CPU_SDM855,

};



struct msm_soc_info {