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

Commit bc270050 authored by Vivek Golani's avatar Vivek Golani
Browse files

soc: qcom: smem: Update size of legacy partition 



Added free offset while assigning size of legacy
partition. Legacy partition size is equal to the
sum of free offset and available size.

Acquired a spinlock while reading free offset and
available size to avoid race conditions.

Change-Id: Iff74b303b8321c6a83271fc0490aaf3d9fea4651
Signed-off-by: default avatarVivek Golani <vgolani@codeaurora.org>
parent 3de27838

drivers/soc/qcom/smem.c

+27 −15
Original line number Diff line number Diff line
@@ -1061,15 +1061,27 @@ static int qcom_smem_map_toc(struct qcom_smem *smem, struct device *dev, 
	return 0;

}



static int qcom_smem_mamp_legacy(struct qcom_smem *smem)

static int qcom_smem_map_legacy(struct qcom_smem *smem)

{

	struct smem_header *header;

	u32 phys_addr;

	u32 p_size;

	unsigned long flags;

	int ret;



	phys_addr = smem->regions[0].aux_base;

	header = smem->regions[0].virt_base;

	p_size = header->available;

	header = (struct smem_header __iomem *)smem->regions[0].virt_base;



	ret = hwspin_lock_timeout_irqsave(smem->hwlock,

					  HWSPINLOCK_TIMEOUT,

					  &flags);

	if (ret)

		return ret;



	p_size = readl_relaxed(&header->available) +

			readl_relaxed(&header->free_offset);



	hwspin_unlock_irqrestore(smem->hwlock, &flags);



	/* unmap previously mapped starting 4k for smem header */

	devm_iounmap(smem->dev, smem->regions[0].virt_base);
@@ -1121,6 +1133,17 @@ static int qcom_smem_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);

	if (hwlock_id < 0) {

		if (hwlock_id != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to retrieve hwlock\n");

		return hwlock_id;

	}



	smem->hwlock = hwspin_lock_request_specific(hwlock_id);

	if (!smem->hwlock)

		return -ENXIO;



	version = qcom_smem_get_sbl_version(smem);

	switch (version >> 16) {

	case SMEM_GLOBAL_PART_VERSION:
@@ -1130,7 +1153,7 @@ static int qcom_smem_probe(struct platform_device *pdev) 
		smem->item_count = qcom_smem_get_item_count(smem);

		break;

	case SMEM_GLOBAL_HEAP_VERSION:

		qcom_smem_mamp_legacy(smem);

		qcom_smem_map_legacy(smem);

		smem->item_count = SMEM_ITEM_COUNT;

		break;

	default:
@@ -1142,17 +1165,6 @@ static int qcom_smem_probe(struct platform_device *pdev) 
	if (ret < 0 && ret != -ENOENT)

		return ret;



	hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);

	if (hwlock_id < 0) {

		if (hwlock_id != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to retrieve hwlock\n");

		return hwlock_id;

	}



	smem->hwlock = hwspin_lock_request_specific(hwlock_id);

	if (!smem->hwlock)

		return -ENXIO;



	__smem = smem;



	return 0;