Commit 4f0a1a1a authored by Yong Wu's avatar Yong Wu Committed by Joerg Roedel
Browse files

memory: mtk-smi: Invoke pm runtime_callback to enable clocks 



This patch only move the clk_prepare_enable and config_port into the
runtime suspend/resume callback. It doesn't change the code content
and sequence.

This is a preparing patch for adjusting SMI_BUS_SEL for mt8183.
(SMI_BUS_SEL need to be restored after smi-common resume every time.)
Also it gives a chance to get rid of mtk_smi_larb_get/put which could
be a next topic.

CC: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 15a01f4c

drivers/memory/mtk-smi.c

+72 −41
Original line number Diff line number Diff line
@@ -78,17 +78,13 @@ struct mtk_smi_larb { /* larb: local arbiter */ 
	u32				*mmu;

};



static int mtk_smi_enable(const struct mtk_smi *smi)

static int mtk_smi_clk_enable(const struct mtk_smi *smi)

{

	int ret;



	ret = pm_runtime_get_sync(smi->dev);

	if (ret < 0)

		return ret;



	ret = clk_prepare_enable(smi->clk_apb);

	if (ret)

		goto err_put_pm;

		return ret;



	ret = clk_prepare_enable(smi->clk_smi);

	if (ret)
@@ -110,59 +106,28 @@ err_disable_smi: 
	clk_disable_unprepare(smi->clk_smi);

err_disable_apb:

	clk_disable_unprepare(smi->clk_apb);

err_put_pm:

	pm_runtime_put_sync(smi->dev);

	return ret;

}



static void mtk_smi_disable(const struct mtk_smi *smi)

static void mtk_smi_clk_disable(const struct mtk_smi *smi)

{

	clk_disable_unprepare(smi->clk_gals1);

	clk_disable_unprepare(smi->clk_gals0);

	clk_disable_unprepare(smi->clk_smi);

	clk_disable_unprepare(smi->clk_apb);

	pm_runtime_put_sync(smi->dev);

}



int mtk_smi_larb_get(struct device *larbdev)

{

	struct mtk_smi_larb *larb = dev_get_drvdata(larbdev);

	const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;

	struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev);

	int ret;

	int ret = pm_runtime_get_sync(larbdev);



	/* Enable the smi-common's power and clocks */

	ret = mtk_smi_enable(common);

	if (ret)

		return ret;



	/* Enable the larb's power and clocks */

	ret = mtk_smi_enable(&larb->smi);

	if (ret) {

		mtk_smi_disable(common);

		return ret;

	}



	/* Configure the iommu info for this larb */

	larb_gen->config_port(larbdev);



	return 0;

	return (ret < 0) ? ret : 0;

}

EXPORT_SYMBOL_GPL(mtk_smi_larb_get);



void mtk_smi_larb_put(struct device *larbdev)

{

	struct mtk_smi_larb *larb = dev_get_drvdata(larbdev);

	struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev);



	/*

	 * Don't de-configure the iommu info for this larb since there may be

	 * several modules in this larb.

	 * The iommu info will be reset after power off.

	 */



	mtk_smi_disable(&larb->smi);

	mtk_smi_disable(common);

	pm_runtime_put_sync(larbdev);

}

EXPORT_SYMBOL_GPL(mtk_smi_larb_put);
@@ -377,12 +342,52 @@ static int mtk_smi_larb_remove(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused mtk_smi_larb_resume(struct device *dev)

{

	struct mtk_smi_larb *larb = dev_get_drvdata(dev);

	const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;

	int ret;



	/* Power on smi-common. */

	ret = pm_runtime_get_sync(larb->smi_common_dev);

	if (ret < 0) {

		dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret);

		return ret;

	}



	ret = mtk_smi_clk_enable(&larb->smi);

	if (ret < 0) {

		dev_err(dev, "Failed to enable clock(%d).\n", ret);

		pm_runtime_put_sync(larb->smi_common_dev);

		return ret;

	}



	/* Configure the basic setting for this larb */

	larb_gen->config_port(dev);



	return 0;

}



static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)

{

	struct mtk_smi_larb *larb = dev_get_drvdata(dev);



	mtk_smi_clk_disable(&larb->smi);

	pm_runtime_put_sync(larb->smi_common_dev);

	return 0;

}



static const struct dev_pm_ops smi_larb_pm_ops = {

	SET_RUNTIME_PM_OPS(mtk_smi_larb_suspend, mtk_smi_larb_resume, NULL)

};



static struct platform_driver mtk_smi_larb_driver = {

	.probe	= mtk_smi_larb_probe,

	.remove	= mtk_smi_larb_remove,

	.driver	= {

		.name = "mtk-smi-larb",

		.of_match_table = mtk_smi_larb_of_ids,

		.pm             = &smi_larb_pm_ops,

	}

};
@@ -481,12 +486,38 @@ static int mtk_smi_common_remove(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused mtk_smi_common_resume(struct device *dev)

{

	struct mtk_smi *common = dev_get_drvdata(dev);

	int ret;



	ret = mtk_smi_clk_enable(common);

	if (ret) {

		dev_err(common->dev, "Failed to enable clock(%d).\n", ret);

		return ret;

	}

	return 0;

}



static int __maybe_unused mtk_smi_common_suspend(struct device *dev)

{

	struct mtk_smi *common = dev_get_drvdata(dev);



	mtk_smi_clk_disable(common);

	return 0;

}



static const struct dev_pm_ops smi_common_pm_ops = {

	SET_RUNTIME_PM_OPS(mtk_smi_common_suspend, mtk_smi_common_resume, NULL)

};



static struct platform_driver mtk_smi_common_driver = {

	.probe	= mtk_smi_common_probe,

	.remove = mtk_smi_common_remove,

	.driver	= {

		.name = "mtk-smi-common",

		.of_match_table = mtk_smi_common_of_ids,

		.pm             = &smi_common_pm_ops,

	}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE