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

Commit 18912806 authored by Andy Gross's avatar Andy Gross
Browse files

soc: qcom: smem: Fix errant private access 



This patch corrects private partition item access.  Instead of falling back to
global for instances where we have an actual host and remote partition existing,
return the results of the private lookup.

Signed-off-by: default avatarAndy Gross <agross@codeaurora.org>
parent 61e19ba9

drivers/soc/qcom/smem.c

+6 −12
Original line number Diff line number Diff line
@@ -258,10 +258,6 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem, 
	size_t alloc_size;

	void *p;



	/* We're not going to find it if there's no matching partition */

	if (host >= SMEM_HOST_COUNT || !smem->partitions[host])

		return -ENOENT;



	phdr = smem->partitions[host];



	p = (void *)phdr + sizeof(*phdr);
@@ -371,8 +367,9 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size) 
	if (ret)

		return ret;



	if (host < SMEM_HOST_COUNT && __smem->partitions[host])

		ret = qcom_smem_alloc_private(__smem, host, item, size);

	if (ret == -ENOENT)

	else

		ret = qcom_smem_alloc_global(__smem, item, size);



	hwspin_unlock_irqrestore(__smem->hwlock, &flags);
@@ -428,10 +425,6 @@ static int qcom_smem_get_private(struct qcom_smem *smem, 
	struct smem_private_entry *hdr;

	void *p;



	/* We're not going to find it if there's no matching partition */

	if (host >= SMEM_HOST_COUNT || !smem->partitions[host])

		return -ENOENT;



	phdr = smem->partitions[host];



	p = (void *)phdr + sizeof(*phdr);
@@ -484,8 +477,9 @@ int qcom_smem_get(unsigned host, unsigned item, void **ptr, size_t *size) 
	if (ret)

		return ret;



	if (host < SMEM_HOST_COUNT && __smem->partitions[host])

		ret = qcom_smem_get_private(__smem, host, item, ptr, size);

	if (ret == -ENOENT)

	else

		ret = qcom_smem_get_global(__smem, item, ptr, size);



	hwspin_unlock_irqrestore(__smem->hwlock, &flags);