mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Here's the usual "low-priority fixes that didn't make it into the last few -rcs, with a twist: We had a fixes pull request that I didn't send in time to get into 4.0, so we'll send some of them to Greg for -stable as well. Contents here is as usual not all that controversial: - A handful of randconfig fixes from Arnd, in particular for older Samsung platforms - Exynos fixes, !SMP building, DTS updates for MMC and lid switch - Kbuild fix to create output subdirectory for DTB files - Misc minor fixes for OMAP -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVNzItAAoJEIwa5zzehBx34T0QAID8eUwb0dAy23y2vlszQIhG 5zxvkDgINGj2LOBvlO3afOf3ErKXfNBGJ4UJYyqWxBsQCvY0AcWWmTVXGERhDF3/ ZY+Fn7txhSf63CKaFa0SVwMq4qM9V3oe1EiR2kaXwNb1sk2vniCFA9RLCznSEYsi wy2cwECfNKljnMVl6CiCihOXsY3ZBTq+7nbp4X6ewUoQkvqde2RDSAHKZG2Y43p6 tKhNEPqSKZ9sYwkNrnQ5F92zlkrc7nUdttKel4Q21+3MR132taC/cqnSsVjjFRL6 cb3xM50iy2sHZBdzqkHNSBTAgP5L+PCGOLqkByUrNronOpUYdmqsz4M0Tm1SwEX3 NvmsLjEkeZTsVd9go0/uyrJlZ71UYkSE+YwE4o+mhg55tTW3ZPvb4i+3uXIJnVA7 +nGT5AhmfgrR1w3sQvniQp/hEwY6+qgt2ygQrpn7zSqsWMrwC9QxlJUbikJECKYC SCGJBvbFBsLTiLZf7aJV2L0rtvYe27E+b1LYMos+DIj9llGSWAbWy+hHj1kY2AbP aa93gx3xT8TOwNYFnSa9CuiA1eiWOpS5HFY5Pp7er4+Mf5PibB/Xqdq/krXLBAo3 nWMiRMWPF0Jmn2o8J1gR3Qrb2TLodHXitpHE2Beh0mG/Un148cG2MrjaUnjNo+NG Ox+2BuDNqtXuTL7Y0B9l =o/4N -----END PGP SIGNATURE----- Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "Here's the usual "low-priority fixes that didn't make it into the last few -rcs, with a twist: We had a fixes pull request that I didn't send in time to get into 4.0, so we'll send some of them to Greg for -stable as well. Contents here is as usual not all that controversial: - a handful of randconfig fixes from Arnd, in particular for older Samsung platforms - Exynos fixes, !SMP building, DTS updates for MMC and lid switch - Kbuild fix to create output subdirectory for DTB files - misc minor fixes for OMAP" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) ARM: at91/dt: sama5d3 xplained: add phy address for macb1 kbuild: Create directory for target DTB ARM: mvebu: Disable CPU Idle on Armada 38x ARM: DRA7: Enable Cortex A15 errata 798181 ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102 ARM: dts: DRA7: Add bandgap and related thermal nodes bus: ocp2scp: SYNC2 value should be changed to 0x6 ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP ARM: OMAP2+: remove superfluous NULL pointer check ARM: EXYNOS: Fix build breakage cpuidle on !SMP ARM: dts: fix lid and power pin-functions for exynos5250-spring ARM: dts: fix mmc node updates for exynos5250-spring ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688 MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs ARM: cns3xxx: don't export static symbol ARM: S3C24XX: avoid a Kconfig warning ARM: S3C24XX: fix header file inclusions ARM: S3C24XX: fix building without PM_SLEEP ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416 ...
146 lines
3.4 KiB
C
146 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Coupled cpuidle support based on the work of:
|
|
* Colin Cross <ccross@android.com>
|
|
* Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/cpuidle.h>
|
|
#include <linux/cpu_pm.h>
|
|
#include <linux/export.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_data/cpuidle-exynos.h>
|
|
|
|
#include <asm/suspend.h>
|
|
#include <asm/cpuidle.h>
|
|
|
|
static atomic_t exynos_idle_barrier;
|
|
|
|
static struct cpuidle_exynos_data *exynos_cpuidle_pdata;
|
|
static void (*exynos_enter_aftr)(void);
|
|
|
|
static int exynos_enter_coupled_lowpower(struct cpuidle_device *dev,
|
|
struct cpuidle_driver *drv,
|
|
int index)
|
|
{
|
|
int ret;
|
|
|
|
exynos_cpuidle_pdata->pre_enter_aftr();
|
|
|
|
/*
|
|
* Waiting all cpus to reach this point at the same moment
|
|
*/
|
|
cpuidle_coupled_parallel_barrier(dev, &exynos_idle_barrier);
|
|
|
|
/*
|
|
* Both cpus will reach this point at the same time
|
|
*/
|
|
ret = dev->cpu ? exynos_cpuidle_pdata->cpu1_powerdown()
|
|
: exynos_cpuidle_pdata->cpu0_enter_aftr();
|
|
if (ret)
|
|
index = ret;
|
|
|
|
/*
|
|
* Waiting all cpus to finish the power sequence before going further
|
|
*/
|
|
cpuidle_coupled_parallel_barrier(dev, &exynos_idle_barrier);
|
|
|
|
exynos_cpuidle_pdata->post_enter_aftr();
|
|
|
|
return index;
|
|
}
|
|
|
|
static int exynos_enter_lowpower(struct cpuidle_device *dev,
|
|
struct cpuidle_driver *drv,
|
|
int index)
|
|
{
|
|
int new_index = index;
|
|
|
|
/* AFTR can only be entered when cores other than CPU0 are offline */
|
|
if (num_online_cpus() > 1 || dev->cpu != 0)
|
|
new_index = drv->safe_state_index;
|
|
|
|
if (new_index == 0)
|
|
return arm_cpuidle_simple_enter(dev, drv, new_index);
|
|
|
|
exynos_enter_aftr();
|
|
|
|
return new_index;
|
|
}
|
|
|
|
static struct cpuidle_driver exynos_idle_driver = {
|
|
.name = "exynos_idle",
|
|
.owner = THIS_MODULE,
|
|
.states = {
|
|
[0] = ARM_CPUIDLE_WFI_STATE,
|
|
[1] = {
|
|
.enter = exynos_enter_lowpower,
|
|
.exit_latency = 300,
|
|
.target_residency = 100000,
|
|
.name = "C1",
|
|
.desc = "ARM power down",
|
|
},
|
|
},
|
|
.state_count = 2,
|
|
.safe_state_index = 0,
|
|
};
|
|
|
|
static struct cpuidle_driver exynos_coupled_idle_driver = {
|
|
.name = "exynos_coupled_idle",
|
|
.owner = THIS_MODULE,
|
|
.states = {
|
|
[0] = ARM_CPUIDLE_WFI_STATE,
|
|
[1] = {
|
|
.enter = exynos_enter_coupled_lowpower,
|
|
.exit_latency = 5000,
|
|
.target_residency = 10000,
|
|
.flags = CPUIDLE_FLAG_COUPLED |
|
|
CPUIDLE_FLAG_TIMER_STOP,
|
|
.name = "C1",
|
|
.desc = "ARM power down",
|
|
},
|
|
},
|
|
.state_count = 2,
|
|
.safe_state_index = 0,
|
|
};
|
|
|
|
static int exynos_cpuidle_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
|
|
if (IS_ENABLED(CONFIG_SMP) &&
|
|
of_machine_is_compatible("samsung,exynos4210")) {
|
|
exynos_cpuidle_pdata = pdev->dev.platform_data;
|
|
|
|
ret = cpuidle_register(&exynos_coupled_idle_driver,
|
|
cpu_possible_mask);
|
|
} else {
|
|
exynos_enter_aftr = (void *)(pdev->dev.platform_data);
|
|
|
|
ret = cpuidle_register(&exynos_idle_driver, NULL);
|
|
}
|
|
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to register cpuidle driver\n");
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver exynos_cpuidle_driver = {
|
|
.probe = exynos_cpuidle_probe,
|
|
.driver = {
|
|
.name = "exynos_cpuidle",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(exynos_cpuidle_driver);
|