Add driver for dvfsrc, support for interconnect
Subsystems (4)
cover Add driver for dvfsrc, support for interconnect
This series is based on v5.14-rc1.
The patchsets add support for MediaTek hardware module named DVFSRC (dynamic voltage and frequency scaling resource collector). The DVFSRC is a HW module which is used to collect all the requests from both software and hardware and turn into the decision of minimum operating voltage and minimum DRAM frequency to fulfill those requests.
So, This series is to implement the dvfsrc driver to collect all the requests of operating voltage or DRAM bandwidth from other device drivers likes GPU/Camera through 3 frameworks basically:
1. interconnect framework: to aggregate the bandwidth requirements from different clients
[1] https://patchwork.kernel.org/cover/10766329/
There has a hw module "DRAM scheduler", which used to control the throughput.
The DVFSRC will collect forecast data of dram bandwidth from SW consumers(camera/gpu...), and according the forecast to change the DRAM frequency
2. Regualtor framework: to handle the operating voltage requirement from user or cosumer which not belong any power domain
Changes in V11:
* rebase all patches on v5.14-rc1.
* support platform mt8195.
* add initial bw in mediatek interconnect driver.
* add one more pcie client in mediatek interconnect driver.
* add compatible for MT8195 dvfsrc.
Changes in V10:
* rebase all patches on v5.13-rc1
* add acked TAG for interconnect provider driver (Georgi)
* update comment message for typos. (Georgi)
* update cover leter for typos.
Changes in V9:
* modify the configuration of dvfsrc.yaml. (Rob)
Changes in V8:
* Fixed the dt_binding_check error of dvfsrc.yaml. (Rob)
* Remove Kconfig dependency of DVFSRC
Changes in V7:
* Fixed the dt_binding_check error of dvfsrc.yaml. (Rob)
* Fixed the checkpatch complains of "Signed-off-by:
email name mismatch". (Georgi)
* Fixed coding style of interconnect driver. (Georgi)
* Update comment of the years to 2021. (Georgi)
Changes in V6:
* Remove the performace state support, because the request from consumer can be replaced by using interconnect and regulator framework.
* Update the DT patches and convert them to DT schema. (Georgi)
* Modify the comment format and coding style. (Mark)
Changes in V5:
* Support more platform mt6873/mt8192
* Drop the compatible and interconnect provider node and make the parent node an interconnect provider. (Rob/Georgi)
* Make modification of interconnect driver from coding suggestion. (Georgi)
* Move interconnect diagram into the commit text of patch. (Georgi)
* Register the interconnect provider as a platform sub-device. (Georgi)
Changes in V4:
* Add acked TAG on dt-bindings patches. (Rob)
* Declaration of emi_icc_aggregate since the prototype of aggregate function has changed meanwhile. (Georgi)
* Used emi_icc_remove instead of icc_provider_del on probe. (Georgi)
* Add dvfsrc regulator driver into series.
* Bug fixed of mt8183_get_current_level.
* Add mutex protection for pstate operation on dvfsrc_set_performance.
Changes in V3:
* Remove RFC from the subject prefix of the series
* Combine dt-binding patch and move interconnect dt-binding document into dvfsrc. (Rob)
* Remove unused header, add unit descirption to the bandwidth, rename compatible name on interconnect driver. (Georgi)
* Fixed some coding style: check flow, naming, used readx_poll_timeout on dvfsrc driver. (Ryan)
* Rename interconnect driver mt8183.c to mtk-emi.c
* Rename interconnect header mtk,mt8183.h to mtk,emi.h
* mtk-scpsys.c: Add opp table check first to avoid OF runtime parse failed
Changes in RFC V2:
* Remove the DT property dram_type. (Rob)
* Used generic dts property 'opp-level' to get the performace state. (Stephen)
* Remove unnecessary dependency config on Kconfig. (Stephen)
* Remove unused header file, fixed some coding style issue, typo, error handling on dvfsrc driver. (Nicolas/Stephen)
* Remove irq handler on dvfsrc driver. (Stephen)
* Remove init table on dvfsrc driver, combine hw init on trustzone.
* Add interconnect support of mt8183 to aggregate the emi bandwidth. (Georgi)
v10: https://patchwork.kernel.org/project/linux-mediatek/list/?series=494095
V9: https://patchwork.kernel.org/project/linux-mediatek/list/?series=440389
V8: https://patchwork.kernel.org/project/linux-mediatek/list/?series=421713
V7: https://patchwork.kernel.org/project/linux-mediatek/list/?series=411057
V6: https://patchwork.kernel.org/project/linux-mediatek/list/?series=406077
V5: https://patchwork.kernel.org/project/linux-mediatek/list/?series=348065
V4: https://lore.kernel.org/patchwork/cover/1209284/
V3: https://patchwork.kernel.org/cover/11118867/
RFC V2: https://lore.kernel.org/patchwork/patch/1068113/
RFC V1: https://lore.kernel.org/patchwork/cover/1028535/
Dawei Chien (8):
dt-bindings: mediatek: add compatible for MT8195 dvfsrc
soc: mediatek: add support for mt8195
arm64: dts: mt8195: add dvfsrc related nodes
dt-bindings: interconnect: add MT8195 interconnect dt-bindings
interconnect: mediatek: add support for mt8195
interconnect: mediatek: add initial bandwidth
regulator: mediatek: add support for mt8195
arm64: dts: mt8195: add dvfsrc related nodes
Henry Chen (11):
dt-bindings: soc: Add dvfsrc driver bindings
soc: mediatek: add header for mediatek SIP interface
soc: mediatek: add driver for dvfsrc support
soc: mediatek: add support for mt6873
arm64: dts: mt8183: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc related nodes
dt-bindings: interconnect: add MT6873 interconnect dt-bindings
interconnect: mediatek: Add interconnect provider driver
arm64: dts: mt8183: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc regulator nodes
.../devicetree/bindings/soc/mediatek/dvfsrc.yaml | 68 +++ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 7 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 14 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 7 + drivers/interconnect/Kconfig | 1 + drivers/interconnect/Makefile | 1 + drivers/interconnect/mediatek/Kconfig | 13 + drivers/interconnect/mediatek/Makefile | 3 + drivers/interconnect/mediatek/mtk-emi.c | 385 +++++++++++++++ drivers/regulator/mtk-dvfsrc-regulator.c | 23 + drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 538 +++++++++++++++++++++ include/dt-bindings/interconnect/mtk,mt6873-emi.h | 41 ++ include/dt-bindings/interconnect/mtk,mt8183-emi.h | 21 + include/dt-bindings/interconnect/mtk,mt8195-emi.h | 42 ++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 ++ include/linux/soc/mediatek/mtk_sip_svc.h | 4 + 18 files changed, 1215 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml create mode 100644 drivers/interconnect/mediatek/Kconfig create mode 100644 drivers/interconnect/mediatek/Makefile create mode 100644 drivers/interconnect/mediatek/mtk-emi.c create mode 100644 drivers/soc/mediatek/mtk-dvfsrc.c create mode 100644 include/dt-bindings/interconnect/mtk,mt6873-emi.h create mode 100644 include/dt-bindings/interconnect/mtk,mt8183-emi.h create mode 100644 include/dt-bindings/interconnect/mtk,mt8195-emi.h create mode 100644 include/linux/soc/mediatek/mtk_dvfsrc.h
Signature · 1 line
2.14.1
PATCH v11 1/19 dt-bindings: soc: Add dvfsrc driver bindings
From: Henry Chen <[email protected]>
Document the binding for enabling dvfsrc on MediaTek SoC.
--- .../devicetree/bindings/soc/mediatek/dvfsrc.yaml | 67 ++++++++++++++++++++++ include/dt-bindings/interconnect/mtk,mt8183-emi.h | 21 +++++++ 2 files changed, 88 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml create mode 100644 include/dt-bindings/interconnect/mtk,mt8183-emi.h
Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml new file +67 -0
@@ -0,0 +1,67 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/soc/mediatek/dvfsrc.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: MediaTek dynamic voltage and frequency scaling resource collector (DVFSRC) + +description: | + The Dynamic Voltage and Frequency Scaling Resource Collector (DVFSRC) is a + HW module which is used to collect all the requests from both software and + hardware and turn into the decision of minimum operating voltage and minimum + DRAM frequency to fulfill those requests. + +maintainers: + - henryc.chen <[email protected]> + +properties: + reg: + maxItems: 1 + description: DVFSRC common register address and length. + + compatible: + enum: + - mediatek,mt6873-dvfsrc + - mediatek,mt8183-dvfsrc + - mediatek,mt8192-dvfsrc + + '#interconnect-cells': + const: 1 + + dvfsrc-vcore: + type: object + description: + The DVFSRC regulator is modelled as a subdevice of the DVFSRC. + Because DVFSRC can request power directly via register read/write, likes + vcore which is a core power of mt8183. As such, the DVFSRC regulator + requires that DVFSRC nodes be present. + $ref: /schemas/regulator/regulator.yaml# + +required: + - compatible + - reg + - "#interconnect-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interconnect/mtk,mt8183-emi.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + dvfsrc@10012000 { + compatible = "mediatek,mt8183-dvfsrc"; + reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; + dvfsrc_vcore: dvfsrc-vcore { + regulator-name = "dvfsrc-vcore"; + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <800000>; + regulator-always-on; + }; + }; + };
include/dt-bindings/interconnect/mtk,mt8183-emi.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __DT_BINDINGS_INTERCONNECT_MTK_MT8183_EMI_H +#define __DT_BINDINGS_INTERCONNECT_MTK_MT8183_EMI_H + +#define MT8183_SLAVE_DDR_EMI 0 +#define MT8183_MASTER_MCUSYS 1 +#define MT8183_MASTER_GPU 2 +#define MT8183_MASTER_MMSYS 3 +#define MT8183_MASTER_MM_VPU 4 +#define MT8183_MASTER_MM_DISP 5 +#define MT8183_MASTER_MM_VDEC 6 +#define MT8183_MASTER_MM_VENC 7 +#define MT8183_MASTER_MM_CAM 8 +#define MT8183_MASTER_MM_IMG 9 +#define MT8183_MASTER_MM_MDP 10 + +#endif
Signature · 1 line
2.14.1
PATCH v11 2/19 dt-bindings: mediatek: add compatible for MT8195 dvfsrc
In reply to Dawei ChienThis adds dt-binding documentation of dvfsrc for Mediatek MT8195 SoCs Platform.
--- Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml +1 -0
@@ -25,6 +25,7 @@ properties: - mediatek,mt6873-dvfsrc - mediatek,mt8183-dvfsrc - mediatek,mt8192-dvfsrc + - mediatek,mt8195-dvfsrc '#interconnect-cells': const: 1
Signature · 1 line
2.14.1
Re: [V11,PATCH 02/19] dt-bindings: mediatek: add compatible for MT8195 dvfsrc
Quoted 8 lines · Dawei Chien
This adds dt-binding documentation of dvfsrc for Mediatek MT8195 SoCs Platform.
Signed-off-by Dawei Chien <[email protected]>--- Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yaml | 1 + 1 file changed, 1 insertion(+)
PATCH v11 3/19 soc: mediatek: add header for mediatek SIP interface
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add a header to collect SIPs and add one SIP call to initialize power management hardware for the SIP interface defined to access the SPM handling vcore voltage and ddr rate changes on mt8183 (and most likely later socs).
--- include/linux/soc/mediatek/mtk_sip_svc.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/soc/mediatek/mtk_sip_svc.h +4 -0
@@ -22,4 +22,8 @@ARM_SMCCC_CALL_VAL (ARM_SMCCC_FAST_CALL ,MTK_SIP_SMC_CONVENTION , \ARM_SMCCC_OWNER_SIP , fn_id) +/* VCOREFS */ +#define MTK_SIP_VCOREFS_CONTROL \ + MTK_SIP_SMC_CMD(0x506) +#endif
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerRe: [V11, PATCH 03/19] soc: mediatek: add header for mediatek SIP interface
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 9 lines
From: Henry Chen <[email protected]>
Add a header to collect SIPs and add one SIP call to initialize power management hardware for the SIP interface defined to access the SPM handling vcore voltage and ddr rate changes on mt8183 (and most likely later socs).
Signed-off-by Henry Chen <[email protected]>Signed-off-by Arvin Wang <[email protected]>
Please sign-off this and all the other patches that you send.
Re: [V11, PATCH 03/19] soc: mediatek: add header for mediatek SIP interface
Quoted 10 lines · AngeloGioacchino Del Regno
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 9 lines
From: Henry Chen <[email protected]>
Add a header to collect SIPs and add one SIP call to initialize power
management hardware for the SIP interface defined to access the SPM handling vcore voltage and ddr rate changes on mt8183 (and most likely
later socs).
Quoted 4 lines
Quoted 2 lines
Signed-off-by Henry Chen <[email protected]>Signed-off-by Arvin Wang <[email protected]>Please sign-off this and all the other patches that you send.
Thank you for your review, I would sign-off all the others patches on next version.
PATCH v11 4/19 soc: mediatek: add driver for dvfsrc support
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add dvfsrc driver for MT6873/MT8183/MT8192
--- drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 421 ++++++++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 +++ 4 files changed, 468 insertions(+) create mode 100644 drivers/soc/mediatek/mtk-dvfsrc.c create mode 100644 include/linux/soc/mediatek/mtk_dvfsrc.h
drivers/soc/mediatek/Kconfig +11 -0
@@ -26,6 +26,17 @@ config MTK_DEVAPC The violation information is logged for further analysis or countermeasures. +config MTK_DVFSRC + tristate "MediaTek DVFSRC Support" + depends on ARCH_MEDIATEK + help + Say yes here to add support for the MediaTek DVFSRC (dynamic voltage + and frequency scaling resource collector) found + on different MediaTek SoCs. The DVFSRC is a proprietary + hardware which is used to collect all the requests from + system and turn into the decision of minimum Vcore voltage + and minimum DRAM frequency to fulfill those requests. + config MTK_INFRACFG bool "MediaTek INFRACFG Support" select REGMAP
drivers/soc/mediatek/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o obj-$(CONFIG_MTK_DEVAPC) += mtk-devapc.o +obj-$(CONFIG_MTK_DVFSRC) += mtk-dvfsrc.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-dvfsrc.c new file +421 -0
421 lines not on this page · raw message
include/linux/soc/mediatek/mtk_dvfsrc.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __SOC_MTK_DVFSRC_H +#define __SOC_MTK_DVFSRC_H + +#define MTK_DVFSRC_CMD_BW_REQUEST 0 +#define MTK_DVFSRC_CMD_OPP_REQUEST 1 +#define MTK_DVFSRC_CMD_VCORE_REQUEST 2 +#define MTK_DVFSRC_CMD_HRTBW_REQUEST 3 +#define MTK_DVFSRC_CMD_VSCP_REQUEST 4 +#define MTK_DVFSRC_CMD_PEAK_BW_REQUEST 5 + +#define MTK_DVFSRC_CMD_VCORE_LEVEL_QUERY 0 +#define MTK_DVFSRC_CMD_VSCP_LEVEL_QUERY 1 + +#if IS_ENABLED (CONFIG_MTK_DVFSRC ) +void mtk_dvfsrc_send_request (const struct device *dev,u32 cmd,u64 data); +int mtk_dvfsrc_query_info (const struct device *dev,u32 cmd,int *data); + +#else + +static inline void mtk_dvfsrc_send_request (const struct device *dev,u32 cmd, +u64 data) +{return -ENODEV ; } + +static inline int mtk_dvfsrc_query_info (const struct device *dev,u32 cmd, +int *data); +{return -ENODEV ; } + +#endif /* CONFIG_MTK_DVFSRC */ + +#endif
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerRe: [V11,PATCH 04/19] soc: mediatek: add driver for dvfsrc support
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 131 lines
From: Henry Chen <[email protected]>
Add dvfsrc driver for MT6873/MT8183/MT8192
Signed-off-by Henry Chen <[email protected]>Signed-off-by Dawei Chien <[email protected]>--- drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 421 ++++++++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 +++ 4 files changed, 468 insertions(+)create mode 100644
drivers/soc/mediatek/mtk-dvfsrc.ccreate mode 100644include/linux/soc/mediatek/mtk_dvfsrc.hdrivers/soc/mediatek/Kconfig +11
-0@@ -26,6 +26,17 @@ config MTK_DEVAPC The violation information is logged for further analysis or countermeasures. +config MTK_DVFSRC + tristate "MediaTek DVFSRC Support" + depends on ARCH_MEDIATEK + help + Say yes here to add support for the MediaTek DVFSRC (dynamic voltage + and frequency scaling resource collector) found + on different MediaTek SoCs. The DVFSRC is a proprietary + hardware which is used to collect all the requests from + system and turn into the decision of minimum Vcore voltage + and minimum DRAM frequency to fulfill those requests. + config MTK_INFRACFG bool "MediaTek INFRACFG Support" select REGMAPdrivers/soc/mediatek/Makefile +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o obj-$(CONFIG_MTK_DEVAPC) += mtk-devapc.o +obj-$(CONFIG_MTK_DVFSRC) += mtk-dvfsrc.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-dvfsrc.c new file +76
-0@@ -0,0 +1,421 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2021 MediaTek Inc. +*/ + +#include <linux/arm-smccc.h> +#include <linux/io.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/notifier.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/soc/mediatek/mtk_dvfsrc.h> +#include <linux/soc/mediatek/mtk_sip_svc.h> + +#define DVFSRC_IDLE 0x00 +#define DVFSRC_GET_TARGET_LEVEL (x) (((x) >> 0) & 0x0000ffff) +#define DVFSRC_GET_CURRENT_LEVEL (x) (((x) >> 16) & 0x0000ffff) +#define kbps_to_mbps (x) ((x) / 1000) + +#define POLL_TIMEOUT 1000 +#define STARTUP_TIME 1 + +#define MTK_SIP_DVFSRC_INIT 0x00 + +#define DVFSRC_OPP_DESC (_opp_table) \ +{ \ + .opps = _opp_table, \ + .num_opp = ARRAY_SIZE(_opp_table), \ +} + +struct dvfsrc_opp { +u32 vcore_opp; +u32 dram_opp; +}; + +struct dvfsrc_opp_desc { +const struct dvfsrc_opp *opps; +u32 num_opp; +}; + +struct mtk_dvfsrc ; +struct dvfsrc_soc_data { +const int *regs; +const struct dvfsrc_opp_desc *opps_desc; +int (*get_target_level)(struct mtk_dvfsrc *dvfsrc); +int (*get_current_level)(struct mtk_dvfsrc *dvfsrc); +u32 (*get_vcore_level)(struct mtk_dvfsrc *dvfsrc); +u32 (*get_vcp_level)(struct mtk_dvfsrc *dvfsrc); +void (*set_dram_bw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_dram_peak_bw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_dram_hrtbw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_opp_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +void (*set_vcore_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +void (*set_vscp_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +int (*wait_for_opp_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +int (*wait_for_vcore_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +}; + +struct mtk_dvfsrc { +struct device *dev; +struct platform_device *icc; +struct platform_device *regulator; +const struct dvfsrc_soc_data *dvd; +int dram_type; +const struct dvfsrc_opp_desc *curr_opps; +void __iomem *regs; +spinlock_t req_lock; +struct mutex pstate_lock; +struct notifier_block scpsys_notifier; +}; + +static u32 dvfsrc_read (struct mtk_dvfsrc *dvfs,u32 offset) +{ +return readl (dvfs->regs + dvfs->dvd->regs[offset]); +}
drivers/soc/mediatek/mtk-dvfsrc.c line 86
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ +static void dvfsrc_write (struct mtk_dvfsrc *dvfs,u32 offset,u32 val) +{ +writel (val, dvfs->regs + dvfs->dvd->regs[offset]); +} + +#define dvfsrc_rmw (dvfs, offset, val, mask, shift) \ + dvfsrc_write(dvfs, offset, \ + (dvfsrc_read(dvfs, offset) & ~(mask << shift)) | (val << shift)) +
Hello Dawei,
is there any reason why you're not using regmap-mmio here? If your concern is about regmap locking overhead, you can disable it by setting disable_locking as true in the regmap_config.
Quoted 11 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +11
-0+enum dvfsrc_regs { +DVFSRC_SW_REQ , +DVFSRC_SW_REQ2 , +DVFSRC_LEVEL , +DVFSRC_TARGET_LEVEL , +DVFSRC_SW_BW , +DVFSRC_SW_PEAK_BW , +DVFSRC_SW_HRT_BW , +DVFSRC_VCORE_REQUEST , +}; +
drivers/soc/mediatek/mtk-dvfsrc.c line 107
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+static const int mt8183_regs[] = { + [DVFSRC_SW_REQ ] =0x4 , + [DVFSRC_SW_REQ2 ] =0x8 , + [DVFSRC_LEVEL ] =0xDC , + [DVFSRC_SW_BW ] =0x160 , +}; + +static const struct dvfsrc_opp *get_current_opp (struct mtk_dvfsrc *dvfsrc) +{ +int level;
int level = dvfsrc->dvd->get_current_level(dvfsrc);
Quoted 54 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +54
-0+ + level = dvfsrc->dvd->get_current_level (dvfsrc); +return &dvfsrc->curr_opps->opps[level]; +} + +static int dvfsrc_is_idle (struct mtk_dvfsrc *dvfsrc) +{ +if (!dvfsrc->dvd->get_target_level) +return true; + +return dvfsrc->dvd->get_target_level (dvfsrc); +} + +static int dvfsrc_wait_for_vcore_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +const struct dvfsrc_opp *curr; + +return readx_poll_timeout_atomic (get_current_opp, dvfsrc, curr, + curr->vcore_opp >= level,STARTUP_TIME , +POLL_TIMEOUT ); +} + +static int mt8183_wait_for_opp_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +const struct dvfsrc_opp *target, *curr; +int ret; + + target = &dvfsrc->curr_opps->opps[level]; + ret =readx_poll_timeout (get_current_opp, dvfsrc, curr, + curr->dram_opp >= target->dram_opp && + curr->vcore_opp >= target->vcore_opp, +STARTUP_TIME ,POLL_TIMEOUT ); +if (ret <0 ) { +dev_warn (dvfsrc->dev, +"timeout, target: %u, dram: %d, vcore: %d\n" , level, + curr->dram_opp, curr->vcore_opp); +return ret; + } + +return 0 ; +} + +static int mt8183_get_target_level (struct mtk_dvfsrc *dvfsrc) +{ +return DVFSRC_GET_TARGET_LEVEL (dvfsrc_read (dvfsrc,DVFSRC_LEVEL )); +} + +static int mt8183_get_current_level (struct mtk_dvfsrc *dvfsrc) +{ +int level; + +/* HW level 0 is begin from 0x10000 */ + level =DVFSRC_GET_CURRENT_LEVEL (dvfsrc_read (dvfsrc,DVFSRC_LEVEL )); +/* Array index start from 0 */
drivers/soc/mediatek/mtk-dvfsrc.c line 171
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+return ffs (level) -1 ; +} + +static u32 mt8183_get_vcore_level (struct mtk_dvfsrc *dvfsrc) +{ +return (dvfsrc_read (dvfsrc,DVFSRC_SW_REQ2 ) >>2 ) &0x3 ; +} + +static void mt8183_set_dram_bw (struct mtk_dvfsrc *dvfsrc,u64 bw) +{
Is there any min/max allowed bw? If there is, please add a boudary check here. Same for set_vcore_level.
Quoted 14 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +14
-0+dvfsrc_write (dvfsrc,DVFSRC_SW_BW ,div_u64 (kbps_to_mbps (bw),100 )); +} + +static void mt8183_set_opp_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +int vcore_opp, dram_opp; +const struct dvfsrc_opp *opp; + +/* translate pstate to dvfsrc level, and set it to DVFSRC HW */ + opp = &dvfsrc->curr_opps->opps[level]; + vcore_opp = opp->vcore_opp; + dram_opp = opp->dram_opp; + + dev_dbg(dvfsrc->dev, "vcore_opp: %d, dram_opp: %d\n",
drivers/soc/mediatek/mtk-dvfsrc.c line 195
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ vcore_opp, dram_opp); +dvfsrc_write (dvfsrc,DVFSRC_SW_REQ , dram_opp | vcore_opp <<2 ); +} + +static void mt8183_set_vcore_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +dvfsrc_write (dvfsrc,DVFSRC_SW_REQ2 , level <<2 ); +} + +void mtk_dvfsrc_send_request (const struct device *dev,u32 cmd,u64 data)
int mtk_dvfsrc_send_request(......
Quoted 16 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +16
-0+{ +int ret, state; +struct mtk_dvfsrc *dvfsrc =dev_get_drvdata (dev); + +dev_dbg (dvfsrc->dev,"cmd: %d, data: %llu\n" , cmd, data); + +switch (cmd) { +case MTK_DVFSRC_CMD_BW_REQUEST : + dvfsrc->dvd->set_dram_bw (dvfsrc, data); +return ; +case MTK_DVFSRC_CMD_PEAK_BW_REQUEST : +if (dvfsrc->dvd->set_dram_peak_bw) + dvfsrc->dvd->set_dram_peak_bw (dvfsrc, data); +return ; +case MTK_DVFSRC_CMD_OPP_REQUEST : +if (dvfsrc->dvd->set_opp_level)
drivers/soc/mediatek/mtk-dvfsrc.c line 221
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ dvfsrc->dvd->set_opp_level (dvfsrc, data); +break ; +case MTK_DVFSRC_CMD_VCORE_REQUEST : + dvfsrc->dvd->set_vcore_level (dvfsrc, data); +break ; +case MTK_DVFSRC_CMD_HRTBW_REQUEST : +if (dvfsrc->dvd->set_dram_hrtbw) + dvfsrc->dvd->set_dram_hrtbw (dvfsrc, data); +else +return ;
return -EINVAL;
drivers/soc/mediatek/mtk-dvfsrc.c line 228
Quoted 7 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +7
-0+break ; +case MTK_DVFSRC_CMD_VSCP_REQUEST : + dvfsrc->dvd->set_vscp_level (dvfsrc, data); +break ; +default : +dev_err (dvfsrc->dev,"unknown command: %d\n" , cmd); +return ;
return -EINVAL;
Quoted 8 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +8
-0+ } + +/* DVFSRC needs to wait at least 2T(~196ns) to handle request +* after receiving command +*/ +udelay (STARTUP_TIME ); + + ret = readx_poll_timeout(dvfsrc_is_idle, dvfsrc,
drivers/soc/mediatek/mtk-dvfsrc.c line 246
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ state, state ==DVFSRC_IDLE , + STARTUP_TIME, POLL_TIMEOUT); + +if (ret <0 ) { +dev_warn (dvfsrc->dev, +"%d: idle timeout, data: %llu, last: %d -> %d\n" , + cmd, data, + dvfsrc->dvd->get_current_level (dvfsrc), + dvfsrc->dvd->get_target_level (dvfsrc)); +return ;
return ret;
Quoted 70 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +70
-0+ } + +/* The previous change may be requested by previous request. +* So we delay 1us, then start checking opp is reached enough. +*/ +udelay (STARTUP_TIME ); + +if (cmd ==MTK_DVFSRC_CMD_OPP_REQUEST ) + ret = dvfsrc->dvd->wait_for_opp_level (dvfsrc, data); +else + ret = dvfsrc->dvd->wait_for_vcore_level (dvfsrc, data); + +if (ret <0 ) { +dev_warn (dvfsrc->dev, +"%d: wait timeout, data: %llu, last: %d -> %d\n" , + cmd, data, + dvfsrc->dvd->get_current_level (dvfsrc), + dvfsrc->dvd->get_target_level (dvfsrc)); + } + +} +EXPORT_SYMBOL (mtk_dvfsrc_send_request); + +int mtk_dvfsrc_query_info (const struct device *dev,u32 cmd,int *data) +{ +struct mtk_dvfsrc *dvfsrc =dev_get_drvdata (dev); + +switch (cmd) { +case MTK_DVFSRC_CMD_VCORE_LEVEL_QUERY : + *data = dvfsrc->dvd->get_vcore_level (dvfsrc); +break ; +case MTK_DVFSRC_CMD_VSCP_LEVEL_QUERY : + *data = dvfsrc->dvd->get_vcp_level (dvfsrc); +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +EXPORT_SYMBOL (mtk_dvfsrc_query_info); + +static int mtk_dvfsrc_probe (struct platform_device *pdev) +{ +struct arm_smccc_res ares; +struct resource *res; +struct mtk_dvfsrc *dvfsrc; +int ret; + + dvfsrc =devm_kzalloc (&pdev->dev,sizeof (*dvfsrc),GFP_KERNEL ); +if (!dvfsrc) +return -ENOMEM ; + + dvfsrc->dvd =of_device_get_match_data (&pdev->dev); + dvfsrc->dev = &pdev->dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + dvfsrc->regs =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (dvfsrc->regs)) +return PTR_ERR (dvfsrc->regs); + +spin_lock_init (&dvfsrc->req_lock); +mutex_init (&dvfsrc->pstate_lock); + +arm_smccc_smc (MTK_SIP_VCOREFS_CONTROL ,MTK_SIP_DVFSRC_INIT ,0 ,0 ,0 , +0 ,0 ,0 , &ares); + +if (!ares.a0) { + dvfsrc->dram_type = ares.a1; +dev_info (dvfsrc->dev,"dram_type: %d\n" , dvfsrc->dram_type);
drivers/soc/mediatek/mtk-dvfsrc.c line 326
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ }else { +dev_err (dvfsrc->dev,"init fails: %lu\n" , ares.a0); +return ares.a0; + } + + dvfsrc->curr_opps = &dvfsrc->dvd->opps_desc[dvfsrc->dram_type]; +platform_set_drvdata (pdev, dvfsrc); + + dvfsrc->regulator =platform_device_register_data (dvfsrc->dev, +"mtk-dvfsrc-regulator" ,-1 ,NULL ,0 );
Why are you registering platform devices like this?
Please use device-tree instead.
drivers/soc/mediatek/mtk-dvfsrc.c line 334
Quoted 8 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +8
-0+if (IS_ERR (dvfsrc->regulator)) { +dev_err (dvfsrc->dev,"Failed create regulator device\n" ); + ret =PTR_ERR (dvfsrc->regulator); + goto err; + } + + dvfsrc->icc =platform_device_register_data (dvfsrc->dev, +"mediatek-emi-icc" ,-1 ,NULL ,0 );
Same here.
drivers/soc/mediatek/mtk-dvfsrc.c line 336
Quoted 2 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +2
-0+if (IS_ERR (dvfsrc->icc)) { +dev_err (dvfsrc->dev,"Failed create icc device\n" );
As a side note, after applying the suggested flow, you will also be able to use dev_err_probe() instead, simplifying this probe function.
Quoted 126 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +85
-0+ ret =PTR_ERR (dvfsrc->icc); + goto unregister_regulator; + } + + ret =devm_of_platform_populate (&pdev->dev); +if (ret) +platform_device_unregister (dvfsrc->icc); + +return 0 ; + +unregister_regulator: +platform_device_unregister (dvfsrc->regulator); +err: +return ret; +} + +static const struct dvfsrc_opp dvfsrc_opp_mt8183_lp4[] = { + {0 ,0 }, {0 ,1 }, {0 ,2 }, {1 ,2 }, +}; + +static const struct dvfsrc_opp dvfsrc_opp_mt8183_lp3[] = { + {0 ,0 }, {0 ,1 }, {1 ,1 }, {1 ,2 }, +}; + +static const struct dvfsrc_opp_desc dvfsrc_opp_mt8183_desc[] = { +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp4), +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp3), +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp3), +}; + +static const struct dvfsrc_soc_data mt8183_data = { + .opps_desc = dvfsrc_opp_mt8183_desc, + .regs = mt8183_regs, + .get_target_level = mt8183_get_target_level, + .get_current_level = mt8183_get_current_level, + .get_vcore_level = mt8183_get_vcore_level, + .set_dram_bw = mt8183_set_dram_bw, + .set_opp_level = mt8183_set_opp_level, + .set_vcore_level = mt8183_set_vcore_level, + .wait_for_opp_level = mt8183_wait_for_opp_level, + .wait_for_vcore_level = dvfsrc_wait_for_vcore_level, +}; + +static int mtk_dvfsrc_remove (struct platform_device *pdev) +{ +struct mtk_dvfsrc *dvfsrc =platform_get_drvdata (pdev); + +platform_device_unregister (dvfsrc->regulator); +platform_device_unregister (dvfsrc->icc); + +return 0 ; +} + +static const struct of_device_id mtk_dvfsrc_of_match[] = { + { + .compatible ="mediatek,mt8183-dvfsrc" , + .data = &mt8183_data, + }, { +/* sentinel */ + }, +}; + +static struct platform_driver mtk_dvfsrc_driver = { + .probe = mtk_dvfsrc_probe, + .remove = mtk_dvfsrc_remove, + .driver = { + .name ="mtk-dvfsrc" , + .of_match_table =of_match_ptr (mtk_dvfsrc_of_match), + }, +}; + +static int __init mtk_dvfsrc_init (void ) +{ +return platform_driver_register (&mtk_dvfsrc_driver); +} +subsys_initcall (mtk_dvfsrc_init); + +static void __exit mtk_dvfsrc_exit(void) +{ +platform_driver_unregister (&mtk_dvfsrc_driver); +} +module_exit (mtk_dvfsrc_exit); + +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MTK DVFSRC driver" );include/linux/soc/mediatek/mtk_dvfsrc.h new file +35
-0@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __SOC_MTK_DVFSRC_H +#define __SOC_MTK_DVFSRC_H + +#define MTK_DVFSRC_CMD_BW_REQUEST 0 +#define MTK_DVFSRC_CMD_OPP_REQUEST 1 +#define MTK_DVFSRC_CMD_VCORE_REQUEST 2 +#define MTK_DVFSRC_CMD_HRTBW_REQUEST 3 +#define MTK_DVFSRC_CMD_VSCP_REQUEST 4 +#define MTK_DVFSRC_CMD_PEAK_BW_REQUEST 5 + +#define MTK_DVFSRC_CMD_VCORE_LEVEL_QUERY 0 +#define MTK_DVFSRC_CMD_VSCP_LEVEL_QUERY 1 + +#if IS_ENABLED (CONFIG_MTK_DVFSRC ) +void mtk_dvfsrc_send_request (const struct device *dev,u32 cmd,u64 data); +int mtk_dvfsrc_query_info (const struct device *dev,u32 cmd,int *data); + +#else + +static inline void mtk_dvfsrc_send_request (const struct device *dev,u32 cmd, +u64 data) +{return -ENODEV ; } + +static inline int mtk_dvfsrc_query_info (const struct device *dev,u32 cmd, +int *data); +{return -ENODEV ; } + +#endif /* CONFIG_MTK_DVFSRC */ + +#endif
Re: [V11,PATCH 04/19] soc: mediatek: add driver for dvfsrc support
Quoted 154 lines · AngeloGioacchino Del Regno
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 148 lines
From: Henry Chen <[email protected]>
Add dvfsrc driver for MT6873/MT8183/MT8192
Signed-off-by Henry Chen <[email protected]>Signed-off-by Dawei Chien <[email protected]>--- drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 421 ++++++++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 +++ 4 files changed, 468 insertions(+)create mode 100644
drivers/soc/mediatek/mtk-dvfsrc.ccreate mode 100644include/linux/soc/mediatek/mtk_dvfsrc.hdrivers/soc/mediatek/Kconfig +5
-0@@ -26,6 +26,17 @@ config MTK_DEVAPC The violation information is logged for further analysis or countermeasures. +config MTK_DVFSRC + tristate "MediaTek DVFSRC Support" + depends on ARCH_MEDIATEK + help + Say yes here to add support for the MediaTek DVFSRC (dynamicvoltage
drivers/soc/mediatek/Kconfig +6
-0+ and frequency scaling resource collector) found + on different MediaTek SoCs. The DVFSRC is a proprietary + hardware which is used to collect all the requests from + system and turn into the decision of minimum Vcore voltage + and minimum DRAM frequency to fulfill those requests. + config MTK_INFRACFG bool "MediaTek INFRACFG Support" select REGMAPdrivers/soc/mediatek/Makefile +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o obj-$(CONFIG_MTK_DEVAPC) += mtk-devapc.o +obj-$(CONFIG_MTK_DVFSRC) += mtk-dvfsrc.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-dvfsrc.c new file +56
-0@@ -0,0 +1,421 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2021 MediaTek Inc. +*/ + +#include <linux/arm-smccc.h> +#include <linux/io.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/notifier.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/soc/mediatek/mtk_dvfsrc.h> +#include <linux/soc/mediatek/mtk_sip_svc.h> + +#define DVFSRC_IDLE 0x00 +#define DVFSRC_GET_TARGET_LEVEL (x) (((x) >> 0) & 0x0000ffff) +#define DVFSRC_GET_CURRENT_LEVEL (x) (((x) >> 16) & 0x0000ffff) +#define kbps_to_mbps (x) ((x) / 1000) + +#define POLL_TIMEOUT 1000 +#define STARTUP_TIME 1 + +#define MTK_SIP_DVFSRC_INIT 0x00 + +#define DVFSRC_OPP_DESC (_opp_table) \ +{ \ + .opps = _opp_table, \ + .num_opp = ARRAY_SIZE(_opp_table), \ +} + +struct dvfsrc_opp { +u32 vcore_opp; +u32 dram_opp; +}; + +struct dvfsrc_opp_desc { +const struct dvfsrc_opp *opps; +u32 num_opp; +}; + +struct mtk_dvfsrc ; +struct dvfsrc_soc_data { +const int *regs; +const struct dvfsrc_opp_desc *opps_desc; +int (*get_target_level)(struct mtk_dvfsrc *dvfsrc); +int (*get_current_level)(struct mtk_dvfsrc *dvfsrc); +u32 (*get_vcore_level)(struct mtk_dvfsrc *dvfsrc); +u32 (*get_vcp_level)(struct mtk_dvfsrc *dvfsrc); +void (*set_dram_bw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_dram_peak_bw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_dram_hrtbw)(struct mtk_dvfsrc *dvfsrc,u64 bw); +void (*set_opp_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +void (*set_vcore_level)(struct mtk_dvfsrc *dvfsrc,u32 level); +void (*set_vscp_level)(struct mtk_dvfsrc *dvfsrc,u32 level); + int (*wait_for_opp_level)(struct mtk_dvfsrc *dvfsrc, u32level);
drivers/soc/mediatek/mtk-dvfsrc.c new file +1
-0+ int (*wait_for_vcore_level)(struct mtk_dvfsrc *dvfsrc, u32level);
drivers/soc/mediatek/mtk-dvfsrc.c new file +21
-0+}; + +struct mtk_dvfsrc { +struct device *dev; +struct platform_device *icc; +struct platform_device *regulator; +const struct dvfsrc_soc_data *dvd; +int dram_type; +const struct dvfsrc_opp_desc *curr_opps; +void __iomem *regs; +spinlock_t req_lock; +struct mutex pstate_lock; +struct notifier_block scpsys_notifier; +}; + +static u32 dvfsrc_read (struct mtk_dvfsrc *dvfs,u32 offset) +{ +return readl (dvfs->regs + dvfs->dvd->regs[offset]); +} + +static void dvfsrc_write(struct mtk_dvfsrc *dvfs, u32 offset, u32val)
drivers/soc/mediatek/mtk-dvfsrc.c new file +7
-0+{ +writel (val, dvfs->regs + dvfs->dvd->regs[offset]); +} + +#define dvfsrc_rmw (dvfs, offset, val, mask, shift) \ + dvfsrc_write(dvfs, offset, \ + (dvfsrc_read(dvfs, offset) & ~(mask << shift)) | (valQuoted 2 lines
<< shift))
+Hello Dawei,
Quoted 5 lines
is there any reason why you're not using regmap-mmio here? If your concern is about regmap locking overhead, you can disable it by
settingdisable_lockingas true in theregmap_config.
Thank you for your review, I would use regmap-mmio to access register on next version.
Quoted 91 lines
Quoted 20 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +19
-0+enum dvfsrc_regs { +DVFSRC_SW_REQ , +DVFSRC_SW_REQ2 , +DVFSRC_LEVEL , +DVFSRC_TARGET_LEVEL , +DVFSRC_SW_BW , +DVFSRC_SW_PEAK_BW , +DVFSRC_SW_HRT_BW , +DVFSRC_VCORE_REQUEST , +}; + +static const int mt8183_regs[] = { + [DVFSRC_SW_REQ ] =0x4 , + [DVFSRC_SW_REQ2 ] =0x8 , + [DVFSRC_LEVEL ] =0xDC , + [DVFSRC_SW_BW ] =0x160 , +}; + +static const struct dvfsrc_opp *get_current_opp(struct mtk_dvfsrc*dvfsrc)
drivers/soc/mediatek/mtk-dvfsrc.c
Quoted 2 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +2
-0+{ +int level;int level = dvfsrc->dvd->get_current_level(dvfsrc);Quoted 66 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +14
-0+ + level = dvfsrc->dvd->get_current_level (dvfsrc); +return &dvfsrc->curr_opps->opps[level]; +} + +static int dvfsrc_is_idle (struct mtk_dvfsrc *dvfsrc) +{ +if (!dvfsrc->dvd->get_target_level) +return true; + +return dvfsrc->dvd->get_target_level (dvfsrc); +} + +static int dvfsrc_wait_for_vcore_level(struct mtk_dvfsrc *dvfsrc,u32 level)
drivers/soc/mediatek/mtk-dvfsrc.c new file +5
-0+{ +const struct dvfsrc_opp *curr; + + return readx_poll_timeout_atomic(get_current_opp, dvfsrc, curr, + curr->vcore_opp >= level,
STARTUP_TIME,drivers/soc/mediatek/mtk-dvfsrc.c new file +4
-0+ POLL_TIMEOUT); +} + +static int mt8183_wait_for_opp_level(struct mtk_dvfsrc *dvfsrc,u32 level)
drivers/soc/mediatek/mtk-dvfsrc.c new file +12
-0+{ +const struct dvfsrc_opp *target, *curr; +int ret; + + target = &dvfsrc->curr_opps->opps[level]; + ret =readx_poll_timeout (get_current_opp, dvfsrc, curr, + curr->dram_opp >= target->dram_opp && + curr->vcore_opp >= target->vcore_opp, +STARTUP_TIME ,POLL_TIMEOUT ); +if (ret <0 ) { + dev_warn(dvfsrc->dev, + "timeout, target: %u, dram: %d, vcore: %d\n",level,
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ curr->dram_opp, curr->vcore_opp); +return ret; + } + +return 0 ; +} + +static int mt8183_get_target_level (struct mtk_dvfsrc *dvfsrc) +{ + return DVFSRC_GET_TARGET_LEVEL(dvfsrc_read(dvfsrc,
DVFSRC_LEVEL));drivers/soc/mediatek/mtk-dvfsrc.c new file +8
-0+} + +static int mt8183_get_current_level (struct mtk_dvfsrc *dvfsrc) +{ +int level; + +/* HW level 0 is begin from 0x10000 */ + level = DVFSRC_GET_CURRENT_LEVEL(dvfsrc_read(dvfsrc,
DVFSRC_LEVEL));drivers/soc/mediatek/mtk-dvfsrc.c new file +7
-0+/* Array index start from 0 */ +return ffs (level) -1 ; +} + +static u32 mt8183_get_vcore_level (struct mtk_dvfsrc *dvfsrc) +{ +return (dvfsrc_read (dvfsrc,DVFSRC_SW_REQ2 ) >>2 ) &0x3 ;
Quoted 9 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 171
Quoted 4 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +4
-0+} + +static void mt8183_set_dram_bw (struct mtk_dvfsrc *dvfsrc,u64 bw) +{Is there any min/max allowed bw? If there is, please add a boudary check here.
Same forset_vcore_level.
I would add a boundary check here on next version.
Quoted 22 lines
Quoted 22 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +1
-0+ dvfsrc_write(dvfsrc, DVFSRC_SW_BW, div_u64(kbps_to_mbps(bw),100));
drivers/soc/mediatek/mtk-dvfsrc.c new file +3
-0+} + +static void mt8183_set_opp_level(struct mtk_dvfsrc *dvfsrc, u32level)
drivers/soc/mediatek/mtk-dvfsrc.c new file +15
-0+{ +int vcore_opp, dram_opp; +const struct dvfsrc_opp *opp; + +/* translate pstate to dvfsrc level, and set it to DVFSRC HW */ + opp = &dvfsrc->curr_opps->opps[level]; + vcore_opp = opp->vcore_opp; + dram_opp = opp->dram_opp; + +dev_dbg (dvfsrc->dev,"vcore_opp: %d, dram_opp: %d\n" , + vcore_opp, dram_opp); +dvfsrc_write (dvfsrc,DVFSRC_SW_REQ , dram_opp | vcore_opp <<2 ); +} + +static void mt8183_set_vcore_level(struct mtk_dvfsrc *dvfsrc, u32level)
Quoted 9 lines
Quoted 6 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +5
-0+{ +dvfsrc_write (dvfsrc,DVFSRC_SW_REQ2 , level <<2 ); +} + +void mtk_dvfsrc_send_request(const struct device *dev, u32 cmd,u64 data)
int mtk_dvfsrc_send_request(......
I would update this on next version
Quoted 20 lines
Quoted 20 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +20
-0+{ +int ret, state; +struct mtk_dvfsrc *dvfsrc =dev_get_drvdata (dev); + +dev_dbg (dvfsrc->dev,"cmd: %d, data: %llu\n" , cmd, data); + +switch (cmd) { +case MTK_DVFSRC_CMD_BW_REQUEST : + dvfsrc->dvd->set_dram_bw (dvfsrc, data); +return ; +case MTK_DVFSRC_CMD_PEAK_BW_REQUEST : +if (dvfsrc->dvd->set_dram_peak_bw) + dvfsrc->dvd->set_dram_peak_bw (dvfsrc, data); +return ; +case MTK_DVFSRC_CMD_OPP_REQUEST : +if (dvfsrc->dvd->set_opp_level) + dvfsrc->dvd->set_opp_level (dvfsrc, data); +break ; +case MTK_DVFSRC_CMD_VCORE_REQUEST : + dvfsrc->dvd->set_vcore_level (dvfsrc, data);
Quoted 9 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 221
Quoted 6 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +6
-0+break ; +case MTK_DVFSRC_CMD_HRTBW_REQUEST : +if (dvfsrc->dvd->set_dram_hrtbw) + dvfsrc->dvd->set_dram_hrtbw (dvfsrc, data); +else +return ;return -EINVAL;
I would update this on next version
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 228
Quoted 7 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +7
-0+break ; +case MTK_DVFSRC_CMD_VSCP_REQUEST : + dvfsrc->dvd->set_vscp_level (dvfsrc, data); +break ; +default : +dev_err (dvfsrc->dev,"unknown command: %d\n" , cmd); +return ;return -EINVAL;
I would update this on next version
Quoted 13 lines
Quoted 13 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +13
-0+ } + +/* DVFSRC needs to wait at least 2T(~196ns) to handle request +* after receiving command +*/ +udelay (STARTUP_TIME ); + + ret =readx_poll_timeout (dvfsrc_is_idle, dvfsrc, + state, state ==DVFSRC_IDLE , +STARTUP_TIME ,POLL_TIMEOUT ); + +if (ret <0 ) { + dev_warn(dvfsrc->dev,
Quoted 9 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 246
Quoted 6 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +1
-0+ "%d: idle timeout, data: %llu, last: %d ->%d\n",
drivers/soc/mediatek/mtk-dvfsrc.c new file +4
-0+ cmd, data, + dvfsrc->dvd->get_current_level (dvfsrc), + dvfsrc->dvd->get_target_level(dvfsrc)); +return ;return ret;
I would update this on next version
Quoted 87 lines
Quoted 74 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +15
-0+ } + +/* The previous change may be requested by previous request. +* So we delay 1us, then start checking opp is reached enough. +*/ +udelay (STARTUP_TIME ); + +if (cmd ==MTK_DVFSRC_CMD_OPP_REQUEST ) + ret = dvfsrc->dvd->wait_for_opp_level (dvfsrc, data); +else + ret = dvfsrc->dvd->wait_for_vcore_level (dvfsrc, data); + +if (ret <0 ) { + dev_warn(dvfsrc->dev, + "%d: wait timeout, data: %llu, last: %d ->%d\n",
drivers/soc/mediatek/mtk-dvfsrc.c new file +9
-0+ cmd, data, + dvfsrc->dvd->get_current_level (dvfsrc), + dvfsrc->dvd->get_target_level(dvfsrc)); + } + +} +EXPORT_SYMBOL (mtk_dvfsrc_send_request); + +int mtk_dvfsrc_query_info(const struct device *dev, u32 cmd, int*data)
drivers/soc/mediatek/mtk-dvfsrc.c new file +41
-0+{ +struct mtk_dvfsrc *dvfsrc =dev_get_drvdata (dev); + +switch (cmd) { +case MTK_DVFSRC_CMD_VCORE_LEVEL_QUERY : + *data = dvfsrc->dvd->get_vcore_level (dvfsrc); +break ; +case MTK_DVFSRC_CMD_VSCP_LEVEL_QUERY : + *data = dvfsrc->dvd->get_vcp_level (dvfsrc); +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +EXPORT_SYMBOL (mtk_dvfsrc_query_info); + +static int mtk_dvfsrc_probe (struct platform_device *pdev) +{ +struct arm_smccc_res ares; +struct resource *res; +struct mtk_dvfsrc *dvfsrc; +int ret; + + dvfsrc =devm_kzalloc (&pdev->dev,sizeof (*dvfsrc),GFP_KERNEL ); +if (!dvfsrc) +return -ENOMEM ; + + dvfsrc->dvd =of_device_get_match_data (&pdev->dev); + dvfsrc->dev = &pdev->dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + dvfsrc->regs =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (dvfsrc->regs)) +return PTR_ERR (dvfsrc->regs); + +spin_lock_init (&dvfsrc->req_lock); +mutex_init (&dvfsrc->pstate_lock); + + arm_smccc_smc(MTK_SIP_VCOREFS_CONTROL, MTK_SIP_DVFSRC_INIT, 0,0, 0,
drivers/soc/mediatek/mtk-dvfsrc.c new file +5
-0+ 0, 0, 0, &ares); + +if (!ares.a0) { + dvfsrc->dram_type = ares.a1; + dev_info(dvfsrc->dev, "dram_type: %d\n", dvfsrc-Quoted 1 line
dram_type);drivers/soc/mediatek/mtk-dvfsrc.c line 326
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ }else { +dev_err (dvfsrc->dev,"init fails: %lu\n" , ares.a0); +return ares.a0; + } + + dvfsrc->curr_opps = &dvfsrc->dvd->opps_desc[dvfsrc->dram_type]; +platform_set_drvdata (pdev, dvfsrc); + + dvfsrc->regulator =platform_device_register_data (dvfsrc->dev, +"mtk-dvfsrc-regulator" ,-1 ,NULL ,0 );Why are you registering platform devices like this?
Quoted 2 lines
Please use device-tree instead.
Thank you for advisement. Let me just describe history.
Actually, we did use device-tree to probe interconnect/regulator driver in v4, and reviewer had some advisement
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/#23243049
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/#23236945
so we refer to this driver to use platform_device_register_data after v5.
Would you kindly give your advisement, thank you.
Quoted 12 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 334
Quoted 9 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +2
-0+if (IS_ERR (dvfsrc->regulator)) { + dev_err(dvfsrc->dev, "Failed create regulatordevice\n");
drivers/soc/mediatek/mtk-dvfsrc.c new file +6
-0+ ret =PTR_ERR (dvfsrc->regulator); + goto err; + } + + dvfsrc->icc =platform_device_register_data (dvfsrc->dev, +"mediatek-emi-icc" ,-1 ,NULL ,0 );Same here.
Quoted 7 lines
drivers/soc/mediatek/mtk-dvfsrc.c line 336
Quoted 2 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +2
-0+if (IS_ERR (dvfsrc->icc)) { +dev_err (dvfsrc->dev,"Failed create icc device\n" );As a side note, after applying the suggested flow, you will also be able
to usedev_err_probe()instead, simplifying this probe function.
I would update this on next version
Quoted 131 lines
Quoted 131 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +85
-0+ ret =PTR_ERR (dvfsrc->icc); + goto unregister_regulator; + } + + ret =devm_of_platform_populate (&pdev->dev); +if (ret) +platform_device_unregister (dvfsrc->icc); + +return 0 ; + +unregister_regulator: +platform_device_unregister (dvfsrc->regulator); +err: +return ret; +} + +static const struct dvfsrc_opp dvfsrc_opp_mt8183_lp4[] = { + {0 ,0 }, {0 ,1 }, {0 ,2 }, {1 ,2 }, +}; + +static const struct dvfsrc_opp dvfsrc_opp_mt8183_lp3[] = { + {0 ,0 }, {0 ,1 }, {1 ,1 }, {1 ,2 }, +}; + +static const struct dvfsrc_opp_desc dvfsrc_opp_mt8183_desc[] = { +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp4), +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp3), +DVFSRC_OPP_DESC (dvfsrc_opp_mt8183_lp3), +}; + +static const struct dvfsrc_soc_data mt8183_data = { + .opps_desc = dvfsrc_opp_mt8183_desc, + .regs = mt8183_regs, + .get_target_level = mt8183_get_target_level, + .get_current_level = mt8183_get_current_level, + .get_vcore_level = mt8183_get_vcore_level, + .set_dram_bw = mt8183_set_dram_bw, + .set_opp_level = mt8183_set_opp_level, + .set_vcore_level = mt8183_set_vcore_level, + .wait_for_opp_level = mt8183_wait_for_opp_level, + .wait_for_vcore_level = dvfsrc_wait_for_vcore_level, +}; + +static int mtk_dvfsrc_remove (struct platform_device *pdev) +{ +struct mtk_dvfsrc *dvfsrc =platform_get_drvdata (pdev); + +platform_device_unregister (dvfsrc->regulator); +platform_device_unregister (dvfsrc->icc); + +return 0 ; +} + +static const struct of_device_id mtk_dvfsrc_of_match[] = { + { + .compatible ="mediatek,mt8183-dvfsrc" , + .data = &mt8183_data, + }, { +/* sentinel */ + }, +}; + +static struct platform_driver mtk_dvfsrc_driver = { + .probe = mtk_dvfsrc_probe, + .remove = mtk_dvfsrc_remove, + .driver = { + .name ="mtk-dvfsrc" , + .of_match_table =of_match_ptr (mtk_dvfsrc_of_match), + }, +}; + +static int __init mtk_dvfsrc_init (void ) +{ +return platform_driver_register (&mtk_dvfsrc_driver); +} +subsys_initcall (mtk_dvfsrc_init); + +static void __exit mtk_dvfsrc_exit(void) +{ +platform_driver_unregister (&mtk_dvfsrc_driver); +} +module_exit (mtk_dvfsrc_exit); + +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("MTK DVFSRC driver" );include/linux/soc/mediatek/mtk_dvfsrc.h new file +20
-0@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __SOC_MTK_DVFSRC_H +#define __SOC_MTK_DVFSRC_H + +#define MTK_DVFSRC_CMD_BW_REQUEST 0 +#define MTK_DVFSRC_CMD_OPP_REQUEST 1 +#define MTK_DVFSRC_CMD_VCORE_REQUEST 2 +#define MTK_DVFSRC_CMD_HRTBW_REQUEST 3 +#define MTK_DVFSRC_CMD_VSCP_REQUEST 4 +#define MTK_DVFSRC_CMD_PEAK_BW_REQUEST 5 + +#define MTK_DVFSRC_CMD_VCORE_LEVEL_QUERY 0 +#define MTK_DVFSRC_CMD_VSCP_LEVEL_QUERY 1 + +#if IS_ENABLED (CONFIG_MTK_DVFSRC ) +void mtk_dvfsrc_send_request(const struct device *dev, u32 cmd,u64 data);
+intmtk_dvfsrc_query_info(const struct device *dev, u32 cmd, int *data);include/linux/soc/mediatek/mtk_dvfsrc.h new file +4
-0+ +#else + +static inline void mtk_dvfsrc_send_request(const struct device*dev, u32 cmd,
include/linux/soc/mediatek/mtk_dvfsrc.h new file +4
-0+ u64 data) +{return -ENODEV ; } + +static inline int mtk_dvfsrc_query_info(const struct device *dev,u32 cmd,
include/linux/soc/mediatek/mtk_dvfsrc.h new file +6
-0+ int *data); +{return -ENODEV ; } + +#endif /* CONFIG_MTK_DVFSRC */ + +#endif
AngeloGioacchino Del Regno
maintainerRe: [V11,PATCH 04/19] soc: mediatek: add driver for dvfsrc support
Il 11/02/22 04:51, Dawei Chien ha scritto:
Quoted 18 lines · AngeloGioacchino Del Regno
Quoted 17 lines
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 16 lines
From: Henry Chen <[email protected]>
Add dvfsrc driver for MT6873/MT8183/MT8192
Signed-off-by Henry Chen <[email protected]>Signed-off-by Dawei Chien <[email protected]>--- drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 421 ++++++++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 +++ 4 files changed, 468 insertions(+)create mode 100644
drivers/soc/mediatek/mtk-dvfsrc.ccreate mode 100644include/linux/soc/mediatek/mtk_dvfsrc.h
..snip..
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +0
-0
..snip..
Quoted 54 lines
Quoted 43 lines
Quoted 30 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +23
-0+static int mtk_dvfsrc_probe (struct platform_device *pdev) +{ +struct arm_smccc_res ares; +struct resource *res; +struct mtk_dvfsrc *dvfsrc; +int ret; + + dvfsrc =devm_kzalloc (&pdev->dev,sizeof (*dvfsrc),GFP_KERNEL ); +if (!dvfsrc) +return -ENOMEM ; + + dvfsrc->dvd =of_device_get_match_data (&pdev->dev); + dvfsrc->dev = &pdev->dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + dvfsrc->regs =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (dvfsrc->regs)) +return PTR_ERR (dvfsrc->regs); + +spin_lock_init (&dvfsrc->req_lock); +mutex_init (&dvfsrc->pstate_lock); + + arm_smccc_smc(MTK_SIP_VCOREFS_CONTROL, MTK_SIP_DVFSRC_INIT, 0,0, 0,
drivers/soc/mediatek/mtk-dvfsrc.c new file +5
-0+ 0, 0, 0, &ares); + +if (!ares.a0) { + dvfsrc->dram_type = ares.a1; + dev_info(dvfsrc->dev, "dram_type: %d\n", dvfsrc-Quoted 1 line
dram_type);drivers/soc/mediatek/mtk-dvfsrc.c line 326
Quoted 10 lines
drivers/soc/mediatek/mtk-dvfsrc.c new file +10
-0+ }else { +dev_err (dvfsrc->dev,"init fails: %lu\n" , ares.a0); +return ares.a0; + } + + dvfsrc->curr_opps = &dvfsrc->dvd->opps_desc[dvfsrc->dram_type]; +platform_set_drvdata (pdev, dvfsrc); + + dvfsrc->regulator =platform_device_register_data (dvfsrc->dev, +"mtk-dvfsrc-regulator" ,-1 ,NULL ,0 );Why are you registering platform devices like this?
Quoted 2 lines
Please use device-tree instead.
Thank you for advisement. Let me just describe history.
Actually, we did use device-tree to probe interconnect/regulator driver in v4, and reviewer had some advisement
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/#23243049
Quoted 9 lines
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/#23236945
so we refer to this driver to use
platform_device_register_dataafter v5.Would you kindly give your advisement, thank you.
Hello Dawei,
I was under the impression that the regulator and EMI were different hardware, while effectively they are inside of the DVFS Resource Collector IP, and the registers look like being a bit mixed up, so it's impossible to actually specify a relative iospace for the regulator, or for the EMI.
In this case, from what I understand right now, the emi and regulator are not different hardware, but "features of" the DVFS Resource Collector.
I've done some research around the kernel and, effectively, the only way that makes sense, is to register the feature-drivers (emi/vreg) with platform_device_register_data(), as per your current approach, even though I have a hunch that it will look a bit confusing in device-tree, as you'd be using the same node for both regulator and interconnects...
I would exclude doing it as a MFD driver, as I don't see any very clean way to actually implement that.
At this point, let's just keep it as it is, or this would probably get a lot overcomplicated for no good reasons.
So, please ignore the device-tree suggestion and go on with the other suggested fixes for this driver.
Looking forward to see your v4!
Kind regards,
Angelo
PATCH v11 5/19 soc: mediatek: add support for mt6873
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
add support for mt6873
--- drivers/soc/mediatek/mtk-dvfsrc.c | 114 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+)
drivers/soc/mediatek/mtk-dvfsrc.c +114 -0
@@ -102,6 +102,16 @@ static const int mt8183_regs[] = { [DVFSRC_SW_BW] = 0x160, }; +static const int mt6873_regs[] = { + [DVFSRC_SW_REQ ] =0xC , + [DVFSRC_LEVEL ] =0xD44 , + [DVFSRC_SW_PEAK_BW ] =0x278 , + [DVFSRC_SW_BW ] =0x26C , + [DVFSRC_SW_HRT_BW ] =0x290 , + [DVFSRC_TARGET_LEVEL ] =0xD48 , + [DVFSRC_VCORE_REQUEST ] =0x6C , +}; +static const struct dvfsrc_opp *get_current_opp (struct mtk_dvfsrc *dvfsrc) {int level;
@@ -127,6 +137,78 @@ static int dvfsrc_wait_for_vcore_level(struct mtk_dvfsrc *dvfsrc, u32 level) POLL_TIMEOUT); } +static int mt6873_get_target_level (struct mtk_dvfsrc *dvfsrc) +{ +return dvfsrc_read (dvfsrc,DVFSRC_TARGET_LEVEL ); +} + +static int mt6873_get_current_level (struct mtk_dvfsrc *dvfsrc) +{ +u32 curr_level; + +/* HW level 0 is begin from 0x1, and max opp is 0x1*/ + curr_level =ffs (dvfsrc_read (dvfsrc,DVFSRC_LEVEL )); +if (curr_level > dvfsrc->curr_opps->num_opp) + curr_level =0 ; +else + curr_level = dvfsrc->curr_opps->num_opp - curr_level; + +return curr_level; +} + +static int mt6873_wait_for_opp_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +const struct dvfsrc_opp *target, *curr; + + target = &dvfsrc->curr_opps->opps[level]; +return readx_poll_timeout_atomic (get_current_opp, dvfsrc, curr, + curr->dram_opp >= target->dram_opp, +STARTUP_TIME ,POLL_TIMEOUT ); +} + +static u32 mt6873_get_vcore_level (struct mtk_dvfsrc *dvfsrc) +{ +return (dvfsrc_read (dvfsrc,DVFSRC_SW_REQ ) >>4 ) &0x7 ; +} + +static u32 mt6873_get_vcp_level (struct mtk_dvfsrc *dvfsrc) +{ +return (dvfsrc_read (dvfsrc,DVFSRC_VCORE_REQUEST ) >>12 ) &0x7 ; +} + +static void mt6873_set_dram_bw (struct mtk_dvfsrc *dvfsrc,u64 bw) +{ + bw =div_u64 (kbps_to_mbps (bw),100 ); + bw =min_t (u64, bw,0xFF ); +dvfsrc_write (dvfsrc,DVFSRC_SW_BW , bw); +} + +static void mt6873_set_dram_peak_bw (struct mtk_dvfsrc *dvfsrc,u64 bw) +{ + bw =div_u64 (kbps_to_mbps (bw),100 ); + bw =min_t (u64, bw,0xFF ); +dvfsrc_write (dvfsrc,DVFSRC_SW_PEAK_BW , bw); +} + +static void mt6873_set_dram_hrtbw (struct mtk_dvfsrc *dvfsrc,u64 bw) +{ + bw =div_u64 ((kbps_to_mbps (bw) +29 ),30 ); + bw =min_t (u64, bw,0x3FF ); +dvfsrc_write (dvfsrc,DVFSRC_SW_HRT_BW , bw); +} + +static void mt6873_set_vcore_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +spin_lock (&dvfsrc->req_lock); +dvfsrc_rmw (dvfsrc,DVFSRC_SW_REQ , level,0x7 ,4 ); +spin_unlock (&dvfsrc->req_lock); +} + +static void mt6873_set_vscp_level (struct mtk_dvfsrc *dvfsrc,u32 level) +{ +dvfsrc_rmw (dvfsrc,DVFSRC_VCORE_REQUEST , level,0x7 ,12 ); +} +static int mt8183_wait_for_opp_level (struct mtk_dvfsrc *dvfsrc,u32 level) {const struct dvfsrc_opp *target, *curr;
@@ -377,6 +459,35 @@ static const struct dvfsrc_soc_data mt8183_data = { .wait_for_vcore_level = dvfsrc_wait_for_vcore_level, }; +static const struct dvfsrc_opp dvfsrc_opp_mt6873_lp4[] = { + {0 ,0 }, {1 ,0 }, {2 ,0 }, {3 ,0 }, + {0 ,1 }, {1 ,1 }, {2 ,1 }, {3 ,1 }, + {0 ,2 }, {1 ,2 }, {2 ,2 }, {3 ,2 }, + {1 ,3 }, {2 ,3 }, {3 ,3 }, {1 ,4 }, + {2 ,4 }, {3 ,4 }, {2 ,5 }, {3 ,5 }, + {3 ,6 }, +}; + +static const struct dvfsrc_opp_desc dvfsrc_opp_mt6873_desc[] = { +DVFSRC_OPP_DESC (dvfsrc_opp_mt6873_lp4), +}; + +static const struct dvfsrc_soc_data mt6873_data = { + .opps_desc = dvfsrc_opp_mt6873_desc, + .regs = mt6873_regs, + .get_target_level = mt6873_get_target_level, + .get_current_level = mt6873_get_current_level, + .get_vcore_level = mt6873_get_vcore_level, + .get_vcp_level = mt6873_get_vcp_level, + .set_dram_bw = mt6873_set_dram_bw, + .set_dram_peak_bw = mt6873_set_dram_peak_bw, + .set_dram_hrtbw = mt6873_set_dram_hrtbw, + .set_vcore_level = mt6873_set_vcore_level, + .set_vscp_level = mt6873_set_vscp_level, + .wait_for_opp_level = mt6873_wait_for_opp_level, + .wait_for_vcore_level = dvfsrc_wait_for_vcore_level, +}; +static int mtk_dvfsrc_remove (struct platform_device *pdev) {struct mtk_dvfsrc *dvfsrc =platform_get_drvdata (pdev);
@@ -391,6 +502,9 @@ static const struct of_device_id mtk_dvfsrc_of_match[] = { { .compatible = "mediatek,mt8183-dvfsrc", .data = &mt8183_data, + }, { + .compatible = "mediatek,mt6873-dvfsrc", + .data = &mt6873_data, }, { /* sentinel */ },
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerRe: [V11,PATCH 05/19] soc: mediatek: add support for mt6873
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 5 lines
From: Henry Chen <[email protected]>
add support for mt6873
Signed-off-by Henry Chen <[email protected]>
You forgot to add your Signed-off-by tag here. Even if this patch is not yours, you're the sender, so you have to sign it.
Besides, can you please fix the title?
soc: mediatek: mtk-dvfsrc: Add support for MT6873
Re: [V11,PATCH 05/19] soc: mediatek: add support for mt6873
Quoted 5 lines · AngeloGioacchino Del Regno
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 4 lines
From: Henry Chen <[email protected]>
add support for mt6873
Quoted 8 lines
Quoted 1 line
Signed-off-by Henry Chen <[email protected]>You forgot to add your Signed-off-by tag here. Even if this patch is not yours, you're the sender, so you have to sign it.
Besides, can you please fix the title?
soc: mediatek: mtk-dvfsrc: Add support for MT6873
I would add signed-off tag and fix the title on next version, thank you.
PATCH v11 6/19 soc: mediatek: add support for mt8195
In reply to Dawei Chienadd support for mt8195
--- drivers/soc/mediatek/mtk-dvfsrc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/mediatek/mtk-dvfsrc.c +3 -0
@@ -505,6 +505,9 @@ static const struct of_device_id mtk_dvfsrc_of_match[] = { }, { .compatible = "mediatek,mt6873-dvfsrc", .data = &mt6873_data, + }, { + .compatible = "mediatek,mt8195-dvfsrc", + .data = &mt6873_data, }, { /* sentinel */ },
Signature · 1 line
2.14.1
PATCH v11 7/19 arm64: dts: mt8183: add dvfsrc related nodes
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Enable dvfsrc on mt8183 platform.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +5 -0
@@ -583,6 +583,11 @@ #clock-cells = <1>; }; + ddr_emi: dvfsrc@10012000 { + compatible = "mediatek,mt8183-dvfsrc"; + reg = <0 0x10012000 0 0x1000>; + }; + pwrap: pwrap@1000d000 { compatible = "mediatek,mt8183-pwrap"; reg = <0 0x1000d000 0 0x1000>;
Signature · 1 line
2.14.1
PATCH v11 8/19 arm64: dts: mt8192: add dvfsrc related nodes
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Enable dvfsrc on mt8192 platform.
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +6 -0
@@ -282,6 +282,12 @@ #interrupt-cells = <2>; }; + ddr_emi: dvfsrc@10012000 { + compatible = "mediatek,mt8192-dvfsrc", + "mediatek,mt6873-dvfsrc"; + reg = <0 0x10012000 0 0x1000>; + }; + systimer: timer@10017000 { compatible = "mediatek,mt8192-timer", "mediatek,mt6765-timer";
Signature · 1 line
2.14.1
PATCH v11 9/19 arm64: dts: mt8195: add dvfsrc related nodes
In reply to Dawei ChienEnable dvfsrc on mt8195 platform.
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +5 -0
@@ -686,6 +686,11 @@ #clock-cells = <1>; }; + ddr_emi: dvfsrc@10012000 { + compatible = "mediatek,mt8195-dvfsrc"; + reg = <0 0x10012000 0 0x1000>; + }; + systimer: timer@10017000 { compatible = "mediatek,mt8195-timer", "mediatek,mt6765-timer"; reg = <0 0x10017000 0 0x1000>;
Signature · 1 line
2.14.1
PATCH v11 10/19 dt-bindings: interconnect: add MT6873 interconnect dt-bindings
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add interconnect provider dt-bindings for MT6873.
--- include/dt-bindings/interconnect/mtk,mt6873-emi.h | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 include/dt-bindings/interconnect/mtk,mt6873-emi.h
include/dt-bindings/interconnect/mtk,mt6873-emi.h new file +41 -0
@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __DT_BINDINGS_INTERCONNECT_MTK_MT6873_EMI_H +#define __DT_BINDINGS_INTERCONNECT_MTK_MT6873_EMI_H + +#define MT6873_SLAVE_DDR_EMI 0 +#define MT6873_MASTER_MCUSYS 1 +#define MT6873_MASTER_GPUSYS 2 +#define MT6873_MASTER_MMSYS 3 +#define MT6873_MASTER_MM_VPU 4 +#define MT6873_MASTER_MM_DISP 5 +#define MT6873_MASTER_MM_VDEC 6 +#define MT6873_MASTER_MM_VENC 7 +#define MT6873_MASTER_MM_CAM 8 +#define MT6873_MASTER_MM_IMG 9 +#define MT6873_MASTER_MM_MDP 10 +#define MT6873_MASTER_VPUSYS 11 +#define MT6873_MASTER_VPU_0 12 +#define MT6873_MASTER_VPU_1 13 +#define MT6873_MASTER_MDLASYS 14 +#define MT6873_MASTER_MDLA_0 15 +#define MT6873_MASTER_UFS 16 +#define MT6873_MASTER_PCIE 17 +#define MT6873_MASTER_USB 18 +#define MT6873_MASTER_DBGIF 19 +#define MT6873_SLAVE_HRT_DDR_EMI 20 +#define MT6873_MASTER_HRT_MMSYS 21 +#define MT6873_MASTER_HRT_MM_DISP 22 +#define MT6873_MASTER_HRT_MM_VDEC 23 +#define MT6873_MASTER_HRT_MM_VENC 24 +#define MT6873_MASTER_HRT_MM_CAM 25 +#define MT6873_MASTER_HRT_MM_IMG 26 +#define MT6873_MASTER_HRT_MM_MDP 27 +#define MT6873_MASTER_HRT_DBGIF 28 +#define MT6873_MASTER_WIFI 29 +#define MT6873_MASTER_BT 30 +#define MT6873_MASTER_NETSYS 31 +#endif
Signature · 1 line
2.14.1
PATCH v11 11/19 dt-bindings: interconnect: add MT8195 interconnect dt-bindings
In reply to Dawei ChienAdd interconnect provider dt-bindings for MT8195
--- include/dt-bindings/interconnect/mtk,mt8195-emi.h | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 include/dt-bindings/interconnect/mtk,mt8195-emi.h
include/dt-bindings/interconnect/mtk,mt8195-emi.h new file +42 -0
@@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2020 MediaTek Inc. +*/ + +#ifndef __DT_BINDINGS_INTERCONNECT_MTK_MT8195_EMI_H +#define __DT_BINDINGS_INTERCONNECT_MTK_MT8195_EMI_H + +#define MT8195_SLAVE_DDR_EMI 0 +#define MT8195_MASTER_MCUSYS 1 +#define MT8195_MASTER_GPUSYS 2 +#define MT8195_MASTER_MMSYS 3 +#define MT8195_MASTER_MM_VPU 4 +#define MT8195_MASTER_MM_DISP 5 +#define MT8195_MASTER_MM_VDEC 6 +#define MT8195_MASTER_MM_VENC 7 +#define MT8195_MASTER_MM_CAM 8 +#define MT8195_MASTER_MM_IMG 9 +#define MT8195_MASTER_MM_MDP 10 +#define MT8195_MASTER_VPUSYS 11 +#define MT8195_MASTER_VPU_0 12 +#define MT8195_MASTER_VPU_1 13 +#define MT8195_MASTER_MDLASYS 14 +#define MT8195_MASTER_MDLA_0 15 +#define MT8195_MASTER_UFS 16 +#define MT8195_MASTER_PCIE_0 17 +#define MT8195_MASTER_PCIE_1 18 +#define MT8195_MASTER_USB 19 +#define MT8195_MASTER_DBGIF 20 +#define MT8195_SLAVE_HRT_DDR_EMI 21 +#define MT8195_MASTER_HRT_MMSYS 22 +#define MT8195_MASTER_HRT_MM_DISP 23 +#define MT8195_MASTER_HRT_MM_VDEC 24 +#define MT8195_MASTER_HRT_MM_VENC 25 +#define MT8195_MASTER_HRT_MM_CAM 26 +#define MT8195_MASTER_HRT_MM_IMG 27 +#define MT8195_MASTER_HRT_MM_MDP 28 +#define MT8195_MASTER_HRT_DBGIF 29 +#define MT8195_MASTER_WIFI 30 +#define MT8195_MASTER_BT 31 +#define MT8195_MASTER_NETSYS 32 +#endif
Signature · 1 line
2.14.1
Re: [V11,PATCH 11/19] dt-bindings: interconnect: add MT8195 interconnect dt-bindings
Quoted 8 lines · Dawei Chien
Add interconnect provider dt-bindings for MT8195
Signed-off-by Dawei Chien <[email protected]>--- include/dt-bindings/interconnect/mtk,mt8195-emi.h | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 include/dt-bindings/interconnect/mtk,mt8195-emi.h
Re: [V11, PATCH 11/19] dt-bindings: interconnect: add MT8195 interconnect dt-bindings
In reply to Dawei ChienIl 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 4 lines
Add interconnect provider dt-bindings for MT8195
Signed-off-by Dawei Chien <[email protected]>Acked-by Rob Herring <[email protected]>
PATCH v11 12/19 interconnect: mediatek: Add interconnect provider driver
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Introduce Mediatek MT6873/MT8183/MT8192 specific provider driver using the interconnect framework.
ICC provider ICC Nodes
---- ----
--------- |CPU | |--- |VPU |
----- | |----- ---- | ----
|DRAM |--|DRAM | ---- | ----
| |--|scheduler|----- |GPU | |--- |DISP|
| |--|(EMI) | ---- | ----
| |--| | ----- | ----
----- | |----- |MMSYS|--|--- |VDEC|
--------- ----- | ----
/|\ | ----
|change DRAM freq |--- |VENC|
---------- | ----
| DVFSR | |
| | | ----
---------- |--- |IMG |
| ----
| ----
|--- |CAM |
------- drivers/interconnect/Kconfig | 1 + drivers/interconnect/Makefile | 1 + drivers/interconnect/mediatek/Kconfig | 13 ++ drivers/interconnect/mediatek/Makefile | 3 + drivers/interconnect/mediatek/mtk-emi.c | 331 ++++++++++++++++++++++++++++++++ 5 files changed, 349 insertions(+) create mode 100644 drivers/interconnect/mediatek/Kconfig create mode 100644 drivers/interconnect/mediatek/Makefile create mode 100644 drivers/interconnect/mediatek/mtk-emi.c
drivers/interconnect/Kconfig +1 -0
@@ -12,6 +12,7 @@ menuconfig INTERCONNECT if INTERCONNECT source "drivers/interconnect/imx/Kconfig" +source "drivers/interconnect/mediatek/Kconfig" source "drivers/interconnect/qcom/Kconfig" source "drivers/interconnect/samsung/Kconfig"
drivers/interconnect/Makefile +1 -0
@@ -5,5 +5,6 @@ icc-core-objs := core.o bulk.o obj-$(CONFIG_INTERCONNECT) += icc-core.o obj-$(CONFIG_INTERCONNECT_IMX) += imx/ +obj-$(CONFIG_INTERCONNECT_MTK) += mediatek/ obj-$(CONFIG_INTERCONNECT_QCOM) += qcom/ obj-$(CONFIG_INTERCONNECT_SAMSUNG) += samsung/
drivers/interconnect/mediatek/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +config INTERCONNECT_MTK + bool "Mediatek Network-on-Chip interconnect drivers" + depends on ARCH_MEDIATEK || COMPILE_TEST + help + Support for Mediatek's Network-on-Chip interconnect hardware. + +config INTERCONNECT_MTK_EMI + tristate "Mediatek EMI interconnect driver" + depends on INTERCONNECT_MTK + depends on (MTK_DVFSRC && OF) || COMPILE_TEST + help + This is a driver for the Mediatek Network-on-Chip on DVFSRC-based + platforms.
drivers/interconnect/mediatek/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_INTERCONNECT_MTK_EMI) += mtk-emi.o
drivers/interconnect/mediatek/mtk-emi.c new file +331 -0
331 lines not on this page · raw message
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerRe: [V11, PATCH 12/19] interconnect: mediatek: Add interconnect provider driver
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 25 lines
From: Henry Chen <[email protected]>
Introduce Mediatek MT6873/MT8183/MT8192 specific provider driver using the interconnect framework.
ICC provider ICC Nodes ---- ---- --------- |CPU | |--- |VPU | ----- | |----- ---- | ---- |DRAM |--|DRAM | ---- | ---- | |--|scheduler|----- |GPU | |--- |DISP| | |--|(EMI) | ---- | ---- | |--| | ----- | ---- ----- | |----- |MMSYS|--|--- |VDEC| --------- ----- | ---- /|\ | ---- |change DRAM freq |--- |VENC| ---------- | ---- | DVFSR | | | | | ---- ---------- |--- |IMG | | ---- | ---- |--- |CAM | ----
Quoted 2 lines
Signed-off-by Henry Chen <[email protected]>Reviewed-by Georgi Djakov <[email protected]>
This patch deserves my Reviewed-by tag, but I cannot release that if the driver is not properly signed-off.
Re: [V11, PATCH 12/19] interconnect: mediatek: Add interconnect provider driver
Quoted 29 lines · AngeloGioacchino Del Regno
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 25 lines
From: Henry Chen <[email protected]>
Introduce Mediatek MT6873/MT8183/MT8192 specific provider driver using the interconnect framework.
ICC provider ICC Nodes ---- ---- --------- |CPU | |--- |VPU | ----- | |----- ---- | ---- |DRAM |--|DRAM | ---- | ---- | |--|scheduler|----- |GPU | |--- |DISP| | |--|(EMI) | ---- | ---- | |--| | ----- | ---- ----- | |----- |MMSYS|--|--- |VDEC| --------- ----- | ---- /|\ | ---- |change DRAM freq |--- |VENC| ---------- | ---- | DVFSR | | | | | ---- ---------- |--- |IMG | | ---- | ---- |--- |CAM | ----Quoted 2 lines
Signed-off-by Henry Chen <[email protected]>Reviewed-by Georgi Djakov <[email protected]>
Quoted 3 lines
This patch deserves my Reviewed-by tag, but I cannot release that if the
driver is not properly signed-off.
I would add singed-off tag on next version, thank you.
PATCH v11 13/19 interconnect: mediatek: add support for mt8195
In reply to Dawei Chienadd platform data of mt8195
--- drivers/interconnect/mediatek/mtk-emi.c | 51 +++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-)
drivers/interconnect/mediatek/mtk-emi.c +48 -3
@@ -12,6 +12,7 @@#include <linux/soc/mediatek/mtk_dvfsrc.h> #include <dt-bindings/interconnect/mtk,mt6873-emi.h> #include <dt-bindings/interconnect/mtk,mt8183-emi.h> +#include <dt-bindings/interconnect/mtk,mt8195-emi.h> enum mtk_icc_name {SLAVE_DDR_EMI ,
@@ -31,7 +32,8 @@ enum mtk_icc_name {MASTER_MDLASYS ,MASTER_MDLA_PORT_0 ,MASTER_UFS , -MASTER_PCIE , +MASTER_PCIE_0 , +MASTER_PCIE_1 ,MASTER_USB ,MASTER_WIFI , MASTER_BT,
@@ -102,7 +104,8 @@ DEFINE_MNODE(vpu_port_1, MASTER_VPU_PORT_1, 0, MASTER_VPUSYS);DEFINE_MNODE (mdlasys,MASTER_MDLASYS ,0 ,SLAVE_DDR_EMI );DEFINE_MNODE (mdla_port_0,MASTER_MDLA_PORT_0 ,0 ,MASTER_MDLASYS );DEFINE_MNODE (ufs,MASTER_UFS ,0 ,SLAVE_DDR_EMI ); -DEFINE_MNODE (pcie,MASTER_PCIE ,0 ,SLAVE_DDR_EMI ); +DEFINE_MNODE (pcie_0,MASTER_PCIE_0 ,0 ,SLAVE_DDR_EMI ); +DEFINE_MNODE (pcie_1,MASTER_PCIE_1 ,0 ,SLAVE_DDR_EMI );DEFINE_MNODE (usb,MASTER_USB ,0 ,SLAVE_DDR_EMI );DEFINE_MNODE (wifi,MASTER_WIFI ,0 ,SLAVE_DDR_EMI );DEFINE_MNODE (bt,MASTER_BT ,0 ,SLAVE_DDR_EMI );
@@ -156,7 +159,7 @@ static struct mtk_icc_node *mt6873_icc_nodes[] = { [MT6873_MASTER_MDLASYS] = &mdlasys, [MT6873_MASTER_MDLA_0] = &mdla_port_0, [MT6873_MASTER_UFS] = &ufs, - [MT6873_MASTER_PCIE] = &pcie, + [MT6873_MASTER_PCIE] = &pcie_0, [MT6873_MASTER_USB] = &usb, [MT6873_MASTER_WIFI] = &wifi, [MT6873_MASTER_BT] = &bt,
@@ -179,10 +182,52 @@ static struct mtk_icc_desc mt6873_icc = { .num_nodes = ARRAY_SIZE(mt6873_icc_nodes), }; +static struct mtk_icc_node *mt8195_icc_nodes[] = { + [MT8195_SLAVE_DDR_EMI ] = &ddr_emi, + [MT8195_MASTER_MCUSYS ] = &mcusys, + [MT8195_MASTER_GPUSYS ] = &gpu, + [MT8195_MASTER_MMSYS ] = &mmsys, + [MT8195_MASTER_MM_VPU ] = &mm_vpu, + [MT8195_MASTER_MM_DISP ] = &mm_disp, + [MT8195_MASTER_MM_VDEC ] = &mm_vdec, + [MT8195_MASTER_MM_VENC ] = &mm_venc, + [MT8195_MASTER_MM_CAM ] = &mm_cam, + [MT8195_MASTER_MM_IMG ] = &mm_img, + [MT8195_MASTER_MM_MDP ] = &mm_mdp, + [MT8195_MASTER_VPUSYS ] = &vpusys, + [MT8195_MASTER_VPU_0 ] = &vpu_port_0, + [MT8195_MASTER_VPU_1 ] = &vpu_port_1, + [MT8195_MASTER_MDLASYS ] = &mdlasys, + [MT8195_MASTER_MDLA_0 ] = &mdla_port_0, + [MT8195_MASTER_UFS ] = &ufs, + [MT8195_MASTER_PCIE_0 ] = &pcie_0, + [MT8195_MASTER_PCIE_1 ] = &pcie_1, + [MT8195_MASTER_USB ] = &usb, + [MT8195_MASTER_WIFI ] = &wifi, + [MT8195_MASTER_BT ] = &bt, + [MT8195_MASTER_NETSYS ] = &netsys, + [MT8195_MASTER_DBGIF ] = &dbgif, + [MT8195_SLAVE_HRT_DDR_EMI ] = &hrt_ddr_emi, + [MT8195_MASTER_HRT_MMSYS ] = &hrt_mmsys, + [MT8195_MASTER_HRT_MM_DISP ] = &hrt_mm_disp, + [MT8195_MASTER_HRT_MM_VDEC ] = &hrt_mm_vdec, + [MT8195_MASTER_HRT_MM_VENC ] = &hrt_mm_venc, + [MT8195_MASTER_HRT_MM_CAM ] = &hrt_mm_cam, + [MT8195_MASTER_HRT_MM_IMG ] = &hrt_mm_img, + [MT8195_MASTER_HRT_MM_MDP ] = &hrt_mm_mdp, + [MT8195_MASTER_HRT_DBGIF ] = &hrt_dbgif, +}; + +static struct mtk_icc_desc mt8195_icc = { + .nodes = mt8195_icc_nodes, + .num_nodes =ARRAY_SIZE (mt8195_icc_nodes), +}; +static const struct of_device_id emi_icc_of_match[] = { { .compatible ="mediatek,mt8183-dvfsrc" , .data = &mt8183_icc }, { .compatible ="mediatek,mt8192-dvfsrc" , .data = &mt6873_icc }, { .compatible ="mediatek,mt6873-dvfsrc" , .data = &mt6873_icc }, + { .compatible ="mediatek,mt8195-dvfsrc" , .data = &mt8195_icc }, { }, };MODULE_DEVICE_TABLE (of, emi_icc_of_match);
Signature · 1 line
2.14.1
Re: [V11,PATCH 13/19] interconnect: mediatek: add support for mt8195
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 3 lines
add platform data of mt8195
Signed-off-by Dawei Chien <[email protected]>
PATCH v11 14/19 interconnect: mediatek: add initial bandwidth
In reply to Dawei Chiensupport get_bw function for suitable initial bandwidth
--- drivers/interconnect/mediatek/mtk-emi.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/interconnect/mediatek/mtk-emi.c +9 -0
@@ -271,6 +271,14 @@ static int emi_icc_set(struct icc_node *src, struct icc_node *dst)return ret; } +static int emi_icc_get_bw (struct icc_node *node,u32 *avg,u32 *peak) +{ + *avg =0 ; + *peak =0 ; + +return 0 ; +} +static int emi_icc_remove (struct platform_device *pdev);static int emi_icc_probe (struct platform_device *pdev) {
@@ -308,6 +316,7 @@ static int emi_icc_probe(struct platform_device *pdev) provider->set = emi_icc_set; provider->aggregate = emi_icc_aggregate; provider->xlate = of_icc_xlate_onecell; + provider->get_bw = emi_icc_get_bw;INIT_LIST_HEAD (&provider->nodes); provider->data = data;
Signature · 1 line
2.14.1
PATCH v11 15/19 regulator: mediatek: add support for mt8195
In reply to Dawei Chienadd platform data on mt8195
--- drivers/regulator/mtk-dvfsrc-regulator.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/regulator/mtk-dvfsrc-regulator.c +23 -0
@@ -140,6 +140,25 @@ static const struct dvfsrc_regulator_init_data regulator_mt6873_data = { .regulator_info = &mt6873_regulators[0], }; +static const unsigned int mt8195_voltages[] = { +550000 , +600000 , +650000 , +750000 , +}; + +static struct dvfsrc_regulator mt8195_regulators[] = { +MT_DVFSRC_REGULAR ("dvfsrc-vcore" ,VCORE , + mt8195_voltages), +MT_DVFSRC_REGULAR ("dvfsrc-vscp" ,VSCP , + mt8195_voltages), +}; + +static const struct dvfsrc_regulator_init_data regulator_mt8195_data = { + .size =ARRAY_SIZE (mt8195_regulators), + .regulator_info = &mt8195_regulators[0 ], +}; +static const struct of_device_id mtk_dvfsrc_regulator_match[] = { { .compatible ="mediatek,mt8183-dvfsrc" ,
@@ -150,6 +169,10 @@ static const struct of_device_id mtk_dvfsrc_regulator_match[] = { }, { .compatible = "mediatek,mt6873-dvfsrc", .data = ®ulator_mt6873_data, + }, { + .compatible = "mediatek,mt8195-dvfsrc", + .data = ®ulator_mt8195_data, + }, { }, { /* sentinel */ },
Signature · 1 line
2.14.1
Re: [V11,PATCH 15/19] regulator: mediatek: add support for mt8195
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 3 lines
add platform data on mt8195
Signed-off-by Dawei Chien <[email protected]>
PATCH v11 16/19 arm64: dts: mt8183: add dvfsrc related nodes
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add DDR EMI provider dictating dram interconnect bus performance found on MT8192-based platforms
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +2 -0
@@ -7,6 +7,7 @@ #include <dt-bindings/clock/mt8183-clk.h> #include <dt-bindings/gce/mt8183-gce.h> +#include <dt-bindings/interconnect/mtk,mt8183-emi.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/memory/mt8183-larb-port.h>
@@ -586,6 +587,7 @@ ddr_emi: dvfsrc@10012000 { compatible = "mediatek,mt8183-dvfsrc"; reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; }; pwrap: pwrap@1000d000 {
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerRe: [V11,PATCH 16/19] arm64: dts: mt8183: add dvfsrc related nodes
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 6 lines
From: Henry Chen <[email protected]>
Add DDR EMI provider dictating dram interconnect bus performance found on MT8192-based platforms
Signed-off-by Henry Chen <[email protected]>
This patch definitely has to be squashed with patch 07/19.
Same for patch 17 and 19.
Also, sign-off.
Quoted 24 lines
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/mediatek/mt8183.dtsi +2
-0@@ -7,6 +7,7 @@ #include <dt-bindings/clock/mt8183-clk.h> #include <dt-bindings/gce/mt8183-gce.h> +#include <dt-bindings/interconnect/mtk,mt8183-emi.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/memory/mt8183-larb-port.h>@@ -586,6 +587,7 @@ ddr_emi: dvfsrc@10012000 { compatible = "mediatek,mt8183-dvfsrc"; reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; }; pwrap: pwrap@1000d000 {
Re: [V11,PATCH 16/19] arm64: dts: mt8183: add dvfsrc related nodes
Quoted 7 lines · AngeloGioacchino Del Regno
Il 12/08/21 10:58, Dawei Chien ha scritto:
Quoted 6 lines
From: Henry Chen <[email protected]>
Add DDR EMI provider dictating dram interconnect bus performance found on
MT8192-based platforms
Quoted 8 lines
Quoted 1 line
Signed-off-by Henry Chen <[email protected]>This patch definitely has to be squashed with patch 07/19.
Same for patch 17 and 19.
Also, sign-off.
I would squash patch 07/16, 08/17, 09/18 on next version, thank you.
Quoted 25 lines
Quoted 25 lines
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/mediatek/mt8183.dtsi +2
-0@@ -7,6 +7,7 @@ #include <dt-bindings/clock/mt8183-clk.h> #include <dt-bindings/gce/mt8183-gce.h> +#include <dt-bindings/interconnect/mtk,mt8183-emi.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/memory/mt8183-larb-port.h>@@ -586,6 +587,7 @@ ddr_emi: dvfsrc@10012000 { compatible = "mediatek,mt8183-dvfsrc"; reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; }; pwrap: pwrap@1000d000 {
PATCH v11 17/19 arm64: dts: mt8192: add dvfsrc related nodes
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add DDR EMI provider dictating dram interconnect bus performance found on MT8183-based platforms
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +2 -0
@@ -5,6 +5,7 @@ */ /dts-v1/; +#include <dt-bindings/interconnect/mtk,mt6873-emi.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/mt8192-pinfunc.h>
@@ -286,6 +287,7 @@ compatible = "mediatek,mt8192-dvfsrc", "mediatek,mt6873-dvfsrc"; reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; }; systimer: timer@10017000 {
Signature · 1 line
2.14.1
PATCH v11 18/19 arm64: dts: mt8192: add dvfsrc regulator nodes
In reply to Dawei ChienFrom: Henry Chen <[email protected]>
Add dvfsrc regulator nodes which is for MT8192-based platforms
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +6 -0
@@ -288,6 +288,12 @@ "mediatek,mt6873-dvfsrc"; reg = <0 0x10012000 0 0x1000>; #interconnect-cells = <1>; + dvfsrc_vcore: dvfsrc-vcore { + regulator-name = "dvfsrc-vcore"; + regulator-min-microvolt = <575000>; + regulator-max-microvolt = <725000>; + regulator-always-on; + }; }; systimer: timer@10017000 {
Signature · 1 line
2.14.1
PATCH v11 19/19 arm64: dts: mt8195: add dvfsrc related nodes
In reply to Dawei ChienAdd DDR EMI provider dictating dram interconnect bus performance found on MT8195-based platforms
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +2 -0
@@ -6,6 +6,7 @@ /dts-v1/; #include <dt-bindings/clock/mt8195-clk.h> +#include <dt-bindings/interconnect/mtk,mt8195-emi.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/power/mt8195-power.h>
@@ -689,6 +690,7 @@ ddr_emi: dvfsrc@10012000 { compatible = "mediatek,mt8195-dvfsrc"; reg = <0 0x10012000 0 0x1000>; + #interconnect-cells = <1>; }; systimer: timer@10017000 {
Signature · 1 line
2.14.1
AngeloGioacchino Del Regno
maintainerHello Dawei,
this series brings very nice improvements to many MediaTek platforms, it would be a real pity to abandon it.
Can you, or anyone else from MediaTek, please respin on the latest -next?
Thanks,
Angelo
Quoted 163 lines
This series is based on v5.14-rc1.
The patchsets add support for MediaTek hardware module named DVFSRC (dynamic voltage and frequency scaling resource collector). The DVFSRC is a HW module which is used to collect all the requests from both software and hardware and turn into the decision of minimum operating voltage and minimum DRAM frequency to fulfill those requests.
So, This series is to implement the dvfsrc driver to collect all the requests of operating voltage or DRAM bandwidth from other device drivers likes GPU/Camera through 3 frameworks basically:
1. interconnect framework: to aggregate the bandwidth requirements from different clients
[1] https://patchwork.kernel.org/cover/10766329/
There has a hw module "DRAM scheduler", which used to control the throughput.
The DVFSRC will collect forecast data of dram bandwidth from SW consumers(camera/gpu...), and according the forecast to change the DRAM frequency2. Regualtor framework: to handle the operating voltage requirement from user or cosumer which not belong any power domain
Changes in V11:
* rebase all patches on v5.14-rc1.
* support platform mt8195.
* add initial bw in mediatek interconnect driver.
* add one more pcie client in mediatek interconnect driver.
* add compatible for MT8195 dvfsrc.Changes in V10:
* rebase all patches on v5.13-rc1
* add acked TAG for interconnect provider driver (Georgi)
* update comment message for typos. (Georgi)
* update cover leter for typos.Changes in V9:
* modify the configuration ofdvfsrc.yaml. (Rob)Changes in V8:
* Fixed thedt_binding_checkerror ofdvfsrc.yaml. (Rob)
* RemoveKconfigdependency of DVFSRCChanges in V7:
* Fixed thedt_binding_checkerror ofdvfsrc.yaml. (Rob)
* Fixed the checkpatch complains of "Signed-off-by:
email name mismatch". (Georgi)
* Fixed coding style of interconnect driver. (Georgi)
* Update comment of the years to 2021. (Georgi)Changes in V6:
* Remove the performace state support, because the request from consumer can be replaced by using interconnect and regulator framework.
* Update the DT patches and convert them to DT schema. (Georgi)
* Modify the comment format and coding style. (Mark)Changes in V5:
* Support more platform mt6873/mt8192
* Drop the compatible and interconnect provider node and make the parent node an interconnect provider. (Rob/Georgi)
* Make modification of interconnect driver from coding suggestion. (Georgi)
* Move interconnect diagram into the commit text of patch. (Georgi)
* Register the interconnect provider as a platform sub-device. (Georgi)Changes in V4:
* Add acked TAG on dt-bindings patches. (Rob)
* Declaration ofemi_icc_aggregatesince the prototype of aggregate function has changed meanwhile. (Georgi)
* Usedemi_icc_removeinstead oficc_provider_delon probe. (Georgi)
* Add dvfsrc regulator driver into series.
* Bug fixed ofmt8183_get_current_level.
* Add mutex protection for pstate operation ondvfsrc_set_performance.Changes in V3:
* Remove RFC from the subject prefix of the series
* Combine dt-binding patch and move interconnect dt-binding document into dvfsrc. (Rob)
* Remove unused header, add unit descirption to the bandwidth, rename compatible name on interconnect driver. (Georgi)
* Fixed some coding style: check flow, naming, usedreadx_poll_timeouton dvfsrc driver. (Ryan)
* Rename interconnect drivermt8183.ctomtk-emi.c
* Rename interconnect header mtk,mt8183.h to mtk,emi.h
*mtk-scpsys.c: Add opp table check first to avoid OF runtime parse failedChanges in RFC V2:
* Remove the DT propertydram_type. (Rob)
* Used generic dts property 'opp-level' to get the performace state. (Stephen)
* Remove unnecessary dependency config onKconfig. (Stephen)
* Remove unused header file, fixed some coding style issue, typo, error handling on dvfsrc driver. (Nicolas/Stephen)
* Remove irq handler on dvfsrc driver. (Stephen)
* Remove init table on dvfsrc driver, combine hw init on trustzone.
* Add interconnect support of mt8183 to aggregate the emi bandwidth. (Georgi)v10: https://patchwork.kernel.org/project/linux-mediatek/list/?series=494095
V9: https://patchwork.kernel.org/project/linux-mediatek/list/?series=440389
V8: https://patchwork.kernel.org/project/linux-mediatek/list/?series=421713
V7: https://patchwork.kernel.org/project/linux-mediatek/list/?series=411057
V6: https://patchwork.kernel.org/project/linux-mediatek/list/?series=406077
V5: https://patchwork.kernel.org/project/linux-mediatek/list/?series=348065
V4: https://lore.kernel.org/patchwork/cover/1209284/
V3: https://patchwork.kernel.org/cover/11118867/
RFC V2: https://lore.kernel.org/patchwork/patch/1068113/
RFC V1: https://lore.kernel.org/patchwork/cover/1028535/Dawei Chien (8):
dt-bindings: mediatek: add compatible for MT8195 dvfsrc
soc: mediatek: add support for mt8195
arm64: dts: mt8195: add dvfsrc related nodes
dt-bindings: interconnect: add MT8195 interconnect dt-bindings
interconnect: mediatek: add support for mt8195
interconnect: mediatek: add initial bandwidth
regulator: mediatek: add support for mt8195
arm64: dts: mt8195: add dvfsrc related nodesHenry Chen (11):
dt-bindings: soc: Add dvfsrc driver bindings
soc: mediatek: add header for mediatek SIP interface
soc: mediatek: add driver for dvfsrc support
soc: mediatek: add support for mt6873
arm64: dts: mt8183: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc related nodes
dt-bindings: interconnect: add MT6873 interconnect dt-bindings
interconnect: mediatek: Add interconnect provider driver
arm64: dts: mt8183: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc related nodes
arm64: dts: mt8192: add dvfsrc regulator nodes.../devicetree/bindings/soc/mediatek/dvfsrc.yaml | 68 +++ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 7 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 14 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 7 + drivers/interconnect/Kconfig | 1 + drivers/interconnect/Makefile | 1 + drivers/interconnect/mediatek/Kconfig | 13 + drivers/interconnect/mediatek/Makefile | 3 + drivers/interconnect/mediatek/mtk-emi.c | 385 +++++++++++++++ drivers/regulator/mtk-dvfsrc-regulator.c | 23 + drivers/soc/mediatek/Kconfig | 11 + drivers/soc/mediatek/Makefile | 1 + drivers/soc/mediatek/mtk-dvfsrc.c | 538 +++++++++++++++++++++ include/dt-bindings/interconnect/mtk,mt6873-emi.h | 41 ++ include/dt-bindings/interconnect/mtk,mt8183-emi.h | 21 + include/dt-bindings/interconnect/mtk,mt8195-emi.h | 42 ++ include/linux/soc/mediatek/mtk_dvfsrc.h | 35 ++ include/linux/soc/mediatek/mtk_sip_svc.h | 4 + 18 files changed, 1215 insertions(+)create mode 100644
Documentation/devicetree/bindings/soc/mediatek/dvfsrc.yamlcreate mode 100644drivers/interconnect/mediatek/Kconfig
create mode 100644drivers/interconnect/mediatek/Makefile
create mode 100644drivers/interconnect/mediatek/mtk-emi.ccreate mode 100644drivers/soc/mediatek/mtk-dvfsrc.c
create mode 100644include/dt-bindings/interconnect/mtk,mt6873-emi.hcreate mode 100644include/dt-bindings/interconnect/mtk,mt8183-emi.hcreate mode 100644include/dt-bindings/interconnect/mtk,mt8195-emi.hcreate mode 100644include/linux/soc/mediatek/mtk_dvfsrc.h