Skip to content

Commit 78e6e4d

Browse files
committed
Merge branches 'pm-opp', 'pm-devfreq' and 'powercap'
Merge an operating performance points (OPP) update, devfreq updates and power capping updates for 5.17-rc1: - Update outdated OPP documentation (Tang Yizhou). - Reduce log severity for informative message regarding frequency transition failures in devfreq (Tzung-Bi Shih). - Add DRAM frequency controller devfreq driver for Allwinner sunXi SoCs (Samuel Holland). - Add missing COMMON_CLK dependency to the sun8i devfreq driver (Arnd Bergmann). - Add support for new layout of Psys PowerLimit Register on SPR to the Intel RAPL power capping driver (Zhang Rui). - Fix typo in a comment in idle_inject.c (Jason Wang). - Remove unused function definition from the DTPM (Dynamit Thermal Power Management) power capping framework (Daniel Lezcano). - Reduce DTPM trace verbosity (Daniel Lezcano). * pm-opp: Documentation: power: Update outdated contents in opp.rst * pm-devfreq: PM / devfreq: Reduce log severity for informative message PM / devfreq: sun8i: addd COMMON_CLK dependency PM / devfreq: Add a driver for the sun8i/sun50i MBUS * powercap: powercap/drivers/dtpm: Reduce trace verbosity powercap/drivers/dtpm: Remove unused function definition powercap: fix typo in a comment in idle_inject.c powercap: intel_rapl: support new layout of Psys PowerLimit Register on SPR
4 parents c001a52 + ffb9bfa + 702f21d + 36fd360 commit 78e6e4d

File tree

10 files changed

+599
-17
lines changed

10 files changed

+599
-17
lines changed

Documentation/power/opp.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ We can represent these as three OPPs as the following {Hz, uV} tuples:
4848
OPP library provides a set of helper functions to organize and query the OPP
4949
information. The library is located in drivers/opp/ directory and the header
5050
is located in include/linux/pm_opp.h. OPP library can be enabled by enabling
51-
CONFIG_PM_OPP from power management menuconfig menu. OPP library depends on
52-
CONFIG_PM as certain SoCs such as Texas Instrument's OMAP framework allows to
53-
optionally boot at a certain OPP without needing cpufreq.
51+
CONFIG_PM_OPP from power management menuconfig menu. Certain SoCs such as Texas
52+
Instrument's OMAP framework allows to optionally boot at a certain OPP without
53+
needing cpufreq.
5454

5555
Typical usage of the OPP library is as follows::
5656

@@ -75,8 +75,8 @@ operations until that OPP could be re-enabled if possible.
7575

7676
OPP library facilitates this concept in its implementation. The following
7777
operational functions operate only on available opps:
78-
opp_find_freq_{ceil, floor}, dev_pm_opp_get_voltage, dev_pm_opp_get_freq,
79-
dev_pm_opp_get_opp_count
78+
dev_pm_opp_find_freq_{ceil, floor}, dev_pm_opp_get_voltage, dev_pm_opp_get_freq,
79+
dev_pm_opp_get_opp_count.
8080

8181
dev_pm_opp_find_freq_exact is meant to be used to find the opp pointer
8282
which can then be used for dev_pm_opp_enable/disable functions to make an
@@ -103,7 +103,7 @@ dev_pm_opp_add
103103
The OPP is defined using the frequency and voltage. Once added, the OPP
104104
is assumed to be available and control of its availability can be done
105105
with the dev_pm_opp_enable/disable functions. OPP library
106-
internally stores and manages this information in the opp struct.
106+
internally stores and manages this information in the dev_pm_opp struct.
107107
This function may be used by SoC framework to define a optimal list
108108
as per the demands of SoC usage environment.
109109

@@ -247,7 +247,7 @@ dev_pm_opp_disable
247247
5. OPP Data Retrieval Functions
248248
===============================
249249
Since OPP library abstracts away the OPP information, a set of functions to pull
250-
information from the OPP structure is necessary. Once an OPP pointer is
250+
information from the dev_pm_opp structure is necessary. Once an OPP pointer is
251251
retrieved using the search functions, the following functions can be used by SoC
252252
framework to retrieve the information represented inside the OPP layer.
253253

drivers/devfreq/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ config ARM_RK3399_DMC_DEVFREQ
132132
It sets the frequency for the memory controller and reads the usage counts
133133
from hardware.
134134

135+
config ARM_SUN8I_A33_MBUS_DEVFREQ
136+
tristate "sun8i/sun50i MBUS DEVFREQ Driver"
137+
depends on ARCH_SUNXI || COMPILE_TEST
138+
depends on COMMON_CLK
139+
select DEVFREQ_GOV_SIMPLE_ONDEMAND
140+
help
141+
This adds the DEVFREQ driver for the MBUS controller in some
142+
Allwinner sun8i (A33 through H3) and sun50i (A64 and H5) SoCs.
143+
135144
source "drivers/devfreq/event/Kconfig"
136145

137146
endif # PM_DEVFREQ

drivers/devfreq/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o
1212
obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o
1313
obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o
1414
obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ) += rk3399_dmc.o
15+
obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ) += sun8i-a33-mbus.o
1516
obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o
1617

1718
# DEVFREQ Event Drivers

drivers/devfreq/devfreq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
382382
devfreq_notify_transition(devfreq, &freqs, DEVFREQ_POSTCHANGE);
383383

384384
if (devfreq_update_status(devfreq, new_freq))
385-
dev_err(&devfreq->dev,
386-
"Couldn't update frequency transition information.\n");
385+
dev_warn(&devfreq->dev,
386+
"Couldn't update frequency transition information.\n");
387387

388388
devfreq->previous_freq = new_freq;
389389

0 commit comments

Comments
 (0)