![Linus Torvalds](/assets/img/avatar_default.png)
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
130 lines
3.2 KiB
C
130 lines
3.2 KiB
C
/*
|
|
* Copyright (c) 2012 Linaro : Daniel Lezcano <daniel.lezcano@linaro.org> (IBM)
|
|
*
|
|
* Based on the work of Rickard Andersson <rickard.andersson@stericsson.com>
|
|
* and Jonas Aaberg <jonas.aberg@stericsson.com>.
|
|
*
|
|
* 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/module.h>
|
|
#include <linux/cpuidle.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/atomic.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/mfd/dbx500-prcmu.h>
|
|
#include <linux/platform_data/arm-ux500-pm.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <asm/cpuidle.h>
|
|
#include <asm/proc-fns.h>
|
|
|
|
static atomic_t master = ATOMIC_INIT(0);
|
|
static DEFINE_SPINLOCK(master_lock);
|
|
|
|
static inline int ux500_enter_idle(struct cpuidle_device *dev,
|
|
struct cpuidle_driver *drv, int index)
|
|
{
|
|
int this_cpu = smp_processor_id();
|
|
bool recouple = false;
|
|
|
|
if (atomic_inc_return(&master) == num_online_cpus()) {
|
|
|
|
/* With this lock, we prevent the other cpu to exit and enter
|
|
* this function again and become the master */
|
|
if (!spin_trylock(&master_lock))
|
|
goto wfi;
|
|
|
|
/* decouple the gic from the A9 cores */
|
|
if (prcmu_gic_decouple()) {
|
|
spin_unlock(&master_lock);
|
|
goto out;
|
|
}
|
|
|
|
/* If an error occur, we will have to recouple the gic
|
|
* manually */
|
|
recouple = true;
|
|
|
|
/* At this state, as the gic is decoupled, if the other
|
|
* cpu is in WFI, we have the guarantee it won't be wake
|
|
* up, so we can safely go to retention */
|
|
if (!prcmu_is_cpu_in_wfi(this_cpu ? 0 : 1))
|
|
goto out;
|
|
|
|
/* The prcmu will be in charge of watching the interrupts
|
|
* and wake up the cpus */
|
|
if (prcmu_copy_gic_settings())
|
|
goto out;
|
|
|
|
/* Check in the meantime an interrupt did
|
|
* not occur on the gic ... */
|
|
if (prcmu_gic_pending_irq())
|
|
goto out;
|
|
|
|
/* ... and the prcmu */
|
|
if (prcmu_pending_irq())
|
|
goto out;
|
|
|
|
/* Go to the retention state, the prcmu will wait for the
|
|
* cpu to go WFI and this is what happens after exiting this
|
|
* 'master' critical section */
|
|
if (prcmu_set_power_state(PRCMU_AP_IDLE, true, true))
|
|
goto out;
|
|
|
|
/* When we switch to retention, the prcmu is in charge
|
|
* of recoupling the gic automatically */
|
|
recouple = false;
|
|
|
|
spin_unlock(&master_lock);
|
|
}
|
|
wfi:
|
|
cpu_do_idle();
|
|
out:
|
|
atomic_dec(&master);
|
|
|
|
if (recouple) {
|
|
prcmu_gic_recouple();
|
|
spin_unlock(&master_lock);
|
|
}
|
|
|
|
return index;
|
|
}
|
|
|
|
static struct cpuidle_driver ux500_idle_driver = {
|
|
.name = "ux500_idle",
|
|
.owner = THIS_MODULE,
|
|
.states = {
|
|
ARM_CPUIDLE_WFI_STATE,
|
|
{
|
|
.enter = ux500_enter_idle,
|
|
.exit_latency = 70,
|
|
.target_residency = 260,
|
|
.flags = CPUIDLE_FLAG_TIMER_STOP,
|
|
.name = "ApIdle",
|
|
.desc = "ARM Retention",
|
|
},
|
|
},
|
|
.safe_state_index = 0,
|
|
.state_count = 2,
|
|
};
|
|
|
|
static int dbx500_cpuidle_probe(struct platform_device *pdev)
|
|
{
|
|
/* Configure wake up reasons */
|
|
prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
|
|
PRCMU_WAKEUP(ABB));
|
|
|
|
return cpuidle_register(&ux500_idle_driver, NULL);
|
|
}
|
|
|
|
static struct platform_driver dbx500_cpuidle_plat_driver = {
|
|
.driver = {
|
|
.name = "cpuidle-dbx500",
|
|
},
|
|
.probe = dbx500_cpuidle_probe,
|
|
};
|
|
|
|
module_platform_driver(dbx500_cpuidle_plat_driver);
|