Skip to content

Commit e876b41

Browse files
airliedairlied
committed
Back merge tag 'v4.4-rc4' into drm-next
We've picked up a few conflicts and it would be nice to resolve them before we move onwards.
2 parents 47c0fd7 + 527e931 commit e876b41

File tree

357 files changed

+4884
-1597
lines changed

Some content is hidden

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

357 files changed

+4884
-1597
lines changed

‎Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ Required properties:
88
- phy-mode: See ethernet.txt file in the same directory
99
- clocks: a pointer to the reference clock for this device.
1010

11+
Optional properties:
12+
- tx-csum-limit: maximum mtu supported by port that allow TX checksum.
13+
Value is presented in bytes. If not used, by default 1600B is set for
14+
"marvell,armada-370-neta" and 9800B for others.
15+
1116
Example:
1217

1318
ethernet@d0070000 {
1419
compatible = "marvell,armada-370-neta";
1520
reg = <0xd0070000 0x2500>;
1621
interrupts = <8>;
1722
clocks = <&gate_clk 4>;
23+
tx-csum-limit = <9800>
1824
status = "okay";
1925
phy = <&phy0>;
2026
phy-mode = "rgmii-id";

‎MAINTAINERS

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com>
318318
L: linux-acpi@vger.kernel.org
319319
W: https://01.org/linux-acpi
320320
S: Supported
321-
F: drivers/acpi/video.c
321+
F: drivers/acpi/acpi_video.c
322322

323323
ACPI WMI DRIVER
324324
L: platform-driver-x86@vger.kernel.org
@@ -1847,7 +1847,7 @@ S: Supported
18471847
F: drivers/net/wireless/ath/ath6kl/
18481848

18491849
WILOCITY WIL6210 WIRELESS DRIVER
1850-
M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
1850+
M: Maya Erez <qca_merez@qca.qualcomm.com>
18511851
L: linux-wireless@vger.kernel.org
18521852
L: wil6210@qca.qualcomm.com
18531853
S: Supported
@@ -9427,8 +9427,10 @@ F: include/scsi/sg.h
94279427

94289428
SCSI SUBSYSTEM
94299429
M: "James E.J. Bottomley" <JBottomley@odin.com>
9430-
L: linux-scsi@vger.kernel.org
94319430
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
9431+
M: "Martin K. Petersen" <martin.petersen@oracle.com>
9432+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
9433+
L: linux-scsi@vger.kernel.org
94329434
S: Maintained
94339435
F: drivers/scsi/
94349436
F: include/scsi/
@@ -10903,9 +10905,9 @@ S: Maintained
1090310905
F: drivers/media/tuners/tua9001*
1090410906

1090510907
TULIP NETWORK DRIVERS
10906-
M: Grant Grundler <grundler@parisc-linux.org>
1090710908
L: netdev@vger.kernel.org
10908-
S: Maintained
10909+
L: linux-parisc@vger.kernel.org
10910+
S: Orphan
1090910911
F: drivers/net/ethernet/dec/tulip/
1091010912

1091110913
TUN/TAP driver

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 4
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Blurry Fish Butt
66

77
# *DOCUMENTATION*

‎arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@
498498
reg = <0x70000 0x4000>;
499499
interrupts-extended = <&mpic 8>;
500500
clocks = <&gateclk 4>;
501+
tx-csum-limit = <9800>;
501502
status = "disabled";
502503
};
503504

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@
2828
unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);
2929
unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu);
3030

31+
static inline unsigned long vcpu_get_reg(struct kvm_vcpu *vcpu,
32+
u8 reg_num)
33+
{
34+
return *vcpu_reg(vcpu, reg_num);
35+
}
36+
37+
static inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num,
38+
unsigned long val)
39+
{
40+
*vcpu_reg(vcpu, reg_num) = val;
41+
}
42+
3143
bool kvm_condition_valid(struct kvm_vcpu *vcpu);
3244
void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr);
3345
void kvm_inject_undefined(struct kvm_vcpu *vcpu);

‎arch/arm/kvm/mmio.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
115115
trace_kvm_mmio(KVM_TRACE_MMIO_READ, len, run->mmio.phys_addr,
116116
data);
117117
data = vcpu_data_host_to_guest(vcpu, data, len);
118-
*vcpu_reg(vcpu, vcpu->arch.mmio_decode.rt) = data;
118+
vcpu_set_reg(vcpu, vcpu->arch.mmio_decode.rt, data);
119119
}
120120

121121
return 0;
@@ -186,7 +186,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
186186
rt = vcpu->arch.mmio_decode.rt;
187187

188188
if (is_write) {
189-
data = vcpu_data_guest_to_host(vcpu, *vcpu_reg(vcpu, rt), len);
189+
data = vcpu_data_guest_to_host(vcpu, vcpu_get_reg(vcpu, rt),
190+
len);
190191

191192
trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, len, fault_ipa, data);
192193
mmio_write_buf(data_buf, len, data);

‎arch/arm/kvm/mmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static void unmap_ptes(struct kvm *kvm, pmd_t *pmd,
218218
kvm_tlb_flush_vmid_ipa(kvm, addr);
219219

220220
/* No need to invalidate the cache for device mappings */
221-
if (!kvm_is_device_pfn(__phys_to_pfn(addr)))
221+
if (!kvm_is_device_pfn(pte_pfn(old_pte)))
222222
kvm_flush_dcache_pte(old_pte);
223223

224224
put_page(virt_to_page(pte));
@@ -310,7 +310,7 @@ static void stage2_flush_ptes(struct kvm *kvm, pmd_t *pmd,
310310

311311
pte = pte_offset_kernel(pmd, addr);
312312
do {
313-
if (!pte_none(*pte) && !kvm_is_device_pfn(__phys_to_pfn(addr)))
313+
if (!pte_none(*pte) && !kvm_is_device_pfn(pte_pfn(*pte)))
314314
kvm_flush_dcache_pte(*pte);
315315
} while (pte++, addr += PAGE_SIZE, addr != end);
316316
}

‎arch/arm/kvm/psci.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
7575
unsigned long context_id;
7676
phys_addr_t target_pc;
7777

78-
cpu_id = *vcpu_reg(source_vcpu, 1) & MPIDR_HWID_BITMASK;
78+
cpu_id = vcpu_get_reg(source_vcpu, 1) & MPIDR_HWID_BITMASK;
7979
if (vcpu_mode_is_32bit(source_vcpu))
8080
cpu_id &= ~((u32) 0);
8181

@@ -94,8 +94,8 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
9494
return PSCI_RET_INVALID_PARAMS;
9595
}
9696

97-
target_pc = *vcpu_reg(source_vcpu, 2);
98-
context_id = *vcpu_reg(source_vcpu, 3);
97+
target_pc = vcpu_get_reg(source_vcpu, 2);
98+
context_id = vcpu_get_reg(source_vcpu, 3);
9999

100100
kvm_reset_vcpu(vcpu);
101101

@@ -114,7 +114,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
114114
* NOTE: We always update r0 (or x0) because for PSCI v0.1
115115
* the general puspose registers are undefined upon CPU_ON.
116116
*/
117-
*vcpu_reg(vcpu, 0) = context_id;
117+
vcpu_set_reg(vcpu, 0, context_id);
118118
vcpu->arch.power_off = false;
119119
smp_mb(); /* Make sure the above is visible */
120120

@@ -134,8 +134,8 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
134134
struct kvm *kvm = vcpu->kvm;
135135
struct kvm_vcpu *tmp;
136136

137-
target_affinity = *vcpu_reg(vcpu, 1);
138-
lowest_affinity_level = *vcpu_reg(vcpu, 2);
137+
target_affinity = vcpu_get_reg(vcpu, 1);
138+
lowest_affinity_level = vcpu_get_reg(vcpu, 2);
139139

140140
/* Determine target affinity mask */
141141
target_affinity_mask = psci_affinity_mask(lowest_affinity_level);
@@ -209,7 +209,7 @@ int kvm_psci_version(struct kvm_vcpu *vcpu)
209209
static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
210210
{
211211
int ret = 1;
212-
unsigned long psci_fn = *vcpu_reg(vcpu, 0) & ~((u32) 0);
212+
unsigned long psci_fn = vcpu_get_reg(vcpu, 0) & ~((u32) 0);
213213
unsigned long val;
214214

215215
switch (psci_fn) {
@@ -273,13 +273,13 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
273273
break;
274274
}
275275

276-
*vcpu_reg(vcpu, 0) = val;
276+
vcpu_set_reg(vcpu, 0, val);
277277
return ret;
278278
}
279279

280280
static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)
281281
{
282-
unsigned long psci_fn = *vcpu_reg(vcpu, 0) & ~((u32) 0);
282+
unsigned long psci_fn = vcpu_get_reg(vcpu, 0) & ~((u32) 0);
283283
unsigned long val;
284284

285285
switch (psci_fn) {
@@ -295,7 +295,7 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)
295295
break;
296296
}
297297

298-
*vcpu_reg(vcpu, 0) = val;
298+
vcpu_set_reg(vcpu, 0, val);
299299
return 1;
300300
}
301301

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,21 @@ static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu)
100100
}
101101

102102
/*
103-
* vcpu_reg should always be passed a register number coming from a
104-
* read of ESR_EL2. Otherwise, it may give the wrong result on AArch32
105-
* with banked registers.
103+
* vcpu_get_reg and vcpu_set_reg should always be passed a register number
104+
* coming from a read of ESR_EL2. Otherwise, it may give the wrong result on
105+
* AArch32 with banked registers.
106106
*/
107-
static inline unsigned long *vcpu_reg(const struct kvm_vcpu *vcpu, u8 reg_num)
107+
static inline unsigned long vcpu_get_reg(const struct kvm_vcpu *vcpu,
108+
u8 reg_num)
108109
{
109-
return (unsigned long *)&vcpu_gp_regs(vcpu)->regs.regs[reg_num];
110+
return (reg_num == 31) ? 0 : vcpu_gp_regs(vcpu)->regs.regs[reg_num];
111+
}
112+
113+
static inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num,
114+
unsigned long val)
115+
{
116+
if (reg_num != 31)
117+
vcpu_gp_regs(vcpu)->regs.regs[reg_num] = val;
110118
}
111119

112120
/* Get vcpu SPSR for current mode */

‎arch/arm64/kvm/handle_exit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)
3737
{
3838
int ret;
3939

40-
trace_kvm_hvc_arm64(*vcpu_pc(vcpu), *vcpu_reg(vcpu, 0),
40+
trace_kvm_hvc_arm64(*vcpu_pc(vcpu), vcpu_get_reg(vcpu, 0),
4141
kvm_vcpu_hvc_get_imm(vcpu));
4242

4343
ret = kvm_psci_call(vcpu);

0 commit comments

Comments
 (0)