mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "FROMLIST: PM / Domains: add domain feature flag for next wakeup"

Browse Source 
This reverts commit e6c313525b.

Drop [v6] patches in favor of upstream backports.

Bug: 170654157
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: Iafa2cb1397ff033efe1c6d1c963e58d0478eed23
This commit is contained in:
Carlos Llamas
2021-04-13 17:01:36 +00:00
committed by Todd Kjos
parent 14f2208945
commit 98de9de261
2 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/base/power/domain.c
View File

@@ -1763,24 +1763,6 @@ int dev_pm_genpd_remove_notifier(struct device *dev)
} }
EXPORT_SYMBOL_GPL(dev_pm_genpd_remove_notifier); EXPORT_SYMBOL_GPL(dev_pm_genpd_remove_notifier);
/**
* genpd_enable_next_wakeup - Enable genpd gov to use next_wakeup
*
* @genpd: The genpd to be updated
* @enable: Enable/disable genpd gov to use next wakeup
*/
void genpd_enable_next_wakeup(struct generic_pm_domain *genpd, bool enable)
{
genpd_lock(genpd);
if (enable)
genpd->flags |= GENPD_FLAG_GOV_NEXT_WAKEUP;
else
genpd->flags &= ~GENPD_FLAG_GOV_NEXT_WAKEUP;
genpd->next_wakeup = KTIME_MAX;
genpd_unlock(genpd);
}
EXPORT_SYMBOL_GPL(genpd_enable_next_wakeup);
static int genpd_add_subdomain(struct generic_pm_domain *genpd, static int genpd_add_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *subdomain) struct generic_pm_domain *subdomain)
{ {

28
include/linux/pm_domain.h
View File

@@ -55,19 +55,13 @@
* *
* GENPD_FLAG_RPM_ALWAYS_ON: Instructs genpd to always keep the PM domain * GENPD_FLAG_RPM_ALWAYS_ON: Instructs genpd to always keep the PM domain
* powered on except for system suspend. * powered on except for system suspend.
*
* GENPD_FLAG_GOV_NEXT_WAKEUP: Enable the genpd governor to consider its
* components' next wakeup when determining the
* optimal idle state. This is setup only if the
* domain's idle state specifies a residency.
*/ */
#define GENPD_FLAG_PM_CLK (1U << 0) #define GENPD_FLAG_PM_CLK (1U << 0)
#define GENPD_FLAG_IRQ_SAFE (1U << 1) #define GENPD_FLAG_IRQ_SAFE (1U << 1)
#define GENPD_FLAG_ALWAYS_ON (1U << 2) #define GENPD_FLAG_ALWAYS_ON (1U << 2)
#define GENPD_FLAG_ACTIVE_WAKEUP (1U << 3) #define GENPD_FLAG_ACTIVE_WAKEUP (1U << 3)
#define GENPD_FLAG_CPU_DOMAIN (1U << 4) #define GENPD_FLAG_CPU_DOMAIN (1U << 4)
#define GENPD_FLAG_RPM_ALWAYS_ON (1U << 5) #define GENPD_FLAG_RPM_ALWAYS_ON (1U << 5)
#define GENPD_FLAG_GOV_NEXT_WAKEUP (1U << 6)
enum gpd_status { enum gpd_status {
GENPD_STATE_ON = 0, /* PM domain is on */ GENPD_STATE_ON = 0, /* PM domain is on */
@@ -211,11 +205,6 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
return to_gpd_data(dev->power.subsys_data->domain_data); return to_gpd_data(dev->power.subsys_data->domain_data);
} }
static inline bool genpd_may_use_next_wakeup(struct generic_pm_domain *genpd)
{
return genpd->flags & GENPD_FLAG_GOV_NEXT_WAKEUP;
}
int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev); int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev);
int pm_genpd_remove_device(struct device *dev); int pm_genpd_remove_device(struct device *dev);
int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
@@ -228,7 +217,6 @@ int pm_genpd_remove(struct generic_pm_domain *genpd);
int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state); int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state);
int dev_pm_genpd_add_notifier(struct device *dev, struct notifier_block *nb); int dev_pm_genpd_add_notifier(struct device *dev, struct notifier_block *nb);
int dev_pm_genpd_remove_notifier(struct device *dev); int dev_pm_genpd_remove_notifier(struct device *dev);
void genpd_enable_next_wakeup(struct generic_pm_domain *genpd, bool enable);
extern struct dev_power_governor simple_qos_governor; extern struct dev_power_governor simple_qos_governor;
extern struct dev_power_governor pm_domain_always_on_gov; extern struct dev_power_governor pm_domain_always_on_gov;
@@ -287,10 +275,6 @@ static inline int dev_pm_genpd_remove_notifier(struct device *dev)
return -ENOTSUPP; return -ENOTSUPP;
} }
static void genpd_enable_next_wakeup(struct generic_pm_domain *genpd,
bool enable)
{ }
#define simple_qos_governor (*(struct dev_power_governor *)(NULL)) #define simple_qos_governor (*(struct dev_power_governor *)(NULL))
#define pm_domain_always_on_gov (*(struct dev_power_governor *)(NULL)) #define pm_domain_always_on_gov (*(struct dev_power_governor *)(NULL))
#endif #endif