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

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

Merge "soc: qcom: socinfo: Protect current_image using semaphore lock."

parents 886c61c2 cc3f8523

drivers/soc/qcom/socinfo.c

+34 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define SMEM_IMAGE_VERSION_OEM_OFFSET 96

#define SMEM_IMAGE_VERSION_PARTITION_APPS 10



static DECLARE_RWSEM(current_image_rwsem);

enum {

	HW_PLATFORM_UNKNOWN = 0,

	HW_PLATFORM_SURF    = 1,
@@ -953,7 +954,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);

}
@@ -966,14 +969,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;

}
@@ -991,7 +999,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);
@@ -1005,14 +1015,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;
@@ -1030,7 +1045,9 @@ 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",

			string_address);
@@ -1044,14 +1061,19 @@ 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);

	return count;
@@ -1062,8 +1084,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
@@ -1075,10 +1103,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 (0 <= digit && digit < SMEM_IMAGE_VERSION_BLOCKS_COUNT)

		current_image = digit;

	else

		current_image = 0;

	up_write(&current_image_rwsem);

	return count;

}