* Re: [PATCH v7 06/20] PM / devfreq: exynos: Add support of bus frequency of sub-blocks using passive governor @ 2016-04-06 10:12 MyungJoo Ham 0 siblings, 0 replies; 2+ messages in thread From: MyungJoo Ham @ 2016-04-06 10:12 UTC (permalink / raw) To: 최찬우, 박경민, 크쉬시토프, kgene@kernel.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, linux.amoon@gmail.com, m.reichl@fivetechno.de, tjakobi@math.uni-bielefeld.de, 대인기, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org > > This patch adds the support of bus frequency feature for sub-blocks which share > the one power line. If each bus depends on the power line, each bus is not able > to change the voltage by oneself. To optimize the power-consumption on runtime, > some buses using the same power line should change the source clock and > regulator at the same time. So, this patch uses the passive governor to support > the bus frequency for all buses which sharing the one power line. > [] > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > [tjakobi: Reported debugfs error during booting and cw00.choi fix it.] > Reported-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> ^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v7 00/20] PM / devferq: Add generic exynos bus frequency driver and new passive governor @ 2016-03-31 9:05 Chanwoo Choi 2016-03-31 9:05 ` [PATCH v7 06/20] PM / devfreq: exynos: Add support of bus frequency of sub-blocks using " Chanwoo Choi 0 siblings, 1 reply; 2+ messages in thread From: Chanwoo Choi @ 2016-03-31 9:05 UTC (permalink / raw) To: myungjoo.ham, kyungmin.park, k.kozlowski, kgene Cc: mark.rutland, inki.dae, linux-samsung-soc, linux, cw00.choi, pawel.moll, ijc+devicetree, linux.amoon, linux-pm, rjw, linux-kernel, m.reichl, tjakobi, devicetree, robh+dt, galak, linux-arm-kernel This patch-set includes the two features as following. The generic exynos bus frequency driver is able to support almost Exynos SoCs for bus frequency scaling. And the new passive governor is able to make the dependency on between devices for frequency/voltage scaling. I had posted the patch-set[1] with the similiar concept. This is is revised version for exynos bus frequency. - Generic exynos bus frequency driver - New passive governor of DEVFREQ framework [1] https://lkml.org/lkml/2015/1/7/872 : [PATCHv3 0/8] devfreq: Add generic exynos memory-bus frequency driver Changes from v6: (https://lkml.org/lkml/2016/3/27/187) - Patch1/2 add signed-off-by tag from DEVFREQ Maintainer (Myungjoo Ham) - Drop patch5 (PM / devfreq: Add governer type with unique number) - Add missing description about the transition_notifier_list in struct devfreq - Remove the passive governor code from devfreq.c core driver. Instead, passive governor uses the DEVFREQ_GOV_START/STOP signal to register/unregister the DEVFREQ_TRANSITION_NOTIFIER between the parent devfreq device and passive devfreq device. - Add the author (myungjoo.ham@samsung.com) of passive governor - Add 'struct devfreq_passive_data' to pass the devfreq instance of parent. Changes from v5: (https://lkml.org/lkml/2016/3/24/5) - Rebase the patch-set on Linux v4.6-rc1 - Add Tested-by tag from Markus Reichl <m.reichl@fivetechno.de> - Add Tested-by tag from Anand Moon <linux.amoon@gmail.com> Changes from v4: (https://lkml.org/lkml/2015/12/14/43) - Add new DEVFREQ_TRANSITION_NOTIFIER notifier. The passive devfreq device recevie the changed frequency of parent devfreq device through DEVFREQ_TRANSITION_NOTIFIER. - Add governor type to identify thme using the defined constant - Modify the passive governor using the DEVFREQ_TRANSITION_NOTIFIER notifier. - Fix the RCU locking probrlm (Reported-by: Tobias Jakobi) - Fix the debugfs error during the kernel booting (Reported-by: Tobias Jakobi) - The Device Tree patches have got Reviewed-by tag from Exynos SoC Maintainer (Krzysztof Kozlowski <k.kozlowski@samsung.com>) Changes from v3: (https://lkml.org/lkml/2015/12/11/75) - Add the reviewed-by tag from Krzysztof Kozlowski (patch2/3/13/14/15/16/17) - Fix typo of the description on patch14 - Modify the subject and description of patch17 - Reorder the 'bus_xxx' device tree node alphabetically in both exynos3250-rinato/monk.dts and exynos4412-trats/odroidu3 Changes from v2: (https://lkml.org/lkml/2015/12/8/869) - Fix typo on documentation - Modify the more appropriate sentence on patch description - Add the detailed description about both parent and passive bus device - Modify the DMC frequency for Exynos4x12 DMC bus (200MHz -> 267MHz) - Modify the voltage of 200MHz was included in Exynos3250 DMC bus (800mV -> 825mV) - Rename OPP nodes as 'opp@<opp-hz>' - Delete the duplicate 'opp-microvolt' property of passive devfreq device - Reorder the 'bus_xxx' device tree node alphabetically in exynos3250-rinato/monk.dts - Reorder the 'bus_xxx' device tree node alphabetically in exynos4412-trats/odroidu3 - Add new exynos4412-ppmu-common.dtsi to remove the duplicate PPMU dt node on rinato/monk/trats2/odroid-u3 board - Add the log message if bus device is registered to devfreq framework successfully - Add the reviewed-by tag from Krzysztof Kozlowski - Add the tested-by tag from Anand Moon on Odroid U3 - Add 'SAMSUNG BUS FREQUENCY DRIVER' entry to MAINTAINERS Changes from v1: (https://lkml.org/lkml/2015/11/26/260) - Check whether the instance of regulator is NULL or not when executing regulator_disable() because of only parent devfreq device has the regulator instance. After fixing it, the wake-up from suspend state is well working. (patch1) - Fix bug which checks 'bus-clk' instead of 'bus->regulator' after calling devm_clk_get() (on patch1) - Update the documentation to remove the description about DEVFREQ-EVENT subsystem (on patch2) - Add the full name of DMC (Dynamic Memory Controller) (on patch2) - Modify the detailed correlation of buses for Exynos3250 on documentation (patch2) - Add the MFC bus node for Exynos3250 (on patch11, patch12) - Fix the duplicate frequency of bus_display on Exynos4x12.dtsi - Add the PPMU node for exynos4412-odroidu3 - Add the support of bus frequency for exynos4412-odroidu3 [Description] Detailed descirption for patch-set: 1. Add generic exynos bus frequency driver : This patch-set adds the generic exynos bus frequency driver for AXI bus of sub-blocks in exynos SoC. The Samsung Exynos SoC have the common architecture for bus between DRAM and sub-blocks in SoC. There are the different buses according to Exynos SoC because Exynos SoC has the differnt sub-blocks and bus speed. In spite of this difference among Exynos SoCs, this driver is able to support almost Exynos SoC by adding unique data of each bus in the devicetree file. In devicetree, each bus node has a bus clock, regulator, operation-point and devfreq-event devices which measure the utilization of each bus block. For example, - The bus of DMC block in exynos3250.dtsi are listed below: bus_dmc: bus_dmc { compatible = "samsung,exynos-bus"; clocks = <&cmu_dmc CLK_DIV_DMC>; clock-names = "bus"; operating-points-v2 = <&bus_dmc_opp_table>; status = "disabled"; }; bus_dmc_opp_table: opp_table1 { compatible = "operating-points-v2"; opp-shared; opp@50000000 { opp-hz = /bits/ 64 <50000000>; opp-microvolt = <800000>; }; opp@100000000 { opp-hz = /bits/ 64 <100000000>; opp-microvolt = <800000>; }; opp@134000000 { opp-hz = /bits/ 64 <134000000>; opp-microvolt = <800000>; }; opp@200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <825000>; }; opp@400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <875000>; }; }; - Usage case to handle the frequency and voltage of bus on runtime in exynos3250-rinato.dts are listed below: &bus_dmc { devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>; vdd-supply = <&buck1_reg>; /* VDD_MIF */ status = "okay"; }; 2. Add new passive governor of DEVFREQ framework : This patch-set add the new passive governor for DEVFREQ framework. The existing governors (ondemand, performance and so on) are used for DVFS (Dynamic Voltage and Frequency Scaling) drivers. The existing governors are independently used for specific device driver which don't give the influence to other device drviers and also don't receive the effect from other device drivers. The passive governor depends on operation of parent driver with existing governors(ondemand, performance and so on) extremely and is not able to decide the new frequency by oneself. According to the decided new frequency of parent driver with governor, the passive governor uses it to decide the appropriate frequency for own device driver. The passive governor must need the following information from device tree: For exameple, There are one more bus device drivers in Exynos3250 which need to change their source clock according to their utilization on runtime. But, they share the same power line (e.g., regulator). So, LEFTBUS bus driver is operated as parent with ondemand governor and then the rest device driver with passive governor. The buses of Internal block in exynos3250.dtsi are listed below: When LEFTBUS bus driver (parent) changes the bus frequency with ondemand governor on runtime, the rest bus devices which sharing the same power line (VDD_INT) will change the each bus frequency according to the decision of LEFTBUS bus driver (parent). - INT (Internal) block : VDD_INT |--- LEFTBUS |--- PERIL |--- MFC |--- G3D |--- RIGHTBUS |--- FSYS |--- LCD0 |--- PERIR |--- ISP |--- CAM - The buss of INT block in exynos3250.dtsi are listed below: bus_leftbus: bus_leftbus { compatible = "samsung,exynos-bus"; clocks = <&cmu CLK_DIV_GDL>; clock-names = "bus"; operating-points-v2 = <&bus_leftbus_opp_table>; status = "disabled"; }; bus_rightbus: bus_rightbus { compatible = "samsung,exynos-bus"; clocks = <&cmu CLK_DIV_GDR>; clock-names = "bus"; operating-points-v2 = <&bus_leftbus_opp_table>; status = "disabled"; }; (Omit the rest bus dt node) - Usage case to handle the frequency and voltage of bus on runtime in exynos3250-rinato.dts are listed below: /* Parent bus device of VDD_INT */ &bus_leftbus { devfreq-events = <&ppmu_leftbus_3>, <&ppmu_rightbus_3>; vdd-supply = <&buck3_reg>; status = "okay"; }; /* Passive bus device depend on LEFTBUS bus. */ &bus_rightbus { devfreq = <&bus_leftbus>; /* 'devfreq' property indicates the phandle of parent device. */ status = "okay"; }; (Omit the rest bus dt node) Chanwoo Choi (20): PM / devfreq: exynos: Add generic exynos bus frequency driver PM / devfreq: exynos: Add documentation for generic exynos bus frequency driver PM / devfreq: Add devfreq_get_devfreq_by_phandle() PM / devfreq: Add new DEVFREQ_TRANSITION_NOTIFIER notifier PM / devfreq: Add new passive governor PM / devfreq: exynos: Add support of bus frequency of sub-blocks using passive governor PM / devfreq: exynos: Update documentation for bus devices using passive governor PM / devfreq: exynos: Add the detailed correlation between sub-blocks and power line PM / devfreq: exynos: Remove unused exynos4/5 busfreq driver MAINTAINERS: Add samsung bus frequency driver entry ARM: dts: Add DMC bus node for Exynos3250 ARM: dts: Add DMC bus frequency for exynos3250-rinato/monk ARM: dts: Add bus nodes using VDD_INT for Exynos3250 ARM: dts: Add bus nodes using VDD_MIF for Exynos4x12 ARM: dts: Add bus nodes using VDD_INT for Exynos4x12 ARM: dts: Add bus nodes using VDD_MIF for Exynos4210 ARM: dts: Add exynos4412-ppmu-common dtsi to delete duplicate PPMU nodes ARM: dts: Add support of bus frequency using VDD_INT for exynos3250-rinato ARM: dts: Expand the voltage range of buck1/3 regulator for exynos4412-odroidu3 ARM: dts: Add support of bus frequency for exynos4412-trats/odroidu3 .../devicetree/bindings/devfreq/exynos-bus.txt | 390 ++++++++ MAINTAINERS | 9 + arch/arm/boot/dts/exynos3250-monk.dts | 47 +- arch/arm/boot/dts/exynos3250-rinato.dts | 88 +- arch/arm/boot/dts/exynos3250.dtsi | 181 ++++ arch/arm/boot/dts/exynos4210.dtsi | 159 +++ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 56 +- arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 50 + arch/arm/boot/dts/exynos4412-trats2.dts | 88 +- arch/arm/boot/dts/exynos4x12.dtsi | 174 ++++ drivers/devfreq/Kconfig | 36 +- drivers/devfreq/Makefile | 4 +- drivers/devfreq/devfreq.c | 207 +++- drivers/devfreq/exynos-bus.c | 570 +++++++++++ drivers/devfreq/exynos/Makefile | 3 - drivers/devfreq/exynos/exynos4_bus.c | 1055 -------------------- drivers/devfreq/exynos/exynos4_bus.h | 110 -- drivers/devfreq/exynos/exynos5_bus.c | 431 -------- drivers/devfreq/exynos/exynos_ppmu.c | 119 --- drivers/devfreq/exynos/exynos_ppmu.h | 86 -- drivers/devfreq/governor_passive.c | 206 ++++ include/linux/devfreq.h | 99 ++ 22 files changed, 2220 insertions(+), 1948 deletions(-) create mode 100644 Documentation/devicetree/bindings/devfreq/exynos-bus.txt create mode 100644 arch/arm/boot/dts/exynos4412-ppmu-common.dtsi create mode 100644 drivers/devfreq/exynos-bus.c delete mode 100644 drivers/devfreq/exynos/Makefile delete mode 100644 drivers/devfreq/exynos/exynos4_bus.c delete mode 100644 drivers/devfreq/exynos/exynos4_bus.h delete mode 100644 drivers/devfreq/exynos/exynos5_bus.c delete mode 100644 drivers/devfreq/exynos/exynos_ppmu.c delete mode 100644 drivers/devfreq/exynos/exynos_ppmu.h create mode 100644 drivers/devfreq/governor_passive.c -- 1.9.1 ^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v7 06/20] PM / devfreq: exynos: Add support of bus frequency of sub-blocks using passive governor 2016-03-31 9:05 [PATCH v7 00/20] PM / devferq: Add generic exynos bus frequency driver and new " Chanwoo Choi @ 2016-03-31 9:05 ` Chanwoo Choi 0 siblings, 0 replies; 2+ messages in thread From: Chanwoo Choi @ 2016-03-31 9:05 UTC (permalink / raw) To: myungjoo.ham, kyungmin.park, k.kozlowski, kgene Cc: mark.rutland, inki.dae, linux-samsung-soc, linux, cw00.choi, pawel.moll, ijc+devicetree, linux.amoon, linux-pm, rjw, linux-kernel, m.reichl, tjakobi, devicetree, robh+dt, galak, linux-arm-kernel This patch adds the support of bus frequency feature for sub-blocks which share the one power line. If each bus depends on the power line, each bus is not able to change the voltage by oneself. To optimize the power-consumption on runtime, some buses using the same power line should change the source clock and regulator at the same time. So, this patch uses the passive governor to support the bus frequency for all buses which sharing the one power line. For example, Exynos3250 include the two power line for AXI buses as following: : VDD_MIF : MIF (Memory Interface) provide the DMC (Dynamic Memory Controller) with the power (regulator). : VDD_INT : INT (Internal) provide the various sub-blocks with the power (regulator). Each bus is included in as follwoing block. In the case of VDD_MIF, only DMC bus use the power line. So, there is no any depencency between buese. But, in the case of VDD_INT, various buses share the one power line of VDD_INT. We need to make the depenency between buses. When using passive governor, there is no problem to support the bus frequency as DVFS for all buses. One bus should be operated as the parent bus device which gathering the current load of INT block and then decides the new frequency with some governors except of passive governor. After deciding the new frequency by the parent bus device, the rest bus devices will change the each source clock according to new frequency of the parent bus device. - MIF (Memory Interface) block : VDD_MIF |--- DMC - INT (Internal) block : VDD_INT |--- LEFTBUS (parent) |--- PERIL |--- MFC |--- G3D |--- RIGHTBUS |--- FSYS |--- LCD0 |--- PERIR |--- ISP |--- CAM Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> [tjakobi: Reported debugfs error during booting and cw00.choi fix it.] Reported-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> --- drivers/devfreq/Kconfig | 1 + drivers/devfreq/exynos-bus.c | 219 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 174 insertions(+), 46 deletions(-) diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index d260cd0219f6..30e1daf1c827 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -78,6 +78,7 @@ config ARM_EXYNOS_BUS_DEVFREQ bool "ARM EXYNOS Generic Memory Bus DEVFREQ Driver" depends on ARCH_EXYNOS select DEVFREQ_GOV_SIMPLE_ONDEMAND + select DEVFREQ_GOV_PASSIVE select DEVFREQ_EVENT_EXYNOS_PPMU select PM_DEVFREQ_EVENT select PM_OPP diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c index f79963187fa1..8647b697d91c 100644 --- a/drivers/devfreq/exynos-bus.c +++ b/drivers/devfreq/exynos-bus.c @@ -1,7 +1,7 @@ /* * Generic Exynos Bus frequency driver with DEVFREQ Framework * - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * Author : Chanwoo Choi <cw00.choi@samsung.com> * * This driver support Exynos Bus frequency feature by using @@ -93,7 +93,7 @@ static int exynos_bus_get_event(struct exynos_bus *bus, } /* - * Must necessary function for devfreq governor + * Must necessary function for devfreq simple-ondemand governor */ static int exynos_bus_target(struct device *dev, unsigned long *freq, u32 flags) { @@ -202,59 +202,81 @@ static void exynos_bus_exit(struct device *dev) regulator_disable(bus->regulator); dev_pm_opp_of_remove_table(dev); + clk_disable_unprepare(bus->clk); } -static int exynos_bus_parse_of(struct device_node *np, - struct exynos_bus *bus) +/* + * Must necessary function for devfreq passive governor + */ +static int exynos_bus_passive_target(struct device *dev, unsigned long *freq, + u32 flags) { - struct device *dev = bus->dev; - unsigned long rate; - int i, ret, count, size; + struct exynos_bus *bus = dev_get_drvdata(dev); + struct dev_pm_opp *new_opp; + unsigned long old_freq, new_freq; + int ret = 0; - /* Get the clock to provide each bus with source clock */ - bus->clk = devm_clk_get(dev, "bus"); - if (IS_ERR(bus->clk)) { - dev_err(dev, "failed to get bus clock\n"); - return PTR_ERR(bus->clk); + /* Get new opp-bus instance according to new bus clock */ + rcu_read_lock(); + new_opp = devfreq_recommended_opp(dev, freq, flags); + if (IS_ERR_OR_NULL(new_opp)) { + dev_err(dev, "failed to get recommed opp instance\n"); + rcu_read_unlock(); + return PTR_ERR(new_opp); } - ret = clk_prepare_enable(bus->clk); - if (ret < 0) { - dev_err(dev, "failed to get enable clock\n"); - return ret; - } + new_freq = dev_pm_opp_get_freq(new_opp); + old_freq = dev_pm_opp_get_freq(bus->curr_opp); + rcu_read_unlock(); - /* Get the freq/voltage OPP table to scale the bus frequency */ - rcu_read_lock(); - ret = dev_pm_opp_of_add_table(dev); + if (old_freq == new_freq) + return 0; + + /* Change the frequency according to new OPP level */ + mutex_lock(&bus->lock); + + ret = clk_set_rate(bus->clk, new_freq); if (ret < 0) { - dev_err(dev, "failed to get OPP table\n"); - rcu_read_unlock(); - goto err_clk; + dev_err(dev, "failed to set the clock of bus\n"); + goto out; } - rate = clk_get_rate(bus->clk); - bus->curr_opp = dev_pm_opp_find_freq_ceil(dev, &rate); - if (IS_ERR(bus->curr_opp)) { - dev_err(dev, "failed to find dev_pm_opp\n"); - rcu_read_unlock(); - ret = PTR_ERR(bus->curr_opp); - goto err_opp; - } - rcu_read_unlock(); + *freq = new_freq; + bus->curr_opp = new_opp; + + dev_dbg(dev, "Set the frequency of bus (%lukHz -> %lukHz)\n", + old_freq/1000, new_freq/1000); +out: + mutex_unlock(&bus->lock); + + return ret; +} + +static void exynos_bus_passive_exit(struct device *dev) +{ + struct exynos_bus *bus = dev_get_drvdata(dev); + + dev_pm_opp_of_remove_table(dev); + clk_disable_unprepare(bus->clk); +} + +static int exynos_bus_parent_parse_of(struct device_node *np, + struct exynos_bus *bus) +{ + struct device *dev = bus->dev; + int i, ret, count, size; /* Get the regulator to provide each bus with the power */ bus->regulator = devm_regulator_get(dev, "vdd"); if (IS_ERR(bus->regulator)) { dev_err(dev, "failed to get VDD regulator\n"); - ret = PTR_ERR(bus->regulator); - goto err_opp; + return PTR_ERR(bus->regulator); } ret = regulator_enable(bus->regulator); if (ret < 0) { dev_err(dev, "failed to enable VDD regulator\n"); - goto err_opp; + return ret; } /* @@ -305,6 +327,51 @@ static int exynos_bus_parse_of(struct device_node *np, err_regulator: regulator_disable(bus->regulator); + + return ret; +} + +static int exynos_bus_parse_of(struct device_node *np, + struct exynos_bus *bus) +{ + struct device *dev = bus->dev; + unsigned long rate; + int ret; + + /* Get the clock to provide each bus with source clock */ + bus->clk = devm_clk_get(dev, "bus"); + if (IS_ERR(bus->clk)) { + dev_err(dev, "failed to get bus clock\n"); + return PTR_ERR(bus->clk); + } + + ret = clk_prepare_enable(bus->clk); + if (ret < 0) { + dev_err(dev, "failed to get enable clock\n"); + return ret; + } + + /* Get the freq and voltage from OPP table to scale the bus freq */ + rcu_read_lock(); + ret = dev_pm_opp_of_add_table(dev); + if (ret < 0) { + dev_err(dev, "failed to get OPP table\n"); + rcu_read_unlock(); + goto err_clk; + } + + rate = clk_get_rate(bus->clk); + bus->curr_opp = dev_pm_opp_find_freq_ceil(dev, &rate); + if (IS_ERR(bus->curr_opp)) { + dev_err(dev, "failed to find dev_pm_opp\n"); + rcu_read_unlock(); + ret = PTR_ERR(bus->curr_opp); + goto err_opp; + } + rcu_read_unlock(); + + return 0; + err_opp: dev_pm_opp_of_remove_table(dev); err_clk: @@ -319,8 +386,11 @@ static int exynos_bus_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; struct devfreq_dev_profile *profile; struct devfreq_simple_ondemand_data *ondemand_data; + struct devfreq_passive_data *passive_data; + struct devfreq *parent_devfreq; struct exynos_bus *bus; - int ret; + int ret, max_state; + unsigned long min_freq, max_freq; if (!np) { dev_err(dev, "failed to find devicetree node\n"); @@ -337,20 +407,33 @@ static int exynos_bus_probe(struct platform_device *pdev) /* Parse the device-tree to get the resource information */ ret = exynos_bus_parse_of(np, bus); if (ret < 0) - return ret; + goto err; - /* Initalize the struct profile and governor data */ profile = devm_kzalloc(dev, sizeof(*profile), GFP_KERNEL); - if (!profile) - return -ENOMEM; + if (!profile) { + ret = -ENOMEM; + goto err; + } + + if (of_parse_phandle(dev->of_node, "devfreq", 0)) + goto passive; + else + ret = exynos_bus_parent_parse_of(np, bus); + + if (ret < 0) + goto err; + + /* Initalize the struct profile and governor data for parent device */ profile->polling_ms = 50; profile->target = exynos_bus_target; profile->get_dev_status = exynos_bus_get_dev_status; profile->exit = exynos_bus_exit; ondemand_data = devm_kzalloc(dev, sizeof(*ondemand_data), GFP_KERNEL); - if (!ondemand_data) - return -ENOMEM; + if (!ondemand_data) { + ret = -ENOMEM; + goto err; + } ondemand_data->upthreshold = 40; ondemand_data->downdifferential = 5; @@ -359,14 +442,15 @@ static int exynos_bus_probe(struct platform_device *pdev) ondemand_data); if (IS_ERR_OR_NULL(bus->devfreq)) { dev_err(dev, "failed to add devfreq device\n"); - return PTR_ERR(bus->devfreq); + ret = PTR_ERR(bus->devfreq); + goto err; } /* Register opp_notifier to catch the change of OPP */ ret = devm_devfreq_register_opp_notifier(dev, bus->devfreq); if (ret < 0) { dev_err(dev, "failed to register opp notifier\n"); - return ret; + goto err; } /* @@ -376,16 +460,59 @@ static int exynos_bus_probe(struct platform_device *pdev) ret = exynos_bus_enable_edev(bus); if (ret < 0) { dev_err(dev, "failed to enable devfreq-event devices\n"); - return ret; + goto err; } ret = exynos_bus_set_event(bus); if (ret < 0) { dev_err(dev, "failed to set event to devfreq-event devices\n"); - return ret; + goto err; } + goto out; +passive: + /* Initalize the struct profile and governor data for passive device */ + profile->target = exynos_bus_passive_target; + profile->exit = exynos_bus_passive_exit; + + /* Get the instance of parent devfreq device */ + parent_devfreq = devfreq_get_devfreq_by_phandle(dev, 0); + if (IS_ERR(parent_devfreq)) { + ret = -EPROBE_DEFER; + goto err; + } + + passive_data = devm_kzalloc(dev, sizeof(*passive_data), GFP_KERNEL); + if (!passive_data) { + ret = -ENOMEM; + goto err; + } + passive_data->parent = parent_devfreq; + + /* Add devfreq device for exynos bus with passive governor */ + bus->devfreq = devm_devfreq_add_device(dev, profile, "passive", + passive_data); + if (IS_ERR_OR_NULL(bus->devfreq)) { + dev_err(dev, + "failed to add devfreq dev with passive governor\n"); + ret = -EPROBE_DEFER; + goto err; + } + +out: + max_state = bus->devfreq->profile->max_state; + min_freq = (bus->devfreq->profile->freq_table[0] / 1000); + max_freq = (bus->devfreq->profile->freq_table[max_state - 1] / 1000); + pr_info("exynos-bus: new bus device registered: %s (%6ld KHz ~ %6ld KHz)\n", + dev_name(dev), min_freq, max_freq); + return 0; + +err: + dev_pm_opp_of_remove_table(dev); + clk_disable_unprepare(bus->clk); + + return ret; } #ifdef CONFIG_PM_SLEEP -- 1.9.1 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-06 10:12 UTC | newest] Thread overview: 2+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-04-06 10:12 [PATCH v7 06/20] PM / devfreq: exynos: Add support of bus frequency of sub-blocks using passive governor MyungJoo Ham -- strict thread matches above, loose matches on Subject: below -- 2016-03-31 9:05 [PATCH v7 00/20] PM / devferq: Add generic exynos bus frequency driver and new " Chanwoo Choi 2016-03-31 9:05 ` [PATCH v7 06/20] PM / devfreq: exynos: Add support of bus frequency of sub-blocks using " Chanwoo Choi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).