Skip to content

Commit c8fbe9c

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
2 parents 0d72d83 + dc4ba5b commit c8fbe9c

File tree

131 files changed

+962
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+962
-485
lines changed

‎Documentation/ABI/testing/sysfs-bus-mei‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ KernelVersion: 3.10
44
Contact: Samuel Ortiz <[email protected]>
55
[email protected]
66
Description: Stores the same MODALIAS value emitted by uevent
7-
Format: mei:<mei device name>:<device uuid>:
7+
Format: mei:<mei device name>:<device uuid>:<protocol version>
88

99
What: /sys/bus/mei/devices/.../name
1010
Date: May 2015

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 19
4-
SUBLEVEL = 95
4+
SUBLEVEL = 97
55
EXTRAVERSION =
66
NAME = "People's Front"
77

‎arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,8 @@
580580
l21 {
581581
regulator-min-microvolt = <2950000>;
582582
regulator-max-microvolt = <2950000>;
583+
regulator-allow-set-load;
584+
regulator-system-load = <200000>;
583585
};
584586
l22 {
585587
regulator-min-microvolt = <3300000>;

‎arch/hexagon/include/asm/atomic.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static inline void atomic_##op(int i, atomic_t *v) \
105105
"1: %0 = memw_locked(%1);\n" \
106106
" %0 = "#op "(%0,%2);\n" \
107107
" memw_locked(%1,P3)=%0;\n" \
108-
" if !P3 jump 1b;\n" \
108+
" if (!P3) jump 1b;\n" \
109109
: "=&r" (output) \
110110
: "r" (&v->counter), "r" (i) \
111111
: "memory", "p3" \
@@ -121,7 +121,7 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
121121
"1: %0 = memw_locked(%1);\n" \
122122
" %0 = "#op "(%0,%2);\n" \
123123
" memw_locked(%1,P3)=%0;\n" \
124-
" if !P3 jump 1b;\n" \
124+
" if (!P3) jump 1b;\n" \
125125
: "=&r" (output) \
126126
: "r" (&v->counter), "r" (i) \
127127
: "memory", "p3" \
@@ -138,7 +138,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \
138138
"1: %0 = memw_locked(%2);\n" \
139139
" %1 = "#op "(%0,%3);\n" \
140140
" memw_locked(%2,P3)=%1;\n" \
141-
" if !P3 jump 1b;\n" \
141+
" if (!P3) jump 1b;\n" \
142142
: "=&r" (output), "=&r" (val) \
143143
: "r" (&v->counter), "r" (i) \
144144
: "memory", "p3" \
@@ -187,7 +187,7 @@ static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u)
187187
" }"
188188
" memw_locked(%2, p3) = %1;"
189189
" {"
190-
" if !p3 jump 1b;"
190+
" if (!p3) jump 1b;"
191191
" }"
192192
"2:"
193193
: "=&r" (__oldval), "=&r" (tmp)

‎arch/hexagon/include/asm/bitops.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr)
5252
"1: R12 = memw_locked(R10);\n"
5353
" { P0 = tstbit(R12,R11); R12 = clrbit(R12,R11); }\n"
5454
" memw_locked(R10,P1) = R12;\n"
55-
" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"
55+
" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"
5656
: "=&r" (oldval)
5757
: "r" (addr), "r" (nr)
5858
: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -76,7 +76,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr)
7676
"1: R12 = memw_locked(R10);\n"
7777
" { P0 = tstbit(R12,R11); R12 = setbit(R12,R11); }\n"
7878
" memw_locked(R10,P1) = R12;\n"
79-
" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"
79+
" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"
8080
: "=&r" (oldval)
8181
: "r" (addr), "r" (nr)
8282
: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -102,7 +102,7 @@ static inline int test_and_change_bit(int nr, volatile void *addr)
102102
"1: R12 = memw_locked(R10);\n"
103103
" { P0 = tstbit(R12,R11); R12 = togglebit(R12,R11); }\n"
104104
" memw_locked(R10,P1) = R12;\n"
105-
" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"
105+
" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"
106106
: "=&r" (oldval)
107107
: "r" (addr), "r" (nr)
108108
: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -237,7 +237,7 @@ static inline int ffs(int x)
237237
int r;
238238

239239
asm("{ P0 = cmp.eq(%1,#0); %0 = ct0(%1);}\n"
240-
"{ if P0 %0 = #0; if !P0 %0 = add(%0,#1);}\n"
240+
"{ if (P0) %0 = #0; if (!P0) %0 = add(%0,#1);}\n"
241241
: "=&r" (r)
242242
: "r" (x)
243243
: "p0");

‎arch/hexagon/include/asm/cmpxchg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
4444
__asm__ __volatile__ (
4545
"1: %0 = memw_locked(%1);\n" /* load into retval */
4646
" memw_locked(%1,P0) = %2;\n" /* store into memory */
47-
" if !P0 jump 1b;\n"
47+
" if (!P0) jump 1b;\n"
4848
: "=&r" (retval)
4949
: "r" (ptr), "r" (x)
5050
: "memory", "p0"

‎arch/hexagon/include/asm/futex.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/* For example: %1 = %4 */ \
1717
insn \
1818
"2: memw_locked(%3,p2) = %1;\n" \
19-
" if !p2 jump 1b;\n" \
19+
" if (!p2) jump 1b;\n" \
2020
" %1 = #0;\n" \
2121
"3:\n" \
2222
".section .fixup,\"ax\"\n" \
@@ -84,10 +84,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval,
8484
"1: %1 = memw_locked(%3)\n"
8585
" {\n"
8686
" p2 = cmp.eq(%1,%4)\n"
87-
" if !p2.new jump:NT 3f\n"
87+
" if (!p2.new) jump:NT 3f\n"
8888
" }\n"
8989
"2: memw_locked(%3,p2) = %5\n"
90-
" if !p2 jump 1b\n"
90+
" if (!p2) jump 1b\n"
9191
"3:\n"
9292
".section .fixup,\"ax\"\n"
9393
"4: %0 = #%6\n"

‎arch/hexagon/include/asm/spinlock.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ static inline void arch_read_lock(arch_rwlock_t *lock)
4444
__asm__ __volatile__(
4545
"1: R6 = memw_locked(%0);\n"
4646
" { P3 = cmp.ge(R6,#0); R6 = add(R6,#1);}\n"
47-
" { if !P3 jump 1b; }\n"
47+
" { if (!P3) jump 1b; }\n"
4848
" memw_locked(%0,P3) = R6;\n"
49-
" { if !P3 jump 1b; }\n"
49+
" { if (!P3) jump 1b; }\n"
5050
:
5151
: "r" (&lock->lock)
5252
: "memory", "r6", "p3"
@@ -60,7 +60,7 @@ static inline void arch_read_unlock(arch_rwlock_t *lock)
6060
"1: R6 = memw_locked(%0);\n"
6161
" R6 = add(R6,#-1);\n"
6262
" memw_locked(%0,P3) = R6\n"
63-
" if !P3 jump 1b;\n"
63+
" if (!P3) jump 1b;\n"
6464
:
6565
: "r" (&lock->lock)
6666
: "memory", "r6", "p3"
@@ -75,7 +75,7 @@ static inline int arch_read_trylock(arch_rwlock_t *lock)
7575
__asm__ __volatile__(
7676
" R6 = memw_locked(%1);\n"
7777
" { %0 = #0; P3 = cmp.ge(R6,#0); R6 = add(R6,#1);}\n"
78-
" { if !P3 jump 1f; }\n"
78+
" { if (!P3) jump 1f; }\n"
7979
" memw_locked(%1,P3) = R6;\n"
8080
" { %0 = P3 }\n"
8181
"1:\n"
@@ -92,9 +92,9 @@ static inline void arch_write_lock(arch_rwlock_t *lock)
9292
__asm__ __volatile__(
9393
"1: R6 = memw_locked(%0)\n"
9494
" { P3 = cmp.eq(R6,#0); R6 = #-1;}\n"
95-
" { if !P3 jump 1b; }\n"
95+
" { if (!P3) jump 1b; }\n"
9696
" memw_locked(%0,P3) = R6;\n"
97-
" { if !P3 jump 1b; }\n"
97+
" { if (!P3) jump 1b; }\n"
9898
:
9999
: "r" (&lock->lock)
100100
: "memory", "r6", "p3"
@@ -108,7 +108,7 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
108108
__asm__ __volatile__(
109109
" R6 = memw_locked(%1)\n"
110110
" { %0 = #0; P3 = cmp.eq(R6,#0); R6 = #-1;}\n"
111-
" { if !P3 jump 1f; }\n"
111+
" { if (!P3) jump 1f; }\n"
112112
" memw_locked(%1,P3) = R6;\n"
113113
" %0 = P3;\n"
114114
"1:\n"
@@ -131,9 +131,9 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)
131131
__asm__ __volatile__(
132132
"1: R6 = memw_locked(%0);\n"
133133
" P3 = cmp.eq(R6,#0);\n"
134-
" { if !P3 jump 1b; R6 = #1; }\n"
134+
" { if (!P3) jump 1b; R6 = #1; }\n"
135135
" memw_locked(%0,P3) = R6;\n"
136-
" { if !P3 jump 1b; }\n"
136+
" { if (!P3) jump 1b; }\n"
137137
:
138138
: "r" (&lock->lock)
139139
: "memory", "r6", "p3"
@@ -153,7 +153,7 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock)
153153
__asm__ __volatile__(
154154
" R6 = memw_locked(%1);\n"
155155
" P3 = cmp.eq(R6,#0);\n"
156-
" { if !P3 jump 1f; R6 = #1; %0 = #0; }\n"
156+
" { if (!P3) jump 1f; R6 = #1; %0 = #0; }\n"
157157
" memw_locked(%1,P3) = R6;\n"
158158
" %0 = P3;\n"
159159
"1:\n"

‎arch/hexagon/kernel/stacktrace.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
#include <linux/thread_info.h>
2525
#include <linux/module.h>
2626

27-
register unsigned long current_frame_pointer asm("r30");
28-
2927
struct stackframe {
3028
unsigned long fp;
3129
unsigned long rets;
@@ -43,7 +41,7 @@ void save_stack_trace(struct stack_trace *trace)
4341

4442
low = (unsigned long)task_stack_page(current);
4543
high = low + THREAD_SIZE;
46-
fp = current_frame_pointer;
44+
fp = (unsigned long)__builtin_frame_address(0);
4745

4846
while (fp >= low && fp <= (high - sizeof(*frame))) {
4947
frame = (struct stackframe *)fp;

‎arch/hexagon/kernel/vm_entry.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ ret_from_fork:
382382
R26.L = #LO(do_work_pending);
383383
R0 = #VM_INT_DISABLE;
384384
}
385-
if P0 jump check_work_pending
385+
if (P0) jump check_work_pending
386386
{
387387
R0 = R25;
388388
callr R24

0 commit comments

Comments
 (0)