Mediatek MT8183 scpsys support
v13 cover Mediatek MT8183 scpsys support
This series is based on v5.6-rc1
change since v12:
- separate the fix of comma at the end into a new patch [PATCH 09/11]
changes since v11:
- re-order patches "Remove infracfg misc driver support" and "Add multiple step bus protection"
- add cap MTK_SCPD_SRAM_ISO for extra sram control
- minor coding sytle fixes and reword commit messages
changes since v10:
- squash PATCH 04 and PATCH 06 in v9 into its previous patch
- add "ignore_clr_ack" for multiple step bus protection control to have a clean definition of power domain data
- keep the mask register bit definitions and do the same for MT8183
changes since v9:
- add new PATCH 04 and PATCH 06 to replace by new method for all compatibles
- add new PATCH 07 to remove infracfg misc driver
- minor coding sytle fix
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 (11):
dt-bindings: mediatek: Add property to mt8183 smi-common
dt-bindings: soc: Add MT8183 power dt-bindings
soc: mediatek: Add basic_clk_name to scp_power_data
soc: mediatek: Remove infracfg misc driver support
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
soc: mediatek: Add a comma at the end
arm64: dts: Add power controller device node of MT8183
arm64: dts: Add power-domains property to mfgcfg
.../mediatek,smi-common.txt | 2 +- .../bindings/soc/mediatek/scpsys.txt | 20 +- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 63 ++ drivers/soc/mediatek/Kconfig | 10 - drivers/soc/mediatek/Makefile | 1 - drivers/soc/mediatek/mtk-infracfg.c | 79 --- drivers/soc/mediatek/mtk-scpsys.c | 654 ++++++++++++++---- drivers/soc/mediatek/scpsys.h | 90 +++ include/dt-bindings/power/mt8183-power.h | 26 + include/linux/soc/mediatek/infracfg.h | 39 -- 10 files changed, 707 insertions(+), 277 deletions(-) delete mode 100644 drivers/soc/mediatek/mtk-infracfg.c create mode 100644 drivers/soc/mediatek/scpsys.h create mode 100644 include/dt-bindings/power/mt8183-power.h delete mode 100644 include/linux/soc/mediatek/infracfg.h
PATCH v13 1/11 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 v13 2/11 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
@@ -15,6 +15,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:
@@ -27,12 +28,16 @@ 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 MT6765: MUX: "mm", "mfg"
@@ -43,6 +48,15 @@ Required properties: 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 · 1 line
1.8.1.1.dirty
Re: [PATCH v13 02/11] dt-bindings: soc: Add MT8183 power dt-bindings
Hi Weiyi Lu,
Thank you for the patch. Just a trivial comment below.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 69 lines
Add 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.Signed-off-by Weiyi Lu <[email protected]>--- .../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.hDocumentation/devicetree/bindings/soc/mediatek/scpsys.txt +17
-3@@ -15,6 +15,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:@@ -27,12 +28,16 @@ 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 MT6765: MUX: "mm", "mfg"@@ -43,6 +48,15 @@ Required properties: 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 domaininclude/dt-bindings/power/mt8183-power.h new file +0
-0
include/dt-bindings/power/mt8183-power.h line 1
Quoted 1 line
include/dt-bindings/power/mt8183-power.h new file +1
-0@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0
This line should end with a '*/'
include/dt-bindings/power/mt8183-power.h line 2
Quoted 1 line
include/dt-bindings/power/mt8183-power.h new file +1
-0+*
And this line start with a '/'
Quoted 30 lines
include/dt-bindings/power/mt8183-power.h new file +24
-1+* 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 */ --1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v13 02/11] dt-bindings: soc: Add MT8183 power dt-bindings
Quoted 79 lines · Enric Balletbo Serra
Hi Weiyi Lu,
Thank you for the patch. Just a trivial comment below.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 69 lines
Add 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.Signed-off-by Weiyi Lu <[email protected]>--- .../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.hDocumentation/devicetree/bindings/soc/mediatek/scpsys.txt +17
-3@@ -15,6 +15,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:@@ -27,12 +28,16 @@ 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 MT6765: MUX: "mm", "mfg"@@ -43,6 +48,15 @@ Required properties: 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 domaininclude/dt-bindings/power/mt8183-power.h new file +0
-0include/dt-bindings/power/mt8183-power.h line 1
Quoted 1 line
include/dt-bindings/power/mt8183-power.h new file +1
-0@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 This line should end with a '*/'
Quoted 4 lines
include/dt-bindings/power/mt8183-power.h line 2
Quoted 1 line
include/dt-bindings/power/mt8183-power.h new file +1
-0+* And this line start with a '/'
Thanks, I'll fix it in next version.
Quoted 36 lines
Quoted 26 lines
include/dt-bindings/power/mt8183-power.h new file +24
-1+* 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 */ --Quoted 5 lines
1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v13 3/11 soc: mediatek: Add basic_clk_name 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_name of each power domain.
And then use basic_clk_name strings for all compatibles, instead of mixing clk_id and clk_name.
--- drivers/soc/mediatek/mtk-scpsys.c | 138 +++++++++++++------------------------- 1 file changed, 45 insertions(+), 93 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +45 -93
@@ -78,34 +78,6 @@#define PWR_STATUS_HIF1 BIT(26)/* MT7622 */ #define PWR_STATUS_WB BIT(27)/* MT7622 */ -enum clk_id { -CLK_NONE , -CLK_MM , -CLK_MFG , -CLK_VENC , -CLK_VENC_LT , -CLK_ETHIF , -CLK_VDEC , -CLK_HIFSEL , -CLK_JPGDEC , -CLK_AUDIO , -CLK_MAX , -}; - -static const char *const clk_names[] = { -NULL , -"mm" , -"mfg" , -"venc" , -"venc_lt" , -"ethif" , -"vdec" , -"hif_sel" , -"jpgdec" , -"audio" , -NULL , -}; -#define MAX_CLKS 3/**
@@ -116,7 +88,7 @@ enum clk_id {* @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. -* @clk_id: The basic clocks required by this power domain. +* @basic_clk_name: The basic clocks required by this power domain. * @caps: The flag for active wake-up action. */ struct scp_domain_data {
@@ -126,7 +98,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask; -enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_name[MAX_CLKS ];u8 caps; };
@@ -411,12 +383,23 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } -static void init_clks (struct platform_device *pdev,struct clk **clk) +static int init_basic_clks (struct platform_device *pdev,struct clk **clk, +const char *const *name) {int i; -for (i =CLK_NONE +1 ; i <CLK_MAX ; i++) - clk[i] =devm_clk_get (&pdev->dev, clk_names[i]); +for (i =0 ; i <MAX_CLKS && name[i]; i++) { + clk[i] =devm_clk_get (&pdev->dev, name[i]); + +if (IS_ERR (clk[i])) { +dev_err (&pdev->dev, +"get basic clk %s fail %ld\n" , + name[i],PTR_ERR (clk[i])); +return PTR_ERR (clk[i]); + } + } + +return 0 ; } static struct scp *init_scp(struct platform_device *pdev,
@@ -426,9 +409,8 @@ static struct scp *init_scp(struct platform_device *pdev, {struct genpd_onecell_data *pd_data;struct resource *res; -int i, j; +int i, ret;struct scp *scp; -struct clk *clk[CLK_MAX ]; scp =devm_kzalloc (&pdev->dev,sizeof (*scp),GFP_KERNEL );if (!scp)
@@ -481,8 +463,6 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; -init_clks (pdev, clk); -for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;
@@ -493,17 +473,9 @@ 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 (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } - - scpd->clk[j] = c; - } + ret =init_basic_clks (pdev, scpd->clk, data->basic_clk_name); +if (ret) +return ERR_PTR (ret); genpd->name = data->name; genpd->power_off = scpsys_power_off;
@@ -560,7 +532,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {
@@ -568,7 +539,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },
@@ -578,7 +549,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_VDEC] = {
@@ -587,7 +558,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ISP] = {
@@ -596,7 +567,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_BDP] = {
@@ -604,7 +575,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_BDP, .ctl_offs = SPM_BDP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ETH] = {
@@ -613,7 +583,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_HIF] = {
@@ -622,14 +592,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };
@@ -644,7 +613,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VDEC] = {
@@ -653,7 +622,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM, CLK_VDEC}, + .basic_clk_name = {"mm", "vdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VENC] = {
@@ -662,7 +631,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC}, + .basic_clk_name = {"mm", "venc", "jpgdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_ISP] = {
@@ -671,7 +640,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_AUDIO] = {
@@ -680,7 +649,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_AUDIO}, + .basic_clk_name = {"audio"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB] = {
@@ -689,7 +658,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB2] = {
@@ -698,7 +666,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB2_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG] = {
@@ -707,7 +674,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), .caps = MTK_SCPD_ACTIVE_WAKEUP, },
@@ -717,7 +684,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c0, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC2] = {
@@ -726,7 +692,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c4, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC3] = {
@@ -735,7 +700,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x01f8, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };
@@ -760,7 +724,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .basic_clk_name = {"vdec"}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc",
@@ -768,7 +732,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp",
@@ -776,7 +739,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm",
@@ -784,7 +746,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x30C, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = (BIT(1) | BIT(2)), }, [MT6797_POWER_DOMAIN_AUDIO] = {
@@ -793,7 +755,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async",
@@ -801,7 +762,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x334, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT6797_POWER_DOMAIN_MJC] = { .name = "mjc",
@@ -809,7 +770,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, }, };
@@ -834,7 +794,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, .caps = MTK_SCPD_ACTIVE_WAKEUP, },
@@ -844,7 +803,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF0_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },
@@ -854,7 +813,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF1_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, .caps = MTK_SCPD_ACTIVE_WAKEUP, },
@@ -864,7 +823,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, },
@@ -881,7 +839,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {
@@ -890,7 +847,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_HIF] = {
@@ -899,14 +856,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };
@@ -922,7 +878,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_VENC] = { .name = "venc",
@@ -930,7 +886,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC}, + .basic_clk_name = {"mm", "venc"}, }, [MT8173_POWER_DOMAIN_ISP] = { .name = "isp",
@@ -938,7 +894,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_MM] = { .name = "mm",
@@ -946,7 +902,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MM_M0 | MT8173_TOP_AXI_PROT_EN_MM_M1, },
@@ -956,7 +912,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN2_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC_LT}, + .basic_clk_name = {"mm", "venc_lt"}, }, [MT8173_POWER_DOMAIN_AUDIO] = { .name = "audio",
@@ -964,7 +920,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_USB] = { .name = "usb",
@@ -972,7 +927,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT8173_POWER_DOMAIN_MFG_ASYNC] = {
@@ -981,7 +935,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT8173_POWER_DOMAIN_MFG_2D] = { .name = "mfg_2d",
@@ -989,7 +943,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_2D_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_MFG] = { .name = "mfg",
@@ -997,7 +950,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .clk_id = {CLK_NONE}, .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S |MT8173_TOP_AXI_PROT_EN_MFG_M0 | MT8173_TOP_AXI_PROT_EN_MFG_M1 |
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v13 03/11] soc: mediatek: Add basic_clk_name to scp_power_data
Hi Weiyi Lu,
Thank you for your patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 53 lines
Try to stop extending the
clk_idorclk_namesif there are more and more new BASIC clocks. To get its own clocks by thebasic_clk_nameof each power domain.
And then usebasic_clk_namestrings for all compatibles, instead of mixingclk_idandclk_name.Signed-off-by Weiyi Lu <[email protected]>Reviewed-by Nicolas Boichat <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 138 +++++++++++++------------------------- 1 file changed, 45 insertions(+), 93 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +0
-28@@ -78,34 +78,6 @@#define PWR_STATUS_HIF1 BIT(26)/* MT7622 */ #define PWR_STATUS_WB BIT(27)/* MT7622 */ -enum clk_id { -CLK_NONE , -CLK_MM , -CLK_MFG , -CLK_VENC , -CLK_VENC_LT , -CLK_ETHIF , -CLK_VDEC , -CLK_HIFSEL , -CLK_JPGDEC , -CLK_AUDIO , -CLK_MAX , -}; - -static const char *const clk_names[] = { -NULL , -"mm" , -"mfg" , -"venc" , -"venc_lt" , -"ethif" , -"vdec" , -"hif_sel" , -"jpgdec" , -"audio" , -NULL , -}; -#define MAX_CLKS 3/**
drivers/soc/mediatek/mtk-scpsys.c enum clk_id { · line 91
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-1@@ -116,7 +88,7 @@ enum clk_id {* @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. -* @clk_id: The basic clocks required by this power domain. +* @basic_clk_name: The basic clocks required by this power domain.
nit: what's the point on telling it basic_? why not just clk_names?
Quoted 21 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-2* @caps: The flag for active wake-up action. */ struct scp_domain_data {@@ -126,7 +98,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask; -enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_name[MAX_CLKS ];u8 caps; };@@ -411,12 +383,23 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } -static void init_clks (struct platform_device *pdev,struct clk **clk) +static int init_basic_clks (struct platform_device *pdev,struct clk **clk, +const char *const *name) {int i;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 397
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-2-for (i =CLK_NONE +1 ; i <CLK_MAX ; i++) - clk[i] =devm_clk_get (&pdev->dev, clk_names[i]); +for (i =0 ; i <MAX_CLKS && name[i]; i++) { + clk[i] =devm_clk_get (&pdev->dev, name[i]); + +if (IS_ERR (clk[i])) { +dev_err (&pdev->dev, +"get basic clk %s fail %ld\n" , + name[i],PTR_ERR (clk[i]));
devm_clk_get() will already print an error if fails, this print is redundant, so you can remove it.
Quoted 438 lines
drivers/soc/mediatek/mtk-scpsys.c +34
-61+return PTR_ERR (clk[i]); + } + } + +return 0 ; } static struct scp *init_scp(struct platform_device *pdev,@@ -426,9 +409,8 @@ static struct scp *init_scp(struct platform_device *pdev, {struct genpd_onecell_data *pd_data;struct resource *res; -int i, j; +int i, ret;struct scp *scp; -struct clk *clk[CLK_MAX ]; scp =devm_kzalloc (&pdev->dev,sizeof (*scp),GFP_KERNEL );if (!scp)@@ -481,8 +463,6 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; -init_clks (pdev, clk); -for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;@@ -493,17 +473,9 @@ 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 (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } - - scpd->clk[j] = c; - } + ret =init_basic_clks (pdev, scpd->clk, data->basic_clk_name); +if (ret) +return ERR_PTR (ret); genpd->name = data->name; genpd->power_off = scpsys_power_off;@@ -560,7 +532,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {@@ -568,7 +539,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -578,7 +549,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_VDEC] = {@@ -587,7 +558,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ISP] = {@@ -596,7 +567,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_BDP] = {@@ -604,7 +575,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_BDP, .ctl_offs = SPM_BDP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ETH] = {@@ -613,7 +583,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_HIF] = {@@ -622,14 +592,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -644,7 +613,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VDEC] = {@@ -653,7 +622,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM, CLK_VDEC}, + .basic_clk_name = {"mm", "vdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VENC] = {@@ -662,7 +631,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC}, + .basic_clk_name = {"mm", "venc", "jpgdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_ISP] = {@@ -671,7 +640,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_AUDIO] = {@@ -680,7 +649,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_AUDIO}, + .basic_clk_name = {"audio"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB] = {@@ -689,7 +658,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB2] = {@@ -698,7 +666,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB2_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG] = {@@ -707,7 +674,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -717,7 +684,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c0, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC2] = {@@ -726,7 +692,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c4, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC3] = {@@ -735,7 +700,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x01f8, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -760,7 +724,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .basic_clk_name = {"vdec"}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc",@@ -768,7 +732,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp",@@ -776,7 +739,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm",@@ -784,7 +746,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x30C, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = (BIT(1) | BIT(2)), }, [MT6797_POWER_DOMAIN_AUDIO] = {@@ -793,7 +755,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async",@@ -801,7 +762,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x334, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT6797_POWER_DOMAIN_MJC] = { .name = "mjc",@@ -809,7 +770,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, }, };@@ -834,7 +794,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -844,7 +803,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF0_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -854,7 +813,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF1_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -864,7 +823,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, },@@ -881,7 +839,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {@@ -890,7 +847,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_HIF] = {@@ -899,14 +856,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -922,7 +878,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_VENC] = { .name = "venc",@@ -930,7 +886,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC}, + .basic_clk_name = {"mm", "venc"}, }, [MT8173_POWER_DOMAIN_ISP] = { .name = "isp",@@ -938,7 +894,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_MM] = { .name = "mm",@@ -946,7 +902,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MM_M0 | MT8173_TOP_AXI_PROT_EN_MM_M1, },@@ -956,7 +912,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN2_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC_LT}, + .basic_clk_name = {"mm", "venc_lt"}, }, [MT8173_POWER_DOMAIN_AUDIO] = { .name = "audio",@@ -964,7 +920,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_USB] = { .name = "usb",@@ -972,7 +927,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT8173_POWER_DOMAIN_MFG_ASYNC] = {@@ -981,7 +935,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT8173_POWER_DOMAIN_MFG_2D] = { .name = "mfg_2d",@@ -989,7 +943,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_2D_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_MFG] = { .name = "mfg",@@ -997,7 +950,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .clk_id = {CLK_NONE}, .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S |MT8173_TOP_AXI_PROT_EN_MFG_M0 | MT8173_TOP_AXI_PROT_EN_MFG_M1 | --1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v13 03/11] soc: mediatek: Add basic_clk_name to scp_power_data
Quoted 57 lines · Enric Balletbo Serra
Hi Weiyi Lu,
Thank you for your patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 51 lines
Try to stop extending the
clk_idorclk_namesif there are more and more new BASIC clocks. To get its own clocks by thebasic_clk_nameof each power domain.
And then usebasic_clk_namestrings for all compatibles, instead of mixingclk_idandclk_name.Signed-off-by Weiyi Lu <[email protected]>Reviewed-by Nicolas Boichat <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 138 +++++++++++++------------------------- 1 file changed, 45 insertions(+), 93 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +0
-28@@ -78,34 +78,6 @@#define PWR_STATUS_HIF1 BIT(26)/* MT7622 */ #define PWR_STATUS_WB BIT(27)/* MT7622 */ -enum clk_id { -CLK_NONE , -CLK_MM , -CLK_MFG , -CLK_VENC , -CLK_VENC_LT , -CLK_ETHIF , -CLK_VDEC , -CLK_HIFSEL , -CLK_JPGDEC , -CLK_AUDIO , -CLK_MAX , -}; - -static const char *const clk_names[] = { -NULL , -"mm" , -"mfg" , -"venc" , -"venc_lt" , -"ethif" , -"vdec" , -"hif_sel" , -"jpgdec" , -"audio" , -NULL , -}; -#define MAX_CLKS 3
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c enum clk_id { · line 91
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-1/** @@ -116,7 +88,7 @@ enum clk_id {* @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. -* @clk_id: The basic clocks required by this power domain. +* @basic_clk_name: The basic clocks required by this power domain. nit: what's the point on telling it
basic_? why not justclk_names?
Because I'll introduce subsys clock for bus protection in the PATCH 06.
Quoted 22 lines
Quoted 22 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-2* @caps: The flag for active wake-up action. */ struct scp_domain_data {@@ -126,7 +98,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask; -enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_name[MAX_CLKS ];u8 caps; };@@ -411,12 +383,23 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } -static void init_clks (struct platform_device *pdev,struct clk **clk) +static int init_basic_clks (struct platform_device *pdev,struct clk **clk, +const char *const *name) {int i;
Quoted 13 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 397
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-2-for (i =CLK_NONE +1 ; i <CLK_MAX ; i++) - clk[i] =devm_clk_get (&pdev->dev, clk_names[i]); +for (i =0 ; i <MAX_CLKS && name[i]; i++) { + clk[i] =devm_clk_get (&pdev->dev, name[i]); + +if (IS_ERR (clk[i])) { +dev_err (&pdev->dev, +"get basic clk %s fail %ld\n" , + name[i],PTR_ERR (clk[i]));
devm_clk_get()will already print an error if fails, this print is redundant, so you can remove it.
Thanks, I'll fix it in next version.
Quoted 444 lines
Quoted 434 lines
drivers/soc/mediatek/mtk-scpsys.c +34
-61+return PTR_ERR (clk[i]); + } + } + +return 0 ; } static struct scp *init_scp(struct platform_device *pdev,@@ -426,9 +409,8 @@ static struct scp *init_scp(struct platform_device *pdev, {struct genpd_onecell_data *pd_data;struct resource *res; -int i, j; +int i, ret;struct scp *scp; -struct clk *clk[CLK_MAX ]; scp =devm_kzalloc (&pdev->dev,sizeof (*scp),GFP_KERNEL );if (!scp)@@ -481,8 +463,6 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; -init_clks (pdev, clk); -for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;@@ -493,17 +473,9 @@ 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 (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); - } - - scpd->clk[j] = c; - } + ret =init_basic_clks (pdev, scpd->clk, data->basic_clk_name); +if (ret) +return ERR_PTR (ret); genpd->name = data->name; genpd->power_off = scpsys_power_off;@@ -560,7 +532,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {@@ -568,7 +539,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -578,7 +549,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_VDEC] = {@@ -587,7 +558,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ISP] = {@@ -596,7 +567,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_BDP] = {@@ -604,7 +575,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_BDP, .ctl_offs = SPM_BDP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ETH] = {@@ -613,7 +583,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_HIF] = {@@ -622,14 +592,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -644,7 +613,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VDEC] = {@@ -653,7 +622,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM, CLK_VDEC}, + .basic_clk_name = {"mm", "vdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VENC] = {@@ -662,7 +631,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC}, + .basic_clk_name = {"mm", "venc", "jpgdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_ISP] = {@@ -671,7 +640,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_AUDIO] = {@@ -680,7 +649,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_AUDIO}, + .basic_clk_name = {"audio"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB] = {@@ -689,7 +658,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB2] = {@@ -698,7 +666,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB2_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG] = {@@ -707,7 +674,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -717,7 +684,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c0, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC2] = {@@ -726,7 +692,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c4, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC3] = {@@ -735,7 +700,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x01f8, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -760,7 +724,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .basic_clk_name = {"vdec"}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc",@@ -768,7 +732,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp",@@ -776,7 +739,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm",@@ -784,7 +746,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x30C, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = (BIT(1) | BIT(2)), }, [MT6797_POWER_DOMAIN_AUDIO] = {@@ -793,7 +755,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async",@@ -801,7 +762,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x334, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT6797_POWER_DOMAIN_MJC] = { .name = "mjc",@@ -809,7 +770,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, }, };@@ -834,7 +794,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -844,7 +803,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF0_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -854,7 +813,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF1_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, .caps = MTK_SCPD_ACTIVE_WAKEUP, },@@ -864,7 +823,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, },@@ -881,7 +839,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {@@ -890,7 +847,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_HIF] = {@@ -899,14 +856,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, };@@ -922,7 +878,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_VENC] = { .name = "venc",@@ -930,7 +886,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC}, + .basic_clk_name = {"mm", "venc"}, }, [MT8173_POWER_DOMAIN_ISP] = { .name = "isp",@@ -938,7 +894,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_MM] = { .name = "mm",@@ -946,7 +902,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MM_M0 | MT8173_TOP_AXI_PROT_EN_MM_M1, },@@ -956,7 +912,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN2_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC_LT}, + .basic_clk_name = {"mm", "venc_lt"}, }, [MT8173_POWER_DOMAIN_AUDIO] = { .name = "audio",@@ -964,7 +920,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_USB] = { .name = "usb",@@ -972,7 +927,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT8173_POWER_DOMAIN_MFG_ASYNC] = {@@ -981,7 +935,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT8173_POWER_DOMAIN_MFG_2D] = { .name = "mfg_2d",@@ -989,7 +943,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_2D_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_MFG] = { .name = "mfg",@@ -997,7 +950,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .clk_id = {CLK_NONE}, .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S |MT8173_TOP_AXI_PROT_EN_MFG_M0 | MT8173_TOP_AXI_PROT_EN_MFG_M1 | --Quoted 5 lines
1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v13 4/11 soc: mediatek: Remove infracfg misc driver support
In reply to Weiyi LuThe functions provided by infracfg misc driver have no other user except the scpsys driver so move those into scpsys driver directly. And then, remove infracfg misc drvier which is no longer being used. BTW, in next patch, we're going to extend the bus protection functions with more customized arguments.
--- drivers/soc/mediatek/Kconfig | 10 ----- drivers/soc/mediatek/Makefile | 1 - drivers/soc/mediatek/mtk-infracfg.c | 79 ----------------------------------- drivers/soc/mediatek/mtk-scpsys.c | 44 +++++++++++++++---- drivers/soc/mediatek/scpsys.h | 28 +++++++++++++ include/linux/soc/mediatek/infracfg.h | 39 ----------------- 6 files changed, 63 insertions(+), 138 deletions(-) delete mode 100644 drivers/soc/mediatek/mtk-infracfg.c create mode 100644 drivers/soc/mediatek/scpsys.h delete mode 100644 include/linux/soc/mediatek/infracfg.h
drivers/soc/mediatek/Kconfig +0 -10
@@ -10,21 +10,12 @@ config MTK_CMDQ depends on ARCH_MEDIATEK || COMPILE_TEST select MAILBOX select MTK_CMDQ_MBOX - select MTK_INFRACFG help Say yes here to add support for the MediaTek Command Queue (CMDQ) driver. The CMDQ is used to help read/write registers with critical time limitation, such as updating display configuration during the vblank. -config MTK_INFRACFG - bool "MediaTek INFRACFG Support" - select REGMAP - help - Say yes here to add support for the MediaTek INFRACFG controller. The - INFRACFG controller contains various infrastructure registers not - directly associated to any device. - config MTK_PMIC_WRAP tristate "MediaTek PMIC Wrapper Support" depends on RESET_CONTROLLER
@@ -38,7 +29,6 @@ config MTK_SCPSYS bool "MediaTek SCPSYS Support" default ARCH_MEDIATEK select REGMAP - select MTK_INFRACFG select PM_GENERIC_DOMAINS if PM help Say yes here to add support for the MediaTek SCPSYS power domain
drivers/soc/mediatek/Makefile +0 -1
@@ -1,5 +1,4 @@ # 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_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o
drivers/soc/mediatek/mtk-infracfg.c deleted +0 -79
79 lines not on this page · raw message
drivers/soc/mediatek/mtk-scpsys.c +35 -9
68 lines not on this page · raw message
drivers/soc/mediatek/scpsys.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_H +#define __SOC_MEDIATEK_SCPSYS_H + +#define INFRA_TOPAXI_PROTECTEN 0x0220 +#define INFRA_TOPAXI_PROTECTSTA1 0x0228 +#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 +#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 + +#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) +#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) + +#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) +#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) +#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ + BIT(28)) +#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ + BIT(7) | BIT(8)) + +#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) +#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) +#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) +#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) +#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) + +#endif /* __SOC_MEDIATEK_SCPSYS_H */
include/linux/soc/mediatek/infracfg.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_MEDIATEK_INFRACFG_H -#define __SOC_MEDIATEK_INFRACFG_H - -#define MT8173_TOP_AXI_PROT_EN_MCI_M2 BIT(0) -#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) -#define MT8173_TOP_AXI_PROT_EN_MMAPB_S BIT(6) -#define MT8173_TOP_AXI_PROT_EN_L2C_M2 BIT(9) -#define MT8173_TOP_AXI_PROT_EN_L2SS_SMI BIT(11) -#define MT8173_TOP_AXI_PROT_EN_L2SS_ADD BIT(12) -#define MT8173_TOP_AXI_PROT_EN_CCI_M2 BIT(13) -#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) -#define MT8173_TOP_AXI_PROT_EN_PERI_M0 BIT(15) -#define MT8173_TOP_AXI_PROT_EN_PERI_M1 BIT(16) -#define MT8173_TOP_AXI_PROT_EN_DEBUGSYS BIT(17) -#define MT8173_TOP_AXI_PROT_EN_CQ_DMA BIT(18) -#define MT8173_TOP_AXI_PROT_EN_GCPU BIT(19) -#define MT8173_TOP_AXI_PROT_EN_IOMMU BIT(20) -#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) -#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) -#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) - -#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) -#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) - -#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) -#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) -#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ - BIT(28)) -#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ - BIT(7) | BIT(8)) - -int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -int mtk_infracfg_clear_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -#endif /* __SOC_MEDIATEK_INFRACFG_H */
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v13 04/11] soc: mediatek: Remove infracfg misc driver support
Hi Weiyi Lu,
Thank you for the patch
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 154 lines
The functions provided by infracfg misc driver have no other user except the scpsys driver so move those into scpsys driver directly. And then, remove infracfg misc drvier which is no longer being used. BTW, in next patch, we're going to extend the bus protection functions with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Kconfig | 10 ----- drivers/soc/mediatek/Makefile | 1 - drivers/soc/mediatek/mtk-infracfg.c | 79 ----------------------------------- drivers/soc/mediatek/mtk-scpsys.c | 44 +++++++++++++++---- drivers/soc/mediatek/scpsys.h | 28 +++++++++++++ include/linux/soc/mediatek/infracfg.h | 39 ----------------- 6 files changed, 63 insertions(+), 138 deletions(-) delete mode 100644 drivers/soc/mediatek/mtk-infracfg.c create mode 100644 drivers/soc/mediatek/scpsys.h delete mode 100644 include/linux/soc/mediatek/infracfg.hdrivers/soc/mediatek/Kconfig +0
-10@@ -10,21 +10,12 @@ config MTK_CMDQ depends on ARCH_MEDIATEK || COMPILE_TEST select MAILBOX select MTK_CMDQ_MBOX - select MTK_INFRACFG help Say yes here to add support for the MediaTek Command Queue (CMDQ) driver. The CMDQ is used to help read/write registers with critical time limitation, such as updating display configuration during the vblank. -config MTK_INFRACFG - bool "MediaTek INFRACFG Support" - select REGMAP - help - Say yes here to add support for the MediaTek INFRACFG controller. The - INFRACFG controller contains various infrastructure registers not - directly associated to any device. - config MTK_PMIC_WRAP tristate "MediaTek PMIC Wrapper Support" depends on RESET_CONTROLLER@@ -38,7 +29,6 @@ config MTK_SCPSYS bool "MediaTek SCPSYS Support" default ARCH_MEDIATEK select REGMAP - select MTK_INFRACFG select PM_GENERIC_DOMAINS if PM help Say yes here to add support for the MediaTek SCPSYS power domaindrivers/soc/mediatek/Makefile +0
-1@@ -1,5 +1,4 @@ # 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_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-infracfg.c deleted +0
-79@@ -1,79 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Copyright (c) 2015 Pengutronix, Sascha Hauer <[email protected]> -*/ - -#include <linux/export.h> -#include <linux/jiffies.h> -#include <linux/regmap.h> -#include <linux/soc/mediatek/infracfg.h> -#include <asm/processor.h> - -#define MTK_POLL_DELAY_US 10 -#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ)) - -#define INFRA_TOPAXI_PROTECTEN 0x0220 -#define INFRA_TOPAXI_PROTECTSTA1 0x0228 -#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 -#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 - -/** -* mtk_infracfg_set_bus_protection - enable bus protection -* @regmap: The infracfg regmap -* @mask: The mask containing the protection bits to be enabled. -* @reg_update: The boolean flag determines to set the protection bits -* by regmap_update_bits with enable register(PROTECTEN) or -* by regmap_write with set register(PROTECTEN_SET). -* -* This function enables the bus protection bits for disabled power -* domains so that the system does not hang when some unit accesses the -* bus while in power down. -*/ -int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update) -{ -u32 val; -int ret; - -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, - mask); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); - - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, (val & mask) == mask, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); - -return ret; -} - -/** -* mtk_infracfg_clear_bus_protection - disable bus protection -* @regmap: The infracfg regmap -* @mask: The mask containing the protection bits to be disabled. -* @reg_update: The boolean flag determines to clear the protection bits -* by regmap_update_bits with enable register(PROTECTEN) or -* by regmap_write with clear register(PROTECTEN_CLR). -* -* This function disables the bus protection bits previously enabled with -* mtk_infracfg_set_bus_protection. -*/ - -int mtk_infracfg_clear_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update) -{ -int ret; -u32 val; - -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); - - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, !(val & mask), -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); - -return ret; -}drivers/soc/mediatek/mtk-scpsys.c +0
-0
drivers/soc/mediatek/mtk-scpsys.c line 15
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-1@@ -10,8 +10,9 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> -#include <linux/soc/mediatek/infracfg.h> +#include "scpsys.h"
Are the defines in this include going to be used somewhere else? Otherwise, you can add the defines in this file directly.
Quoted 147 lines
drivers/soc/mediatek/mtk-scpsys.c +33
-8#include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -251,25 +252,50 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr)static int scpsys_bus_protect_enable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +struct regmap *infracfg = scp->infracfg; +u32 mask = scpd->data->bus_prot_mask; +bool reg_update = scp->bus_prot_reg_update; +u32 val; +int ret; -if (!scpd->data->bus_prot_mask) +if (!mask)return 0 ; -return mtk_infracfg_set_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +if (reg_update) +regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, + mask); +else +regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); + + ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , + val, (val & mask) == mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + +return ret; }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +struct regmap *infracfg = scp->infracfg; +u32 mask = scpd->data->bus_prot_mask; +bool reg_update = scp->bus_prot_reg_update; +u32 val; +int ret; -if (!scpd->data->bus_prot_mask) +if (!mask)return 0 ; -return mtk_infracfg_clear_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +if (reg_update) +regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); +else +regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); + + ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , + val, !(val & mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + +return ret; }static int scpsys_power_on (struct generic_pm_domain *genpd)drivers/soc/mediatek/scpsys.h new file +28
-0@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_H +#define __SOC_MEDIATEK_SCPSYS_H + +#define INFRA_TOPAXI_PROTECTEN 0x0220 +#define INFRA_TOPAXI_PROTECTSTA1 0x0228 +#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 +#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 + +#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) +#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) + +#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) +#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) +#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ + BIT(28)) +#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ + BIT(7) | BIT(8)) + +#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) +#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) +#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) +#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) +#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) + +#endif /* __SOC_MEDIATEK_SCPSYS_H */ include/linux/soc/mediatek/infracfg.h deleted +0
-40@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_MEDIATEK_INFRACFG_H -#define __SOC_MEDIATEK_INFRACFG_H - -#define MT8173_TOP_AXI_PROT_EN_MCI_M2 BIT(0) -#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) -#define MT8173_TOP_AXI_PROT_EN_MMAPB_S BIT(6) -#define MT8173_TOP_AXI_PROT_EN_L2C_M2 BIT(9) -#define MT8173_TOP_AXI_PROT_EN_L2SS_SMI BIT(11) -#define MT8173_TOP_AXI_PROT_EN_L2SS_ADD BIT(12) -#define MT8173_TOP_AXI_PROT_EN_CCI_M2 BIT(13) -#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) -#define MT8173_TOP_AXI_PROT_EN_PERI_M0 BIT(15) -#define MT8173_TOP_AXI_PROT_EN_PERI_M1 BIT(16) -#define MT8173_TOP_AXI_PROT_EN_DEBUGSYS BIT(17) -#define MT8173_TOP_AXI_PROT_EN_CQ_DMA BIT(18) -#define MT8173_TOP_AXI_PROT_EN_GCPU BIT(19) -#define MT8173_TOP_AXI_PROT_EN_IOMMU BIT(20) -#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) -#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) -#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) - -#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) -#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) - -#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) -#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) -#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ - BIT(28)) -#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ - BIT(7) | BIT(8)) - -int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -int mtk_infracfg_clear_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -#endif /* __SOC_MEDIATEK_INFRACFG_H */ --1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v13 04/11] soc: mediatek: Remove infracfg misc driver support
Quoted 162 lines · Enric Balletbo Serra
Hi Weiyi Lu,
Thank you for the patch
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 156 lines
The functions provided by infracfg misc driver have no other user except the scpsys driver so move those into scpsys driver directly. And then, remove infracfg misc drvier which is no longer being used. BTW, in next patch, we're going to extend the bus protection functions with more customized arguments.
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Kconfig | 10 ----- drivers/soc/mediatek/Makefile | 1 - drivers/soc/mediatek/mtk-infracfg.c | 79 ----------------------------------- drivers/soc/mediatek/mtk-scpsys.c | 44 +++++++++++++++---- drivers/soc/mediatek/scpsys.h | 28 +++++++++++++ include/linux/soc/mediatek/infracfg.h | 39 ----------------- 6 files changed, 63 insertions(+), 138 deletions(-) delete mode 100644 drivers/soc/mediatek/mtk-infracfg.c create mode 100644 drivers/soc/mediatek/scpsys.h delete mode 100644 include/linux/soc/mediatek/infracfg.hdrivers/soc/mediatek/Kconfig +0
-10@@ -10,21 +10,12 @@ config MTK_CMDQ depends on ARCH_MEDIATEK || COMPILE_TEST select MAILBOX select MTK_CMDQ_MBOX - select MTK_INFRACFG help Say yes here to add support for the MediaTek Command Queue (CMDQ) driver. The CMDQ is used to help read/write registers with critical time limitation, such as updating display configuration during the vblank. -config MTK_INFRACFG - bool "MediaTek INFRACFG Support" - select REGMAP - help - Say yes here to add support for the MediaTek INFRACFG controller. The - INFRACFG controller contains various infrastructure registers not - directly associated to any device. - config MTK_PMIC_WRAP tristate "MediaTek PMIC Wrapper Support" depends on RESET_CONTROLLER@@ -38,7 +29,6 @@ config MTK_SCPSYS bool "MediaTek SCPSYS Support" default ARCH_MEDIATEK select REGMAP - select MTK_INFRACFG select PM_GENERIC_DOMAINS if PM help Say yes here to add support for the MediaTek SCPSYS power domaindrivers/soc/mediatek/Makefile +0
-1@@ -1,5 +1,4 @@ # 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_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-infracfg.c deleted +0
-79@@ -1,79 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Copyright (c) 2015 Pengutronix, Sascha Hauer <[email protected]> -*/ - -#include <linux/export.h> -#include <linux/jiffies.h> -#include <linux/regmap.h> -#include <linux/soc/mediatek/infracfg.h> -#include <asm/processor.h> - -#define MTK_POLL_DELAY_US 10 -#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ)) - -#define INFRA_TOPAXI_PROTECTEN 0x0220 -#define INFRA_TOPAXI_PROTECTSTA1 0x0228 -#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 -#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 - -/** -* mtk_infracfg_set_bus_protection - enable bus protection -* @regmap: The infracfg regmap -* @mask: The mask containing the protection bits to be enabled. -* @reg_update: The boolean flag determines to set the protection bits -* by regmap_update_bits with enable register(PROTECTEN) or -* by regmap_write with set register(PROTECTEN_SET). -* -* This function enables the bus protection bits for disabled power -* domains so that the system does not hang when some unit accesses the -* bus while in power down. -*/ -int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update) -{ -u32 val; -int ret; - -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, - mask); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); - - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, (val & mask) == mask, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); - -return ret; -} - -/** -* mtk_infracfg_clear_bus_protection - disable bus protection -* @regmap: The infracfg regmap -* @mask: The mask containing the protection bits to be disabled. -* @reg_update: The boolean flag determines to clear the protection bits -* by regmap_update_bits with enable register(PROTECTEN) or -* by regmap_write with clear register(PROTECTEN_CLR). -* -* This function disables the bus protection bits previously enabled with -* mtk_infracfg_set_bus_protection. -*/ - -int mtk_infracfg_clear_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update) -{ -int ret; -u32 val; - -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); - - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, !(val & mask), -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); - -return ret; -}drivers/soc/mediatek/mtk-scpsys.c +0
-0@@ -10,8 +10,9 @@#include <linux/of_device.h> #include <linux/platform_device.h>
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c line 15
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-1#include <linux/pm_domain.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> -#include <linux/soc/mediatek/infracfg.h> +#include "scpsys.h" Are the defines in this include going to be used somewhere else? Otherwise, you can add the defines in this file directly.
Supposed to be NO, so I'll add directly in this file in next version.
Quoted 153 lines
Quoted 143 lines
drivers/soc/mediatek/mtk-scpsys.c +33
-8#include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -251,25 +252,50 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr)static int scpsys_bus_protect_enable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +struct regmap *infracfg = scp->infracfg; +u32 mask = scpd->data->bus_prot_mask; +bool reg_update = scp->bus_prot_reg_update; +u32 val; +int ret; -if (!scpd->data->bus_prot_mask) +if (!mask)return 0 ; -return mtk_infracfg_set_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +if (reg_update) +regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, + mask); +else +regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); + + ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , + val, (val & mask) == mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + +return ret; }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +struct regmap *infracfg = scp->infracfg; +u32 mask = scpd->data->bus_prot_mask; +bool reg_update = scp->bus_prot_reg_update; +u32 val; +int ret; -if (!scpd->data->bus_prot_mask) +if (!mask)return 0 ; -return mtk_infracfg_clear_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); +if (reg_update) +regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); +else +regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); + + ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , + val, !(val & mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + +return ret; }static int scpsys_power_on (struct generic_pm_domain *genpd)drivers/soc/mediatek/scpsys.h new file +28
-0@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_H +#define __SOC_MEDIATEK_SCPSYS_H + +#define INFRA_TOPAXI_PROTECTEN 0x0220 +#define INFRA_TOPAXI_PROTECTSTA1 0x0228 +#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 +#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 + +#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) +#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) + +#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) +#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) +#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ + BIT(28)) +#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ + BIT(7) | BIT(8)) + +#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) +#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) +#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) +#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) +#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) +#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) + +#endif /* __SOC_MEDIATEK_SCPSYS_H */ include/linux/soc/mediatek/infracfg.h deleted +0
-40@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_MEDIATEK_INFRACFG_H -#define __SOC_MEDIATEK_INFRACFG_H - -#define MT8173_TOP_AXI_PROT_EN_MCI_M2 BIT(0) -#define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) -#define MT8173_TOP_AXI_PROT_EN_MMAPB_S BIT(6) -#define MT8173_TOP_AXI_PROT_EN_L2C_M2 BIT(9) -#define MT8173_TOP_AXI_PROT_EN_L2SS_SMI BIT(11) -#define MT8173_TOP_AXI_PROT_EN_L2SS_ADD BIT(12) -#define MT8173_TOP_AXI_PROT_EN_CCI_M2 BIT(13) -#define MT8173_TOP_AXI_PROT_EN_MFG_S BIT(14) -#define MT8173_TOP_AXI_PROT_EN_PERI_M0 BIT(15) -#define MT8173_TOP_AXI_PROT_EN_PERI_M1 BIT(16) -#define MT8173_TOP_AXI_PROT_EN_DEBUGSYS BIT(17) -#define MT8173_TOP_AXI_PROT_EN_CQ_DMA BIT(18) -#define MT8173_TOP_AXI_PROT_EN_GCPU BIT(19) -#define MT8173_TOP_AXI_PROT_EN_IOMMU BIT(20) -#define MT8173_TOP_AXI_PROT_EN_MFG_M0 BIT(21) -#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) -#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) - -#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) -#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) -#define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) - -#define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) -#define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) -#define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \ - BIT(28)) -#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ - BIT(7) | BIT(8)) - -int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -int mtk_infracfg_clear_bus_protection (struct regmap *infracfg,u32 mask, -bool reg_update); -#endif /* __SOC_MEDIATEK_INFRACFG_H */ --Quoted 5 lines
1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v13 5/11 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.
Extend function to support multiple step bus protection control with more customized arguments.
And then use bp_table for bus protection of all compatibles, instead of mixing bus_prot_mask and bus_prot_reg_update.
--- drivers/soc/mediatek/mtk-scpsys.c | 206 ++++++++++++++++++++++++++------------ drivers/soc/mediatek/scpsys.h | 42 +++++++- 2 files changed, 182 insertions(+), 66 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +144 -62
@@ -88,9 +88,9 @@* @ctl_offs: The offset for main power control register. * @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. * @basic_clk_name: The basic clocks required by this power domain. * @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;
@@ -98,9 +98,9 @@ struct scp_domain_data {int ctl_offs;u32 sram_pdn_bits;u32 sram_pdn_ack_bits; -u32 bus_prot_mask;const char *basic_clk_name[MAX_CLKS ];u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;
@@ -124,8 +124,8 @@ 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; };struct scp_subdomain {
@@ -139,7 +139,6 @@ struct scp_soc_data {const struct scp_subdomain *subdomains;int num_subdomains;const struct scp_ctrl_reg regs; -bool bus_prot_reg_update; };static int scpsys_domain_is_on (struct scp_domain *scpd)
@@ -249,53 +248,102 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); } +static int set_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val; +u32 set_ofs = bp->set_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask; + +if (set_ofs) +regmap_write (map, set_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask, mask); + +return regmap_read_poll_timeout (map, sta_ofs, + val, (val & mask) == mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +static int clear_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val; +u32 clr_ofs = bp->clr_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask; +bool ignore_ack = bp->ignore_clr_ack; + +if (clr_ofs) +regmap_write (map, clr_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask,0 ); + +if (ignore_ack) +return 0 ; + +return regmap_read_poll_timeout (map, sta_ofs, + val, !(val & mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} +static int scpsys_bus_protect_enable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val; -int ret; +struct regmap *smi_common = scp->smi_common; +int i; -if (!mask) -return 0 ; +for (i =0 ; i <MAX_STEPS ; i++) { +struct regmap *map =NULL ; +int ret; +struct bus_prot bp = bp_table[i]; -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, - mask); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); +if (bp.type ==IFR_TYPE ) + map = infracfg; +else if (bp.type ==SMI_TYPE ) + map = smi_common; +else +break ; - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, (val & mask) == mask, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =set_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val; -int ret; +struct regmap *smi_common = scp->smi_common; +int i; -if (!mask) -return 0 ; +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; +struct bus_prot bp = bp_table[i]; -if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); +if (bp.type ==IFR_TYPE ) + map = infracfg; +else if (bp.type ==SMI_TYPE ) + map = smi_common; +else +continue ; - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, !(val & mask), -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =clear_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_power_on (struct generic_pm_domain *genpd)
@@ -430,8 +478,7 @@ static int init_basic_clks(struct platform_device *pdev, struct clk **clk,static struct scp *init_scp (struct platform_device *pdev,const struct scp_domain_data *scp_domain_data,int num, -const struct scp_ctrl_reg *scp_ctrl_reg, -bool bus_prot_reg_update) +const struct scp_ctrl_reg *scp_ctrl_reg) {struct genpd_onecell_data *pd_data;struct resource *res;
@@ -445,8 +492,6 @@ static struct scp *init_scp(struct platform_device *pdev, scp->ctrl_reg.pwr_sta_offs = scp_ctrl_reg->pwr_sta_offs; scp->ctrl_reg.pwr_sta2nd_offs = scp_ctrl_reg->pwr_sta2nd_offs; - scp->bus_prot_reg_update = bus_prot_reg_update; - scp->dev = &pdev->dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -474,6 +519,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];
@@ -556,8 +612,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {
@@ -566,7 +625,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .basic_clk_name = {"mm"}, - .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT2701_TOP_AXI_PROT_EN_MM_M0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_MFG] = {
@@ -701,7 +763,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), .basic_clk_name = {"mfg"}, - .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x260 ,0x264 ,0x220 ,0x228 , + BIT(14) | BIT(21) | BIT(23)), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC1] = {
@@ -773,7 +838,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask = (BIT(1) | BIT(2)), + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + BIT(1) | BIT(2)), + }, }, [MT6797_POWER_DOMAIN_AUDIO] = { .name = "audio",
@@ -820,7 +888,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_ETHSYS), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF0] = {
@@ -830,7 +901,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF1] = {
@@ -840,7 +914,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF1), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_WB] = {
@@ -849,7 +926,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, + .bp_table = { + BUS_PROT(IFR_TYPE, 0, 0, 0x220, 0x228, + MT7622_TOP_AXI_PROT_EN_WB), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, }, };
@@ -863,8 +943,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {
@@ -929,8 +1012,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MM_M0 | - MT8173_TOP_AXI_PROT_EN_MM_M1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MM_M0 | + MT8173_TOP_AXI_PROT_EN_MM_M1), + }, }, [MT8173_POWER_DOMAIN_VENC_LT] = { .name = "venc_lt",
@@ -976,10 +1062,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S | -MT8173_TOP_AXI_PROT_EN_MFG_M0 | -MT8173_TOP_AXI_PROT_EN_MFG_M1 | - MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MFG_S | +MT8173_TOP_AXI_PROT_EN_MFG_M0 | +MT8173_TOP_AXI_PROT_EN_MFG_M1 | + MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT), + }, }, };
@@ -995,7 +1084,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt2712_data = {
@@ -1007,7 +1095,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = false, };static const struct scp_soc_data mt6797_data = {
@@ -1019,7 +1106,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS_MT6797, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND_MT6797 }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7622_data = {
@@ -1029,7 +1115,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7623a_data = {
@@ -1039,7 +1124,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt8173_data = {
@@ -1051,7 +1135,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };/*
@@ -1092,8 +1175,7 @@ static int scpsys_probe(struct platform_device *pdev) soc =of_device_get_match_data (&pdev->dev); - scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs, - soc->bus_prot_reg_update); + scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs);if (IS_ERR (scp))return PTR_ERR (scp);
drivers/soc/mediatek/scpsys.h +38 -4
52 lines not on this page · raw message
Signature · 1 line
1.8.1.1.dirty
Re: [PATCH v13 05/11] soc: mediatek: Add multiple step bus protection control
Hi Wiyi Lu,
Thank you for your patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 60 lines
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.
Extend function to support multiple step bus protection control with more customized arguments.
And then usebp_tablefor bus protection of all compatibles, instead of mixingbus_prot_maskandbus_prot_reg_update.Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 206 ++++++++++++++++++++++++++------------ drivers/soc/mediatek/scpsys.h | 42 +++++++- 2 files changed, 182 insertions(+), 66 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +3
-4@@ -88,9 +88,9 @@* @ctl_offs: The offset for main power control register. * @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. * @basic_clk_name: The basic clocks required by this power domain. * @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;@@ -98,9 +98,9 @@ struct scp_domain_data {int ctl_offs;u32 sram_pdn_bits;u32 sram_pdn_ack_bits; -u32 bus_prot_mask;const char *basic_clk_name[MAX_CLKS ];u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;@@ -124,8 +124,8 @@ 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; };struct scp_subdomain {@@ -139,7 +139,6 @@ struct scp_soc_data {const struct scp_subdomain *subdomains;int num_subdomains;const struct scp_ctrl_reg regs; -bool bus_prot_reg_update; };static int scpsys_domain_is_on (struct scp_domain *scpd)
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 257
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-0@@ -249,53 +248,102 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); } +static int set_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val; +u32 set_ofs = bp->set_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask;
Remove unnecessary local variables (set_ofs, en_ofs, sta_ofs and mask), and use their bp-> form directly.
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+ +if (set_ofs) +regmap_write (map, set_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask, mask); + +return regmap_read_poll_timeout (map, sta_ofs, + val, (val & mask) == mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT );
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 276
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+} + +static int clear_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val; +u32 clr_ofs = bp->clr_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask; +bool ignore_ack = bp->ignore_clr_ack;
Remove unnecessary local variables (clr_ofs, en_ofs, sta_ofs, mask and ignore_ack), and use their bp-> form directly.
Quoted 13 lines
drivers/soc/mediatek/mtk-scpsys.c +13
-0+ +if (clr_ofs) +regmap_write (map, clr_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask,0 ); + +if (ignore_ack) +return 0 ; + +return regmap_read_poll_timeout (map, sta_ofs, + val, !(val & mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +}
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 259
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-4+static int scpsys_bus_protect_enable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val; -int ret;
No need to remove ret if you're going to add anyway later.
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 300
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-2+struct regmap *smi_common = scp->smi_common; +int i; -if (!mask) -return 0 ; +for (i =0 ; i <MAX_STEPS ; i++) { +struct regmap *map =NULL ;
Declare this on top of the function and no need to initialize to NUlL
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 302
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+int ret; +struct bus_prot bp = bp_table[i];
Unneeded local variable ...
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 304
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-5-if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, - mask); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); +if (bp.type ==IFR_TYPE )
bp_table[i].type?
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 305
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+ map = infracfg; + else if (bp.type == SMI_TYPE)
ditto
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 309
Quoted 3 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-0+ map = smi_common; + else + break;
So if the type is invalid you break the loop, this is different to what you are doing below with the scpsys_bus_protect_protect_disable() function where you are "ignoring" instead of beaking the loop. I am wondering why? Looks to me that, or you break and print an error because something was really wrong? or you ignore in both cases?
Quoted 22 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-7- ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, (val & mask) == mask, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =set_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 331
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +6
-3-int ret; +struct regmap *smi_common = scp->smi_common; +int i; -if (!mask) -return 0 ; +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; +struct bus_prot bp = bp_table[i];
The same comments done for scpsys_bus_protect_disable apply here.
Quoted 46 lines
drivers/soc/mediatek/mtk-scpsys.c +13
-12-if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); +if (bp.type ==IFR_TYPE ) + map = infracfg; +else if (bp.type ==SMI_TYPE ) + map = smi_common; +else +continue ; - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, !(val & mask), -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =clear_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_power_on (struct generic_pm_domain *genpd)@@ -430,8 +478,7 @@ static int init_basic_clks(struct platform_device *pdev, struct clk **clk,static struct scp *init_scp (struct platform_device *pdev,const struct scp_domain_data *scp_domain_data,int num, -const struct scp_ctrl_reg *scp_ctrl_reg, -bool bus_prot_reg_update) +const struct scp_ctrl_reg *scp_ctrl_reg) {struct genpd_onecell_data *pd_data;struct resource *res;@@ -445,8 +492,6 @@ static struct scp *init_scp(struct platform_device *pdev, scp->ctrl_reg.pwr_sta_offs = scp_ctrl_reg->pwr_sta_offs; scp->ctrl_reg.pwr_sta2nd_offs = scp_ctrl_reg->pwr_sta2nd_offs; - scp->bus_prot_reg_update = bus_prot_reg_update; - scp->dev = &pdev->dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 523
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0@@ -474,6 +519,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" );
Hmm, is this property documented? I couldn't find it.
Quoted 252 lines
drivers/soc/mediatek/mtk-scpsys.c +60
-25+ +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];@@ -556,8 +612,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {@@ -566,7 +625,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .basic_clk_name = {"mm"}, - .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT2701_TOP_AXI_PROT_EN_MM_M0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_MFG] = {@@ -701,7 +763,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), .basic_clk_name = {"mfg"}, - .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x260 ,0x264 ,0x220 ,0x228 , + BIT(14) | BIT(21) | BIT(23)), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC1] = {@@ -773,7 +838,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask = (BIT(1) | BIT(2)), + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + BIT(1) | BIT(2)), + }, }, [MT6797_POWER_DOMAIN_AUDIO] = { .name = "audio",@@ -820,7 +888,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_ETHSYS), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF0] = {@@ -830,7 +901,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF1] = {@@ -840,7 +914,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF1), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_WB] = {@@ -849,7 +926,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_WB), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, }, };@@ -863,8 +943,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {@@ -929,8 +1012,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MM_M0 | - MT8173_TOP_AXI_PROT_EN_MM_M1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MM_M0 | + MT8173_TOP_AXI_PROT_EN_MM_M1), + }, }, [MT8173_POWER_DOMAIN_VENC_LT] = { .name = "venc_lt",@@ -976,10 +1062,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S | -MT8173_TOP_AXI_PROT_EN_MFG_M0 | -MT8173_TOP_AXI_PROT_EN_MFG_M1 | - MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MFG_S | +MT8173_TOP_AXI_PROT_EN_MFG_M0 | +MT8173_TOP_AXI_PROT_EN_MFG_M1 | + MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT), + }, }, };@@ -995,7 +1084,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt2712_data = {@@ -1007,7 +1095,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = false, };static const struct scp_soc_data mt6797_data = {@@ -1019,7 +1106,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS_MT6797, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND_MT6797 }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7622_data = {@@ -1029,7 +1115,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7623a_data = {@@ -1039,7 +1124,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt8173_data = {@@ -1051,7 +1135,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };/* @@ -1092,8 +1175,7 @@ static int scpsys_probe(struct platform_device *pdev) soc =of_device_get_match_data (&pdev->dev); - scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs, - soc->bus_prot_reg_update); + scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs);if (IS_ERR (scp))return PTR_ERR (scp);drivers/soc/mediatek/scpsys.h +22
-4@@ -2,10 +2,28 @@#ifndef __SOC_MEDIATEK_SCPSYS_H#define __SOC_MEDIATEK_SCPSYS_H -#define INFRA_TOPAXI_PROTECTEN 0x0220 -#define INFRA_TOPAXI_PROTECTSTA1 0x0228 -#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 -#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 +#define MAX_STEPS 4 + +#define _BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _ignore_clr_ack) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .ignore_clr_ack = _ignore_clr_ack, \ + } + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask) \ + _BUS_PROT(_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, false) + +#define BUS_PROT_IGN (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask) \ + _BUS_PROT(_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, true)#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1)#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2)
drivers/soc/mediatek/scpsys.h line 47
Quoted 5 lines
drivers/soc/mediatek/scpsys.h +2
-0@@ -25,4 +43,20 @@#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22)#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) +enum regmap_type { +INVALID_TYPE =0 ,
I didn't see any use of that type, is this an option?
Quoted 21 lines
drivers/soc/mediatek/scpsys.h +14
-1+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; +bool ignore_clr_ack; +}; +#endif /* __SOC_MEDIATEK_SCPSYS_H */ --1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v13 05/11] soc: mediatek: Add multiple step bus protection control
Quoted 69 lines · Enric Balletbo Serra
Hi Wiyi Lu,
Thank you for your patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 63 lines
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.
Extend function to support multiple step bus protection control with more customized arguments.
And then usebp_tablefor bus protection of all compatibles, instead of mixingbus_prot_maskandbus_prot_reg_update.Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 206 ++++++++++++++++++++++++++------------ drivers/soc/mediatek/scpsys.h | 42 +++++++- 2 files changed, 182 insertions(+), 66 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +3
-4@@ -88,9 +88,9 @@* @ctl_offs: The offset for main power control register. * @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. * @basic_clk_name: The basic clocks required by this power domain. * @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;@@ -98,9 +98,9 @@ struct scp_domain_data {int ctl_offs;u32 sram_pdn_bits;u32 sram_pdn_ack_bits; -u32 bus_prot_mask;const char *basic_clk_name[MAX_CLKS ];u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;@@ -124,8 +124,8 @@ 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; };struct scp_subdomain {@@ -139,7 +139,6 @@ struct scp_soc_data {const struct scp_subdomain *subdomains;int num_subdomains;const struct scp_ctrl_reg regs; -bool bus_prot_reg_update; };static int scpsys_domain_is_on (struct scp_domain *scpd)@@ -249,53 +248,102 @@ static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); }
Quoted 11 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 257
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +7
-0+static int set_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val; +u32 set_ofs = bp->set_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask;Remove unnecessary local variables (
set_ofs,en_ofs,sta_ofsand mask), and use their bp-> form directly.
OK, I'll fix it.
Quoted 14 lines
Quoted 14 lines
drivers/soc/mediatek/mtk-scpsys.c +14
-0+ +if (set_ofs) +regmap_write (map, set_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask, mask); + +return regmap_read_poll_timeout (map, sta_ofs, + val, (val & mask) == mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +static int clear_bus_protection (struct regmap *map,struct bus_prot *bp) +{ +u32 val;
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 276
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +5
-0+u32 clr_ofs = bp->clr_ofs; +u32 en_ofs = bp->en_ofs; +u32 sta_ofs = bp->sta_ofs; +u32 mask = bp->mask; +bool ignore_ack = bp->ignore_clr_ack;Remove unnecessary local variables (
clr_ofs,en_ofs,sta_ofs, mask andignore_ack), and use their bp-> form directly.
OK, I'll fix it.
Quoted 17 lines
Quoted 17 lines
drivers/soc/mediatek/mtk-scpsys.c +14
-0+ +if (clr_ofs) +regmap_write (map, clr_ofs, mask); +else +regmap_update_bits (map, en_ofs, mask,0 ); + +if (ignore_ack) +return 0 ; + +return regmap_read_poll_timeout (map, sta_ofs, + val, !(val & mask), +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} +static int scpsys_bus_protect_enable (struct scp_domain *scpd) {struct scp *scp = scpd->scp;
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 259
Quoted 6 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-4+const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val; -int ret;No need to remove ret if you're going to add anyway later.
Got it.
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 300
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-2+struct regmap *smi_common = scp->smi_common; +int i; -if (!mask) -return 0 ; +for (i =0 ; i <MAX_STEPS ; i++) { +struct regmap *map =NULL ;Declare this on top of the function and no need to initialize to NUlL
Got it.
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 302
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+int ret; +struct bus_prot bp = bp_table[i];Unneeded local variable ...
Actually I followed Nicolas's suggestion in [1]
But, it's okay to me to change it back.
[1] https://patchwork.kernel.org/patch/11304709/
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 304
Quoted 7 lines
drivers/soc/mediatek/mtk-scpsys.c +1
-5-if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask, - mask); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_SET , mask); +if (bp.type ==IFR_TYPE )bp_table[i].type?
Got it.
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 305
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+ map = infracfg; + else if (bp.type == SMI_TYPE)ditto
Got it.
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 309
Quoted 3 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-0+ map = smi_common; + else + break;So if the type is invalid you break the loop, this is different to what you are doing below with the
scpsys_bus_protect_protect_disable()function where you are "ignoring" instead of beaking the loop. I am wondering why? Looks to me that, or you break and print an error because something was really wrong? or you ignore in both cases?
The bp_table inside the scp_domain_data_mt8183 is static variable with maximum MAX_STEPS member count. So, for those power domains with less bus protection steps, invalid type will be used.
Quoted 26 lines
Quoted 26 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-8- ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, (val & mask) == mask, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =set_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_bus_protect_disable (struct scp_domain *scpd) {struct scp *scp = scpd->scp; +const struct bus_prot *bp_table = scpd->data->bp_table;struct regmap *infracfg = scp->infracfg; -u32 mask = scpd->data->bus_prot_mask; -bool reg_update = scp->bus_prot_reg_update; -u32 val; -int ret; +struct regmap *smi_common = scp->smi_common; +int i;
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_sram_disable(struct scp_domain *scpd, void __iomem *ctl_addr) · line 331
Quoted 6 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-2-if (!mask) -return 0 ; +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map =NULL ; +int ret; +struct bus_prot bp = bp_table[i];The same comments done for
scpsys_bus_protect_disableapply here.
Got it.
Quoted 49 lines
Quoted 49 lines
drivers/soc/mediatek/mtk-scpsys.c +13
-12-if (reg_update) -regmap_update_bits (infracfg,INFRA_TOPAXI_PROTECTEN , mask,0 ); -else -regmap_write (infracfg,INFRA_TOPAXI_PROTECTEN_CLR , mask); +if (bp.type ==IFR_TYPE ) + map = infracfg; +else if (bp.type ==SMI_TYPE ) + map = smi_common; +else +continue ; - ret =regmap_read_poll_timeout (infracfg,INFRA_TOPAXI_PROTECTSTA1 , - val, !(val & mask), -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =clear_bus_protection (map, &bp); -return ret; +if (ret) +return ret; + } + +return 0 ; }static int scpsys_power_on (struct generic_pm_domain *genpd)@@ -430,8 +478,7 @@ static int init_basic_clks(struct platform_device *pdev, struct clk **clk,static struct scp *init_scp (struct platform_device *pdev,const struct scp_domain_data *scp_domain_data,int num, -const struct scp_ctrl_reg *scp_ctrl_reg, -bool bus_prot_reg_update) +const struct scp_ctrl_reg *scp_ctrl_reg) {struct genpd_onecell_data *pd_data;struct resource *res;@@ -445,8 +492,6 @@ static struct scp *init_scp(struct platform_device *pdev, scp->ctrl_reg.pwr_sta_offs = scp_ctrl_reg->pwr_sta_offs; scp->ctrl_reg.pwr_sta2nd_offs = scp_ctrl_reg->pwr_sta2nd_offs; - scp->bus_prot_reg_update = bus_prot_reg_update; - scp->dev = &pdev->dev; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );@@ -474,6 +519,17 @@ static struct scp *init_scp(struct platform_device *pdev,return ERR_CAST (scp->infracfg); }
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 523
Quoted 2 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0+ scp->smi_common =syscon_regmap_lookup_by_phandle (pdev->dev.of_node, +"smi_comm" );Hmm, is this property documented? I couldn't find it.
Thanks, I'll add in the dt-binding document in PATCH 02.
Quoted 255 lines
Quoted 255 lines
drivers/soc/mediatek/mtk-scpsys.c +60
-25+ +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];@@ -556,8 +612,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = {@@ -566,7 +625,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .basic_clk_name = {"mm"}, - .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT2701_TOP_AXI_PROT_EN_MM_M0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_MFG] = {@@ -701,7 +763,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), .basic_clk_name = {"mfg"}, - .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x260 ,0x264 ,0x220 ,0x228 , + BIT(14) | BIT(21) | BIT(23)), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC1] = {@@ -773,7 +838,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask = (BIT(1) | BIT(2)), + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + BIT(1) | BIT(2)), + }, }, [MT6797_POWER_DOMAIN_AUDIO] = { .name = "audio",@@ -820,7 +888,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_ETHSYS), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF0] = {@@ -830,7 +901,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF0), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_HIF1] = {@@ -840,7 +914,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .basic_clk_name = {"hif_sel"}, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_HIF1), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7622_POWER_DOMAIN_WB] = {@@ -849,7 +926,10 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , + MT7622_TOP_AXI_PROT_EN_WB), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, }, };@@ -863,8 +943,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, - .bus_prot_mask =MT2701_TOP_AXI_PROT_EN_CONN_M | - MT2701_TOP_AXI_PROT_EN_CONN_S, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT2701_TOP_AXI_PROT_EN_CONN_M | + MT2701_TOP_AXI_PROT_EN_CONN_S), + }, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = {@@ -929,8 +1012,11 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .basic_clk_name = {"mm"}, - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MM_M0 | - MT8173_TOP_AXI_PROT_EN_MM_M1, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MM_M0 | + MT8173_TOP_AXI_PROT_EN_MM_M1), + }, }, [MT8173_POWER_DOMAIN_VENC_LT] = { .name = "venc_lt",@@ -976,10 +1062,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .bus_prot_mask =MT8173_TOP_AXI_PROT_EN_MFG_S | -MT8173_TOP_AXI_PROT_EN_MFG_M0 | -MT8173_TOP_AXI_PROT_EN_MFG_M1 | - MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT, + .bp_table = { +BUS_PROT (IFR_TYPE ,0 ,0 ,0x220 ,0x228 , +MT8173_TOP_AXI_PROT_EN_MFG_S | +MT8173_TOP_AXI_PROT_EN_MFG_M0 | +MT8173_TOP_AXI_PROT_EN_MFG_M1 | + MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT), + }, }, };@@ -995,7 +1084,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt2712_data = {@@ -1007,7 +1095,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = false, };static const struct scp_soc_data mt6797_data = {@@ -1019,7 +1106,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS_MT6797, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND_MT6797 }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7622_data = {@@ -1029,7 +1115,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt7623a_data = {@@ -1039,7 +1124,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };static const struct scp_soc_data mt8173_data = {@@ -1051,7 +1135,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .pwr_sta_offs = SPM_PWR_STATUS, .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND }, - .bus_prot_reg_update = true, };/* @@ -1092,8 +1175,7 @@ static int scpsys_probe(struct platform_device *pdev) soc =of_device_get_match_data (&pdev->dev); - scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs, - soc->bus_prot_reg_update); + scp =init_scp (pdev, soc->domains, soc->num_domains, &soc->regs);if (IS_ERR (scp))return PTR_ERR (scp);drivers/soc/mediatek/scpsys.h +22
-4@@ -2,10 +2,28 @@#ifndef __SOC_MEDIATEK_SCPSYS_H#define __SOC_MEDIATEK_SCPSYS_H -#define INFRA_TOPAXI_PROTECTEN 0x0220 -#define INFRA_TOPAXI_PROTECTSTA1 0x0228 -#define INFRA_TOPAXI_PROTECTEN_SET 0x0260 -#define INFRA_TOPAXI_PROTECTEN_CLR 0x0264 +#define MAX_STEPS 4 + +#define _BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _ignore_clr_ack) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .ignore_clr_ack = _ignore_clr_ack, \ + } + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask) \ + _BUS_PROT(_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, false) + +#define BUS_PROT_IGN (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask) \ + _BUS_PROT(_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, true)#define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1)#define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2)@@ -25,4 +43,20 @@#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22)#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23)
Quoted 5 lines
drivers/soc/mediatek/scpsys.h line 47
Quoted 2 lines
drivers/soc/mediatek/scpsys.h +2
-0+enum regmap_type { +INVALID_TYPE =0 ,I didn't see any use of that type, is this an option?
Answered above.
Quoted 27 lines
Quoted 17 lines
drivers/soc/mediatek/scpsys.h +14
-1+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; +bool ignore_clr_ack; +}; +#endif /* __SOC_MEDIATEK_SCPSYS_H */ --Quoted 5 lines
1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v13 6/11 soc: mediatek: Add subsys clock control for bus protection
In reply to Weiyi LuFor the bus protection operations, some subsys clocks need to be enabled before releasing the protection, and vise versa.
But those subsys clocks could only be controlled once its corresponding power domain is turned on first.
In this patch, we add the subsys clock control into its relavent steps.
--- drivers/soc/mediatek/mtk-scpsys.c | 71 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +69 -2
@@ -80,6 +80,7 @@#define PWR_STATUS_WB BIT(27)/* MT7622 */ #define MAX_CLKS 3 +#define MAX_SUBSYS_CLKS 10/** * struct scp_domain_data - scp domain data for power on/off flow
@@ -89,6 +90,8 @@* @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @basic_clk_name: The basic clocks required by this power domain. +* @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. */
@@ -99,6 +102,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;const char *basic_clk_name[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps;struct bus_prot bp_table[MAX_STEPS ]; };
@@ -109,6 +113,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; };
@@ -384,16 +389,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:
@@ -420,6 +431,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 ;
@@ -457,6 +470,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 -EINVAL ; + } + + 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 int init_basic_clks (struct platform_device *pdev,struct clk **clk,const char *const *name) {
@@ -559,6 +614,18 @@ static struct scp *init_scp(struct platform_device *pdev,if (ret)return ERR_PTR (ret); +if (data->subsys_clk_prefix) { + ret =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (ret <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name); +return ERR_PTR (ret); + } + } + genpd->name = data->name; genpd->power_off = scpsys_power_off; genpd->power_on = scpsys_power_on;
Signature · 5 lines
1.8.1.1.dirty _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v13 06/11] soc: mediatek: Add subsys clock control for bus protection
Hi Weiyi Lu,
Thank you for the patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 3 lines
For the bus protection operations, some subsys clocks need to be enabled before releasing the protection, and vise versa.
typo s/vise/vice/
Quoted 3 lines
But those subsys clocks could only be controlled once its corresponding power domain is turned on first.
In this patch, we add the subsys clock control into its relavent steps.
typo s/relavent/relevant/
Quoted 80 lines
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 71 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +15
-2@@ -80,6 +80,7 @@#define PWR_STATUS_WB BIT(27)/* MT7622 */ #define MAX_CLKS 3 +#define MAX_SUBSYS_CLKS 10/** * struct scp_domain_data - scp domain data for power on/off flow @@ -89,6 +90,8 @@* @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @basic_clk_name: The basic clocks required by this power domain. +* @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. */ @@ -99,6 +102,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;const char *basic_clk_name[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps;struct bus_prot bp_table[MAX_STEPS ]; };@@ -109,6 +113,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; };@@ -384,16 +389,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:@@ -420,6 +431,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 ;@@ -457,6 +470,48 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; }
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 481
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+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) {
Is this possible? I suspect you can remove this check.
Quoted 14 lines
drivers/soc/mediatek/mtk-scpsys.c +14
-0+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);
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 505
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+return -EINVAL ; + } + + 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]));
This dev_err is redundant, devm_clk_get already prints it if the clock is not found.
Quoted 14 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+return PTR_ERR (clk[sub_clk_cnt]); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static int init_basic_clks (struct platform_device *pdev,struct clk **clk,const char *const *name) {@@ -559,6 +614,18 @@ static struct scp *init_scp(struct platform_device *pdev,if (ret)
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 624
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +8
-0return ERR_PTR (ret); +if (data->subsys_clk_prefix) { + ret =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (ret <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name);
And this print is also redundant.
Quoted 13 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-1+return ERR_PTR (ret); + } + } + genpd->name = data->name; genpd->power_off = scpsys_power_off; genpd->power_on = scpsys_power_on; --1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v13 06/11] soc: mediatek: Add subsys clock control for bus protection
Quoted 11 lines · Enric Balletbo Serra
Hi Weiyi Lu,
Thank you for the patch.
Missatge de Weiyi Lu <[email protected]> del dia dv., 20 de març 2020 a les 8:33:
Quoted 3 lines
For the bus protection operations, some subsys clocks need to be enabled before releasing the protection, and vise versa.
typo s/vise/vice/
Thanks, I'll fix it.
Quoted 7 lines
Quoted 4 lines
But those subsys clocks could only be controlled once its corresponding power domain is turned on first.
In this patch, we add the subsys clock control into its relavent steps.typo s/relavent/relevant/
Thanks, I'll fix it.
Quoted 81 lines
Quoted 81 lines
Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/mtk-scpsys.c | 71 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-)drivers/soc/mediatek/mtk-scpsys.c +15
-2@@ -80,6 +80,7 @@#define PWR_STATUS_WB BIT(27)/* MT7622 */ #define MAX_CLKS 3 +#define MAX_SUBSYS_CLKS 10/** * struct scp_domain_data - scp domain data for power on/off flow @@ -89,6 +90,8 @@* @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @basic_clk_name: The basic clocks required by this power domain. +* @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. */ @@ -99,6 +102,7 @@ struct scp_domain_data {u32 sram_pdn_bits;u32 sram_pdn_ack_bits;const char *basic_clk_name[MAX_CLKS ]; +const char *subsys_clk_prefix;u8 caps;struct bus_prot bp_table[MAX_STEPS ]; };@@ -109,6 +113,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; };@@ -384,16 +389,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:@@ -420,6 +431,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 ;@@ -457,6 +470,48 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; }
Quoted 12 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 481
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+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) {Is this possible? I suspect you can remove this check.
You're right. It never happens, I'll remove it.
Quoted 19 lines
Quoted 19 lines
drivers/soc/mediatek/mtk-scpsys.c +19
-0+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 -EINVAL ; + } + + clk[sub_clk_cnt] =devm_clk_get (&pdev->dev, + clk_name);
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 505
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +5
-0+ +if (IS_ERR (clk[sub_clk_cnt])) { +dev_err (&pdev->dev, +"Subsys clk get fail %ld\n" , +PTR_ERR (clk[sub_clk_cnt]));This
dev_erris redundant,devm_clk_getalready prints it if the clock is not found.
Got it.
Quoted 16 lines
Quoted 16 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+return PTR_ERR (clk[sub_clk_cnt]); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static int init_basic_clks (struct platform_device *pdev,struct clk **clk,const char *const *name) {@@ -559,6 +614,18 @@ static struct scp *init_scp(struct platform_device *pdev,if (ret)return ERR_PTR (ret);
Quoted 11 lines
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 624
Quoted 8 lines
drivers/soc/mediatek/mtk-scpsys.c +8
-0+if (data->subsys_clk_prefix) { + ret =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (ret <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name);And this print is also redundant.
Got it.
Quoted 19 lines
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-1+return ERR_PTR (ret); + } + } + genpd->name = data->name; genpd->power_off = scpsys_power_off; genpd->power_on = scpsys_power_on; --Quoted 5 lines
1.8.1.1.dirty
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v13 7/11 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 cap "MTK_SCPD_SRAM_ISO" to judge if we need to do the extra sram isolation control or not.
--- drivers/soc/mediatek/mtk-scpsys.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +20 -2
@@ -26,6 +26,7 @@#define MTK_SCPD_ACTIVE_WAKEUP BIT(0)#define MTK_SCPD_FWAIT_SRAM BIT(1) +#define MTK_SCPD_SRAM_ISO BIT(2)#define MTK_SCPD_CAPS (_scpd, _x) ((_scpd)->data->caps & (_x))#define SPM_VDE_PWR_CON 0x0210
@@ -57,6 +58,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)
@@ -234,6 +237,14 @@ static int scpsys_sram_enable(struct scp_domain *scpd, void __iomem *ctl_addr)return ret; } +if (MTK_SCPD_CAPS (scpd,MTK_SCPD_SRAM_ISO )) { + 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 ; }
@@ -243,8 +254,15 @@ 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 (MTK_SCPD_CAPS (scpd,MTK_SCPD_SRAM_ISO )) { + val =readl (ctl_addr) |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
PATCH v13 8/11 soc: mediatek: Add MT8183 scpsys support
In reply to Weiyi LuAdd scpsys driver for MT8183
--- drivers/soc/mediatek/mtk-scpsys.c | 221 ++++++++++++++++++++++++++++++++++++++ drivers/soc/mediatek/scpsys.h | 28 +++++ 2 files changed, 249 insertions(+)
drivers/soc/mediatek/mtk-scpsys.c +221 -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
@@ -1162,6 +1163,212 @@ 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_name = {"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 , +MT8183_TOP_AXI_PROT_EN_CONN ), + }, + }, + [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_name = {"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 , +MT8183_TOP_AXI_PROT_EN_1_MFG ), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +MT8183_TOP_AXI_PROT_EN_MFG ), + }, + }, + [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_name = {"mm" }, + .subsys_clk_prefix ="mm" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +MT8183_TOP_AXI_PROT_EN_1_DISP ), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +MT8183_TOP_AXI_PROT_EN_DISP ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +MT8183_SMI_COMMON_SMI_CLAMP_DISP ), + }, + }, + [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_name = {"cam" }, + .subsys_clk_prefix ="cam" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_CAM ), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +MT8183_TOP_AXI_PROT_EN_CAM ), +BUS_PROT_IGN (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_CAM_2ND ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +MT8183_SMI_COMMON_SMI_CLAMP_CAM ), + }, + }, + [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_name = {"isp" }, + .subsys_clk_prefix ="isp" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_ISP ), +BUS_PROT_IGN (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_ISP_2ND ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +MT8183_SMI_COMMON_SMI_CLAMP_ISP ), + }, + }, + [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 , +MT8183_SMI_COMMON_SMI_CLAMP_VDEC ), + }, + }, + [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 , +MT8183_SMI_COMMON_SMI_CLAMP_VENC ), + }, + }, + [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_name = {"vpu" ,"vpu1" }, + .subsys_clk_prefix ="vpu" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP ), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +MT8183_TOP_AXI_PROT_EN_VPU_TOP ), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP_2ND ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP ), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE0 ] = { + .name ="vpu_core0" , + .sta_mask =BIT (27 ), + .ctl_offs =0x33c , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu2" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0 ), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0_2ND ), + }, + .caps =MTK_SCPD_SRAM_ISO , + }, + [MT8183_POWER_DOMAIN_VPU_CORE1 ] = { + .name ="vpu_core1" , + .sta_mask =BIT (28 ), + .ctl_offs =0x0340 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu3" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1 ), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1_2ND ), + }, + .caps =MTK_SCPD_SRAM_ISO , + }, +}; + +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),
@@ -1222,6 +1429,17 @@ static void mtk_register_power_domains(struct platform_device *pdev, }, }; +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 */
@@ -1246,6 +1464,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 */ } };
drivers/soc/mediatek/scpsys.h +28 -0
@@ -43,6 +43,34 @@#define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22)#define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) +#define MT8183_TOP_AXI_PROT_EN_DISP (BIT(10) | BIT(11)) +#define MT8183_TOP_AXI_PROT_EN_CONN (BIT(13) | BIT(14)) +#define MT8183_TOP_AXI_PROT_EN_MFG (BIT(21) | BIT(22)) +#define MT8183_TOP_AXI_PROT_EN_CAM BIT(28) +#define MT8183_TOP_AXI_PROT_EN_VPU_TOP BIT(27) +#define MT8183_TOP_AXI_PROT_EN_1_DISP (BIT(16) | BIT(17)) +#define MT8183_TOP_AXI_PROT_EN_1_MFG GENMASK(21, 19) +#define MT8183_TOP_AXI_PROT_EN_MM_ISP (BIT(3) | BIT(8)) +#define MT8183_TOP_AXI_PROT_EN_MM_ISP_2ND BIT(10) +#define MT8183_TOP_AXI_PROT_EN_MM_CAM (BIT(4) | BIT(5) | \ + BIT(9) | BIT(13)) +#define MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP (GENMASK(9, 6) | \ + BIT(12)) +#define MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP_2ND (BIT(10) | BIT(11)) +#define MT8183_TOP_AXI_PROT_EN_MM_CAM_2ND BIT(11) +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0_2ND (BIT(0) | BIT(2) | \ + BIT(4)) +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1_2ND (BIT(1) | BIT(3) | \ + BIT(5)) +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0 BIT(6) +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1 BIT(7) +#define MT8183_SMI_COMMON_SMI_CLAMP_DISP GENMASK(7, 0) +#define MT8183_SMI_COMMON_SMI_CLAMP_VENC BIT(1) +#define MT8183_SMI_COMMON_SMI_CLAMP_ISP BIT(2) +#define MT8183_SMI_COMMON_SMI_CLAMP_CAM (BIT(3) | BIT(4)) +#define MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP (BIT(5) | BIT(6)) +#define MT8183_SMI_COMMON_SMI_CLAMP_VDEC BIT(7) +enum regmap_type {INVALID_TYPE =0 ,IFR_TYPE ,
Signature · 1 line
1.8.1.1.dirty
PATCH v13 9/11 soc: mediatek: Add a comma at the end
In reply to Weiyi LuA minor coding style fix
--- drivers/soc/mediatek/mtk-scpsys.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/soc/mediatek/mtk-scpsys.c +7 -7
@@ -1374,7 +1374,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_domains = ARRAY_SIZE(scp_domain_data_mt2701), .regs = { .pwr_sta_offs = SPM_PWR_STATUS, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, }, };
@@ -1385,7 +1385,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_subdomains = ARRAY_SIZE(scp_subdomain_mt2712), .regs = { .pwr_sta_offs = SPM_PWR_STATUS, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, }, };
@@ -1396,7 +1396,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_subdomains = ARRAY_SIZE(scp_subdomain_mt6797), .regs = { .pwr_sta_offs = SPM_PWR_STATUS_MT6797, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND_MT6797 + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND_MT6797, }, };
@@ -1405,7 +1405,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_domains = ARRAY_SIZE(scp_domain_data_mt7622), .regs = { .pwr_sta_offs = SPM_PWR_STATUS, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, }, };
@@ -1414,7 +1414,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_domains = ARRAY_SIZE(scp_domain_data_mt7623a), .regs = { .pwr_sta_offs = SPM_PWR_STATUS, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, }, };
@@ -1425,7 +1425,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_subdomains = ARRAY_SIZE(scp_subdomain_mt8173), .regs = { .pwr_sta_offs = SPM_PWR_STATUS, - .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, }, };
@@ -1436,7 +1436,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .num_subdomains = ARRAY_SIZE(scp_subdomain_mt8183), .regs = { .pwr_sta_offs = 0x0180, - .pwr_sta2nd_offs = 0x0184 + .pwr_sta2nd_offs = 0x0184, } };
Signature · 1 line
1.8.1.1.dirty
PATCH v13 10/11 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 <dt-bindings/reset-controller/mt8183-resets.h> #include "mt8183-pinfunc.h"
@@ -255,6 +256,62 @@ #interrupt-cells = <2>; }; + scpsys: power-controller@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>;
@@ -605,6 +662,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 v13 11/11 arm64: dts: Add power-domains property 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
@@ -654,6 +654,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 · 5 lines
1.8.1.1.dirty _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel