Commit 9f195f3a authored by Roger Lu's avatar Roger Lu Committed by Matthias Brugger
Browse files

soc: mediatek: mtk-svs: use svs get efuse common function 



SVS might need to read both svs efuse and thermal efuse on the probe flow.
Therefore, add a common efuse read function to remove the superfluous
codes.

Signed-off-by: default avatarRoger Lu <roger.lu@mediatek.com>
Link: https://lore.kernel.org/r/20230202124104.16504-2-roger.lu@mediatek.com


Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent fe15c26e

drivers/soc/mediatek/mtk-svs.c

+25 −46
Original line number Diff line number Diff line
@@ -1729,26 +1729,28 @@ static int svs_bank_resource_setup(struct svs_platform *svsp) 
	return 0;

}



static int svs_thermal_efuse_get_data(struct svs_platform *svsp)

static int svs_get_efuse_data(struct svs_platform *svsp,

			      const char *nvmem_cell_name,

			      u32 **svsp_efuse, size_t *svsp_efuse_max)

{

	struct nvmem_cell *cell;



	/* Thermal efuse parsing */

	cell = nvmem_cell_get(svsp->dev, "t-calibration-data");

	cell = nvmem_cell_get(svsp->dev, nvmem_cell_name);

	if (IS_ERR_OR_NULL(cell)) {

		dev_err(svsp->dev, "no \"t-calibration-data\"? %ld\n", PTR_ERR(cell));

		dev_err(svsp->dev, "no \"%s\"? %ld\n",

			nvmem_cell_name, PTR_ERR(cell));

		return PTR_ERR(cell);

	}



	svsp->tefuse = nvmem_cell_read(cell, &svsp->tefuse_max);

	if (IS_ERR(svsp->tefuse)) {

		dev_err(svsp->dev, "cannot read thermal efuse: %ld\n",

			PTR_ERR(svsp->tefuse));

	*svsp_efuse = nvmem_cell_read(cell, svsp_efuse_max);

	if (IS_ERR(*svsp_efuse)) {

		dev_err(svsp->dev, "cannot read \"%s\" efuse: %ld\n",

			nvmem_cell_name, PTR_ERR(*svsp_efuse));

		nvmem_cell_put(cell);

		return PTR_ERR(svsp->tefuse);

		return PTR_ERR(*svsp_efuse);

	}



	svsp->tefuse_max /= sizeof(u32);

	*svsp_efuse_max /= sizeof(u32);

	nvmem_cell_put(cell);



	return 0;
@@ -1796,7 +1798,8 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp) 
		svsb->vmax += svsb->dvt_fixed;

	}



	ret = svs_thermal_efuse_get_data(svsp);

	ret = svs_get_efuse_data(svsp, "t-calibration-data",

				 &svsp->tefuse, &svsp->tefuse_max);

	if (ret)

		return false;
@@ -1901,7 +1904,8 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) 
		}

	}



	ret = svs_thermal_efuse_get_data(svsp);

	ret = svs_get_efuse_data(svsp, "t-calibration-data",

				 &svsp->tefuse, &svsp->tefuse_max);

	if (ret)

		return false;
@@ -2003,32 +2007,6 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp) 
	return true;

}



static bool svs_is_efuse_data_correct(struct svs_platform *svsp)

{

	struct nvmem_cell *cell;



	/* Get svs efuse by nvmem */

	cell = nvmem_cell_get(svsp->dev, "svs-calibration-data");

	if (IS_ERR(cell)) {

		dev_err(svsp->dev, "no \"svs-calibration-data\"? %ld\n",

			PTR_ERR(cell));

		return false;

	}



	svsp->efuse = nvmem_cell_read(cell, &svsp->efuse_max);

	if (IS_ERR(svsp->efuse)) {

		dev_err(svsp->dev, "cannot read svs efuse: %ld\n",

			PTR_ERR(svsp->efuse));

		nvmem_cell_put(cell);

		return false;

	}



	svsp->efuse_max /= sizeof(u32);

	nvmem_cell_put(cell);



	return true;

}



static struct device *svs_get_subsys_device(struct svs_platform *svsp,

					    const char *node_name)

{
@@ -2364,8 +2342,9 @@ static int svs_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	if (!svs_is_efuse_data_correct(svsp)) {

		dev_notice(svsp->dev, "efuse data isn't correct\n");

	ret = svs_get_efuse_data(svsp, "svs-calibration-data",

				 &svsp->efuse, &svsp->efuse_max);

	if (ret) {

		ret = -EPERM;

		goto svs_probe_free_efuse;

	}
@@ -2373,19 +2352,19 @@ static int svs_probe(struct platform_device *pdev) 
	if (!svsp_data->efuse_parsing(svsp)) {

		dev_err(svsp->dev, "efuse data parsing failed\n");

		ret = -EPERM;

		goto svs_probe_free_resource;

		goto svs_probe_free_tefuse;

	}



	ret = svs_bank_resource_setup(svsp);

	if (ret) {

		dev_err(svsp->dev, "svs bank resource setup fail: %d\n", ret);

		goto svs_probe_free_resource;

		goto svs_probe_free_tefuse;

	}



	svsp_irq = platform_get_irq(pdev, 0);

	if (svsp_irq < 0) {

		ret = svsp_irq;

		goto svs_probe_free_resource;

		goto svs_probe_free_tefuse;

	}



	svsp->main_clk = devm_clk_get(svsp->dev, "main");
@@ -2393,13 +2372,13 @@ static int svs_probe(struct platform_device *pdev) 
		dev_err(svsp->dev, "failed to get clock: %ld\n",

			PTR_ERR(svsp->main_clk));

		ret = PTR_ERR(svsp->main_clk);

		goto svs_probe_free_resource;

		goto svs_probe_free_tefuse;

	}



	ret = clk_prepare_enable(svsp->main_clk);

	if (ret) {

		dev_err(svsp->dev, "cannot enable main clk: %d\n", ret);

		goto svs_probe_free_resource;

		goto svs_probe_free_tefuse;

	}



	svsp->base = of_iomap(svsp->dev->of_node, 0);
@@ -2439,7 +2418,7 @@ static int svs_probe(struct platform_device *pdev) 
svs_probe_clk_disable:

	clk_disable_unprepare(svsp->main_clk);



svs_probe_free_resource:

svs_probe_free_tefuse:

	if (!IS_ERR_OR_NULL(svsp->tefuse))

		kfree(svsp->tefuse);