Linux 4.9.17
Greg KH
maintainerI'm announcing the release of the 4.9.17 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/arm64/silicon-errata.txt | 44 Makefile | 2 arch/arm64/Kconfig | 10 arch/arm64/kvm/hyp/tlb.c | 64 - arch/powerpc/crypto/crc32c-vpmsum_glue.c | 2 arch/powerpc/include/asm/mmu_context.h | 20 arch/powerpc/kernel/setup-common.c | 2 arch/powerpc/mm/mmu_context_book3s64.c | 6 arch/powerpc/mm/mmu_context_iommu.c | 62 - arch/x86/events/core.c | 4 arch/x86/kernel/cpu/mshyperv.c | 24 arch/x86/kernel/head64.c | 1 arch/x86/kernel/tsc.c | 2 arch/x86/mm/kasan_init_64.c | 1 arch/x86/pci/xen.c | 23 block/scsi_ioctl.c | 3 drivers/acpi/blacklist.c | 28 drivers/clk/bcm/clk-bcm2835.c | 2 drivers/dma/ioat/init.c | 4 drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 30 drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 23 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c | 37 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c | 6 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | 44 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c | 23 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c | 46 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmg84.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c | 37 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c | 6 drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c | 28 drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c | 30 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c | 4 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 4 drivers/gpu/drm/vc4/vc4_crtc.c | 46 drivers/gpu/drm/vc4/vc4_drv.h | 2 drivers/gpu/drm/vc4/vc4_kms.c | 33 drivers/gpu/drm/vc4/vc4_regs.h | 3 drivers/irqchip/irq-gic-v3-its.c | 16 drivers/media/usb/uvc/uvc_driver.c | 118 + drivers/net/ethernet/ibm/ibmveth.c | 12 drivers/net/ethernet/intel/igb/e1000_phy.c | 4 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 34 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 13 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 30 drivers/net/geneve.c | 10 drivers/net/phy/phy.c | 14 drivers/net/tun.c | 18 drivers/net/vrf.c | 3 drivers/net/vxlan.c | 27 drivers/pci/iov.c | 70 - drivers/pci/pci.c | 34 drivers/pci/pci.h | 7 drivers/pci/probe.c | 3 drivers/pci/rom.c | 5 drivers/pci/setup-res.c | 48 drivers/s390/crypto/ap_bus.c | 3 drivers/s390/crypto/ap_bus.h | 1 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1096 ++++++++---------- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 5 drivers/tty/serial/8250/8250_pci.c | 23 drivers/usb/gadget/udc/atmel_usba_udc.c | 3 drivers/usb/gadget/udc/atmel_usba_udc.h | 1 drivers/vfio/vfio_iommu_spapr_tce.c | 328 +++-- include/linux/bpf_verifier.h | 14 include/linux/dccp.h | 1 include/linux/hyperv.h | 32 include/uapi/linux/packet_diag.h | 2 kernel/bpf/verifier.c | 77 - kernel/futex.c | 22 kernel/locking/rwsem-spinlock.c | 15 mm/slab.c | 4 mm/slab.h | 2 mm/slab_common.c | 27 mm/slob.c | 2 mm/slub.c | 19 net/bridge/br_forward.c | 3 net/bridge/br_input.c | 1 net/bridge/br_netfilter_hooks.c | 21 net/core/dev.c | 35 net/core/skbuff.c | 30 net/dccp/ccids/ccid2.c | 1 net/dccp/input.c | 10 net/dccp/ipv4.c | 3 net/dccp/ipv6.c | 8 net/dccp/minisocks.c | 25 net/ipv4/af_inet.c | 4 net/ipv4/route.c | 1 net/ipv4/tcp_input.c | 10 net/ipv4/tcp_ipv4.c | 10 net/ipv4/tcp_timer.c | 6 net/ipv6/ip6_fib.c | 2 net/ipv6/ip6_offload.c | 4 net/ipv6/ip6_output.c | 7 net/ipv6/ip6_vti.c | 4 net/ipv6/netfilter/nf_conntrack_reasm.c | 1 net/ipv6/tcp_ipv6.c | 8 net/l2tp/l2tp_ip.c | 2 net/mpls/af_mpls.c | 4 net/openvswitch/conntrack.c | 1 net/packet/af_packet.c | 8 net/sched/act_api.c | 5 net/sched/act_connmark.c | 3 net/sched/act_skbmod.c | 1 net/strparser/strparser.c | 1 112 files changed, 1815 insertions(+), 1271 deletions(-)
Alex Hung (1):
ACPI / blacklist: add _REV quirks for Dell Precision 5520 and 3520
Alexander Potapenko (1):
net: don't call strlen() on the user buffer in packet_bind_spkt()
Alexandre Belloni (1):
usb: gadget: udc: atmel: remove memory leak
Alexei Starovoitov (1):
bpf: fix state equivalence
Alexey Kardashevskiy (7):
vfio/spapr: Postpone allocation of userspace version of TCE table powerpc/iommu: Pass mm_struct to init/cleanup helpers powerpc/iommu: Stop using @current in mm_iommu_xxx vfio/spapr: Reference mm in tce_container powerpc/mm/iommu, vfio/spapr: Put pages on VFIO container shutdown vfio/spapr: Add a helper to create default DMA window vfio/spapr: Postpone default window creation
Alexey Khoroshilov (1):
net/sched: act_skbmod: remove unneeded rcu_read_unlock in tcf_skbmod_dump
Andrey Ryabinin (1):
x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
Andy Lutomirski (1):
x86/perf: Fix CR4.PCE propagation to use active_mm instead of mm
Arnaldo Carvalho de Melo (1):
dccp: Unlock sock before calling sk_free()
Ben Skeggs (3):
drm/nouveau/disp/gp102: fix cursor/overlay immediate channel indices drm/nouveau/disp/nv50-: split chid into chid.ctrl and chid.user drm/nouveau/disp/nv50-: specify ctrl/user separately when constructing classes
Bjorn Helgaas (7):
PCI: Separate VF BAR updates from standard BAR updates
PCI: Remove pci_resource_bar() and pci_iov_resource_bar()
PCI: Add comments about ROM BAR updating
PCI: Decouple IORESOURCE_ROM_ENABLE and PCI_ROM_ADDRESS_ENABLE
PCI: Don't update VF BARs while VF memory space is enabled
PCI: Update BARs using property bits appropriate for type
PCI: Ignore BAR updates on virtual functions
Boris Brezillon (2):
clk: bcm2835: Fix ->fixed_divider of pllh_aux
drm/vc4: Fix ->clock_select setting for the VEC encoderBrian Russell (1):
vxlan: don't allow overwrite of config src addr
Chris J Arges (1):
igb: Workaround for igb i210 firmware issue
Dan Streetman (1):
xen: do not re-use pirq number cached in pci device msi msg data
Daniel Axtens (1):
crypto: powerpc - Fix initialisation of crc32c context
Daniel Borkmann (2):
bpf: fix regression on verifier pruning wrt map lookups
bpf: fix mark_reg_unknown_value for spilled regs on map value marking
David Ahern (3):
vrf: Fix use-after-free in vrf_xmit
mpls: Send route delete notifications when router module is unloaded
mpls: Do not decrement alive counter for unregister events
David Forster (1):
vti6: return GRE_KEY for vti6
Derek Foreman (1):
drm/vc4: Fix race between page flip completion event and clean-up
Dmitry V. Levin (1):
uapi: fix linux/packet_diag.h userspace compilation error
Eric Dumazet (7):
tcp/dccp: block BH for SYN processing
net: net_enable_timestamp() can be called from irq contexts
ipv6: orphan skbs in reassembly unit
tcp: fix various issues for sockets morphing to listen state
net: fix socket refcounting in skb_complete_wifi_ack()
net: fix socket refcounting in skb_complete_tx_timestamp()
dccp: fix use-after-free in dccp_feat_activate_values
Etienne Noss (1):
act_connmark: avoid crashing on malformed nlattrs with null parms
Florian Fainelli (1):
net: phy: Avoid deadlock during phy_error()
Florian Westphal (2):
ipv6: avoid write to a possibly cloned skb
bridge: drop netfilter fake rtable unconditionally
Gabriel Krisman Bertazi (1):
serial: 8250_pci: Detach low-level driver during PCI error recovery
Gavin Shan (1):
PCI: Do any VF BAR updates before enabling the BARs
Greg Kroah-Hartman (1):
Linux 4.9.17
Hannes Frederic Sowa (2):
tun: fix premature POLLOUT notification on tun devices
dccp: fix memory leak during tear-down of unsuccessful connection request
Harald Freudenberger (1):
s390/zcrypt: Introduce CEX6 toleration
Henrik Ingo (1):
uvcvideo: uvc_scan_fallback() for webcams with broken chain
Ido Schimmel (1):
mlxsw: spectrum_router: Avoid potential packets loss
Jakub Kicinski (2):
vxlan: lock RCU on TX path
geneve: lock RCU on TX path
Jon Maxwell (1):
dccp/tcp: fix routing redirect race
Julian Anastasov (1):
ipv4: mask tos for input route
Krister Johansen (1):
dmaengine: iota: ioat_alloc_chan_resources should not perform sleeping allocations.
Marc Zyngier (1):
arm64: KVM: VHE: Clear HCR_TGE when invalidating guest TLBs
Matthias Schiffer (1):
vxlan: correctly validate VXLAN ID against VXLAN_N_VID
Mauricio Faria de Oliveira (1):
block: allow WRITE_SAME commands with the SG_IO ioctl
Michael Cyr (6):
scsi: ibmvscsis: Issues from Dan Carpenter/Smatch
scsi: ibmvscsis: Return correct partition name/# to client
scsi: ibmvscsis: Clean up properly if target_submit_cmd/tmr fails
scsi: ibmvscsis: Rearrange functions for future patches
scsi: ibmvscsis: Synchronize cmds at tpg_enable_store time
scsi: ibmvscsis: Synchronize cmds at remove time
Michael Ellerman (1):
powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y
Michael Pobega (1):
ACPI / blacklist: Make Dell Latitude 3350 ethernet work
Mike Manning (1):
net: bridge: allow IPv6 when multicast flood is disabled
Niklas Cassel (1):
locking/rwsem: Fix down_write_killable() for CONFIG_RWSEM_GENERIC_SPINLOCK=y
Paolo Abeni (1):
net/tunnel: set inner protocol in network gro hooks
Paul Hüber (1):
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
Peter Zijlstra (3):
x86/tsc: Fix ART for TSC_KNOWN_FREQ
futex: Fix potential use-after-free in FUTEX_REQUEUE_PI
futex: Add missing error handling to FUTEX_REQUEUE_PI
Roman Mashak (1):
net sched actions: decrement module reference count after table flush.
Sabrina Dubroca (1):
ipv6: make ECMP route replacement less greedy
Saeed Mahameed (1):
net/mlx5e: Register/unregister vport representors on interface attach/detach
Shanker Donthineni (1):
irqchip/gicv3-its: Add workaround for QDF2400 ITS erratum 0065
Tariq Toukan (2):
net/mlx5e: Do not reduce LRO WQE size when not using build_skb net/mlx5e: Fix wrong CQE decompression
Thomas Falcon (1):
ibmveth: calculate gso_segs for large packets
Thomas Graf (1):
bpf: Detect identical PTR_TO_MAP_VALUE_OR_NULL registers
Todd Fujinaka (1):
igb: add i211 to i210 PHY workaround
Vitaly Kuznetsov (2):
x86/hyperv: Handle unknown NMIs on one CPU when unknown_nmi_panic
Drivers: hv: ring_buffer: count on wrap around mappings in get_next_pkt_raw() (v2)
Vladimir Davydov (1):
slub: move synchronize_sched out of slab_mutex on shrink
WANG Cong (1):
strparser: destroy workqueue on module exit
Greg KH
maintainerDocumentation/arm64/silicon-errata.txt +23 -21
@@ -42,24 +42,26 @@ file acts as a registry of software workarounds in the Linux Kernel and will be updated when new workarounds are committed and backported to stable kernels. -| Implementor | Component | Erratum ID | Kconfig | -+----------------+-----------------+-----------------+-------------------------+ -| ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 | -| ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 | -| ARM | Cortex-A53 | #824069 | ARM64_ERRATUM_824069 | -| ARM | Cortex-A53 | #819472 | ARM64_ERRATUM_819472 | -| ARM | Cortex-A53 | #845719 | ARM64_ERRATUM_845719 | -| ARM | Cortex-A53 | #843419 | ARM64_ERRATUM_843419 | -| ARM | Cortex-A57 | #832075 | ARM64_ERRATUM_832075 | -| ARM | Cortex-A57 | #852523 | N/A | -| ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 | -| ARM | Cortex-A72 | #853709 | N/A | -| ARM | MMU-500 | #841119,#826419 | N/A | -| | | | | -| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 | -| Cavium | ThunderX ITS | #23144 | CAVIUM_ERRATUM_23144 | -| Cavium | ThunderX GICv3 | #23154 | CAVIUM_ERRATUM_23154 | -| Cavium | ThunderX Core | #27456 | CAVIUM_ERRATUM_27456 | -| Cavium | ThunderX SMMUv2 | #27704 | N/A | -| | | | | -| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 | +| Implementor | Component | Erratum ID | Kconfig | ++----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 | +| ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 | +| ARM | Cortex-A53 | #824069 | ARM64_ERRATUM_824069 | +| ARM | Cortex-A53 | #819472 | ARM64_ERRATUM_819472 | +| ARM | Cortex-A53 | #845719 | ARM64_ERRATUM_845719 | +| ARM | Cortex-A53 | #843419 | ARM64_ERRATUM_843419 | +| ARM | Cortex-A57 | #832075 | ARM64_ERRATUM_832075 | +| ARM | Cortex-A57 | #852523 | N/A | +| ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 | +| ARM | Cortex-A72 | #853709 | N/A | +| ARM | MMU-500 | #841119,#826419 | N/A | +| | | | | +| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 | +| Cavium | ThunderX ITS | #23144 | CAVIUM_ERRATUM_23144 | +| Cavium | ThunderX GICv3 | #23154 | CAVIUM_ERRATUM_23154 | +| Cavium | ThunderX Core | #27456 | CAVIUM_ERRATUM_27456 | +| Cavium | ThunderX SMMUv2 | #27704 | N/A | +| | | | | +| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 | +| | | | | +| Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 |
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Roaring Lionus
arch/arm64/Kconfig +10 -0
@@ -474,6 +474,16 @@ config CAVIUM_ERRATUM_27456 If unsure, say Y. +config QCOM_QDF2400_ERRATUM_0065 + bool "QDF2400 E0065: Incorrect GITS_TYPER.ITT_Entry_size" + default y + help + On Qualcomm Datacenter Technologies QDF2400 SoC, ITS hardware reports + ITE size incorrectly. The GITS_TYPER.ITT_Entry_size field should have + been indicated as 16Bytes (0xf), not 8Bytes (0x7). + + If unsure, say Y. + endmenu
arch/arm64/kvm/hyp/tlb.c +55 -9
104 lines not on this page · raw message
arch/powerpc/crypto/crc32c-vpmsum_glue.c +1 -1
@@ -52,7 +52,7 @@ static int crc32c_vpmsum_cra_init(struct crypto_tfm *tfm) {u32 *key =crypto_tfm_ctx (tfm); - *key =0 ; + *key = ~0 ;return 0 ; }
arch/powerpc/include/asm/mmu_context.h +11 -9
@@ -19,16 +19,18 @@ extern void destroy_context(struct mm_struct *mm);struct mm_iommu_table_group_mem_t ;extern int isolate_lru_page (struct page *page);/* from internal.h */ -extern bool mm_iommu_preregistered (void ); -extern long mm_iommu_get (unsigned long ua,unsigned long entries, +extern bool mm_iommu_preregistered (struct mm_struct *mm); +extern long mm_iommu_get (struct mm_struct *mm, +unsigned long ua,unsigned long entries,struct mm_iommu_table_group_mem_t **pmem); -extern long mm_iommu_put (struct mm_iommu_table_group_mem_t *mem); -extern void mm_iommu_init (mm_context_t *ctx); -extern void mm_iommu_cleanup (mm_context_t *ctx); -extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup (unsigned long ua, -unsigned long size); -extern struct mm_iommu_table_group_mem_t *mm_iommu_find (unsigned long ua, -unsigned long entries); +extern long mm_iommu_put (struct mm_struct *mm, +struct mm_iommu_table_group_mem_t *mem); +extern void mm_iommu_init (struct mm_struct *mm); +extern void mm_iommu_cleanup (struct mm_struct *mm); +extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup (struct mm_struct *mm, +unsigned long ua,unsigned long size); +extern struct mm_iommu_table_group_mem_t *mm_iommu_find (struct mm_struct *mm, +unsigned long ua,unsigned long entries);extern long mm_iommu_ua_to_hpa (struct mm_iommu_table_group_mem_t *mem,unsigned long ua,unsigned long *hpa);extern long mm_iommu_mapped_inc (struct mm_iommu_table_group_mem_t *mem);
arch/powerpc/kernel/setup-common.c +1 -1
@@ -915,7 +915,7 @@ void __init setup_arch(char **cmdline_p) init_mm.context.pte_frag =NULL ;#endif #ifdef CONFIG_SPAPR_TCE_IOMMU -mm_iommu_init (&init_mm.context); +mm_iommu_init (&init_mm);#endif irqstack_early_init ();exc_lvl_early_init ();
arch/powerpc/mm/mmu_context_book3s64.c +2 -4
@@ -115,7 +115,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) mm->context.pte_frag =NULL ;#endif #ifdef CONFIG_SPAPR_TCE_IOMMU -mm_iommu_init (&mm->context); +mm_iommu_init (mm);#endif return 0 ; }
@@ -156,13 +156,11 @@ static inline void destroy_pagetable_page(struct mm_struct *mm) }#endif -void destroy_context (struct mm_struct *mm) {#ifdef CONFIG_SPAPR_TCE_IOMMU -mm_iommu_cleanup (&mm->context); +WARN_ON_ONCE (!list_empty (&mm->context.iommu_group_mem_list));#endif -#ifdef CONFIG_PPC_ICSWX drop_cop (mm->context.acop, mm);kfree (mm->context.cop_lockp);
arch/powerpc/mm/mmu_context_iommu.c +20 -42
151 lines not on this page · raw message
arch/x86/events/core.c +2 -2
@@ -2096,8 +2096,8 @@ static int x86_pmu_event_init(struct perf_event *event)static void refresh_pce (void *ignored) { -if (current->mm) -load_mm_cr4 (current->mm); +if (current->active_mm) +load_mm_cr4 (current->active_mm); }static void x86_pmu_event_mapped (struct perf_event *event)
arch/x86/kernel/cpu/mshyperv.c +24 -0
@@ -31,6 +31,7 @@#include <asm/apic.h> #include <asm/timer.h> #include <asm/reboot.h> +#include <asm/nmi.h> struct ms_hyperv_info ms_hyperv;EXPORT_SYMBOL_GPL (ms_hyperv);
@@ -158,6 +159,26 @@ static unsigned char hv_get_nmi_reason(void)return 0 ; } +#ifdef CONFIG_X86_LOCAL_APIC +/* +* Prior to WS2016 Debug-VM sends NMIs to all CPUs which makes +* it dificult to process CHANNELMSG_UNLOAD in case of crash. Handle +* unknown NMI on the first CPU which gets it. +*/ +static int hv_nmi_unknown (unsigned int val,struct pt_regs *regs) +{ +static atomic_t nmi_cpu =ATOMIC_INIT (-1 ); + +if (!unknown_nmi_panic) +return NMI_DONE ; + +if (atomic_cmpxchg (&nmi_cpu,-1 ,raw_smp_processor_id ()) !=-1 ) +return NMI_HANDLED ; + +return NMI_DONE ; +} +#endif +static void __init ms_hyperv_init_platform (void ) {/*
@@ -183,6 +204,9 @@ static void __init ms_hyperv_init_platform(void)pr_info ("HyperV: LAPIC Timer Frequency: %#x\n" , lapic_timer_frequency); } + +register_nmi_handler (NMI_UNKNOWN , hv_nmi_unknown,NMI_FLAG_FIRST , +"hv_nmi_unknown" );#endif if (ms_hyperv.features &HV_X64_MSR_TIME_REF_COUNT_AVAILABLE )
arch/x86/kernel/head64.c +1 -0
@@ -4,6 +4,7 @@* Copyright (C) 2000 Andrea Arcangeli <[email protected]> SuSE */ +#define DISABLE_BRANCH_PROFILING #include <linux/init.h> #include <linux/linkage.h> #include <linux/types.h>
arch/x86/kernel/tsc.c +2 -0
@@ -1287,6 +1287,8 @@ static int __init init_tsc_clocksource(void)* exporting a reliable TSC. */ if (boot_cpu_has (X86_FEATURE_TSC_RELIABLE )) { +if (boot_cpu_has (X86_FEATURE_ART )) + art_related_clocksource = &clocksource_tsc;clocksource_register_khz (&clocksource_tsc, tsc_khz);return 0 ; }
arch/x86/mm/kasan_init_64.c +1 -0
@@ -1,3 +1,4 @@ +#define DISABLE_BRANCH_PROFILING #define pr_fmt (fmt) "kasan: " fmt#include <linux/bootmem.h> #include <linux/kasan.h>
arch/x86/pci/xen.c +7 -16
@@ -234,23 +234,14 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)return 1 ;for_each_pci_msi_entry (msidesc, dev) { -__pci_read_msi_msg (msidesc, &msg); - pirq =MSI_ADDR_EXT_DEST_ID (msg.address_hi) | - ((msg.address_lo >>MSI_ADDR_DEST_ID_SHIFT ) &0xff ); -if (msg.data !=XEN_PIRQ_MSI_DATA || -xen_irq_from_pirq (pirq) <0 ) { - pirq =xen_allocate_pirq_msi (dev, msidesc); -if (pirq <0 ) { - irq = -ENODEV ; - goto error; - } -xen_msi_compose_msg (dev, pirq, &msg); -__pci_write_msi_msg (msidesc, &msg); -dev_dbg (&dev->dev,"xen: msi bound to pirq=%d\n" , pirq); - }else { -dev_dbg (&dev->dev, -"xen: msi already bound to pirq=%d\n" , pirq); + pirq =xen_allocate_pirq_msi (dev, msidesc); +if (pirq <0 ) { + irq = -ENODEV ; + goto error; } +xen_msi_compose_msg (dev, pirq, &msg); +__pci_write_msi_msg (msidesc, &msg); +dev_dbg (&dev->dev,"xen: msi bound to pirq=%d\n" , pirq); irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, (type == PCI_CAP_ID_MSI) ? nvec : 1, (type == PCI_CAP_ID_MSIX) ?
block/scsi_ioctl.c +3 -0
@@ -182,6 +182,9 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)__set_bit (WRITE_16 , filter->write_ok);__set_bit (WRITE_LONG , filter->write_ok);__set_bit (WRITE_LONG_2 , filter->write_ok); +__set_bit (WRITE_SAME , filter->write_ok); +__set_bit (WRITE_SAME_16 , filter->write_ok); +__set_bit (WRITE_SAME_32 , filter->write_ok);__set_bit (ERASE , filter->write_ok);__set_bit (GPCMD_MODE_SELECT_10 , filter->write_ok);__set_bit (MODE_SELECT , filter->write_ok);
drivers/acpi/blacklist.c +28 -0
@@ -160,6 +160,34 @@ static struct dmi_system_id acpi_rev_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343"), }, }, + { + .callback = dmi_enable_rev_override, + .ident = "DELL Precision 5520", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision 5520"), + }, + }, + { + .callback = dmi_enable_rev_override, + .ident = "DELL Precision 3520", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision 3520"), + }, + }, + /* + * Resolves a quirk with the Dell Latitude 3350 that + * causes the ethernet adapter to not function. + */ + { + .callback = dmi_enable_rev_override, + .ident = "DELL Latitude 3350", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude 3350"), + }, + }, #endif {} };
drivers/clk/bcm/clk-bcm2835.c +1 -1
@@ -1598,7 +1598,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .a2w_reg = A2W_PLLH_AUX, .load_mask = CM_PLLH_LOADAUX, .hold_mask = 0, - .fixed_divider = 10), + .fixed_divider = 1), [BCM2835_PLLH_PIX] = REGISTER_PLL_DIV( .name = "pllh_pix", .source_pll = "pllh",
drivers/dma/ioat/init.c +2 -2
@@ -691,7 +691,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c)/* doing 2 32bit writes to mmio since 1 64b write doesn't work */ ioat_chan->completion =dma_pool_zalloc (ioat_chan->ioat_dma->completion_pool, -GFP_KERNEL , &ioat_chan->completion_dma); +GFP_NOWAIT , &ioat_chan->completion_dma);if (!ioat_chan->completion)return -ENOMEM ;
@@ -701,7 +701,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c) ioat_chan->reg_base + IOAT_CHANCMP_OFFSET_HIGH); order =IOAT_MAX_ORDER ; - ring =ioat_alloc_ring (c, order,GFP_KERNEL ); + ring =ioat_alloc_ring (c, order,GFP_NOWAIT );if (!ring)return -ENOMEM ;
drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild +2 -0
@@ -95,9 +95,11 @@ nvkm-y += nvkm/engine/disp/cursg84.o nvkm-y += nvkm/engine/disp/cursgt215.o nvkm-y += nvkm/engine/disp/cursgf119.o nvkm-y += nvkm/engine/disp/cursgk104.o +nvkm-y += nvkm/engine/disp/cursgp102.o nvkm-y += nvkm/engine/disp/oimmnv50.o nvkm-y += nvkm/engine/disp/oimmg84.o nvkm-y += nvkm/engine/disp/oimmgt215.o nvkm-y += nvkm/engine/disp/oimmgf119.o nvkm-y += nvkm/engine/disp/oimmgk104.o +nvkm-y += nvkm/engine/disp/oimmgp102.o
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c +16 -14
@@ -82,7 +82,7 @@ nv50_disp_chan_mthd(struct nv50_disp_chan *chan, int debug)if (mthd->addr) {snprintf (cname_,sizeof (cname_),"%s %d" , - mthd->name, chan->chid); + mthd->name, chan->chid.user); cname = cname_; }
@@ -139,7 +139,7 @@ nv50_disp_chan_uevent_ctor(struct nvkm_object *object, void *data, u32 size,if (!(ret =nvif_unvers (ret, &data, &size, args->none))) { notify->size =sizeof (struct nvif_notify_uevent_rep ); notify->types =1 ; - notify->index = chan->chid; + notify->index = chan->chid.user;return 0 ; }
@@ -159,7 +159,7 @@ nv50_disp_chan_rd32(struct nvkm_object *object, u64 addr, u32 *data)struct nv50_disp_chan *chan =nv50_disp_chan (object);struct nv50_disp *disp = chan->root->disp;struct nvkm_device *device = disp->base.engine.subdev.device; - *data =nvkm_rd32 (device,0x640000 + (chan->chid *0x1000 ) + addr); + *data =nvkm_rd32 (device,0x640000 + (chan->chid.user *0x1000 ) + addr);return 0 ; }
@@ -169,7 +169,7 @@ nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data)struct nv50_disp_chan *chan =nv50_disp_chan (object);struct nv50_disp *disp = chan->root->disp;struct nvkm_device *device = disp->base.engine.subdev.device; -nvkm_wr32 (device,0x640000 + (chan->chid *0x1000 ) + addr, data); +nvkm_wr32 (device,0x640000 + (chan->chid.user *0x1000 ) + addr, data);return 0 ; }
@@ -196,7 +196,7 @@ nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size)struct nv50_disp *disp = chan->root->disp;struct nvkm_device *device = disp->base.engine.subdev.device; *addr = device->func->resource_addr (device,0 ) + -0x640000 + (chan->chid *0x1000 ); +0x640000 + (chan->chid.user *0x1000 ); *size =0x001000 ;return 0 ; }
@@ -243,8 +243,8 @@ nv50_disp_chan_dtor(struct nvkm_object *object) {struct nv50_disp_chan *chan =nv50_disp_chan (object);struct nv50_disp *disp = chan->root->disp; -if (chan->chid >=0 ) - disp->chan[chan->chid] =NULL ; +if (chan->chid.user >=0 ) + disp->chan[chan->chid.user] =NULL ;return chan->func->dtor ? chan->func->dtor (chan) : chan; }
@@ -263,7 +263,7 @@ nv50_disp_chan = {int nv50_disp_chan_ctor (const struct nv50_disp_chan_func *func,const struct nv50_disp_chan_mthd *mthd, -struct nv50_disp_root *root,int chid,int head, +struct nv50_disp_root *root,int ctrl,int user,int head,const struct nvkm_oclass *oclass,struct nv50_disp_chan *chan) {
@@ -273,21 +273,22 @@ nv50_disp_chan_ctor(const struct nv50_disp_chan_func *func, chan->func = func; chan->mthd = mthd; chan->root = root; - chan->chid = chid; + chan->chid.ctrl = ctrl; + chan->chid.user = user; chan->head = head; -if (disp->chan[chan->chid]) { - chan->chid =-1 ; +if (disp->chan[chan->chid.user]) { + chan->chid.user =-1 ;return -EBUSY ; } - disp->chan[chan->chid] = chan; + disp->chan[chan->chid.user] = chan;return 0 ; }int nv50_disp_chan_new_ (const struct nv50_disp_chan_func *func,const struct nv50_disp_chan_mthd *mthd, -struct nv50_disp_root *root,int chid,int head, +struct nv50_disp_root *root,int ctrl,int user,int head,const struct nvkm_oclass *oclass,struct nvkm_object **pobject) {
@@ -297,5 +298,6 @@ nv50_disp_chan_new_(const struct nv50_disp_chan_func *func,return -ENOMEM ; *pobject = &chan->object; -return nv50_disp_chan_ctor (func, mthd, root, chid, head, oclass, chan); +return nv50_disp_chan_ctor (func, mthd, root, ctrl, user, + head, oclass, chan); }
drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +16 -7
@@ -7,7 +7,11 @@ struct nv50_disp_chan {const struct nv50_disp_chan_func *func;const struct nv50_disp_chan_mthd *mthd;struct nv50_disp_root *root; -int chid; + +struct { +int ctrl; +int user; + } chid;int head;struct nvkm_object object;
@@ -25,11 +29,11 @@ struct nv50_disp_chan_func {int nv50_disp_chan_ctor (const struct nv50_disp_chan_func *,const struct nv50_disp_chan_mthd *, -struct nv50_disp_root *,int chid,int head, +struct nv50_disp_root *,int ctrl,int user,int head,const struct nvkm_oclass *,struct nv50_disp_chan *);int nv50_disp_chan_new_ (const struct nv50_disp_chan_func *,const struct nv50_disp_chan_mthd *, -struct nv50_disp_root *,int chid,int head, +struct nv50_disp_root *,int ctrl,int user,int head,const struct nvkm_oclass *,struct nvkm_object **);extern const struct nv50_disp_chan_func nv50_disp_pioc_func;
@@ -90,13 +94,16 @@ extern const struct nv50_disp_chan_mthd gk104_disp_ovly_chan_mthd;struct nv50_disp_pioc_oclass {int (*ctor)(const struct nv50_disp_chan_func *,const struct nv50_disp_chan_mthd *, -struct nv50_disp_root *,int chid, +struct nv50_disp_root *,int ctrl,int user,const struct nvkm_oclass *,void *data,u32 size,struct nvkm_object **);struct nvkm_sclass base;const struct nv50_disp_chan_func *func;const struct nv50_disp_chan_mthd *mthd; -int chid; +struct { +int ctrl; +int user; + } chid; };extern const struct nv50_disp_pioc_oclass nv50_disp_oimm_oclass;
@@ -114,15 +121,17 @@ extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass;extern const struct nv50_disp_pioc_oclass gk104_disp_oimm_oclass;extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass; +extern const struct nv50_disp_pioc_oclass gp102_disp_oimm_oclass; +extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass;int nv50_disp_curs_new (const struct nv50_disp_chan_func *,const struct nv50_disp_chan_mthd *, -struct nv50_disp_root *,int chid, +struct nv50_disp_root *,int ctrl,int user,const struct nvkm_oclass *,void *data,u32 size,struct nvkm_object **);int nv50_disp_oimm_new (const struct nv50_disp_chan_func *,const struct nv50_disp_chan_mthd *, -struct nv50_disp_root *,int chid, +struct nv50_disp_root *,int ctrl,int user,const struct nvkm_oclass *,void *data,u32 size,struct nvkm_object **);#endif
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c +1 -1
@@ -33,5 +33,5 @@ g84_disp_curs_oclass = { .base.maxver = 0, .ctor = nv50_disp_curs_new, .func = &nv50_disp_pioc_func, - .chid = 7, + .chid = { 7, 7 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c +1 -1
@@ -33,5 +33,5 @@ gf119_disp_curs_oclass = { .base.maxver = 0, .ctor = nv50_disp_curs_new, .func = &gf119_disp_pioc_func, - .chid = 13, + .chid = { 13, 13 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c +1 -1
@@ -33,5 +33,5 @@ gk104_disp_curs_oclass = { .base.maxver = 0, .ctor = nv50_disp_curs_new, .func = &gf119_disp_pioc_func, - .chid = 13, + .chid = { 13, 13 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2016 Red Hat Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Ben Skeggs <[email protected]> +*/ +#include "channv50.h" +#include "rootnv50.h" + +#include <nvif/class.h> + +const struct nv50_disp_pioc_oclass +gp102_disp_curs_oclass = { + .base.oclass =GK104_DISP_CURSOR , + .base.minver =0 , + .base.maxver =0 , + .ctor = nv50_disp_curs_new, + .func = &gf119_disp_pioc_func, + .chid = {13 ,17 }, +};
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c +1 -1
@@ -33,5 +33,5 @@ gt215_disp_curs_oclass = { .base.maxver = 0, .ctor = nv50_disp_curs_new, .func = &nv50_disp_pioc_func, - .chid = 7, + .chid = { 7, 7 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c +3 -3
@@ -33,7 +33,7 @@int nv50_disp_curs_new (const struct nv50_disp_chan_func *func,const struct nv50_disp_chan_mthd *mthd, -struct nv50_disp_root *root,int chid, +struct nv50_disp_root *root,int ctrl,int user,const struct nvkm_oclass *oclass,void *data,u32 size,struct nvkm_object **pobject) {
@@ -54,7 +54,7 @@ nv50_disp_curs_new(const struct nv50_disp_chan_func *func, }else return ret; -return nv50_disp_chan_new_ (func, mthd, root, chid + head, +return nv50_disp_chan_new_ (func, mthd, root, ctrl + head, user + head, head, oclass, pobject); }
@@ -65,5 +65,5 @@ nv50_disp_curs_oclass = { .base.maxver = 0, .ctor = nv50_disp_curs_new, .func = &nv50_disp_pioc_func, - .chid = 7, + .chid = { 7, 7 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c +23 -21
79 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c +12 -11
@@ -32,26 +32,27 @@ gp104_disp_dmac_init(struct nv50_disp_dmac *chan)struct nv50_disp *disp = chan->base.root->disp;struct nvkm_subdev *subdev = &disp->base.engine.subdev;struct nvkm_device *device = subdev->device; -int chid = chan->base.chid; +int ctrl = chan->base.chid.ctrl; +int user = chan->base.chid.user;/* enable error reporting */ -nvkm_mask (device,0x6100a0 ,0x00000001 << chid,0x00000001 << chid); +nvkm_mask (device,0x6100a0 ,0x00000001 << user,0x00000001 << user);/* initialise channel for dma command submission */ -nvkm_wr32 (device,0x611494 + (chid *0x0010 ), chan->push); -nvkm_wr32 (device,0x611498 + (chid *0x0010 ),0x00010000 ); -nvkm_wr32 (device,0x61149c + (chid *0x0010 ),0x00000001 ); -nvkm_mask (device,0x610490 + (chid *0x0010 ),0x00000010 ,0x00000010 ); -nvkm_wr32 (device,0x640000 + (chid *0x1000 ),0x00000000 ); -nvkm_wr32 (device,0x610490 + (chid *0x0010 ),0x00000013 ); +nvkm_wr32 (device,0x611494 + (ctrl *0x0010 ), chan->push); +nvkm_wr32 (device,0x611498 + (ctrl *0x0010 ),0x00010000 ); +nvkm_wr32 (device,0x61149c + (ctrl *0x0010 ),0x00000001 ); +nvkm_mask (device,0x610490 + (ctrl *0x0010 ),0x00000010 ,0x00000010 ); +nvkm_wr32 (device,0x640000 + (ctrl *0x1000 ),0x00000000 ); +nvkm_wr32 (device,0x610490 + (ctrl *0x0010 ),0x00000013 );/* wait for it to go inactive */ if (nvkm_msec (device,2000 , - if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x80000000)) + if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x80000000)) break; ) <0 ) { -nvkm_error (subdev,"ch %d init: %08x\n" , chid, -nvkm_rd32 (device,0x610490 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d init: %08x\n" , user, +nvkm_rd32 (device,0x610490 + (ctrl *0x10 )));return -EBUSY ; }
drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c +24 -22
87 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmg84.c +1 -1
@@ -33,5 +33,5 @@ g84_disp_oimm_oclass = { .base.maxver = 0, .ctor = nv50_disp_oimm_new, .func = &nv50_disp_pioc_func, - .chid = 5, + .chid = { 5, 5 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c +1 -1
@@ -33,5 +33,5 @@ gf119_disp_oimm_oclass = { .base.maxver = 0, .ctor = nv50_disp_oimm_new, .func = &gf119_disp_pioc_func, - .chid = 9, + .chid = { 9, 9 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c +1 -1
@@ -33,5 +33,5 @@ gk104_disp_oimm_oclass = { .base.maxver = 0, .ctor = nv50_disp_oimm_new, .func = &gf119_disp_pioc_func, - .chid = 9, + .chid = { 9, 9 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2016 Red Hat Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Ben Skeggs <[email protected]> +*/ +#include "channv50.h" +#include "rootnv50.h" + +#include <nvif/class.h> + +const struct nv50_disp_pioc_oclass +gp102_disp_oimm_oclass = { + .base.oclass =GK104_DISP_OVERLAY , + .base.minver =0 , + .base.maxver =0 , + .ctor = nv50_disp_oimm_new, + .func = &gf119_disp_pioc_func, + .chid = {9 ,13 }, +};
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c +1 -1
@@ -33,5 +33,5 @@ gt215_disp_oimm_oclass = { .base.maxver = 0, .ctor = nv50_disp_oimm_new, .func = &nv50_disp_pioc_func, - .chid = 5, + .chid = { 5, 5 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c +3 -3
@@ -33,7 +33,7 @@int nv50_disp_oimm_new (const struct nv50_disp_chan_func *func,const struct nv50_disp_chan_mthd *mthd, -struct nv50_disp_root *root,int chid, +struct nv50_disp_root *root,int ctrl,int user,const struct nvkm_oclass *oclass,void *data,u32 size,struct nvkm_object **pobject) {
@@ -54,7 +54,7 @@ nv50_disp_oimm_new(const struct nv50_disp_chan_func *func, }else return ret; -return nv50_disp_chan_new_ (func, mthd, root, chid + head, +return nv50_disp_chan_new_ (func, mthd, root, ctrl + head, user + head, head, oclass, pobject); }
@@ -65,5 +65,5 @@ nv50_disp_oimm_oclass = { .base.maxver = 0, .ctor = nv50_disp_oimm_new, .func = &nv50_disp_pioc_func, - .chid = 5, + .chid = { 5, 5 }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c +15 -13
@@ -32,20 +32,21 @@ gf119_disp_pioc_fini(struct nv50_disp_chan *chan)struct nv50_disp *disp = chan->root->disp;struct nvkm_subdev *subdev = &disp->base.engine.subdev;struct nvkm_device *device = subdev->device; -int chid = chan->chid; +int ctrl = chan->chid.ctrl; +int user = chan->chid.user; -nvkm_mask (device,0x610490 + (chid *0x10 ),0x00000001 ,0x00000000 ); +nvkm_mask (device,0x610490 + (ctrl *0x10 ),0x00000001 ,0x00000000 );if (nvkm_msec (device,2000 , - if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x00030000)) + if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x00030000)) break; ) <0 ) { -nvkm_error (subdev,"ch %d fini: %08x\n" , chid, -nvkm_rd32 (device,0x610490 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d fini: %08x\n" , user, +nvkm_rd32 (device,0x610490 + (ctrl *0x10 ))); }/* disable error reporting and completion notification */ -nvkm_mask (device,0x610090 ,0x00000001 << chid,0x00000000 ); -nvkm_mask (device,0x6100a0 ,0x00000001 << chid,0x00000000 ); +nvkm_mask (device,0x610090 ,0x00000001 << user,0x00000000 ); +nvkm_mask (device,0x6100a0 ,0x00000001 << user,0x00000000 ); } static int
@@ -54,20 +55,21 @@ gf119_disp_pioc_init(struct nv50_disp_chan *chan)struct nv50_disp *disp = chan->root->disp;struct nvkm_subdev *subdev = &disp->base.engine.subdev;struct nvkm_device *device = subdev->device; -int chid = chan->chid; +int ctrl = chan->chid.ctrl; +int user = chan->chid.user;/* enable error reporting */ -nvkm_mask (device,0x6100a0 ,0x00000001 << chid,0x00000001 << chid); +nvkm_mask (device,0x6100a0 ,0x00000001 << user,0x00000001 << user);/* activate channel */ -nvkm_wr32 (device,0x610490 + (chid *0x10 ),0x00000001 ); +nvkm_wr32 (device,0x610490 + (ctrl *0x10 ),0x00000001 );if (nvkm_msec (device,2000 , - u32 tmp = nvkm_rd32(device, 0x610490 + (chid * 0x10)); + u32 tmp = nvkm_rd32(device, 0x610490 + (ctrl * 0x10)); if ((tmp & 0x00030000) == 0x00010000) break; ) <0 ) { -nvkm_error (subdev,"ch %d init: %08x\n" , chid, -nvkm_rd32 (device,0x610490 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d init: %08x\n" , user, +nvkm_rd32 (device,0x610490 + (ctrl *0x10 )));return -EBUSY ; }
drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c +16 -14
@@ -32,15 +32,16 @@ nv50_disp_pioc_fini(struct nv50_disp_chan *chan)struct nv50_disp *disp = chan->root->disp;struct nvkm_subdev *subdev = &disp->base.engine.subdev;struct nvkm_device *device = subdev->device; -int chid = chan->chid; +int ctrl = chan->chid.ctrl; +int user = chan->chid.user; -nvkm_mask (device,0x610200 + (chid *0x10 ),0x00000001 ,0x00000000 ); +nvkm_mask (device,0x610200 + (ctrl *0x10 ),0x00000001 ,0x00000000 );if (nvkm_msec (device,2000 , - if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x00030000)) + if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x00030000)) break; ) <0 ) { -nvkm_error (subdev,"ch %d timeout: %08x\n" , chid, -nvkm_rd32 (device,0x610200 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d timeout: %08x\n" , user, +nvkm_rd32 (device,0x610200 + (ctrl *0x10 ))); } }
@@ -50,26 +51,27 @@ nv50_disp_pioc_init(struct nv50_disp_chan *chan)struct nv50_disp *disp = chan->root->disp;struct nvkm_subdev *subdev = &disp->base.engine.subdev;struct nvkm_device *device = subdev->device; -int chid = chan->chid; +int ctrl = chan->chid.ctrl; +int user = chan->chid.user; -nvkm_wr32 (device,0x610200 + (chid *0x10 ),0x00002000 ); +nvkm_wr32 (device,0x610200 + (ctrl *0x10 ),0x00002000 );if (nvkm_msec (device,2000 , - if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x00030000)) + if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x00030000)) break; ) <0 ) { -nvkm_error (subdev,"ch %d timeout0: %08x\n" , chid, -nvkm_rd32 (device,0x610200 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d timeout0: %08x\n" , user, +nvkm_rd32 (device,0x610200 + (ctrl *0x10 )));return -EBUSY ; } -nvkm_wr32 (device,0x610200 + (chid *0x10 ),0x00000001 ); +nvkm_wr32 (device,0x610200 + (ctrl *0x10 ),0x00000001 );if (nvkm_msec (device,2000 , - u32 tmp = nvkm_rd32(device, 0x610200 + (chid * 0x10)); + u32 tmp = nvkm_rd32(device, 0x610200 + (ctrl * 0x10)); if ((tmp & 0x00030000) == 0x00010000) break; ) <0 ) { -nvkm_error (subdev,"ch %d timeout1: %08x\n" , chid, -nvkm_rd32 (device,0x610200 + (chid *0x10 ))); +nvkm_error (subdev,"ch %d timeout1: %08x\n" , user, +nvkm_rd32 (device,0x610200 + (ctrl *0x10 )));return -EBUSY ; }
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c +2 -2
@@ -36,8 +36,8 @@ gp104_disp_root = { &gp104_disp_ovly_oclass, }, .pioc = { - &gk104_disp_oimm_oclass, - &gk104_disp_curs_oclass, + &gp102_disp_oimm_oclass, + &gp102_disp_curs_oclass, }, };
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c +2 -2
@@ -207,8 +207,8 @@ nv50_disp_root_pioc_new_(const struct nvkm_oclass *oclass, {const struct nv50_disp_pioc_oclass *sclass = oclass->priv;struct nv50_disp_root *root =nv50_disp_root (oclass->parent); -return sclass->ctor (sclass->func, sclass->mthd, root, sclass->chid, - oclass, data, size, pobject); +return sclass->ctor (sclass->func, sclass->mthd, root, sclass->chid.ctrl, + sclass->chid.user, oclass, data, size, pobject); } static int
drivers/gpu/drm/vc4/vc4_crtc.c +31 -15
82 lines not on this page · raw message
drivers/gpu/drm/vc4/vc4_drv.h +2 -0
@@ -194,6 +194,7 @@ to_vc4_plane(struct drm_plane *plane) }enum vc4_encoder_type { +VC4_ENCODER_TYPE_NONE ,VC4_ENCODER_TYPE_HDMI ,VC4_ENCODER_TYPE_VEC ,VC4_ENCODER_TYPE_DSI0 ,
@@ -440,6 +441,7 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *arg);extern struct platform_driver vc4_crtc_driver;int vc4_enable_vblank (struct drm_device *dev,unsigned int crtc_id);void vc4_disable_vblank (struct drm_device *dev,unsigned int crtc_id); +bool vc4_event_pending (struct drm_crtc *crtc);int vc4_crtc_debugfs_regs (struct seq_file *m,void *arg); int vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, unsigned int flags, int *vpos, int *hpos,
drivers/gpu/drm/vc4/vc4_kms.c +25 -8
@@ -119,17 +119,34 @@ static int vc4_atomic_commit(struct drm_device *dev,/* Make sure that any outstanding modesets have finished. */ if (nonblock) { - ret =down_trylock (&vc4->async_modeset); -if (ret) { +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; +unsigned long flags; +bool busy = false; + +/* +* If there's an undispatched event to send then we're +* obviously still busy. If there isn't, then we can +* unconditionally wait for the semaphore because it +* shouldn't be contended (for long). +* +* This is to prevent a race where queuing a new flip +* from userspace immediately on receipt of an event +* beats our clean-up and returns EBUSY. +*/ +spin_lock_irqsave (&dev->event_lock, flags); +for_each_crtc_in_state (state, crtc, crtc_state, i) + busy |=vc4_event_pending (crtc); +spin_unlock_irqrestore (&dev->event_lock, flags); +if (busy) {kfree (c);return -EBUSY ; } - }else { - ret =down_interruptible (&vc4->async_modeset); -if (ret) { -kfree (c); -return ret; - } + } + ret =down_interruptible (&vc4->async_modeset); +if (ret) { +kfree (c); +return ret; } ret =drm_atomic_helper_prepare_planes (dev, state);
drivers/gpu/drm/vc4/vc4_regs.h +2 -1
@@ -177,8 +177,9 @@# define PV_CONTROL_WAIT_HSTART BIT(12)# define PV_CONTROL_PIXEL_REP_MASK VC4_MASK(5, 4)# define PV_CONTROL_PIXEL_REP_SHIFT 4 -# define PV_CONTROL_CLK_SELECT_DSI_VEC 0 +# define PV_CONTROL_CLK_SELECT_DSI 0# define PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI 1 +# define PV_CONTROL_CLK_SELECT_VEC 2# define PV_CONTROL_CLK_SELECT_MASK VC4_MASK(3, 2)# define PV_CONTROL_CLK_SELECT_SHIFT 2# define PV_CONTROL_FIFO_CLR BIT(1)
drivers/irqchip/irq-gic-v3-its.c +16 -0
@@ -1598,6 +1598,14 @@ static void __maybe_unused its_enable_quirk_cavium_23144(void *data) its->flags |=ITS_FLAGS_WORKAROUND_CAVIUM_23144 ; } +static void __maybe_unused its_enable_quirk_qdf2400_e0065 (void *data) +{ +struct its_node *its = data; + +/* On QDF2400, the size of the ITE is 16Bytes */ + its->ite_size =16 ; +} + static const struct gic_quirk its_quirks[] = { #ifdef CONFIG_CAVIUM_ERRATUM_22375 {
@@ -1615,6 +1623,14 @@ static const struct gic_quirk its_quirks[] = { .init = its_enable_quirk_cavium_23144, },#endif +#ifdef CONFIG_QCOM_QDF2400_ERRATUM_0065 + { + .desc = "ITS: QDF2400 erratum 0065", + .iidr = 0x00001070, /* QDF2400 ITS rev 1.x */ + .mask = 0xffffffff, + .init = its_enable_quirk_qdf2400_e0065, + }, +#endif { } };
drivers/media/usb/uvc/uvc_driver.c +112 -6
139 lines not on this page · raw message
drivers/net/ethernet/ibm/ibmveth.c +10 -2
@@ -1181,7 +1181,9 @@ static netdev_tx_t ibmveth_start_xmit(struct sk_buff *skb,static void ibmveth_rx_mss_helper (struct sk_buff *skb,u16 mss,int lrg_pkt) { +struct tcphdr *tcph;int offset =0 ; +int hdr_len;/* only TCP packets will be aggregated */ if (skb->protocol ==htons (ETH_P_IP )) {
@@ -1208,14 +1210,20 @@ static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)/* if mss is not set through Large Packet bit/mss in rx buffer, * expect that the mss will be written to the tcp header checksum. */ + tcph = (struct tcphdr *)(skb->data + offset);if (lrg_pkt) {skb_shinfo (skb)->gso_size = mss; }else if (offset) { -struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset); -skb_shinfo (skb)->gso_size =ntohs (tcph->check); tcph->check =0 ; } + +if (skb_shinfo (skb)->gso_size) { + hdr_len = offset + tcph->doff *4 ; +skb_shinfo (skb)->gso_segs = +DIV_ROUND_UP (skb->len - hdr_len, +skb_shinfo (skb)->gso_size); + } }static int ibmveth_poll (struct napi_struct *napi,int budget)
drivers/net/ethernet/intel/igb/e1000_phy.c +4 -0
@@ -77,6 +77,10 @@ s32 igb_get_phy_id(struct e1000_hw *hw)s32 ret_val =0 ;u16 phy_id; +/* ensure PHY page selection to fix misconfigured i210 */ +if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) + phy->ops.write_reg (hw,I347AT4_PAGE_SELECT ,0 ); + ret_val = phy->ops.read_reg (hw,PHY_ID1 , &phy_id);if (ret_val) goto out;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +20 -14
@@ -81,6 +81,7 @@ static bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev)static void mlx5e_set_rq_type_params (struct mlx5e_priv *priv,u8 rq_type) { priv->params.rq_wq_type = rq_type; + priv->params.lro_wqe_sz =MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ ;switch (priv->params.rq_wq_type) {case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ : priv->params.log_rq_size =MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE_MPW ;
@@ -92,6 +93,10 @@ static void mlx5e_set_rq_type_params(struct mlx5e_priv *priv, u8 rq_type)break ;default :/* MLX5_WQ_TYPE_LINKED_LIST */ priv->params.log_rq_size =MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE ; + +/* Extra room needed for build_skb */ + priv->params.lro_wqe_sz -=MLX5_RX_HEADROOM + +SKB_DATA_ALIGN (sizeof (struct skb_shared_info )); } priv->params.min_rx_wqes =mlx5_min_rx_wqes (priv->params.rq_wq_type,BIT (priv->params.log_rq_size));
@@ -3473,12 +3478,6 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev,mlx5e_build_default_indir_rqt (mdev, priv->params.indirection_rqt,MLX5E_INDIR_RQT_SIZE , profile->max_nch (mdev)); - priv->params.lro_wqe_sz = -MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ - -/* Extra room needed for build_skb */ -MLX5_RX_HEADROOM - -SKB_DATA_ALIGN (sizeof (struct skb_shared_info )); -/* Initialize pflags */ MLX5E_SET_PRIV_FLAG (priv,MLX5E_PFLAG_RX_CQE_BASED_MODER , priv->params.rx_cq_period_mode ==MLX5_CQ_PERIOD_MODE_START_FROM_CQE );
@@ -3936,6 +3935,19 @@ static void mlx5e_register_vport_rep(struct mlx5_core_dev *mdev) } } +static void mlx5e_unregister_vport_rep (struct mlx5_core_dev *mdev) +{ +struct mlx5_eswitch *esw = mdev->priv.eswitch; +int total_vfs =MLX5_TOTAL_VPORTS (mdev); +int vport; + +if (!MLX5_CAP_GEN (mdev, vport_group_manager)) +return ; + +for (vport =1 ; vport < total_vfs; vport++) +mlx5_eswitch_unregister_vport_rep (esw, vport); +} +void mlx5e_detach_netdev (struct mlx5_core_dev *mdev,struct net_device *netdev) {struct mlx5e_priv *priv =netdev_priv (netdev);
@@ -3983,6 +3995,7 @@ static int mlx5e_attach(struct mlx5_core_dev *mdev, void *vpriv)return err; } +mlx5e_register_vport_rep (mdev);return 0 ; }
@@ -3994,6 +4007,7 @@ static void mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv)if (!netif_device_present (netdev))return ; +mlx5e_unregister_vport_rep (mdev);mlx5e_detach_netdev (mdev, netdev);mlx5e_destroy_mdev_resources (mdev); }
@@ -4012,8 +4026,6 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)if (err)return NULL ; -mlx5e_register_vport_rep (mdev); -if (MLX5_CAP_GEN (mdev, vport_group_manager)) ppriv = &esw->offloads.vport_reps[0 ];
@@ -4065,13 +4077,7 @@ void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, struct mlx5e_priv *priv)static void mlx5e_remove (struct mlx5_core_dev *mdev,void *vpriv) { -struct mlx5_eswitch *esw = mdev->priv.eswitch; -int total_vfs =MLX5_TOTAL_VPORTS (mdev);struct mlx5e_priv *priv = vpriv; -int vport; - -for (vport =1 ; vport < total_vfs; vport++) -mlx5_eswitch_unregister_vport_rep (esw, vport);unregister_netdev (priv->netdev);mlx5e_detach (mdev, vpriv);
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +6 -7
@@ -92,19 +92,18 @@ static inline void mlx5e_cqes_update_owner(struct mlx5e_cq *cq, u32 cqcc, int n)static inline void mlx5e_decompress_cqe (struct mlx5e_rq *rq,struct mlx5e_cq *cq,u32 cqcc) { -u16 wqe_cnt_step; - cq->title.byte_cnt = cq->mini_arr[cq->mini_arr_idx].byte_cnt; cq->title.check_sum = cq->mini_arr[cq->mini_arr_idx].checksum; cq->title.op_own &=0xf0 ; cq->title.op_own |=0x01 & (cqcc >> cq->wq.log_sz); cq->title.wqe_counter =cpu_to_be16 (cq->decmprs_wqe_counter); - wqe_cnt_step = - rq->wq_type ==MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ? -mpwrq_get_cqe_consumed_strides (&cq->title) :1 ; - cq->decmprs_wqe_counter = - (cq->decmprs_wqe_counter + wqe_cnt_step) & rq->wq.sz_m1; +if (rq->wq_type ==MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ) + cq->decmprs_wqe_counter += +mpwrq_get_cqe_consumed_strides (&cq->title); +else + cq->decmprs_wqe_counter = + (cq->decmprs_wqe_counter +1 ) & rq->wq.sz_m1; } static inline void mlx5e_decompress_cqe_no_hash(struct mlx5e_rq *rq,
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +20 -10
@@ -500,30 +500,40 @@ static int mlxsw_sp_vr_lpm_tree_check(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_vr *vr, struct mlxsw_sp_prefix_usage *req_prefix_usage) { - struct mlxsw_sp_lpm_tree *lpm_tree; + struct mlxsw_sp_lpm_tree *lpm_tree = vr->lpm_tree; +struct mlxsw_sp_lpm_tree *new_tree; +int err; -if (mlxsw_sp_prefix_usage_eq (req_prefix_usage, - &vr->lpm_tree->prefix_usage)) +if (mlxsw_sp_prefix_usage_eq (req_prefix_usage, &lpm_tree->prefix_usage))return 0 ; - lpm_tree =mlxsw_sp_lpm_tree_get (mlxsw_sp, req_prefix_usage, + new_tree =mlxsw_sp_lpm_tree_get (mlxsw_sp, req_prefix_usage, vr->proto, false); -if (IS_ERR (lpm_tree)) { +if (IS_ERR (new_tree)) {/* We failed to get a tree according to the required * prefix usage. However, the current tree might be still good * for us if our requirement is subset of the prefixes used * in the tree. */ if (mlxsw_sp_prefix_usage_subset (req_prefix_usage, - &vr->lpm_tree->prefix_usage)) + &lpm_tree->prefix_usage))return 0 ; -return PTR_ERR (lpm_tree); +return PTR_ERR (new_tree); } -mlxsw_sp_vr_lpm_tree_unbind (mlxsw_sp, vr); -mlxsw_sp_lpm_tree_put (mlxsw_sp, vr->lpm_tree); +/* Prevent packet loss by overwriting existing binding */ + vr->lpm_tree = new_tree; + err =mlxsw_sp_vr_lpm_tree_bind (mlxsw_sp, vr); +if (err) + goto err_tree_bind; +mlxsw_sp_lpm_tree_put (mlxsw_sp, lpm_tree); + +return 0 ; + +err_tree_bind: vr->lpm_tree = lpm_tree; -return mlxsw_sp_vr_lpm_tree_bind (mlxsw_sp, vr); +mlxsw_sp_lpm_tree_put (mlxsw_sp, new_tree); +return err; } static struct mlxsw_sp_vr *mlxsw_sp_vr_get(struct mlxsw_sp *mlxsw_sp,
drivers/net/geneve.c +8 -2
@@ -1039,16 +1039,22 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) {struct geneve_dev *geneve =netdev_priv (dev);struct ip_tunnel_info *info =NULL ; +int err;if (geneve->collect_md) info =skb_tunnel_info (skb); +rcu_read_lock ();#if IS_ENABLED (CONFIG_IPV6 )if ((info &&ip_tunnel_info_af (info) ==AF_INET6 ) || (!info && geneve->remote.sa.sa_family ==AF_INET6 )) -return geneve6_xmit_skb (skb, dev, info); + err =geneve6_xmit_skb (skb, dev, info); + else#endif -return geneve_xmit_skb (skb, dev, info); + err =geneve_xmit_skb (skb, dev, info); +rcu_read_unlock (); + +return err; }static int __geneve_change_mtu (struct net_device *dev,int new_mtu,bool strict)
drivers/net/phy/phy.c +9 -5
@@ -611,14 +611,18 @@ void phy_start_machine(struct phy_device *phydev)* phy_trigger_machine - trigger the state machine to run * * @phydev: the phy_device struct +* @sync: indicate whether we should wait for the workqueue cancelation * * Description: There has been a change in state which requires that the * state machine runs. */ -static void phy_trigger_machine (struct phy_device *phydev) +static void phy_trigger_machine (struct phy_device *phydev,bool sync) { -cancel_delayed_work_sync (&phydev->state_queue); +if (sync) +cancel_delayed_work_sync (&phydev->state_queue); +else +cancel_delayed_work (&phydev->state_queue);queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,0 ); }
@@ -655,7 +659,7 @@ static void phy_error(struct phy_device *phydev) phydev->state =PHY_HALTED ;mutex_unlock (&phydev->lock); -phy_trigger_machine (phydev); +phy_trigger_machine (phydev, false); }/**
@@ -817,7 +821,7 @@ void phy_change(struct work_struct *work) }/* reschedule state queue work to run as soon as possible */ -phy_trigger_machine (phydev); +phy_trigger_machine (phydev, true);return ; ignore:
@@ -907,7 +911,7 @@ void phy_start(struct phy_device *phydev)if (do_resume)phy_resume (phydev); -phy_trigger_machine (phydev); +phy_trigger_machine (phydev, true); }EXPORT_SYMBOL (phy_start);
drivers/net/tun.c +15 -3
@@ -819,7 +819,18 @@ static void tun_net_uninit(struct net_device *dev)/* Net device open. */ static int tun_net_open (struct net_device *dev) { +struct tun_struct *tun =netdev_priv (dev); +int i; +netif_tx_start_all_queues (dev); + +for (i =0 ; i < tun->numqueues; i++) { +struct tun_file *tfile; + + tfile =rtnl_dereference (tun->tfiles[i]); + tfile->socket.sk->sk_write_space (tfile->socket.sk); + } +return 0 ; }
@@ -1116,9 +1127,10 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait)if (!skb_array_empty (&tfile->tx_array)) mask |=POLLIN |POLLRDNORM ; -if (sock_writeable (sk) || - (!test_and_set_bit (SOCKWQ_ASYNC_NOSPACE , &sk->sk_socket->flags) && -sock_writeable (sk))) +if (tun->dev->flags &IFF_UP && + (sock_writeable (sk) || + (!test_and_set_bit (SOCKWQ_ASYNC_NOSPACE , &sk->sk_socket->flags) && +sock_writeable (sk)))) mask |=POLLOUT |POLLWRNORM ;if (tun->dev->reg_state !=NETREG_REGISTERED )
drivers/net/vrf.c +2 -1
@@ -346,6 +346,7 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev)static netdev_tx_t vrf_xmit (struct sk_buff *skb,struct net_device *dev) { +int len = skb->len;netdev_tx_t ret =is_ip_tx_frame (skb, dev);if (likely (ret ==NET_XMIT_SUCCESS || ret ==NET_XMIT_CN )) {
@@ -353,7 +354,7 @@ static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev)u64_stats_update_begin (&dstats->syncp); dstats->tx_pkts++; - dstats->tx_bytes += skb->len; + dstats->tx_bytes += len;u64_stats_update_end (&dstats->syncp); }else {this_cpu_inc (dev->dstats->tx_drps);
drivers/net/vxlan.c +14 -13
@@ -1942,7 +1942,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,const struct iphdr *old_iph;union vxlan_addr *dst;union vxlan_addr remote_ip, local_ip; -union vxlan_addr *src;struct vxlan_metadata _md;struct vxlan_metadata *md = &_md;__be16 src_port =0 , dst_port;
@@ -1956,11 +1955,12 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, info =skb_tunnel_info (skb); +rcu_read_lock ();if (rdst) { dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port; vni = rdst->remote_vni; dst = &rdst->remote_ip; - src = &vxlan->cfg.saddr; + local_ip = vxlan->cfg.saddr; dst_cache = &rdst->dst_cache; }else {if (!info) {
@@ -1979,7 +1979,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, local_ip.sin6.sin6_addr = info->key.u.ipv6.src; } dst = &remote_ip; - src = &local_ip; dst_cache = &info->dst_cache; }
@@ -1987,7 +1986,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,if (did_rsc) {/* short-circuited back to local bridge */ vxlan_encap_bypass (skb, vxlan, vxlan); -return ; + goto out_unlock; } goto drop; }
@@ -2028,7 +2027,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, rt =vxlan_get_route (vxlan, skb, rdst ? rdst->remote_ifindex :0 , tos, dst->sin.sin_addr.s_addr, - &src->sin.sin_addr.s_addr, + &local_ip.sin.sin_addr.s_addr, dst_cache, info);if (IS_ERR (rt)) { netdev_dbg(dev, "no route to %pI4\n",
@@ -2056,7 +2055,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,if (!dst_vxlan) goto tx_error;vxlan_encap_bypass (skb, vxlan, dst_vxlan); -return ; + goto out_unlock; }if (!info)
@@ -2071,7 +2070,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,if (err <0 ) goto xmit_tx_error; -udp_tunnel_xmit_skb (rt, sk, skb, src->sin.sin_addr.s_addr, +udp_tunnel_xmit_skb (rt, sk, skb, local_ip.sin.sin_addr.s_addr, dst->sin.sin_addr.s_addr, tos, ttl, df, src_port, dst_port, xnet, !udp_sum);#if IS_ENABLED (CONFIG_IPV6 )
@@ -2087,7 +2086,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, ndst =vxlan6_get_route (vxlan, skb, rdst ? rdst->remote_ifindex :0 , tos, label, &dst->sin6.sin6_addr, - &src->sin6.sin6_addr, + &local_ip.sin6.sin6_addr, dst_cache, info);if (IS_ERR (ndst)) { netdev_dbg(dev, "no route to %pI6\n",
@@ -2117,7 +2116,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,if (!dst_vxlan) goto tx_error;vxlan_encap_bypass (skb, vxlan, dst_vxlan); -return ; + goto out_unlock; }if (!info)
@@ -2131,15 +2130,16 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,if (err <0 ) {dst_release (ndst); dev->stats.tx_errors++; -return ; + goto out_unlock; }udp_tunnel6_xmit_skb (ndst, sk, skb, dev, - &src->sin6.sin6_addr, + &local_ip.sin6.sin6_addr, &dst->sin6.sin6_addr, tos, ttl, label, src_port, dst_port, !udp_sum);#endif } - +out_unlock: +rcu_read_unlock ();return ; drop:
@@ -2155,6 +2155,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, dev->stats.tx_errors++; tx_free:dev_kfree_skb (skb); +rcu_read_unlock (); }/* Transmit local packets over Vxlan
@@ -2637,7 +2638,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])if (data[IFLA_VXLAN_ID ]) {__u32 id =nla_get_u32 (data[IFLA_VXLAN_ID ]); -if (id >=VXLAN_VID_MASK ) +if (id >=VXLAN_N_VID )return -ERANGE ; }
drivers/pci/iov.c +55 -15
95 lines not on this page · raw message
drivers/pci/pci.c +0 -34
@@ -564,10 +564,6 @@ static void pci_restore_bars(struct pci_dev *dev) {int i; -/* Per SR-IOV spec 3.4.1.11, VF BARs are RO zero */ -if (dev->is_virtfn) -return ; -for (i =0 ; i <PCI_BRIDGE_RESOURCES ; i++)pci_update_resource (dev, i); }
@@ -4835,36 +4831,6 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags) }EXPORT_SYMBOL (pci_select_bars); -/** -* pci_resource_bar - get position of the BAR associated with a resource -* @dev: the PCI device -* @resno: the resource number -* @type: the BAR type to be filled in -* -* Returns BAR position in config space, or 0 if the BAR is invalid. -*/ -int pci_resource_bar (struct pci_dev *dev,int resno,enum pci_bar_type *type) -{ -int reg; - -if (resno <PCI_ROM_RESOURCE ) { - *type = pci_bar_unknown; -return PCI_BASE_ADDRESS_0 +4 * resno; - }else if (resno ==PCI_ROM_RESOURCE ) { - *type = pci_bar_mem32; -return dev->rom_base_reg; - }else if (resno <PCI_BRIDGE_RESOURCES ) { -/* device specific resource */ - *type = pci_bar_unknown; - reg =pci_iov_resource_bar (dev, resno); -if (reg) -return reg; - } - -dev_err (&dev->dev,"BAR %d: invalid resource\n" , resno); -return 0 ; -} -/* Some architectures require additional programming to enable VGA */ static arch_set_vga_state_t arch_set_vga_state;
drivers/pci/pci.h +1 -6
@@ -245,7 +245,6 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl,int pci_setup_device (struct pci_dev *dev);int __pci_read_base (struct pci_dev *dev,enum pci_bar_type type,struct resource *res,unsigned int reg); -int pci_resource_bar (struct pci_dev *dev,int resno,enum pci_bar_type *type);void pci_configure_ari (struct pci_dev *dev);void __pci_bus_size_bridges (struct pci_bus *bus,struct list_head *realloc_head);
@@ -289,7 +288,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)#ifdef CONFIG_PCI_IOV int pci_iov_init (struct pci_dev *dev);void pci_iov_release (struct pci_dev *dev); -int pci_iov_resource_bar (struct pci_dev *dev,int resno); +void pci_iov_update_resource (struct pci_dev *dev,int resno);resource_size_t pci_sriov_resource_alignment (struct pci_dev *dev,int resno);void pci_restore_iov_state (struct pci_dev *dev);int pci_iov_bus_range (struct pci_bus *bus);
@@ -303,10 +302,6 @@ static inline void pci_iov_release(struct pci_dev *dev) { } -static inline int pci_iov_resource_bar (struct pci_dev *dev,int resno) -{ -return 0 ; -}static inline void pci_restore_iov_state (struct pci_dev *dev) { }
drivers/pci/probe.c +2 -1
@@ -227,7 +227,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, mask64 = (u32 )PCI_BASE_ADDRESS_MEM_MASK ; } }else { - res->flags |= (l &IORESOURCE_ROM_ENABLE ); +if (l &PCI_ROM_ADDRESS_ENABLE ) + res->flags |=IORESOURCE_ROM_ENABLE ; l64 = l &PCI_ROM_ADDRESS_MASK ; sz64 = sz &PCI_ROM_ADDRESS_MASK ; mask64 = (u32 )PCI_ROM_ADDRESS_MASK ;
drivers/pci/rom.c +5 -0
@@ -35,6 +35,11 @@ int pci_enable_rom(struct pci_dev *pdev)if (res->flags &IORESOURCE_ROM_SHADOW )return 0 ; +/* +* Ideally pci_update_resource() would update the ROM BAR address, +* and we would only set the enable bit here. But apparently some +* devices have buggy ROM BARs that read as zero when disabled. +*/ pcibios_resource_to_bus (pdev->bus, ®ion, res);pci_read_config_dword (pdev, pdev->rom_base_reg, &rom_addr); rom_addr &= ~PCI_ROM_ADDRESS_MASK ;
drivers/pci/setup-res.c +34 -14
82 lines not on this page · raw message
drivers/s390/crypto/ap_bus.c +3 -0
@@ -1712,6 +1712,9 @@ static void ap_scan_bus(struct work_struct *unused) ap_dev->queue_depth = queue_depth; ap_dev->raw_hwtype = device_type; ap_dev->device_type = device_type; +/* CEX6 toleration: map to CEX5 */ +if (device_type ==AP_DEVICE_TYPE_CEX6 ) + ap_dev->device_type =AP_DEVICE_TYPE_CEX5 ; ap_dev->functions = device_functions;spin_lock_init (&ap_dev->lock);INIT_LIST_HEAD (&ap_dev->pendingq);
drivers/s390/crypto/ap_bus.h +1 -0
@@ -105,6 +105,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)#define AP_DEVICE_TYPE_CEX3C 9#define AP_DEVICE_TYPE_CEX4 10#define AP_DEVICE_TYPE_CEX5 11 +#define AP_DEVICE_TYPE_CEX6 12/* * Known function facilities
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +491 -605
754 lines not on this page · raw message
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h +3 -2
Lines of this file are not shown. View the raw message.
drivers/usb/gadget/udc/atmel_usba_udc.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/usb/gadget/udc/atmel_usba_udc.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/vfio/vfio_iommu_spapr_tce.c +217 -111
328 lines not on this page · raw message
kernel/bpf/verifier.c +58 -19
77 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_reasm.c +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.