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

Commit 11d2e7ed authored by Alex Elder's avatar Alex Elder Committed by Andy Gross
Browse files

soc: qcom: smem: check sooner in qcom_smem_set_global_partition() 



There's no sense in scanning the partition table again if we know
the global partition has already been discovered.  Check for a
non-null global_partition pointer in qcom_smem_set_global_partition()
immediately.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 8fa1a214

drivers/soc/qcom/smem.c

+5 −5
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem, 
	end = phdr_to_last_uncached_entry(phdr);

	cached = phdr_to_last_cached_entry(phdr);



	if (smem->global_partition) {

		dev_err(smem->dev, "Already found the global partition\n");

		return -EINVAL;

	}



	while (hdr < end) {

		if (hdr->canary != SMEM_PRIVATE_CANARY)

			goto bad_canary;
@@ -729,11 +734,6 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem) 
		return -EINVAL;

	}



	if (smem->global_partition) {

		dev_err(smem->dev, "Already found the global partition\n");

		return -EINVAL;

	}



	header = smem->regions[0].virt_base + le32_to_cpu(entry->offset);

	host0 = le16_to_cpu(header->host0);

	host1 = le16_to_cpu(header->host1);