Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM and clkdev fixes from Russell King:
"Two patches for clkdev which resolve the long standing issue that the
devm_* versions were dependent on clkdev, which they shouldn't have
been. Instead, they're dependent on HAVE_CLK instead, which implies
that you're providing clk_get() and clk_put().
A small fix to the ARM decompressor to ensure that the page tables are
properly interpreted by the CPU, and reserve syscall 378 for kcmp (the
checksyscalls.sh script is unfortunately currently broken so arch
maintainers aren't getting notified of new syscalls...)
Lastly, a larger fix for an issue between the common clk subsystem and
smp_twd which causes warnings to be spat out."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: reserve syscall 378 for kcmp
ARM: 7535/1: Reprogram smp_twd based on new common clk framework notifiers
ARM: 7537/1: clk: Fix release in devm_clk_put()
ARM: 7532/1: decompressor: reset SCTLR.TRE for VMSA ARMv7 cores
ARM: 7534/1: clk: Make the managed clk functions generically available
+106
-53
+1
arch/arm/boot/compressed/head.S
+1
arch/arm/boot/compressed/head.S
···
653
653
mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs
654
654
#endif
655
655
mrc p15, 0, r0, c1, c0, 0 @ read control reg
656
+
bic r0, r0, #1 << 28 @ clear SCTLR.TRE
656
657
orr r0, r0, #0x5000 @ I-cache enable, RR cache replacement
657
658
orr r0, r0, #0x003c @ write buffer
658
659
#ifdef CONFIG_MMU
+2
arch/arm/include/asm/unistd.h
+2
arch/arm/include/asm/unistd.h
···
404
404
#define __NR_setns (__NR_SYSCALL_BASE+375)
405
405
#define __NR_process_vm_readv (__NR_SYSCALL_BASE+376)
406
406
#define __NR_process_vm_writev (__NR_SYSCALL_BASE+377)
407
+
/* 378 for kcmp */
407
408
408
409
/*
409
410
* The following SWIs are ARM private.
···
484
483
*/
485
484
#define __IGNORE_fadvise64_64
486
485
#define __IGNORE_migrate_pages
486
+
#define __IGNORE_kcmp
487
487
488
488
#endif /* __KERNEL__ */
489
489
#endif /* __ASM_ARM_UNISTD_H */
+1
arch/arm/kernel/calls.S
+1
arch/arm/kernel/calls.S
+46
-2
arch/arm/kernel/smp_twd.c
+46
-2
arch/arm/kernel/smp_twd.c
···
11
11
#include <linux/init.h>
12
12
#include <linux/kernel.h>
13
13
#include <linux/clk.h>
14
-
#include <linux/cpufreq.h>
15
14
#include <linux/delay.h>
16
15
#include <linux/device.h>
17
16
#include <linux/err.h>
···
95
96
disable_percpu_irq(clk->irq);
96
97
}
97
98
98
-
#ifdef CONFIG_CPU_FREQ
99
+
#ifdef CONFIG_COMMON_CLK
100
+
101
+
/*
102
+
* Updates clockevent frequency when the cpu frequency changes.
103
+
* Called on the cpu that is changing frequency with interrupts disabled.
104
+
*/
105
+
static void twd_update_frequency(void *new_rate)
106
+
{
107
+
twd_timer_rate = *((unsigned long *) new_rate);
108
+
109
+
clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);
110
+
}
111
+
112
+
static int twd_rate_change(struct notifier_block *nb,
113
+
unsigned long flags, void *data)
114
+
{
115
+
struct clk_notifier_data *cnd = data;
116
+
117
+
/*
118
+
* The twd clock events must be reprogrammed to account for the new
119
+
* frequency. The timer is local to a cpu, so cross-call to the
120
+
* changing cpu.
121
+
*/
122
+
if (flags == POST_RATE_CHANGE)
123
+
smp_call_function(twd_update_frequency,
124
+
(void *)&cnd->new_rate, 1);
125
+
126
+
return NOTIFY_OK;
127
+
}
128
+
129
+
static struct notifier_block twd_clk_nb = {
130
+
.notifier_call = twd_rate_change,
131
+
};
132
+
133
+
static int twd_clk_init(void)
134
+
{
135
+
if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
136
+
return clk_notifier_register(twd_clk, &twd_clk_nb);
137
+
138
+
return 0;
139
+
}
140
+
core_initcall(twd_clk_init);
141
+
142
+
#elif defined (CONFIG_CPU_FREQ)
143
+
144
+
#include <linux/cpufreq.h>
99
145
100
146
/*
101
147
* Updates clockevent frequency when the cpu frequency changes.
-6
arch/m68k/platform/coldfire/clk.c
-6
arch/m68k/platform/coldfire/clk.c
+1
drivers/clk/Makefile
+1
drivers/clk/Makefile
+55
drivers/clk/clk-devres.c
+55
drivers/clk/clk-devres.c
···
1
+
/*
2
+
* This program is free software; you can redistribute it and/or modify
3
+
* it under the terms of the GNU General Public License version 2 as
4
+
* published by the Free Software Foundation.
5
+
*/
6
+
7
+
#include <linux/clk.h>
8
+
#include <linux/device.h>
9
+
#include <linux/export.h>
10
+
#include <linux/gfp.h>
11
+
12
+
static void devm_clk_release(struct device *dev, void *res)
13
+
{
14
+
clk_put(*(struct clk **)res);
15
+
}
16
+
17
+
struct clk *devm_clk_get(struct device *dev, const char *id)
18
+
{
19
+
struct clk **ptr, *clk;
20
+
21
+
ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);
22
+
if (!ptr)
23
+
return ERR_PTR(-ENOMEM);
24
+
25
+
clk = clk_get(dev, id);
26
+
if (!IS_ERR(clk)) {
27
+
*ptr = clk;
28
+
devres_add(dev, ptr);
29
+
} else {
30
+
devres_free(ptr);
31
+
}
32
+
33
+
return clk;
34
+
}
35
+
EXPORT_SYMBOL(devm_clk_get);
36
+
37
+
static int devm_clk_match(struct device *dev, void *res, void *data)
38
+
{
39
+
struct clk **c = res;
40
+
if (!c || !*c) {
41
+
WARN_ON(!c || !*c);
42
+
return 0;
43
+
}
44
+
return *c == data;
45
+
}
46
+
47
+
void devm_clk_put(struct device *dev, struct clk *clk)
48
+
{
49
+
int ret;
50
+
51
+
ret = devres_release(dev, devm_clk_release, devm_clk_match, clk);
52
+
53
+
WARN_ON(ret);
54
+
}
55
+
EXPORT_SYMBOL(devm_clk_put);
-45
drivers/clk/clkdev.c
-45
drivers/clk/clkdev.c
···
171
171
}
172
172
EXPORT_SYMBOL(clk_put);
173
173
174
-
static void devm_clk_release(struct device *dev, void *res)
175
-
{
176
-
clk_put(*(struct clk **)res);
177
-
}
178
-
179
-
struct clk *devm_clk_get(struct device *dev, const char *id)
180
-
{
181
-
struct clk **ptr, *clk;
182
-
183
-
ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);
184
-
if (!ptr)
185
-
return ERR_PTR(-ENOMEM);
186
-
187
-
clk = clk_get(dev, id);
188
-
if (!IS_ERR(clk)) {
189
-
*ptr = clk;
190
-
devres_add(dev, ptr);
191
-
} else {
192
-
devres_free(ptr);
193
-
}
194
-
195
-
return clk;
196
-
}
197
-
EXPORT_SYMBOL(devm_clk_get);
198
-
199
-
static int devm_clk_match(struct device *dev, void *res, void *data)
200
-
{
201
-
struct clk **c = res;
202
-
if (!c || !*c) {
203
-
WARN_ON(!c || !*c);
204
-
return 0;
205
-
}
206
-
return *c == data;
207
-
}
208
-
209
-
void devm_clk_put(struct device *dev, struct clk *clk)
210
-
{
211
-
int ret;
212
-
213
-
ret = devres_destroy(dev, devm_clk_release, devm_clk_match, clk);
214
-
215
-
WARN_ON(ret);
216
-
}
217
-
EXPORT_SYMBOL(devm_clk_put);
218
-
219
174
void clkdev_add(struct clk_lookup *cl)
220
175
{
221
176
mutex_lock(&clocks_mutex);