Mediatek MT8183 scpsys support
v9 cover Mediatek MT8183 scpsys support
This series is based on v5.5-rc1
changes since v7:
- reword in binding document [PATCH 02/14]
- fix error return checking bug in subsys clock control [PATCH 10/14]
- add power domains properity to mfgcfg patch [PATCH 14/14] from
https://patchwork.kernel.org/patch/11126199/
changes since v6:
- remove the patch of SPDX license identifier because it's already fixed
changes since v5:
- fix documentation in [PATCH 04/14]
- remove useless variable checking and reuse API of clock control in [PATCH 06/14]
- coding style fix of bus protection control in [PATCH 08/14]
- fix naming of new added data in [PATCH 09/14]
- small refactor of multiple step bus protection control in [PATCH 10/14]
changes since v4:
- add property to mt8183 smi-common
- seperate refactor patches and new add function
- add power controller device node
Weiyi Lu (9):
dt-bindings: mediatek: Add property to mt8183 smi-common
dt-bindings: soc: Add MT8183 power dt-bindings
soc: mediatek: Add basic_clk_id to scp_power_data
soc: mediatek: Add multiple step bus protection control
soc: mediatek: Add subsys clock control for bus protection
soc: mediatek: Add extra sram control
soc: mediatek: Add MT8183 scpsys support
arm64: dts: Add power controller device node of MT8183
arm64: dts: Add power-domains properity to mfgcfg
.../memory-controllers/mediatek,smi-common.txt | 2 +- .../devicetree/bindings/soc/mediatek/scpsys.txt | 20 +- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 63 ++++ drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 ++++++ drivers/soc/mediatek/mtk-scpsys.c | 389 +++++++++++++++++++-- include/dt-bindings/power/mt8183-power.h | 26 ++ include/linux/soc/mediatek/scpsys-ext.h | 39 +++ 8 files changed, 614 insertions(+), 26 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/dt-bindings/power/mt8183-power.h create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
PATCH v9 1/9 dt-bindings: mediatek: Add property to mt8183 smi-common
For scpsys driver using regmap based syscon driver API.
--- .../devicetree/bindings/memory-controllers/mediatek,smi-common.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt +1 -1
@@ -20,7 +20,7 @@ Required properties: "mediatek,mt2712-smi-common" "mediatek,mt7623-smi-common", "mediatek,mt2701-smi-common" "mediatek,mt8173-smi-common" - "mediatek,mt8183-smi-common" + "mediatek,mt8183-smi-common", "syscon" - reg : the register and size of the SMI block. - power-domains : a phandle to the power domain of this local arbiter. - clocks : Must contain an entry for each entry in clock-names.
Signature · 1 line
1.8.1.1.dirty
PATCH v9 2/9 dt-bindings: soc: Add MT8183 power dt-bindings
In reply to Weiyi LuAdd power dt-bindings of MT8183 and introduces "BASIC" and "SUBSYS" clock types in binding document.
The "BASIC" type is compatible to the original power control with clock name [a-z]+[0-9]*, e.g. mm, vpu1.
The "SUBSYS" type is used for bus protection control with clock name [a-z]+-[0-9]+, e.g. isp-0, cam-1.
--- .../devicetree/bindings/soc/mediatek/scpsys.txt | 20 ++++++++++++++--- include/dt-bindings/power/mt8183-power.h | 26 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 include/dt-bindings/power/mt8183-power.h
Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +17 -3
@@ -14,6 +14,7 @@ power/power-domain.yaml. It provides the power domains defined in - include/dt-bindings/power/mt2701-power.h - include/dt-bindings/power/mt2712-power.h - include/dt-bindings/power/mt7622-power.h +- include/dt-bindings/power/mt8183-power.h Required properties: - compatible: Should be one of:
@@ -25,18 +26,31 @@ Required properties: - "mediatek,mt7623a-scpsys": For MT7623A SoC - "mediatek,mt7629-scpsys", "mediatek,mt7622-scpsys": For MT7629 SoC - "mediatek,mt8173-scpsys" + - "mediatek,mt8183-scpsys" - #power-domain-cells: Must be 1 - reg: Address range of the SCPSYS unit - infracfg: must contain a phandle to the infracfg controller -- clock, clock-names: clocks according to the common clock binding. - These are clocks which hardware needs to be - enabled before enabling certain power domains. +- clock, clock-names: Clocks according to the common clock binding. + Some SoCs have to groups of clocks. + BASIC clocks need to be enabled before enabling the + corresponding power domain. + SUBSYS clocks need to be enabled before releasing the + bus protection. Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" Required clocks for MT6797: "mm", "mfg", "vdec" Required clocks for MT7622 or MT7629: "hif_sel" Required clocks for MT7623A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" + Required clocks for MT8183: BASIC: "audio", "mfg", "mm", "cam", "isp", + "vpu", "vpu1", "vpu2", "vpu3" + SUBSYS: "mm-0", "mm-1", "mm-2", "mm-3", + "mm-4", "mm-5", "mm-6", "mm-7", + "mm-8", "mm-9", "isp-0", "isp-1", + "cam-0", "cam-1", "cam-2", "cam-3", + "cam-4", "cam-5", "cam-6", "vpu-0", + "vpu-1", "vpu-2", "vpu-3", "vpu-4", + "vpu-5" Optional properties: - vdec-supply: Power supply for the vdec power domain
include/dt-bindings/power/mt8183-power.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H +#define _DT_BINDINGS_POWER_MT8183_POWER_H + +#define MT8183_POWER_DOMAIN_AUDIO 0 +#define MT8183_POWER_DOMAIN_CONN 1 +#define MT8183_POWER_DOMAIN_MFG_ASYNC 2 +#define MT8183_POWER_DOMAIN_MFG 3 +#define MT8183_POWER_DOMAIN_MFG_CORE0 4 +#define MT8183_POWER_DOMAIN_MFG_CORE1 5 +#define MT8183_POWER_DOMAIN_MFG_2D 6 +#define MT8183_POWER_DOMAIN_DISP 7 +#define MT8183_POWER_DOMAIN_CAM 8 +#define MT8183_POWER_DOMAIN_ISP 9 +#define MT8183_POWER_DOMAIN_VDEC 10 +#define MT8183_POWER_DOMAIN_VENC 11 +#define MT8183_POWER_DOMAIN_VPU_TOP 12 +#define MT8183_POWER_DOMAIN_VPU_CORE0 13 +#define MT8183_POWER_DOMAIN_VPU_CORE1 14 + +#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */
Signature · 5 lines
1.8.1.1.dirty _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v9 3/9 soc: mediatek: Add basic_clk_id to scp_power_data
In reply to Weiyi LuTry to stop extending the clk_id or clk_names if there are more and more new BASIC clocks. To get its own clocks by the basic_clk_id of each power domain.
--- drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +21 -8
@@ -117,6 +117,8 @@ enum clk_id {* @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. * @clk_id: The basic clocks required by this power domain. +* @basic_clk_id: provide the same purpose with field "clk_id" +* by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. */ struct scp_domain_data {
@@ -127,6 +129,7 @@ struct scp_domain_data {u32 sram_pdn_ack_bits;u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_id[MAX_CLKS ];u8 caps; };
@@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; -for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { -struct clk *c = clk[data->clk_id[j]]; +if (data->clk_id[0 ]) { +WARN_ON (data->basic_clk_id[0 ]); -if (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } +for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { +struct clk *c = clk[data->clk_id[j]]; + +if (IS_ERR (c)) { +dev_err (&pdev->dev, +"%s: clk unavailable\n" , + data->name); +return ERR_CAST (c); + } - scpd->clk[j] = c; + scpd->clk[j] = c; + } + }else if (data->basic_clk_id[0 ]) { +for (j =0 ; j <MAX_CLKS && + data->basic_clk_id[j]; j++) + scpd->clk[j] =devm_clk_get (&pdev->dev, + data->basic_clk_id[j]); } genpd->name = data->name;
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v9 3/9] soc: mediatek: Add basic_clk_id to scp_power_data
Quoted 4 lines · Weiyi Lu
Try to stop extending the
clk_idorclk_namesif there are more and more new BASIC clocks. To get its own clocks by thebasic_clk_idof each power domain.
Looking at this a bit more, I'm not sure why we make this an option...
The easiest way to make this consistent with non-MT8183 scpsys drivers is to add your missing clocks to "enum clk_id" and clk_names, but I understand it's not desired (number of clocks would blow up).
Can we, instead, convert all existing scpsys drivers to use "char *" clock names instead?
I made an attempt here and it seems simple enough:
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1969103
Quoted 11 lines
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +0
-0
drivers/soc/mediatek/mtk-scpsys.c enum clk_id { · line 121
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -117,6 +117,8 @@ enum clk_id {* @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. * @clk_id: The basic clocks required by this power domain. +* @basic_clk_id: provide the same purpose with field "clk_id" +* by declaring basic clock prefix name rather than clk_id.
Actually, I prefer the name clk_name, not sure why I pushed you in that direction...
Quoted 48 lines
drivers/soc/mediatek/mtk-scpsys.c +19
-9* @caps: The flag for active wake-up action. */ struct scp_domain_data {@@ -127,6 +129,7 @@ struct scp_domain_data {u32 sram_pdn_ack_bits;u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_id[MAX_CLKS ];u8 caps; };@@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; -for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { -struct clk *c = clk[data->clk_id[j]]; +if (data->clk_id[0 ]) { +WARN_ON (data->basic_clk_id[0 ]); -if (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } +for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { +struct clk *c = clk[data->clk_id[j]]; + +if (IS_ERR (c)) { +dev_err (&pdev->dev, +"%s: clk unavailable\n" , + data->name); +return ERR_CAST (c); + } - scpd->clk[j] = c; + scpd->clk[j] = c; + } + }else if (data->basic_clk_id[0 ]) { +for (j =0 ; j <MAX_CLKS && + data->basic_clk_id[j]; j++) + scpd->clk[j] =devm_clk_get (&pdev->dev, + data->basic_clk_id[j]); } genpd->name = data->name; --1.8.1.1.dirty
Re: [PATCH v9 3/9] soc: mediatek: Add basic_clk_id to scp_power_data
Quoted 8 lines · Nicolas Boichat
Quoted 4 lines · Weiyi Lu
Try to stop extending the
clk_idorclk_namesif there are more and more new BASIC clocks. To get its own clocks by thebasic_clk_idof each power domain.Looking at this a bit more, I'm not sure why we make this an option...
Quoted 9 lines
The easiest way to make this consistent with non-MT8183 scpsys drivers is to add your missing clocks to "enum
clk_id" andclk_names, but I understand it's not desired (number of clocks would blow up).Can we, instead, convert all existing scpsys drivers to use "char *" clock names instead?
I made an attempt here and it seems simple enough:
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1969103
That's what we'd like to do in the future. But you're right! I should complete it at one go.
Quoted 6 lines
Quoted 6 lines
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
Quoted 14 lines
drivers/soc/mediatek/mtk-scpsys.c enum clk_id { · line 121
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -117,6 +117,8 @@ enum clk_id {* @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. * @clk_id: The basic clocks required by this power domain. +* @basic_clk_id: provide the same purpose with field "clk_id" +* by declaring basic clock prefix name rather than clk_id. Actually, I prefer the name
clk_name, not sure why I pushed you in that direction...
OK, I'll fix it in next version. But I'd like to use "basic_clk_name" because we will add "subsys_clk_prefix" in following patch.
Quoted 48 lines
Quoted 48 lines
drivers/soc/mediatek/mtk-scpsys.c +19
-9* @caps: The flag for active wake-up action. */ struct scp_domain_data {@@ -127,6 +129,7 @@ struct scp_domain_data {u32 sram_pdn_ack_bits;u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_id[MAX_CLKS ];u8 caps; };@@ -493,16 +496,26 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; -for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { -struct clk *c = clk[data->clk_id[j]]; +if (data->clk_id[0 ]) { +WARN_ON (data->basic_clk_id[0 ]); -if (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } +for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { +struct clk *c = clk[data->clk_id[j]]; + +if (IS_ERR (c)) { +dev_err (&pdev->dev, +"%s: clk unavailable\n" , + data->name); +return ERR_CAST (c); + } - scpd->clk[j] = c; + scpd->clk[j] = c; + } + }else if (data->basic_clk_id[0 ]) { +for (j =0 ; j <MAX_CLKS && + data->basic_clk_id[j]; j++) + scpd->clk[j] =devm_clk_get (&pdev->dev, + data->basic_clk_id[j]); } genpd->name = data->name; --1.8.1.1.dirty
PATCH v9 4/9 soc: mediatek: Add multiple step bus protection control
In reply to Weiyi LuBoth MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
drivers/soc/mediatek/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o
drivers/soc/mediatek/mtk-scpsys-ext.c new file +99 -0
99 lines not on this page · raw message
drivers/soc/mediatek/mtk-scpsys.c +29 -10
@@ -12,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h>
@@ -120,6 +121,7 @@ enum clk_id {* @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. */ struct scp_domain_data {const char *name;
@@ -131,6 +133,7 @@ struct scp_domain_data {enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ];u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;
@@ -154,6 +157,7 @@ struct scp {struct device *dev;void __iomem *base;struct regmap *infracfg; +struct regmap *smi_common;struct scp_ctrl_reg ctrl_reg;bool bus_prot_reg_update; };
@@ -283,24 +287,28 @@ static int scpsys_bus_protect_enable(struct scp_domain *scpd) {struct scp *scp = scpd->scp; -if (!scpd->data->bus_prot_mask) -return 0 ; +if (scpd->data->bus_prot_mask) { +return mtk_infracfg_set_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); + } -return mtk_infracfg_set_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +return mtk_scpsys_ext_set_bus_protection (scpd->data->bp_table, + scp->infracfg, scp->smi_common); }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; -if (!scpd->data->bus_prot_mask) -return 0 ; +if (scpd->data->bus_prot_mask) { +return mtk_infracfg_clear_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); + } -return mtk_infracfg_clear_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +return mtk_scpsys_ext_clear_bus_protection (scpd->data->bp_table, + scp->infracfg, scp->smi_common); }static int scpsys_power_on (struct generic_pm_domain *genpd)
@@ -469,6 +477,17 @@ static struct scp *init_scp(struct platform_device *pdev,return ERR_CAST (scp->infracfg); } + scp->smi_common =syscon_regmap_lookup_by_phandle (pdev->dev.of_node, +"smi_comm" ); + +if (scp->smi_common ==ERR_PTR (-ENODEV )) { + scp->smi_common =NULL ; + }else if (IS_ERR (scp->smi_common)) { +dev_err (&pdev->dev,"Cannot find smi_common controller: %ld\n" , +PTR_ERR (scp->smi_common)); +return ERR_CAST (scp->smi_common); + } +for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];const struct scp_domain_data *data = &scp_domain_data[i];
include/linux/soc/mediatek/scpsys-ext.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_EXT_H +#define __SOC_MEDIATEK_SCPSYS_EXT_H + +#define MAX_STEPS 4 + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _clr_ack_mask) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .clr_ack_mask = _clr_ack_mask, \ + } + +enum regmap_type { +INVALID_TYPE =0 , +IFR_TYPE , +SMI_TYPE , +}; + +struct bus_prot { +enum regmap_type type; +u32 set_ofs; +u32 clr_ofs; +u32 en_ofs; +u32 sta_ofs; +u32 mask; +u32 clr_ack_mask; +}; + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); + +#endif /* __SOC_MEDIATEK_SCPSYS_EXT_H */
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v9 4/9] soc: mediatek: Add multiple step bus protection control
Quoted 46 lines · Weiyi Lu
Both MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +13
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC
drivers/soc/mediatek/mtk-scpsys-ext.c line 23
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +10
-0+ +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val; + +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask);
At least for 8183, we never seen to use the reg_set case, can we simplify this function?
drivers/soc/mediatek/mtk-scpsys-ext.c line 27
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+ +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );
From 8183, I see that you have either:
1. mask == ack_mask
2. ack_mask == 0 (essentially this skips this test)
Would it be simpler to just skip this test if reg_sta == 0, and always assume mask == ack_mask otherwise?
e.g.
if (reg_sta == 0)
return 0;
return regmap_read_poll_timeout(map, reg_sta,
val, (val & mask) == mask,
MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+} + + +int mtk_scpsys_ext_set_bus_protection(const struct bus_prot *bp_table,
drivers/soc/mediatek/mtk-scpsys-ext.c line 55
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +10
-0+ struct regmap *infracfg, struct regmap *smi_common) +{ + int i; + +for (i =0 ; i <MAX_STEPS ; i++) { +struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ;
break? (but yes the one below in mtk_scpsys_ext_clear_bus_protection has to be continue).
Quoted 65 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +44
-0+else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ; +else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -12,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -120,6 +121,7 @@ enum clk_id {* @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. */ struct scp_domain_data {const char *name;
drivers/soc/mediatek/mtk-scpsys.c struct scp_domain_data { · line 136
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0@@ -131,6 +133,7 @@ struct scp_domain_data {enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ];u8 caps; +struct bus_prot bp_table[MAX_STEPS ];
As with the previous patch, I'm not a big fan of having 2 approaches for something similar (bus_prot_mask vs bp_table), can we define a simple macro for this?
e.g.:
.bp_table = BUS_PROT_SINGLE(mask)
Re: [PATCH v9 4/9] soc: mediatek: Add multiple step bus protection control
Quoted 52 lines · Nicolas Boichat
Quoted 51 lines · Weiyi Lu
Both MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +18
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val;
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 23
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+ +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask);At least for 8183, we never seen to use the
reg_setcase, can we simplify this function?
Actually 6765 will use it and all the other MediaTek chips at least in near future.
https://patchwork.kernel.org/patch/11042003/
Quoted 12 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 27
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+ +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );From 8183, I see that you have either:
1. mask ==ack_mask
2.ack_mask== 0 (essentially this skips this test)Would it be simpler to just skip this test if
reg_sta== 0, and always assume mask ==ack_maskotherwise?
Quoted 8 lines
e.g.
if (reg_sta== 0)
return 0;return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);
I'm not sure if you mean ack_mask == 0?reg_sta would be possible to be 0 because it's a register address offset.
I guess what you'd actually suggest is like below?
if (ack_mask == 0)
return 0;
return regmap_read_poll_timeout(map, reg_sta,
val, (val & mask) == mask,
MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);Quoted 10 lines
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +9
-0+} + + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =0 ; i <MAX_STEPS ; i++) {
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 55
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ;break? (but yes the one below in
mtk_scpsys_ext_clear_bus_protectionhas to be continue).
Thanks. I'll fix in next version.
Quoted 67 lines
Quoted 67 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +44
-0+else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ; +else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -12,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -120,6 +121,7 @@ enum clk_id {* @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. */ struct scp_domain_data {const char *name;@@ -131,6 +133,7 @@ struct scp_domain_data {enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ];
Quoted 8 lines
drivers/soc/mediatek/mtk-scpsys.c struct scp_domain_data { · line 136
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0u8 caps; +struct bus_prot bp_table[MAX_STEPS ];As with the previous patch, I'm not a big fan of having 2 approaches for something similar (
bus_prot_maskvsbp_table), can we define a simple macro for this?
e.g.:
.bp_table =BUS_PROT_SINGLE(mask)
Agree! I'll fix it.
Re: [PATCH v9 4/9] soc: mediatek: Add multiple step bus protection control
Quoted 64 lines · Weiyi Lu
Quoted 52 lines · Nicolas Boichat
Quoted 51 lines · Weiyi Lu
Both MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +18
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val;Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 23
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+ +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask);At least for 8183, we never seen to use the
reg_setcase, can we simplify this function?
Quoted 3 lines
Actually 6765 will use it and all the other MediaTek chips at least in near future.
https://patchwork.kernel.org/patch/11042003/
Ok, that's fine then.
Quoted 16 lines
Quoted 16 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 27
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+ +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );From 8183, I see that you have either:
1. mask ==ack_mask
2.ack_mask== 0 (essentially this skips this test)Would it be simpler to just skip this test if
reg_sta== 0, and always assume mask ==ack_maskotherwise?e.g.
if (reg_sta== 0)
return 0;
Quoted 8 lines
Quoted 4 lines
return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);I'm not sure if you mean
ack_mask== 0?reg_stawould be possible to be 0 because it's a register address offset.
Right, so maybe "0" is not a good invalid value, or maybe you can have a #define REG_STA_INVALID U32_MAX
And then test for:
if (reg_sta == REG_STA_INVALID)
return 0;
My point here is that mask and ack_mask are always the same (unless you don't care about reading back the status), so maybe you only need to specify mask?
(but if you need different mask and ack_mask for future chips, feel free to ignore)
Quoted 111 lines
I guess what you'd actually suggest is like below?
if (
ack_mask== 0)return 0;return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);Quoted 10 lines
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +9
-0+} + + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =0 ; i <MAX_STEPS ; i++) {Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 55
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ;break? (but yes the one below in
mtk_scpsys_ext_clear_bus_protectionhas to be continue).Thanks. I'll fix in next version.
Quoted 67 lines
Quoted 67 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +44
-0+else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ; +else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -12,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -120,6 +121,7 @@ enum clk_id {* @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. */ struct scp_domain_data {const char *name;@@ -131,6 +133,7 @@ struct scp_domain_data {enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ];Quoted 8 lines
drivers/soc/mediatek/mtk-scpsys.c struct scp_domain_data { · line 136
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0u8 caps; +struct bus_prot bp_table[MAX_STEPS ];As with the previous patch, I'm not a big fan of having 2 approaches for something similar (
bus_prot_maskvsbp_table), can we define a simple macro for this?
e.g.:
.bp_table =BUS_PROT_SINGLE(mask)Agree! I'll fix it.
Re: [PATCH v9 4/9] soc: mediatek: Add multiple step bus protection control
Quoted 103 lines · Nicolas Boichat
Quoted 64 lines · Weiyi Lu
Quoted 52 lines · Nicolas Boichat
Quoted 51 lines · Weiyi Lu
Both MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +18
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val;Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 23
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+ +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask);At least for 8183, we never seen to use the
reg_setcase, can we simplify this function?Quoted 3 lines
Actually 6765 will use it and all the other MediaTek chips at least in near future.
https://patchwork.kernel.org/patch/11042003/Ok, that's fine then.
Quoted 16 lines
Quoted 16 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 27
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+ +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );From 8183, I see that you have either:
1. mask ==ack_mask
2.ack_mask== 0 (essentially this skips this test)Would it be simpler to just skip this test if
reg_sta== 0, and always assume mask ==ack_maskotherwise?e.g.
if (reg_sta== 0)
return 0;Quoted 8 lines
Quoted 4 lines
return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);I'm not sure if you mean
ack_mask== 0?reg_stawould be possible to be 0 because it's a register address offset.Right, so maybe "0" is not a good invalid value, or maybe you can have a #define
REG_STA_INVALIDU32_MAXAnd then test for:
if (reg_sta==REG_STA_INVALID)
return 0;
Quoted 7 lines
My point here is that mask and
ack_maskare always the same (unless you don't care about reading back the status), so maybe you only need to specify mask?(but if you need different mask and
ack_maskfor future chips, feel free to ignore)
I do need different mask and ack_mask.
For the special case of 8183 here, we still have to check the ack status when setting bus protection but only ignore the ack status when clearing bus protection.
case A.
SET: reg_set, reg_sta, mask == ack mask
CLEAR: reg_clr, reg_sta, mask == clear ack mask
case B. (the special case we discussed)
SET: reg_set, reg_sta, mask == ack mask
CLEAR: reg_clr, reg_sta, mask != clear ack mask(which is 0 now)
If I use the REG_STA_INVALID to replace the clear ack mask way. I might need two reg_sta to satisfy the check of set and clear bus protection.
One is valid for setting case and another is invalid for clearing case, e.g. case 2 below
case 1.
SET: reg_set, reg_sta(valid), mask == ack mask
CLEAR: reg_clr, reg_sta(valid), mask == ack mask
case 2.
SET: reg_set, reg_sta(valid), mask == ack mask
CLEAR: reg_clr, reg_sta(invalid then return), mask == ack mask
so I'd like to keep the original proposal. What do you think?
Quoted 111 lines
Quoted 111 lines
I guess what you'd actually suggest is like below?
if (
ack_mask== 0)return 0;return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);Quoted 10 lines
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +9
-0+} + + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =0 ; i <MAX_STEPS ; i++) {Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 55
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ;break? (but yes the one below in
mtk_scpsys_ext_clear_bus_protectionhas to be continue).Thanks. I'll fix in next version.
Quoted 67 lines
Quoted 67 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +44
-0+else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; + +if (bp_table[i].type ==INVALID_TYPE ) +continue ; +else if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -12,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -120,6 +121,7 @@ enum clk_id {* @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. * @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. */ struct scp_domain_data {const char *name;@@ -131,6 +133,7 @@ struct scp_domain_data {enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ];Quoted 8 lines
drivers/soc/mediatek/mtk-scpsys.c struct scp_domain_data { · line 136
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-0u8 caps; +struct bus_prot bp_table[MAX_STEPS ];As with the previous patch, I'm not a big fan of having 2 approaches for something similar (
bus_prot_maskvsbp_table), can we define a simple macro for this?
e.g.:
.bp_table =BUS_PROT_SINGLE(mask)Agree! I'll fix it.
Re: [PATCH v9 4/9] soc: mediatek: Add multiple step bus protection control
Quoted 136 lines · Weiyi Lu
Quoted 103 lines · Nicolas Boichat
Quoted 64 lines · Weiyi Lu
Quoted 52 lines · Nicolas Boichat
Quoted 51 lines · Weiyi Lu
Both MT8183 & MT6765 have more control steps of bus protection than previous project. And there add more bus protection registers reside at infracfg & smi-common. Also add new APIs for multiple step bus protection control with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-scpsys.c | 39 +++++++++---- include/linux/soc/mediatek/scpsys-ext.h | 39 +++++++++++++ 4 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +18
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h> +#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en) +{ +u32 val;Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 23
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +5
-0+ +if (reg_set) +regmap_write (map, reg_set, mask); +else +regmap_update_bits (map, reg_en, mask, mask);At least for 8183, we never seen to use the
reg_setcase, can we simplify this function?Quoted 3 lines
Actually 6765 will use it and all the other MediaTek chips at least in near future.
https://patchwork.kernel.org/patch/11042003/Ok, that's fine then.
Quoted 16 lines
Quoted 16 lines
drivers/soc/mediatek/mtk-scpsys-ext.c line 27
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+ +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );From 8183, I see that you have either:
1. mask ==ack_mask
2.ack_mask== 0 (essentially this skips this test)Would it be simpler to just skip this test if
reg_sta== 0, and always assume mask ==ack_maskotherwise?e.g.
if (reg_sta== 0)
return 0;Quoted 8 lines
Quoted 4 lines
return regmap_read_poll_timeout(map,
reg_sta,val, (val & mask) == mask, MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT);I'm not sure if you mean
ack_mask== 0?reg_stawould be possible to be 0 because it's a register address offset.Right, so maybe "0" is not a good invalid value, or maybe you can have a #define
REG_STA_INVALIDU32_MAXAnd then test for:
if (reg_sta==REG_STA_INVALID)
return 0;Quoted 7 lines
My point here is that mask and
ack_maskare always the same (unless you don't care about reading back the status), so maybe you only need to specify mask?(but if you need different mask and
ack_maskfor future chips, feel free to ignore)I do need different mask and
ack_mask.
For the special case of 8183 here, we still have to check the ack status when setting bus protection but only ignore the ack status when clearing bus protection.case A.
SET:reg_set,reg_sta, mask == ack mask
CLEAR:reg_clr,reg_sta, mask == clear ack maskcase B. (the special case we discussed)
SET:reg_set,reg_sta, mask == ack mask
CLEAR:reg_clr,reg_sta, mask != clear ack mask(which is 0 now)If I use the
REG_STA_INVALIDto replace the clear ack mask way. I might need tworeg_stato satisfy the check of set and clear bus protection.
One is valid for setting case and another is invalid for clearing case, e.g. case 2 belowcase 1.
SET:reg_set,reg_sta(valid), mask == ack mask
CLEAR:reg_clr,reg_sta(valid), mask == ack mask
Quoted 5 lines
case 2.
SET:reg_set,reg_sta(valid), mask == ack mask
CLEAR:reg_clr,reg_sta(invalid then return), mask == ack maskso I'd like to keep the original proposal. What do you think?
Ooh, I see. This is quite confusing to be honest... I wonder if it wouldn't be clearer to have a boolean instead in bus_prot (something like "clk_no_check", can't find a better name right now).
PATCH v9 5/9 soc: mediatek: Add subsys clock control for bus protection
In reply to Weiyi LuAdd subsys CG control flow before/after the bus protect control due to bus protection need SMI bus relative CGs enabled to feedback its ack.
--- drivers/soc/mediatek/mtk-scpsys.c | 72 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +70 -2
@@ -108,6 +108,7 @@ enum clk_id { };#define MAX_CLKS 3 +#define MAX_SUBSYS_CLKS 10/** * struct scp_domain_data - scp domain data for power on/off flow
@@ -120,6 +121,8 @@ enum clk_id {* @clk_id: The basic clocks required by this power domain. * @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. +* @subsys_clk_prefix: The prefix name of the clocks need to be enabled +* before releasing bus protection. * @caps: The flag for active wake-up action. * @bp_table: The mask table for multiple step bus protection. */
@@ -132,6 +135,7 @@ struct scp_domain_data {u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps;struct bus_prot bp_table[MAX_STEPS ]; };
@@ -142,6 +146,7 @@ struct scp_domain {struct generic_pm_domain genpd;struct scp *scp;struct clk *clk[MAX_CLKS ]; +struct clk *subsys_clk[MAX_SUBSYS_CLKS ];const struct scp_domain_data *data;struct regulator *supply; };
@@ -349,16 +354,22 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) val |=PWR_RST_B_BIT ;writel (val, ctl_addr); - ret =scpsys_sram_enable (scpd, ctl_addr); + ret =scpsys_clk_enable (scpd->subsys_clk,MAX_SUBSYS_CLKS );if (ret <0 ) goto err_pwr_ack; + ret =scpsys_sram_enable (scpd, ctl_addr); +if (ret <0 ) + goto err_sram; + ret =scpsys_bus_protect_disable (scpd);if (ret <0 ) - goto err_pwr_ack; + goto err_sram;return 0 ; +err_sram: +scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); err_pwr_ack:scpsys_clk_disable (scpd->clk,MAX_CLKS ); err_clk:
@@ -385,6 +396,8 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)if (ret <0 ) goto out; +scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); +/* subsys power off */ val =readl (ctl_addr); val |=PWR_ISO_BIT ;
@@ -422,6 +435,48 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } +static int init_subsys_clks (struct platform_device *pdev, +const char *prefix,struct clk **clk) +{ +struct device_node *node = pdev->dev.of_node; +u32 prefix_len, sub_clk_cnt =0 ; +struct property *prop; +const char *clk_name; + +if (!node) { +dev_err (&pdev->dev,"Cannot find scpsys node: %ld\n" , +PTR_ERR (node)); +return PTR_ERR (node); + } + + prefix_len =strlen (prefix); + +of_property_for_each_string (node,"clock-names" , prop, clk_name) { +if (!strncmp (clk_name, prefix, prefix_len) && + (clk_name[prefix_len] =='-' )) { +if (sub_clk_cnt >=MAX_SUBSYS_CLKS ) { +dev_err (&pdev->dev, +"subsys clk out of range %d\n" , + sub_clk_cnt); +return -ENOMEM ; + } + + clk[sub_clk_cnt] =devm_clk_get (&pdev->dev, + clk_name); + +if (IS_ERR (clk[sub_clk_cnt])) { +dev_err (&pdev->dev, +"Subsys clk get fail %ld\n" , +PTR_ERR (clk[sub_clk_cnt])); +return PTR_ERR (clk[sub_clk_cnt]); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static void init_clks (struct platform_device *pdev,struct clk **clk) {int i;
@@ -509,6 +564,7 @@ static struct scp *init_scp(struct platform_device *pdev,struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;const struct scp_domain_data *data = &scp_domain_data[i]; +int clk_cnt; pd_data->domains[i] = genpd; scpd->scp = scp;
@@ -537,6 +593,18 @@ static struct scp *init_scp(struct platform_device *pdev, data->basic_clk_id[j]); } +if (data->subsys_clk_prefix) { + clk_cnt =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (clk_cnt <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name); +return ERR_PTR (clk_cnt); + } + } + genpd->name = data->name; genpd->power_off = scpsys_power_off; genpd->power_on = scpsys_power_on;
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v9 5/9] soc: mediatek: Add subsys clock control for bus protection
Quoted 6 lines · Weiyi Lu
Add subsys CG control flow before/after the bus protect control due to bus protection need SMI bus relative CGs enabled to feedback its ack.
Signed-off-by Weiyi Lu <[email protected]>
I'm not a clock expert but this one looks ok.
Quoted 153 lines
--- drivers/soc/mediatek/mtk-scpsys.c | 72 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +70
-3@@ -108,6 +108,7 @@ enum clk_id { };#define MAX_CLKS 3 +#define MAX_SUBSYS_CLKS 10/** * struct scp_domain_data - scp domain data for power on/off flow @@ -120,6 +121,8 @@ enum clk_id {* @clk_id: The basic clocks required by this power domain. * @basic_clk_id: provide the same purpose with field "clk_id" * by declaring basic clock prefix name rather than clk_id. +* @subsys_clk_prefix: The prefix name of the clocks need to be enabled +* before releasing bus protection. * @caps: The flag for active wake-up action. * @bp_table: The mask table for multiple step bus protection. */ @@ -132,6 +135,7 @@ struct scp_domain_data {u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ];const char *basic_clk_id[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps;struct bus_prot bp_table[MAX_STEPS ]; };@@ -142,6 +146,7 @@ struct scp_domain {struct generic_pm_domain genpd;struct scp *scp;struct clk *clk[MAX_CLKS ]; +struct clk *subsys_clk[MAX_SUBSYS_CLKS ];const struct scp_domain_data *data;struct regulator *supply; };@@ -349,16 +354,22 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) val |=PWR_RST_B_BIT ;writel (val, ctl_addr); - ret =scpsys_sram_enable (scpd, ctl_addr); + ret =scpsys_clk_enable (scpd->subsys_clk,MAX_SUBSYS_CLKS );if (ret <0 ) goto err_pwr_ack; + ret =scpsys_sram_enable (scpd, ctl_addr); +if (ret <0 ) + goto err_sram; + ret =scpsys_bus_protect_disable (scpd);if (ret <0 ) - goto err_pwr_ack; + goto err_sram;return 0 ; +err_sram: +scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); err_pwr_ack:scpsys_clk_disable (scpd->clk,MAX_CLKS ); err_clk:@@ -385,6 +396,8 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)if (ret <0 ) goto out; +scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); +/* subsys power off */ val =readl (ctl_addr); val |=PWR_ISO_BIT ;@@ -422,6 +435,48 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } +static int init_subsys_clks (struct platform_device *pdev, +const char *prefix,struct clk **clk) +{ +struct device_node *node = pdev->dev.of_node; +u32 prefix_len, sub_clk_cnt =0 ; +struct property *prop; +const char *clk_name; + +if (!node) { +dev_err (&pdev->dev,"Cannot find scpsys node: %ld\n" , +PTR_ERR (node)); +return PTR_ERR (node); + } + + prefix_len =strlen (prefix); + +of_property_for_each_string (node,"clock-names" , prop, clk_name) { +if (!strncmp (clk_name, prefix, prefix_len) && + (clk_name[prefix_len] =='-' )) { +if (sub_clk_cnt >=MAX_SUBSYS_CLKS ) { +dev_err (&pdev->dev, +"subsys clk out of range %d\n" , + sub_clk_cnt); +return -ENOMEM ; + } + + clk[sub_clk_cnt] =devm_clk_get (&pdev->dev, + clk_name); + +if (IS_ERR (clk[sub_clk_cnt])) { +dev_err (&pdev->dev, +"Subsys clk get fail %ld\n" , +PTR_ERR (clk[sub_clk_cnt])); +return PTR_ERR (clk[sub_clk_cnt]); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static void init_clks (struct platform_device *pdev,struct clk **clk) {int i;@@ -509,6 +564,7 @@ static struct scp *init_scp(struct platform_device *pdev,struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;const struct scp_domain_data *data = &scp_domain_data[i]; +int clk_cnt; pd_data->domains[i] = genpd; scpd->scp = scp;@@ -537,6 +593,18 @@ static struct scp *init_scp(struct platform_device *pdev, data->basic_clk_id[j]); } +if (data->subsys_clk_prefix) { + clk_cnt =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (clk_cnt <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name); +return ERR_PTR (clk_cnt); + } + } + genpd->name = data->name; genpd->power_off = scpsys_power_off; genpd->power_on = scpsys_power_on; --1.8.1.1.dirty
PATCH v9 6/9 soc: mediatek: Add extra sram control
In reply to Weiyi LuFor some power domains like vpu_core on MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" in scp_domain_data to judge if we need to do the extra sram isolation control or not.
--- drivers/soc/mediatek/mtk-scpsys.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +23 -2
@@ -57,6 +57,8 @@#define PWR_ON_BIT BIT(2)#define PWR_ON_2ND_BIT BIT(3)#define PWR_CLK_DIS_BIT BIT(4) +#define PWR_SRAM_CLKISO_BIT BIT(5) +#define PWR_SRAM_ISOINT_B_BIT BIT(6)#define PWR_STATUS_CONN BIT(1)#define PWR_STATUS_DISP BIT(3)
@@ -115,6 +117,8 @@ enum clk_id {* @name: The domain name. * @sta_mask: The mask for power on/off status bit. * @ctl_offs: The offset for main power control register. +* @sram_iso_ctrl: The flag to judge if the power domain need to do +* the extra sram isolation control. * @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection.
@@ -130,6 +134,7 @@ struct scp_domain_data {const char *name;u32 sta_mask;int ctl_offs; +bool sram_iso_ctrl;u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask;
@@ -269,6 +274,14 @@ static int scpsys_sram_enable(struct scp_domain *scpd, void __iomem *ctl_addr)return ret; } +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr) |PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + val &= ~PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + } +return 0 ; }
@@ -278,8 +291,16 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr)u32 pdn_ack = scpd->data->sram_pdn_ack_bits;int tmp; - val =readl (ctl_addr); - val |= scpd->data->sram_pdn_bits; +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr); + val |=PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + val &= ~PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + } + + val =readl (ctl_addr) | scpd->data->sram_pdn_bits;writel (val, ctl_addr);/* Either wait until SRAM_PDN_ACK all 1 or 0 */
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v9 6/9] soc: mediatek: Add extra sram control
Quoted 57 lines · Weiyi Lu
For some power domains like
vpu_coreon MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" inscp_domain_datato judge if we need to do the extra sram isolation control or not.Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +13
-0@@ -57,6 +57,8 @@#define PWR_ON_BIT BIT(2)#define PWR_ON_2ND_BIT BIT(3)#define PWR_CLK_DIS_BIT BIT(4) +#define PWR_SRAM_CLKISO_BIT BIT(5) +#define PWR_SRAM_ISOINT_B_BIT BIT(6)#define PWR_STATUS_CONN BIT(1)#define PWR_STATUS_DISP BIT(3)@@ -115,6 +117,8 @@ enum clk_id {* @name: The domain name. * @sta_mask: The mask for power on/off status bit. * @ctl_offs: The offset for main power control register. +* @sram_iso_ctrl: The flag to judge if the power domain need to do +* the extra sram isolation control. * @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. @@ -130,6 +134,7 @@ struct scp_domain_data {const char *name;u32 sta_mask;int ctl_offs; +bool sram_iso_ctrl;u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask;@@ -269,6 +274,14 @@ static int scpsys_sram_enable(struct scp_domain *scpd, void __iomem *ctl_addr)return ret; } +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr) |PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + val &= ~PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + } +return 0 ; }
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 296
Quoted 8 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-2@@ -278,8 +291,16 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr)u32 pdn_ack = scpd->data->sram_pdn_ack_bits;int tmp; - val =readl (ctl_addr); - val |= scpd->data->sram_pdn_bits; +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr); + val |=PWR_SRAM_CLKISO_BIT ;
You do this in 1 line above. I don't really care, but be consistent? e.g. val = readl(ctl_addr) | PWR_SRAM_CLKISO_BIT;
Quoted 12 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-1+writel (val, ctl_addr); + val &= ~PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + } + + val =readl (ctl_addr) | scpd->data->sram_pdn_bits;writel (val, ctl_addr);/* Either wait until SRAM_PDN_ACK all 1 or 0 */ --1.8.1.1.dirty
PATCH v9 7/9 soc: mediatek: Add MT8183 scpsys support
In reply to Weiyi LuAdd scpsys driver for MT8183
--- drivers/soc/mediatek/mtk-scpsys.c | 226 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+)
drivers/soc/mediatek/mtk-scpsys.c +226 -0
@@ -20,6 +20,7 @@#include <dt-bindings/power/mt7622-power.h> #include <dt-bindings/power/mt7623a-power.h> #include <dt-bindings/power/mt8173-power.h> +#include <dt-bindings/power/mt8183-power.h> #define MTK_POLL_DELAY_US 10#define MTK_POLL_TIMEOUT USEC_PER_SEC
@@ -1131,6 +1132,217 @@ static void mtk_register_power_domains(struct platform_device *pdev, {MT8173_POWER_DOMAIN_MFG_2D, MT8173_POWER_DOMAIN_MFG}, }; +/* +* MT8183 power domain support +*/ + +static const struct scp_domain_data scp_domain_data_mt8183[] = { + [MT8183_POWER_DOMAIN_AUDIO ] = { + .name ="audio" , + .sta_mask =PWR_STATUS_AUDIO , + .ctl_offs =0x0314 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .basic_clk_id = {"audio" ,"audio1" ,"audio2" }, + }, + [MT8183_POWER_DOMAIN_CONN ] = { + .name ="conn" , + .sta_mask =PWR_STATUS_CONN , + .ctl_offs =0x032c , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (13 ) |BIT (14 ),BIT (13 ) |BIT (14 )), + }, + }, + [MT8183_POWER_DOMAIN_MFG_ASYNC ] = { + .name ="mfg_async" , + .sta_mask =PWR_STATUS_MFG_ASYNC , + .ctl_offs =0x0334 , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .basic_clk_id = {"mfg" }, + }, + [MT8183_POWER_DOMAIN_MFG ] = { + .name ="mfg" , + .sta_mask =PWR_STATUS_MFG , + .ctl_offs =0x0338 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE0 ] = { + .name ="mfg_core0" , + .sta_mask =BIT (7 ), + .ctl_offs =0x034c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE1 ] = { + .name ="mfg_core1" , + .sta_mask =BIT (20 ), + .ctl_offs =0x0310 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_2D ] = { + .name ="mfg_2d" , + .sta_mask =PWR_STATUS_MFG_2D , + .ctl_offs =0x0348 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (19 ) |BIT (20 ) |BIT (21 ), +BIT (19 ) |BIT (20 ) |BIT (21 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (21 ) |BIT (22 ),BIT (21 ) |BIT (22 )), + }, + }, + [MT8183_POWER_DOMAIN_DISP ] = { + .name ="disp" , + .sta_mask =PWR_STATUS_DISP , + .ctl_offs =0x030c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_id = {"mm" }, + .subsys_clk_prefix ="mm" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (16 ) |BIT (17 ),BIT (16 ) |BIT (17 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +GENMASK (7 ,0 ),GENMASK (7 ,0 )), + }, + }, + [MT8183_POWER_DOMAIN_CAM ] = { + .name ="cam" , + .sta_mask =BIT (25 ), + .ctl_offs =0x0344 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_id = {"cam" }, + .subsys_clk_prefix ="cam" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 ), +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (28 ),BIT (28 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (11 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (3 ) |BIT (4 ),BIT (3 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_ISP ] = { + .name ="isp" , + .sta_mask =PWR_STATUS_ISP , + .ctl_offs =0x0308 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_id = {"isp" }, + .subsys_clk_prefix ="isp" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (3 ) |BIT (8 ),BIT (3 ) |BIT (8 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (2 ),BIT (2 )), + }, + }, + [MT8183_POWER_DOMAIN_VDEC ] = { + .name ="vdec" , + .sta_mask =BIT (31 ), + .ctl_offs =0x0300 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (7 ),BIT (7 )), + }, + }, + [MT8183_POWER_DOMAIN_VENC ] = { + .name ="venc" , + .sta_mask =PWR_STATUS_VENC , + .ctl_offs =0x0304 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (1 ),BIT (1 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_TOP ] = { + .name ="vpu_top" , + .sta_mask =BIT (26 ), + .ctl_offs =0x0324 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_id = {"vpu" ,"vpu1" }, + .subsys_clk_prefix ="vpu" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +GENMASK (9 ,6 ) |BIT (12 ), +GENMASK (9 ,6 ) |BIT (12 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (27 ),BIT (27 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (5 ) |BIT (6 ),BIT (5 ) |BIT (6 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE0 ] = { + .name ="vpu_core0" , + .sta_mask =BIT (27 ), + .ctl_offs =0x33c , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_id = {"vpu2" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (6 ),BIT (6 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (0 ) |BIT (2 ) |BIT (4 ), +BIT (0 ) |BIT (2 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE1 ] = { + .name ="vpu_core1" , + .sta_mask =BIT (28 ), + .ctl_offs =0x0340 , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_id = {"vpu3" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (7 ),BIT (7 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (1 ) |BIT (3 ) |BIT (5 ), +BIT (1 ) |BIT (3 ) |BIT (5 )), + }, + }, +}; + +static const struct scp_subdomain scp_subdomain_mt8183[] = { + {MT8183_POWER_DOMAIN_MFG_ASYNC ,MT8183_POWER_DOMAIN_MFG }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_2D }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE0 }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE1 }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_CAM }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_ISP }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VDEC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VENC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VPU_TOP }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE0 }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE1 }, +}; +static const struct scp_soc_data mt2701_data = { .domains = scp_domain_data_mt2701, .num_domains = ARRAY_SIZE(scp_domain_data_mt2701),
@@ -1197,6 +1409,17 @@ static void mtk_register_power_domains(struct platform_device *pdev, .bus_prot_reg_update = true, }; +static const struct scp_soc_data mt8183_data = { + .domains = scp_domain_data_mt8183, + .num_domains =ARRAY_SIZE (scp_domain_data_mt8183), + .subdomains = scp_subdomain_mt8183, + .num_subdomains =ARRAY_SIZE (scp_subdomain_mt8183), + .regs = { + .pwr_sta_offs =0x0180 , + .pwr_sta2nd_offs =0x0184 + } +}; +/* * scpsys driver init */
@@ -1221,6 +1444,9 @@ static void mtk_register_power_domains(struct platform_device *pdev, .compatible = "mediatek,mt8173-scpsys", .data = &mt8173_data, }, { + .compatible = "mediatek,mt8183-scpsys", + .data = &mt8183_data, + }, {/* sentinel */ } };
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v9 7/9] soc: mediatek: Add MT8183 scpsys support
Just a minor nit, but I can't really comment on the exact register addresses (what I could find in register table made sense).
Quoted 4 lines · Weiyi Lu
Add scpsys driver for MT8183
Signed-off-by Weiyi Lu <[email protected]>
Otherwise:
Quoted 5 lines
--- drivers/soc/mediatek/mtk-scpsys.c | 226 ++++++++++++++++++++++++++++++++++++++[snip]
drivers/soc/mediatek/mtk-scpsys.c +0
-0@@ -1197,6 +1409,17 @@ static void mtk_register_power_domains(struct platform_device *pdev, .bus_prot_reg_update = true,
drivers/soc/mediatek/mtk-scpsys.c static void mtk_register_power_domains(struct platform_device *pdev, · line 1419
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +8
-0}; +static const struct scp_soc_data mt8183_data = { + .domains = scp_domain_data_mt8183, + .num_domains =ARRAY_SIZE (scp_domain_data_mt8183), + .subdomains = scp_subdomain_mt8183, + .num_subdomains =ARRAY_SIZE (scp_subdomain_mt8183), + .regs = { + .pwr_sta_offs =0x0180 , + .pwr_sta2nd_offs =0x0184
Add a comma at the end.
Quoted 18 lines
drivers/soc/mediatek/mtk-scpsys.c +6
-1+ } +}; +/* * scpsys driver init */ @@ -1221,6 +1444,9 @@ static void mtk_register_power_domains(struct platform_device *pdev, .compatible = "mediatek,mt8173-scpsys", .data = &mt8173_data, }, { + .compatible = "mediatek,mt8183-scpsys", + .data = &mt8183_data, + }, {/* sentinel */ } }; --1.8.1.1.dirty
PATCH v9 8/9 arm64: dts: Add power controller device node of MT8183
In reply to Weiyi LuAdd power controller node and smi-common node for MT8183 In scpsys node, it contains clocks and regmapping of infracfg and smi-common for bus protection.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +62 -0
@@ -8,6 +8,7 @@ #include <dt-bindings/clock/mt8183-clk.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/power/mt8183-power.h> #include "mt8183-pinfunc.h" / {
@@ -253,6 +254,62 @@ #interrupt-cells = <2>; }; + scpsys: syscon@10006000 { + compatible = "mediatek,mt8183-scpsys", "syscon"; + #power-domain-cells = <1>; + reg = <0 0x10006000 0 0x1000>; + clocks = <&topckgen CLK_TOP_MUX_AUD_INTBUS>, + <&infracfg CLK_INFRA_AUDIO>, + <&infracfg CLK_INFRA_AUDIO_26M_BCLK>, + <&topckgen CLK_TOP_MUX_MFG>, + <&topckgen CLK_TOP_MUX_MM>, + <&topckgen CLK_TOP_MUX_CAM>, + <&topckgen CLK_TOP_MUX_IMG>, + <&topckgen CLK_TOP_MUX_IPU_IF>, + <&topckgen CLK_TOP_MUX_DSP>, + <&topckgen CLK_TOP_MUX_DSP1>, + <&topckgen CLK_TOP_MUX_DSP2>, + <&mmsys CLK_MM_SMI_COMMON>, + <&mmsys CLK_MM_SMI_LARB0>, + <&mmsys CLK_MM_SMI_LARB1>, + <&mmsys CLK_MM_GALS_COMM0>, + <&mmsys CLK_MM_GALS_COMM1>, + <&mmsys CLK_MM_GALS_CCU2MM>, + <&mmsys CLK_MM_GALS_IPU12MM>, + <&mmsys CLK_MM_GALS_IMG2MM>, + <&mmsys CLK_MM_GALS_CAM2MM>, + <&mmsys CLK_MM_GALS_IPU2MM>, + <&imgsys CLK_IMG_LARB5>, + <&imgsys CLK_IMG_LARB2>, + <&camsys CLK_CAM_LARB6>, + <&camsys CLK_CAM_LARB3>, + <&camsys CLK_CAM_SENINF>, + <&camsys CLK_CAM_CAMSV0>, + <&camsys CLK_CAM_CAMSV1>, + <&camsys CLK_CAM_CAMSV2>, + <&camsys CLK_CAM_CCU>, + <&ipu_conn CLK_IPU_CONN_IPU>, + <&ipu_conn CLK_IPU_CONN_AHB>, + <&ipu_conn CLK_IPU_CONN_AXI>, + <&ipu_conn CLK_IPU_CONN_ISP>, + <&ipu_conn CLK_IPU_CONN_CAM_ADL>, + <&ipu_conn CLK_IPU_CONN_IMG_ADL>; + clock-names = "audio", "audio1", "audio2", + "mfg", "mm", "cam", + "isp", "vpu", "vpu1", + "vpu2", "vpu3", "mm-0", + "mm-1", "mm-2", "mm-3", + "mm-4", "mm-5", "mm-6", + "mm-7", "mm-8", "mm-9", + "isp-0", "isp-1", "cam-0", + "cam-1", "cam-2", "cam-3", + "cam-4", "cam-5", "cam-6", + "vpu-0", "vpu-1", "vpu-2", + "vpu-3", "vpu-4", "vpu-5"; + infracfg = <&infracfg>; + smi_comm = <&smi_common>; + }; + apmixedsys: syscon@1000c000 { compatible = "mediatek,mt8183-apmixedsys", "syscon"; reg = <0 0x1000c000 0 0x1000>;
@@ -594,6 +651,11 @@ #clock-cells = <1>; }; + smi_common: smi@14019000 { + compatible = "mediatek,mt8183-smi-common", "syscon"; + reg = <0 0x14019000 0 0x1000>; + }; + imgsys: syscon@15020000 { compatible = "mediatek,mt8183-imgsys", "syscon"; reg = <0 0x15020000 0 0x1000>;
Signature · 1 line
1.8.1.1.dirty
PATCH v9 9/9 arm64: dts: Add power-domains properity to mfgcfg
In reply to Weiyi Lumfgcfg clock is under MFG_ASYNC power domain
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +1 -0
@@ -643,6 +643,7 @@ compatible = "mediatek,mt8183-mfgcfg", "syscon"; reg = <0 0x13000000 0 0x1000>; #clock-cells = <1>; + power-domains = <&scpsys MT8183_POWER_DOMAIN_MFG_ASYNC>; }; mmsys: syscon@14000000 {
Signature · 1 line
1.8.1.1.dirty