iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: mtk-smi: Add bus_sel for mt8183

Browse Source 
There are 2 mmu cells in a M4U HW. we could adjust some larbs entering
mmu0 or mmu1 to balance the bandwidth via the smi-common register
SMI_BUS_SEL(0x220)(Each larb occupy 2 bits).

In mt8183, For better performance, we switch larb1/2/5/7 to enter
mmu1 while the others still keep enter mmu0.

In mt8173 and mt2712, we don't get the performance issue,
Keep its default value(0x0), that means all the larbs enter mmu0.

Note: smi gen1(mt2701/mt7623) don't have this bus_sel.

And, the base of smi-common is completely different with smi_ao_base
of gen1, thus I add new variable for that.

CC: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Yong Wu 2019-08-24 11:02:05 +08:00 committed by Joerg Roedel
parent 4f0a1a1ae3
commit 567e58cf96
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/memory/mtk-smi.c
View File

@ -41,6 +41,12 @@
#define SMI_LARB_NONSEC_CON(id) (0x380 + ((id) * 4)) #define SMI_LARB_NONSEC_CON(id) (0x380 + ((id) * 4))
#define F_MMU_EN BIT(0) #define F_MMU_EN BIT(0)
/* SMI COMMON */
#define SMI_BUS_SEL 0x220
#define SMI_BUS_LARB_SHIFT(larbid) ((larbid) << 1)
/* All are MMU0 defaultly. Only specialize mmu1 here. */
#define F_MMU1_LARB(larbid) (0x1 << SMI_BUS_LARB_SHIFT(larbid))
enum mtk_smi_gen { enum mtk_smi_gen {
MTK_SMI_GEN1, MTK_SMI_GEN1,
MTK_SMI_GEN2 MTK_SMI_GEN2
@ -49,6 +55,7 @@ enum mtk_smi_gen {
struct mtk_smi_common_plat { struct mtk_smi_common_plat {
enum mtk_smi_gen gen; enum mtk_smi_gen gen;
bool has_gals; bool has_gals;
u32 bus_sel; /* Balance some larbs to enter mmu0 or mmu1 */
}; };
struct mtk_smi_larb_gen { struct mtk_smi_larb_gen {
@ -64,8 +71,10 @@ struct mtk_smi {
struct clk *clk_apb, *clk_smi; struct clk *clk_apb, *clk_smi;
struct clk *clk_gals0, *clk_gals1; struct clk *clk_gals0, *clk_gals1;
struct clk *clk_async; /*only needed by mt2701*/ struct clk *clk_async; /*only needed by mt2701*/
void __iomem *smi_ao_base; union {
void __iomem *smi_ao_base; /* only for gen1 */
void __iomem *base; /* only for gen2 */
};
const struct mtk_smi_common_plat *plat; const struct mtk_smi_common_plat *plat;
}; };
@ -402,6 +411,8 @@ static const struct mtk_smi_common_plat mtk_smi_common_gen2 = {
static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = { static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = {
.gen = MTK_SMI_GEN2, .gen = MTK_SMI_GEN2,
.has_gals = true, .has_gals = true,
.bus_sel = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(5) |
F_MMU1_LARB(7),
}; };
static const struct of_device_id mtk_smi_common_of_ids[] = { static const struct of_device_id mtk_smi_common_of_ids[] = {
@ -474,6 +485,11 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
ret = clk_prepare_enable(common->clk_async); ret = clk_prepare_enable(common->clk_async);
if (ret) if (ret)
return ret; return ret;
} else {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
common->base = devm_ioremap_resource(dev, res);
if (IS_ERR(common->base))
return PTR_ERR(common->base);
} }
pm_runtime_enable(dev); pm_runtime_enable(dev);
platform_set_drvdata(pdev, common); platform_set_drvdata(pdev, common);
@ -489,6 +505,7 @@ static int mtk_smi_common_remove(struct platform_device *pdev)
static int __maybe_unused mtk_smi_common_resume(struct device *dev) static int __maybe_unused mtk_smi_common_resume(struct device *dev)
{ {
struct mtk_smi *common = dev_get_drvdata(dev); struct mtk_smi *common = dev_get_drvdata(dev);
u32 bus_sel = common->plat->bus_sel;
int ret; int ret;
ret = mtk_smi_clk_enable(common); ret = mtk_smi_clk_enable(common);
@ -496,6 +513,9 @@ static int __maybe_unused mtk_smi_common_resume(struct device *dev)
dev_err(common->dev, "Failed to enable clock(%d).\n", ret); dev_err(common->dev, "Failed to enable clock(%d).\n", ret);
return ret; return ret;
} }
if (common->plat->gen == MTK_SMI_GEN2 && bus_sel)
writel(bus_sel, common->base + SMI_BUS_SEL);
return 0; return 0;
} }