Skip to content

Commit 72b904d

Browse files
otaviootavio
authored
Merge pull request #86 from zandrey/5.4-1.0.0-imx
Update 5.4-1.0.0-imx to v5.4.47 from stable
2 parents 5376418 + a896a80 commit 72b904d

File tree

151 files changed

+1041
-553
lines changed

Some content is hidden

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

151 files changed

+1041
-553
lines changed

‎Documentation/lzo.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,15 @@ Byte sequences
159159
distance = 16384 + (H << 14) + D
160160
state = S (copy S literals after this block)
161161
End of stream is reached if distance == 16384
162+
In version 1 only, to prevent ambiguity with the RLE case when
163+
((distance & 0x803f) == 0x803f) && (261 <= length <= 264), the
164+
compressor must not emit block copies where distance and length
165+
meet these conditions.
162166

163167
In version 1 only, this instruction is also used to encode a run of
164-
zeros if distance = 0xbfff, i.e. H = 1 and the D bits are all 1.
168+
zeros if distance = 0xbfff, i.e. H = 1 and the D bits are all 1.
165169
In this case, it is followed by a fourth byte, X.
166-
run length = ((X << 3) | (0 0 0 0 0 L L L)) + 4.
170+
run length = ((X << 3) | (0 0 0 0 0 L L L)) + 4
167171

168172
0 0 1 L L L L L (32..63)
169173
Copy of small block within 16kB distance (preferably less than 34B)

‎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 = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 46
4+
SUBLEVEL = 47
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

‎arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@
125125
bus-width = <8>;
126126
pinctrl-names = "default";
127127
pinctrl-0 = <&pinctrl_sdmmc0_default>;
128-
non-removable;
129-
mmc-ddr-1_8v;
130128
status = "okay";
131129
};
132130

‎arch/arm/include/asm/kvm_emulate.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
363363
}
364364
}
365365

366-
static inline void vcpu_ptrauth_setup_lazy(struct kvm_vcpu *vcpu) {}
366+
static inline bool vcpu_has_ptrauth(struct kvm_vcpu *vcpu) { return false; }
367+
static inline void vcpu_ptrauth_disable(struct kvm_vcpu *vcpu) { }
367368

368369
#endif /* __ARM_KVM_EMULATE_H__ */

‎arch/arm/include/asm/kvm_host.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,6 @@ static inline bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)
421421
return true;
422422
}
423423

424+
#define kvm_arm_vcpu_loaded(vcpu) (false)
425+
424426
#endif /* __ARM_KVM_HOST_H__ */

‎arch/arm/kernel/ptrace.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ static struct undef_hook arm_break_hook = {
219219
};
220220

221221
static struct undef_hook thumb_break_hook = {
222-
.instr_mask = 0xffff,
223-
.instr_val = 0xde01,
222+
.instr_mask = 0xffffffff,
223+
.instr_val = 0x0000de01,
224224
.cpsr_mask = PSR_T_BIT,
225225
.cpsr_val = PSR_T_BIT,
226226
.fn = break_trap,

‎arch/arm64/include/asm/acpi.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/efi.h>
1313
#include <linux/memblock.h>
1414
#include <linux/psci.h>
15+
#include <linux/stddef.h>
1516

1617
#include <asm/cputype.h>
1718
#include <asm/io.h>
@@ -31,14 +32,14 @@
3132
* is therefore used to delimit the MADT GICC structure minimum length
3233
* appropriately.
3334
*/
34-
#define ACPI_MADT_GICC_MIN_LENGTH ACPI_OFFSET( \
35+
#define ACPI_MADT_GICC_MIN_LENGTH offsetof( \
3536
struct acpi_madt_generic_interrupt, efficiency_class)
3637

3738
#define BAD_MADT_GICC_ENTRY(entry, end) \
3839
(!(entry) || (entry)->header.length < ACPI_MADT_GICC_MIN_LENGTH || \
3940
(unsigned long)(entry) + (entry)->header.length > (end))
4041

41-
#define ACPI_MADT_GICC_SPE (ACPI_OFFSET(struct acpi_madt_generic_interrupt, \
42+
#define ACPI_MADT_GICC_SPE (offsetof(struct acpi_madt_generic_interrupt, \
4243
spe_interrupt) + sizeof(u16))
4344

4445
/* Basic configuration for ACPI */

‎arch/arm64/include/asm/kvm_emulate.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ static inline void vcpu_ptrauth_disable(struct kvm_vcpu *vcpu)
9797
vcpu->arch.hcr_el2 &= ~(HCR_API | HCR_APK);
9898
}
9999

100-
static inline void vcpu_ptrauth_setup_lazy(struct kvm_vcpu *vcpu)
101-
{
102-
if (vcpu_has_ptrauth(vcpu))
103-
vcpu_ptrauth_disable(vcpu);
104-
}
105-
106100
static inline unsigned long vcpu_get_vsesr(struct kvm_vcpu *vcpu)
107101
{
108102
return vcpu->arch.vsesr_el2;

‎arch/arm64/include/asm/kvm_host.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,10 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);
392392
* CP14 and CP15 live in the same array, as they are backed by the
393393
* same system registers.
394394
*/
395-
#define vcpu_cp14(v,r) ((v)->arch.ctxt.copro[(r)])
396-
#define vcpu_cp15(v,r) ((v)->arch.ctxt.copro[(r)])
395+
#define CPx_BIAS IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)
396+
397+
#define vcpu_cp14(v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_BIAS])
398+
#define vcpu_cp15(v,r) ((v)->arch.ctxt.copro[(r) ^ CPx_BIAS])
397399

398400
struct kvm_vm_stat {
399401
ulong remote_tlb_flush;
@@ -677,4 +679,6 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);
677679
#define kvm_arm_vcpu_sve_finalized(vcpu) \
678680
((vcpu)->arch.flags & KVM_ARM64_VCPU_SVE_FINALIZED)
679681

682+
#define kvm_arm_vcpu_loaded(vcpu) ((vcpu)->arch.sysregs_loaded_on_cpu)
683+
680684
#endif /* __ARM64_KVM_HOST_H__ */

‎arch/arm64/kvm/handle_exit.c‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,16 @@ static int handle_sve(struct kvm_vcpu *vcpu, struct kvm_run *run)
162162
return 1;
163163
}
164164

165-
#define __ptrauth_save_key(regs, key) \
166-
({ \
167-
regs[key ## KEYLO_EL1] = read_sysreg_s(SYS_ ## key ## KEYLO_EL1); \
168-
regs[key ## KEYHI_EL1] = read_sysreg_s(SYS_ ## key ## KEYHI_EL1); \
169-
})
170-
171165
/*
172166
* Handle the guest trying to use a ptrauth instruction, or trying to access a
173167
* ptrauth register.
174168
*/
175169
void kvm_arm_vcpu_ptrauth_trap(struct kvm_vcpu *vcpu)
176170
{
177-
struct kvm_cpu_context *ctxt;
178-
179-
if (vcpu_has_ptrauth(vcpu)) {
171+
if (vcpu_has_ptrauth(vcpu))
180172
vcpu_ptrauth_enable(vcpu);
181-
ctxt = vcpu->arch.host_cpu_context;
182-
__ptrauth_save_key(ctxt->sys_regs, APIA);
183-
__ptrauth_save_key(ctxt->sys_regs, APIB);
184-
__ptrauth_save_key(ctxt->sys_regs, APDA);
185-
__ptrauth_save_key(ctxt->sys_regs, APDB);
186-
__ptrauth_save_key(ctxt->sys_regs, APGA);
187-
} else {
173+
else
188174
kvm_inject_undefined(vcpu);
189-
}
190175
}
191176

192177
/*

0 commit comments

Comments
 (0)