Skip to content

Commit e63c182

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c e009b2e ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()") 0f2b214 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL") https://lore.kernel.org/all/[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>
2 parents a180b0b + 1f87478 commit e63c182

File tree

264 files changed

+3481
-1647
lines changed

Some content is hidden

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

264 files changed

+3481
-1647
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ Muna Sinada <[email protected]> <[email protected]>
436436
437437
Mythri P K <[email protected]>
438438
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
439+
439440
440441
441442

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,6 +1855,10 @@ D: Fedora kernel maintenance (2003-2014).
18551855
D: 'Trinity' and similar fuzz testing work.
18561856
D: Misc/Other.
18571857

1858+
N: Tom Joseph
1859+
1860+
D: Cadence PCIe driver
1861+
18581862
N: Martin Josfsson
18591863
18601864
P: 1024D/F6B6D3B1 7610 7CED 5C34 4AA6 DBA2 8BE1 5A6D AF95 F6B6 D3B1

Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- fsl,imx23-ocotp
20-
- fsl,imx28-ocotp
18+
items:
19+
- enum:
20+
- fsl,imx23-ocotp
21+
- fsl,imx28-ocotp
22+
- const: fsl,ocotp
2123

2224
reg:
2325
maxItems: 1
@@ -35,7 +37,7 @@ unevaluatedProperties: false
3537
examples:
3638
- |
3739
ocotp: efuse@8002c000 {
38-
compatible = "fsl,imx28-ocotp";
40+
compatible = "fsl,imx28-ocotp", "fsl,ocotp";
3941
#address-cells = <1>;
4042
#size-cells = <1>;
4143
reg = <0x8002c000 0x2000>;

Documentation/networking/ip-sysctl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2511,7 +2511,7 @@ temp_valid_lft - INTEGER
25112511
temp_prefered_lft - INTEGER
25122512
Preferred lifetime (in seconds) for temporary addresses. If
25132513
temp_prefered_lft is less than the minimum required lifetime (typically
2514-
5 seconds), the preferred lifetime is the minimum required. If
2514+
5 seconds), temporary addresses will not be created. If
25152515
temp_prefered_lft is greater than temp_valid_lft, the preferred lifetime
25162516
is temp_valid_lft.
25172517

MAINTAINERS

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4127,7 +4127,6 @@ M: Franky Lin <[email protected]>
41274127
M: Hante Meuleman <[email protected]>
41284128
41294129
4130-
41314130
S: Supported
41324131
F: drivers/net/wireless/broadcom/brcm80211/
41334132

@@ -9008,12 +9007,9 @@ K: (devm_)?gpio_regmap_(un)?register
90089007
GPIO SUBSYSTEM
90099008
M: Linus Walleij <[email protected]>
90109009
M: Bartosz Golaszewski <[email protected]>
9011-
R: Andy Shevchenko <[email protected]>
90129010
90139011
S: Maintained
90149012
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
9015-
F: Documentation/ABI/obsolete/sysfs-gpio
9016-
F: Documentation/ABI/testing/gpio-cdev
90179013
F: Documentation/admin-guide/gpio/
90189014
F: Documentation/devicetree/bindings/gpio/
90199015
F: Documentation/driver-api/gpio/
@@ -9022,6 +9018,16 @@ F: include/dt-bindings/gpio/
90229018
F: include/linux/gpio.h
90239019
F: include/linux/gpio/
90249020
F: include/linux/of_gpio.h
9021+
9022+
GPIO UAPI
9023+
M: Bartosz Golaszewski <[email protected]>
9024+
R: Kent Gibson <[email protected]>
9025+
9026+
S: Maintained
9027+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
9028+
F: Documentation/ABI/obsolete/sysfs-gpio
9029+
F: Documentation/ABI/testing/gpio-cdev
9030+
F: drivers/gpio/gpiolib-cdev.c
90259031
F: include/uapi/linux/gpio.h
90269032
F: tools/gpio/
90279033

@@ -10642,6 +10648,7 @@ F: drivers/gpio/gpio-pch.c
1064210648
F: drivers/gpio/gpio-sch.c
1064310649
F: drivers/gpio/gpio-sodaville.c
1064410650
F: drivers/gpio/gpio-tangier.c
10651+
F: drivers/gpio/gpio-tangier.h
1064510652

1064610653
INTEL GVT-g DRIVERS (Intel GPU Virtualization)
1064710654
M: Zhenyu Wang <[email protected]>
@@ -11473,6 +11480,7 @@ F: scripts/*vmlinux*
1147311480
F: scripts/Kbuild*
1147411481
F: scripts/Makefile*
1147511482
F: scripts/basic/
11483+
F: scripts/clang-tools/
1147611484
F: scripts/dummy-tools/
1147711485
F: scripts/mk*
1147811486
F: scripts/mod/
@@ -12828,7 +12836,7 @@ S: Maintained
1282812836
F: drivers/net/ethernet/marvell/mvneta.*
1282912837

1283012838
MARVELL MVPP2 ETHERNET DRIVER
12831-
M: Marcin Wojtas <mw@semihalf.com>
12839+
M: Marcin Wojtas <marcin.s.wojtas@gmail.com>
1283212840
M: Russell King <[email protected]>
1283312841
1283412842
S: Maintained
@@ -15093,6 +15101,7 @@ K: \bmdo_
1509315101
NETWORKING [MPTCP]
1509415102
M: Matthieu Baerts <[email protected]>
1509515103
M: Mat Martineau <[email protected]>
15104+
R: Geliang Tang <[email protected]>
1509615105
1509715106
1509815107
S: Maintained
@@ -15441,7 +15450,7 @@ F: Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
1544115450
F: drivers/bluetooth/btnxpuart.c
1544215451

1544315452
NXP C45 TJA11XX PHY DRIVER
15444-
M: Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
15453+
M: Andrei Botila <andrei.botila@oss.nxp.com>
1544515454
1544615455
S: Maintained
1544715456
F: drivers/net/phy/nxp-c45-tja11xx*
@@ -16458,11 +16467,10 @@ F: Documentation/devicetree/bindings/pci/pci-armada8k.txt
1645816467
F: drivers/pci/controller/dwc/pcie-armada8k.c
1645916468

1646016469
PCI DRIVER FOR CADENCE PCIE IP
16461-
M: Tom Joseph <[email protected]>
1646216470
16463-
S: Maintained
16471+
S: Orphan
1646416472
F: Documentation/devicetree/bindings/pci/cdns,*
16465-
F: drivers/pci/controller/cadence/
16473+
F: drivers/pci/controller/cadence/*cadence*
1646616474

1646716475
PCI DRIVER FOR FREESCALE LAYERSCAPE
1646816476
M: Minghuan Lian <[email protected]>

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc6
5+
EXTRAVERSION = -rc8
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

arch/arm64/kvm/arm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
410410
kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);
411411
kvm_timer_vcpu_terminate(vcpu);
412412
kvm_pmu_vcpu_destroy(vcpu);
413-
413+
kvm_vgic_vcpu_destroy(vcpu);
414414
kvm_arm_vcpu_destroy(vcpu);
415415
}
416416

arch/arm64/kvm/vgic/vgic-init.c

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm)
368368
vgic_v4_teardown(kvm);
369369
}
370370

371-
void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
371+
static void __kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
372372
{
373373
struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
374374

@@ -379,29 +379,39 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
379379
vgic_flush_pending_lpis(vcpu);
380380

381381
INIT_LIST_HEAD(&vgic_cpu->ap_list_head);
382-
vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;
382+
if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {
383+
vgic_unregister_redist_iodev(vcpu);
384+
vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;
385+
}
383386
}
384387

385-
static void __kvm_vgic_destroy(struct kvm *kvm)
388+
void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
389+
{
390+
struct kvm *kvm = vcpu->kvm;
391+
392+
mutex_lock(&kvm->slots_lock);
393+
__kvm_vgic_vcpu_destroy(vcpu);
394+
mutex_unlock(&kvm->slots_lock);
395+
}
396+
397+
void kvm_vgic_destroy(struct kvm *kvm)
386398
{
387399
struct kvm_vcpu *vcpu;
388400
unsigned long i;
389401

390-
lockdep_assert_held(&kvm->arch.config_lock);
402+
mutex_lock(&kvm->slots_lock);
391403

392404
vgic_debug_destroy(kvm);
393405

394406
kvm_for_each_vcpu(i, vcpu, kvm)
395-
kvm_vgic_vcpu_destroy(vcpu);
407+
__kvm_vgic_vcpu_destroy(vcpu);
408+
409+
mutex_lock(&kvm->arch.config_lock);
396410

397411
kvm_vgic_dist_destroy(kvm);
398-
}
399412

400-
void kvm_vgic_destroy(struct kvm *kvm)
401-
{
402-
mutex_lock(&kvm->arch.config_lock);
403-
__kvm_vgic_destroy(kvm);
404413
mutex_unlock(&kvm->arch.config_lock);
414+
mutex_unlock(&kvm->slots_lock);
405415
}
406416

407417
/**
@@ -469,25 +479,26 @@ int kvm_vgic_map_resources(struct kvm *kvm)
469479
type = VGIC_V3;
470480
}
471481

472-
if (ret) {
473-
__kvm_vgic_destroy(kvm);
482+
if (ret)
474483
goto out;
475-
}
484+
476485
dist->ready = true;
477486
dist_base = dist->vgic_dist_base;
478487
mutex_unlock(&kvm->arch.config_lock);
479488

480489
ret = vgic_register_dist_iodev(kvm, dist_base, type);
481-
if (ret) {
490+
if (ret)
482491
kvm_err("Unable to register VGIC dist MMIO regions\n");
483-
kvm_vgic_destroy(kvm);
484-
}
485-
mutex_unlock(&kvm->slots_lock);
486-
return ret;
487492

493+
goto out_slots;
488494
out:
489495
mutex_unlock(&kvm->arch.config_lock);
496+
out_slots:
490497
mutex_unlock(&kvm->slots_lock);
498+
499+
if (ret)
500+
kvm_vgic_destroy(kvm);
501+
491502
return ret;
492503
}
493504

arch/arm64/kvm/vgic/vgic-mmio-v3.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
820820
return ret;
821821
}
822822

823-
static void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)
823+
void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)
824824
{
825825
struct vgic_io_device *rd_dev = &vcpu->arch.vgic_cpu.rd_iodev;
826826

@@ -833,6 +833,8 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm)
833833
unsigned long c;
834834
int ret = 0;
835835

836+
lockdep_assert_held(&kvm->slots_lock);
837+
836838
kvm_for_each_vcpu(c, vcpu, kvm) {
837839
ret = vgic_register_redist_iodev(vcpu);
838840
if (ret)

arch/arm64/kvm/vgic/vgic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq);
241241
int vgic_v3_save_pending_tables(struct kvm *kvm);
242242
int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count);
243243
int vgic_register_redist_iodev(struct kvm_vcpu *vcpu);
244+
void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu);
244245
bool vgic_v3_check_base(struct kvm *kvm);
245246

246247
void vgic_v3_load(struct kvm_vcpu *vcpu);

0 commit comments

Comments
 (0)