Linux 4.19.5
Greg KH
maintainerI'm announcing the release of the 4.19.5 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.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/admin-guide/kernel-parameters.txt | 8 Documentation/x86/x86_64/mm.txt | 10 Makefile | 2 arch/arm/boot/dts/imx53-ppd.dts | 2 arch/arm/boot/dts/imx6sll.dtsi | 2 arch/arm/boot/dts/vf610m4-colibri.dts | 4 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 47 +-- arch/arm64/include/asm/percpu.h | 3 arch/arm64/kernel/probes/kprobes.c | 27 +- arch/mips/configs/cavium_octeon_defconfig | 1 arch/riscv/include/asm/uaccess.h | 4 arch/s390/boot/compressed/Makefile | 14 - arch/s390/include/asm/mmu_context.h | 5 arch/s390/include/asm/pgalloc.h | 6 arch/s390/include/asm/pgtable.h | 18 + arch/s390/include/asm/tlb.h | 6 arch/s390/kernel/perf_cpum_cf.c | 2 arch/s390/kernel/vdso32/Makefile | 6 arch/s390/kernel/vdso64/Makefile | 6 arch/s390/mm/pgalloc.c | 1 arch/s390/numa/numa.c | 1 arch/um/os-Linux/skas/process.c | 5 arch/x86/include/asm/page_64_types.h | 12 arch/x86/include/asm/pgtable_64_types.h | 4 arch/x86/kernel/early_printk.c | 29 +- arch/x86/kernel/ldt.c | 59 ++-- arch/x86/xen/mmu_pv.c | 6 block/bio.c | 1 drivers/acpi/acpi_platform.c | 1 drivers/block/brd.c | 16 - drivers/clk/clk-fixed-factor.c | 1 drivers/clk/clk-fixed-rate.c | 1 drivers/clk/meson/axg.c | 7 drivers/clk/meson/gxbb.c | 12 drivers/clk/meson/meson8b.c | 3 drivers/clk/renesas/r9a06g032-clocks.c | 3 drivers/clk/samsung/clk-exynos5420.c | 1 drivers/clk/ti/clk.c | 13 - drivers/gnss/serial.c | 3 drivers/gnss/sirf.c | 3 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 45 --- drivers/gpu/drm/drm_edid.c | 3 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 11 drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 drivers/gpu/drm/i915/i915_drv.h | 2 drivers/gpu/drm/i915/i915_gem_gtt.c | 18 - drivers/hid/hid-alps.c | 18 + drivers/hid/hid-ids.h | 6 drivers/hid/hid-quirks.c | 4 drivers/hid/i2c-hid/i2c-hid.c | 19 + drivers/hid/uhid.c | 12 drivers/hwmon/ibmpowernv.c | 7 drivers/i2c/busses/Kconfig | 2 drivers/i2c/busses/i2c-qcom-geni.c | 15 - drivers/media/v4l2-core/v4l2-event.c | 43 +-- drivers/misc/atmel-ssc.c | 2 drivers/misc/sgi-gru/grukdump.c | 4 drivers/mtd/nand/raw/atmel/nand-controller.c | 11 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 10 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 35 +- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 42 +-- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 18 + drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 14 - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 6 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 10 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 drivers/net/ethernet/intel/i40e/i40e_main.c | 2 drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 drivers/net/ethernet/intel/ice/ice_txrx.c | 2 drivers/net/ethernet/intel/ice/ice_type.h | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 4 drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 11 drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 1 drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 drivers/net/ethernet/qlogic/qed/qed_sp.h | 14 + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 22 + drivers/net/ethernet/qlogic/qed/qed_spq.c | 69 ++--- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 drivers/net/ethernet/stmicro/stmmac/common.h | 3 drivers/net/ethernet/stmicro/stmmac/descs_com.h | 2 drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 2 drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 4 drivers/nvme/host/core.c | 4 drivers/nvme/host/multipath.c | 1 drivers/of/device.c | 4 drivers/platform/x86/acerhdf.c | 1 drivers/platform/x86/intel_telemetry_debugfs.c | 8 drivers/s390/net/qeth_core.h | 5 drivers/s390/net/qeth_l2_main.c | 5 drivers/s390/net/qeth_l3_main.c | 13 - drivers/tty/serial/sh-sci.c | 4 drivers/uio/uio.c | 7 drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/hub.c | 14 - drivers/usb/core/quirks.c | 14 + drivers/usb/misc/appledisplay.c | 1 drivers/xen/grant-table.c | 2 fs/afs/rxrpc.c | 5 fs/ceph/quota.c | 3 fs/cifs/cifsfs.c | 7 fs/cifs/smb2ops.c | 11 fs/exofs/super.c | 5 fs/hfs/brec.c | 4 fs/hfsplus/brec.c | 4 fs/reiserfs/xattr.c | 7 include/linux/mtd/nand.h | 2 include/linux/netfilter/ipset/ip_set.h | 2 include/linux/netfilter/ipset/ip_set_comment.h | 4 include/linux/usb/quirks.h | 3 include/uapi/linux/netfilter/nf_tables.h | 4 include/uapi/linux/netfilter_bridge.h | 4 kernel/bpf/syscall.c | 1 kernel/sched/core.c | 5 lib/raid6/test/Makefile | 4 net/ceph/messenger.c | 12 net/ipv6/netfilter/nf_conntrack_reasm.c | 13 - net/netfilter/ipset/ip_set_core.c | 43 +-- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 net/netfilter/ipset/ip_set_list_set.c | 17 - net/netfilter/nft_compat.c | 21 - net/netfilter/nft_numgen.c | 127 ---------- net/netfilter/xt_IDLETIMER.c | 20 + net/sunrpc/xdr.c | 2 scripts/package/mkdebian | 7 scripts/setlocalversion | 2 security/apparmor/lib.c | 6 sound/pci/hda/patch_ca0132.c | 2 sound/pci/hda/patch_realtek.c | 1 tools/perf/jvmti/jvmti_agent.c | 49 ++- tools/perf/tests/attr/test-record-group-sampling | 1 tools/perf/util/evsel.c | 1 tools/perf/util/symbol-elf.c | 12 tools/perf/util/unwind-libdw.c | 4 145 files changed, 848 insertions(+), 576 deletions(-)
Aaro Koskinen (1):
MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver
Akeem G Abodunrin (1):
ice: Fix dead device link issue with flow control
Alan Tull (1):
clk: fixed-rate: fix of_node_get-put imbalance
Anders Roxell (1):
arm64: kprobe: make page to RO mode when allocate it
Andrey Ryabinin (1):
netfilter: ipset: fix ip_set_list allocation failure
Benjamin Tissoires (2):
Revert "HID: add NOGET quirk for Eaton Ellipse MAX UPS"
HID: alps: allow incoming reports when only the trackstick is opened
Boris Brezillon (1):
mtd: nand: Fix nanddev_pos_next_page() kernel-doc header
Brett Creeley (1):
ice: Fix the bytecount sent to netdev_tx_sent_queue
Chengguang Xu (1):
fs/exofs: fix potential memory leak in mount option parsing
Chinh T Cao (1):
ice: Change req_speeds to be u16
Colin Ian King (1):
cifs: don't dereference smb_file_target before null check
Dan Carpenter (1):
uio: Fix an Oops on load
Daniel Borkmann (1):
bpf: fix bpf_prog_get_info_by_fd to return 0 func_lens for unpriv
David Howells (1):
afs: Handle EIO from delivery function
David Miller (1):
perf symbols: Set PLT entry/header sizes properly on Sparc
Denis Bolotin (3):
qed: Fix memory/entry leak in qed_init_sp_request()
qed: Fix blocking/unlimited SPQ entries leak
qed: Fix SPQ entries not returned to pool in error flows
Dmitry Bogdanov (2):
net: aquantia: fix potential IOMMU fault after driver unbind
net: aquantia: invalid checksumm offload implementation
Emmanuel Pescosta (1):
usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
Eric Biggers (1):
HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges
Eric Westbrook (1):
netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
Ernesto A. Fernández (2):
hfs: prevent btree data loss on root split
hfsplus: prevent btree data loss on root split
Feng Tang (1):
x86/earlyprintk: Add a force option for pciserial device
Florian Westphal (2):
netfilter: ipv6: fix oops when defragmenting locally generated fragments
netfilter: nft_compat: ebtables 'nat' table is normal chain type
Geert Uytterhoeven (2):
serial: sh-sci: Fix receive on SCIFA/SCIFB variants with DMA
hwmon: (ibmpowernv) Remove bogus __init annotations
Greg Kroah-Hartman (1):
Linux 4.19.5
Guenter Roeck (1):
Revert "scripts/setlocalversion: git: Make -dirty check more robust"
Gustavo A. R. Silva (1):
drivers/misc/sgi-gru: fix Spectre v1 vulnerability
Gustavo Romero (1):
perf tools: Fix undefined symbol scnprintf in libperf-jvmti.so
Hans de Goede (1):
ACPI / platform: Add SMB0001 HID to forbidden_id_list
Harry Wentland (1):
drm/amd/display: Stop leaking planes
Huazhong Tan (4):
net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset()
net: hns3: bugfix for rtnl_lock's range in the hclge_reset()
net: hns3: bugfix for handling mailbox while the command queue reinitialized
net: hns3: bugfix for the initialization of command queue's spin lock
Igor Russkikh (1):
net: aquantia: fixed enable unicast on 32 macvlan
Ilya Dryomov (1):
libceph: fall back to sendmsg for slab pages
Inki Dae (1):
Revert "drm/exynos/decon5433: implement frame counter"
Jacob Keller (1):
i40e: restore NETIF_F_GSO_IPXIP[46] to netdev features
Jann Horn (1):
reiserfs: propagate errors from fill_with_dentries() properly
Jeremy Linton (1):
lib/raid6: Fix arm64 test build
Jerome Brunet (1):
clk: meson: clk-pll: drop CLK_GET_RATE_NOCACHE where unnecessary
Jerry (Fangzhi) Zuo (1):
drm/amd/display: Drop reusing drm connector for MST
Jimmy Assarsson (2):
can: kvaser_usb: Fix accessing freed memory in kvaser_usb_start_xmit()
can: kvaser_usb: Fix potential uninitialized variable use
Jiri Olsa (1):
perf tools: Do not zero sample_id_all for group members
Jiri Slaby (1):
netfilter: bridge: define INT_MIN & INT_MAX in userspace
Johan Hovold (4):
clk: ti: fix OF child-node lookup
gnss: serial: fix synchronous write timeout
gnss: sirf: fix synchronous write timeout
mtd: rawnand: atmel: fix OF child-node lookup
Jozsef Kadlecsik (2):
netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
netfilter: ipset: Fix calling ip_set() macro at dumping
Julian Wiedmann (2):
s390/qeth: fix HiperSockets sniffer s390/qeth: unregister netdevice only when registered
Justin M. Forbes (1):
s390/mm: Fix ERROR: "__node_distance" undefined!
Kai-Heng Feng (3):
HID: i2c-hid: Add a small delay after sleep command for Raydium touchpanel
USB: quirks: Add no-lpm quirk for Raydium touchscreens
USB: Wait for extra delay time after USB_PORT_FEAT_RESET for quirky hub
Keith Busch (1):
block: Clear kernel memory before copying to user
Kirill A. Shutemov (3):
x86/mm: Move LDT remap out of KASLR region on 5-level paging x86/ldt: Unmap PTEs for the slot before freeing LDT pages x86/ldt: Remove unused variable in map_ldt_struct()
Kuninori Morimoto (1):
arm64: dts: renesas: r8a7795: add missing dma-names on hscif2
Lee, Shawn C (1):
drm/edid: Add 6 bpc quirk for BOE panel.
Liam Merwick (1):
xen/grant-table: Fix incorrect gnttab_dma_free_pages() pr_debug message
Lorenzo Bianconi (1):
mt76x0: run vco calibration for each channel configuration
Luis Henriques (1):
ceph: quota: fix null pointer dereference in quota check
Lyude Paul (1):
drm/amd/amdgpu/dm: Fix dm_dp_create_fake_mst_encoder()
Maarten Jacobs (1):
usb: cdc-acm: add entry for Hiro (Conexant) modem
Marek Szyprowski (1):
clk: samsung: exynos5420: Enable PERIS clocks for suspend
Martin Schwidefsky (1):
s390/mm: fix mis-accounting of pgtable_bytes
Masahiro Yamada (1):
kbuild: deb-pkg: fix too low build version number
Mattias Jacobsson (1):
USB: misc: appledisplay: add 20" Apple Cinema Display
Milian Wolff (1):
perf unwind: Take pgoff into account when reporting elf to libdwfl
Ming Lei (1):
block: brd: associate with queue until adding disk
Nathan Chancellor (2):
arm64: percpu: Initialize ret in the default case
misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
Oleksij Rempel (1):
ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node
Olof Johansson (1):
RISC-V: Fix raw_copy_{to,from}_user()Pablo Neira Ayuso (1):
Revert "netfilter: nft_numgen: add map lookups for numgen random operations"
Paul Gortmaker (1):
platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307
Phil Edworthy (1):
clk: renesas: r9a06g032: Fix UART34567 clock rate
Radoslaw Tyl (1):
ixgbe: fix MAC anti-spoofing filter after VFLR
Rajneesh Bhardwaj (1):
platform/x86: intel_telemetry: report debugfs failure
Ricardo Ribalda Delgado (1):
clk: fixed-factor: fix of_node_get-put imbalance
Richard Weinberger (1):
um: Give start_idle_thread() a return code
Rob Herring (1):
ARM: dts: fsl: Fix improperly quoted stdout-path values
Robin Murphy (1):
of/device: Really only set bus DMA mask when appropriate
Ronnie Sahlberg (1):
cifs: fix return value for cifs_listxattr
Sagi Grimberg (1):
nvme: make sure ns head inherits underlying device limits
Sagiv Ozeri (1):
qed: Fix potential memory corruption
Sakari Ailus (1):
media: v4l: event: Add subscription to list before calling "add" operation
Sebastian Parschauer (2):
HID: Add quirk for Primax PIXART OEM mice
HID: Add quirk for Microsoft PIXART OEM mouse
Sergei Shtylyov (1):
arm64: dts: renesas: condor: switch from EtherAVB to GEther
Stefano Brivio (1):
netfilter: ipset: list:set: Decrease refcount synchronously on deletion and replace
Stephen Boyd (1):
i2c: qcom-geni: Fix runtime PM mismatch with child devices
Taehee Yoo (1):
netfilter: xt_IDLETIMER: add sysfs filename checking routine
Takashi Iwai (2):
ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()
Thomas Richter (1):
s390/perf: Change CPUM_CF return code in event init function
Thor Thayer (1):
net: stmmac: Fix RX packet size > 8191
Valentin Schneider (1):
sched/core: Take the hotplug lock in sched_init_smp()
Vasily Gorbik (2):
s390/decompressor: add missing FORCE to build targets s390/vdso: add missing FORCE to build targets
Vignesh R (1):
i2c: omap: Enable for ARCH_K3
Ville Syrjälä (1):
drm/i915: Replace some PAGE_SIZE with I915_GTT_PAGE_SIZE
Yixun Lan (1):
clk: meson-axg: pcie: drop the mpll3 clock parent
YueHaibing (1):
SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()
Yunsheng Lin (1):
net: hns3: Fix for out-of-bounds access when setting pfc back pressure
Zubin Mithra (1):
apparmor: Fix uninitialized value in aa_split_fqname
Greg KH
maintainerDocumentation/admin-guide/kernel-parameters.txt +7 -1
@@ -1063,7 +1063,7 @@ earlyprintk=serial[,0x...[,baudrate]] earlyprintk=ttySn[,baudrate] earlyprintk=dbgp[debugController#] - earlyprintk=pciserial,bus:device.function[,baudrate] + earlyprintk=pciserial[,force],bus:device.function[,baudrate] earlyprintk=xdbc[xhciController#] earlyprintk is useful when the kernel crashes before
@@ -1095,6 +1095,10 @@ The sclp output can only be used on s390. + The optional "force" to "pciserial" enables use of a + PCI device even when its classcode is not of the + UART class. + edac_report= [HW,EDAC] Control how to report EDAC event Format: {"on" | "off" | "force"} on: enable EDAC to report H/W event. May be overridden
@@ -4683,6 +4687,8 @@ prevent spurious wakeup); n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a pause after every control message); + o = USB_QUIRK_HUB_SLOW_RESET (Hub needs extra + delay after resetting its port); Example: quirks=0781:5580:bk,0a5c:5834:gij usbhid.mousepoll=
Documentation/x86/x86_64/mm.txt +6 -4
@@ -4,8 +4,9 @@ Virtual memory map with 4 level page tables: 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [47:63] sign extension ffff800000000000 - ffff87ffffffffff (=43 bits) guard hole, reserved for hypervisor -ffff880000000000 - ffffc7ffffffffff (=64 TB) direct mapping of all phys. memory -ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole +ffff880000000000 - ffff887fffffffff (=39 bits) LDT remap for PTI +ffff888000000000 - ffffc87fffffffff (=64 TB) direct mapping of all phys. memory +ffffc88000000000 - ffffc8ffffffffff (=39 bits) hole ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
@@ -30,8 +31,9 @@ Virtual memory map with 5 level page tables: 0000000000000000 - 00ffffffffffffff (=56 bits) user space, different per mm hole caused by [56:63] sign extension ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor -ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory -ff90000000000000 - ff9fffffffffffff (=52 bits) LDT remap for PTI +ff10000000000000 - ff10ffffffffffff (=48 bits) LDT remap for PTI +ff11000000000000 - ff90ffffffffffff (=55 bits) direct mapping of all phys. memory +ff91000000000000 - ff9fffffffffffff (=3840 TB) hole ffa0000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space (12800 TB) ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = "People's Front"
arch/arm/boot/dts/imx53-ppd.dts +1 -1
@@ -55,7 +55,7 @@ }; chosen { - stdout-path = "&uart1:115200n8"; + stdout-path = "serial0:115200n8"; }; memory@70000000 {
arch/arm/boot/dts/imx6sll.dtsi +1 -1
@@ -709,7 +709,7 @@ i2c1: i2c@21a0000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c"; + compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c"; reg = <0x021a0000 0x4000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SLL_CLK_I2C1>;
arch/arm/boot/dts/vf610m4-colibri.dts +2 -2
@@ -50,8 +50,8 @@ compatible = "fsl,vf610m4"; chosen { - bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw"; - stdout-path = "&uart2"; + bootargs = "clk_ignore_unused init=/linuxrc rw"; + stdout-path = "serial2:115200"; }; memory@8c000000 {
arch/arm64/boot/dts/renesas/r8a7795.dtsi +1 -1
@@ -662,7 +662,7 @@ clock-names = "fck", "brg_int", "scif_clk"; dmas = <&dmac1 0x35>, <&dmac1 0x34>, <&dmac2 0x35>, <&dmac2 0x34>; - dma-names = "tx", "rx"; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; resets = <&cpg 518>; status = "disabled";
arch/arm64/boot/dts/renesas/r8a77980-condor.dts +24 -23
76 lines not on this page · raw message
arch/arm64/include/asm/percpu.h +3 -0
@@ -96,6 +96,7 @@ static inline unsigned long __percpu_##op(void *ptr, \ : [val] "Ir" (val)); \break ; \default : \ + ret =0 ; \BUILD_BUG (); \ } \ \
@@ -125,6 +126,7 @@ static inline unsigned long __percpu_read(void *ptr, int size) ret =READ_ONCE (*(u64 *)ptr);break ;default : + ret =0 ;BUILD_BUG (); }
@@ -194,6 +196,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, : [val] "r" (val));break ;default : + ret =0 ;BUILD_BUG (); }
arch/arm64/kernel/probes/kprobes.c +20 -7
@@ -23,7 +23,9 @@#include <linux/slab.h> #include <linux/stop_machine.h> #include <linux/sched/debug.h> +#include <linux/set_memory.h> #include <linux/stringify.h> +#include <linux/vmalloc.h> #include <asm/traps.h> #include <asm/ptrace.h> #include <asm/cacheflush.h>
@@ -42,10 +44,21 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);static void __kprobes post_kprobe_handler (struct kprobe_ctlblk *,struct pt_regs *); +static int __kprobes patch_text (kprobe_opcode_t *addr,u32 opcode) +{ +void *addrs[1 ]; +u32 insns[1 ]; + + addrs[0 ] = addr; + insns[0 ] = opcode; + +return aarch64_insn_patch_text (addrs, insns,1 ); +} +static void __kprobes arch_prepare_ss_slot (struct kprobe *p) {/* prepare insn slot */ - p->ainsn.api.insn[0 ] =cpu_to_le32 (p->opcode); +patch_text (p->ainsn.api.insn, p->opcode); flush_icache_range((uintptr_t) (p->ainsn.api.insn), (uintptr_t) (p->ainsn.api.insn) +
@@ -118,15 +131,15 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)return 0 ; } -static int __kprobes patch_text (kprobe_opcode_t *addr,u32 opcode) +void *alloc_insn_page (void ) { -void *addrs[1 ]; -u32 insns[1 ]; +void *page; - addrs[0 ] = (void *)addr; - insns[0 ] = (u32 )opcode; + page =vmalloc_exec (PAGE_SIZE ); +if (page) +set_memory_ro ((unsigned long )page,1 ); -return aarch64_insn_patch_text (addrs, insns,1 ); +return page; }/* arm kprobe: install breakpoint in text */
arch/mips/configs/cavium_octeon_defconfig +1 -0
@@ -140,6 +140,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_STAGING=y CONFIG_OCTEON_ETHERNET=y +CONFIG_OCTEON_USB=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_RAS=y CONFIG_EXT4_FS=y
arch/riscv/include/asm/uaccess.h +2 -2
@@ -400,13 +400,13 @@ extern unsigned long __must_check __asm_copy_from_user(void *to,static inline unsigned long raw_copy_from_user (void *to,const void __user *from,unsigned long n) { -return __asm_copy_to_user (to, from, n); +return __asm_copy_from_user (to, from, n); }static inline unsigned long raw_copy_to_user (void __user *to,const void *from,unsigned long n) { -return __asm_copy_from_user (to, from, n); +return __asm_copy_to_user (to, from, n); }extern long strncpy_from_user (char *dest,const char __user *src,long count);
arch/s390/boot/compressed/Makefile +7 -7
@@ -20,7 +20,7 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) OBJECTS := $(addprefix $(obj)/,$(obj-y)) LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T -$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) +$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) FORCE $(call if_changed,ld) # extract required uncompressed vmlinux symbols and adjust them to reflect offsets inside vmlinux.bin
@@ -51,17 +51,17 @@ suffix-$(CONFIG_KERNEL_LZMA) := .lzma suffix-$(CONFIG_KERNEL_LZO) := .lzo suffix-$(CONFIG_KERNEL_XZ) := .xz -$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE $(call if_changed,gzip) -$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE $(call if_changed,bzip2) -$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE $(call if_changed,lz4) -$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE $(call if_changed,lzma) -$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE $(call if_changed,lzo) -$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) +$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE $(call if_changed,xzkern) LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T
arch/s390/include/asm/mmu_context.h +0 -5
@@ -45,8 +45,6 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.asce_limit =STACK_TOP_MAX ; mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_REGION3; -/* pgd_alloc() did not account this pud */ -mm_inc_nr_puds (mm);break ;case -PAGE_SIZE :/* forked 5-level task, set new asce with new_mm->pgd */
@@ -62,9 +60,6 @@ static inline int init_new_context(struct task_struct *tsk,/* forked 2-level compat task, set new asce with new mm->pgd */ mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_SEGMENT; -/* pgd_alloc() did not account this pmd */ -mm_inc_nr_pmds (mm); -mm_inc_nr_puds (mm); }crst_table_init ((unsigned long *) mm->pgd,pgd_entry_type (mm));return 0 ;
arch/s390/include/asm/pgalloc.h +3 -3
@@ -36,11 +36,11 @@ static inline void crst_table_init(unsigned long *crst, unsigned long entry)static inline unsigned long pgd_entry_type (struct mm_struct *mm) { -if (mm->context.asce_limit <= _REGION3_SIZE) +if (mm_pmd_folded (mm))return _SEGMENT_ENTRY_EMPTY; -if (mm->context.asce_limit <= _REGION2_SIZE) +if (mm_pud_folded (mm))return _REGION3_ENTRY_EMPTY; -if (mm->context.asce_limit <= _REGION1_SIZE) +if (mm_p4d_folded (mm))return _REGION2_ENTRY_EMPTY;return _REGION1_ENTRY_EMPTY; }
arch/s390/include/asm/pgtable.h +18 -0
@@ -485,6 +485,24 @@ static inline int is_module_addr(void *addr) _REGION_ENTRY_PROTECT | \ _REGION_ENTRY_NOEXEC) +static inline bool mm_p4d_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION1_SIZE; +} +#define mm_p4d_folded (mm) mm_p4d_folded(mm) + +static inline bool mm_pud_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION2_SIZE; +} +#define mm_pud_folded (mm) mm_pud_folded(mm) + +static inline bool mm_pmd_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION3_SIZE; +} +#define mm_pmd_folded (mm) mm_pmd_folded(mm) +static inline int mm_has_pgste (struct mm_struct *mm) {#ifdef CONFIG_PGSTE
arch/s390/include/asm/tlb.h +3 -3
@@ -136,7 +136,7 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,static inline void pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmd,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION3_SIZE) +if (mm_pmd_folded (tlb->mm))return ;pgtable_pmd_page_dtor (virt_to_page (pmd));tlb_remove_table (tlb, pmd);
@@ -152,7 +152,7 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,static inline void p4d_free_tlb (struct mmu_gather *tlb,p4d_t *p4d,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION1_SIZE) +if (mm_p4d_folded (tlb->mm))return ;tlb_remove_table (tlb, p4d); }
@@ -167,7 +167,7 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,static inline void pud_free_tlb (struct mmu_gather *tlb,pud_t *pud,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION2_SIZE) +if (mm_pud_folded (tlb->mm))return ;tlb_remove_table (tlb, pud); }
arch/s390/kernel/perf_cpum_cf.c +1 -1
@@ -373,7 +373,7 @@ static int __hw_perf_event_init(struct perf_event *event)return -ENOENT ;if (ev >PERF_CPUM_CF_MAX_CTR ) -return -EINVAL ; +return -ENOENT ;/* Obtain the counter set to which the specified counter belongs */ set =get_counter_set (ev);
arch/s390/kernel/vdso32/Makefile +3 -3
@@ -36,7 +36,7 @@ UBSAN_SANITIZE := n $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) +$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE $(call if_changed,vdso32ld) # strip rule for the .so file
@@ -45,12 +45,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso32): %.o: %.S +$(obj-vdso32): %.o: %.S FORCE $(call if_changed_dep,vdso32as) # actual build commands quiet_cmd_vdso32ld = VDSO32L $@ - cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso32as = VDSO32A $@ cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<
arch/s390/kernel/vdso64/Makefile +3 -3
@@ -36,7 +36,7 @@ UBSAN_SANITIZE := n $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) +$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE $(call if_changed,vdso64ld) # strip rule for the .so file
@@ -45,12 +45,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso64): %.o: %.S +$(obj-vdso64): %.o: %.S FORCE $(call if_changed_dep,vdso64as) # actual build commands quiet_cmd_vdso64ld = VDSO64L $@ - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
arch/s390/mm/pgalloc.c +1 -0
@@ -101,6 +101,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end) mm->context.asce_limit = _REGION1_SIZE; mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_REGION2; +mm_inc_nr_puds (mm); }else {crst_table_init (table, _REGION1_ENTRY_EMPTY);pgd_populate (mm, (pgd_t *) table, (p4d_t *) pgd);
arch/s390/numa/numa.c +1 -0
@@ -54,6 +54,7 @@ int __node_distance(int a, int b) {return mode->distance ? mode->distance (a, b) :0 ; } +EXPORT_SYMBOL (__node_distance);int numa_debug_enabled;
arch/um/os-Linux/skas/process.c +5 -0
@@ -610,6 +610,11 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)fatal_sigsegv (); }longjmp (*switch_buf,1 ); + +/* unreachable */ +printk (UM_KERN_ERR "impossible long jump!" ); +fatal_sigsegv (); +return 0 ; }void initial_thread_cb_skas (void (*proc)(void *),void *arg)
arch/x86/include/asm/page_64_types.h +7 -5
@@ -33,12 +33,14 @@/* * Set __PAGE_OFFSET to the most negative possible address + -* PGDIR_SIZE*16 (pgd slot 272). The gap is to allow a space for a -* hypervisor to fit. Choosing 16 slots here is arbitrary, but it's -* what Xen requires. +* PGDIR_SIZE*17 (pgd slot 273). +* +* The gap is to allow a space for LDT remap for PTI (1 pgd slot) and space for +* a hypervisor (16 slots). Choosing 16 slots for a hypervisor is arbitrary, +* but it's what Xen requires. */ -#define __PAGE_OFFSET_BASE_L5 _AC(0xff10000000000000, UL) -#define __PAGE_OFFSET_BASE_L4 _AC(0xffff880000000000, UL) +#define __PAGE_OFFSET_BASE_L5 _AC(0xff11000000000000, UL) +#define __PAGE_OFFSET_BASE_L4 _AC(0xffff888000000000, UL)#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT #define __PAGE_OFFSET page_offset_base
arch/x86/include/asm/pgtable_64_types.h +1 -3
@@ -111,9 +111,7 @@ extern unsigned int ptrs_per_p4d;*/ #define MAXMEM (1UL << MAX_PHYSMEM_BITS) -#define LDT_PGD_ENTRY_L4 -3UL -#define LDT_PGD_ENTRY_L5 -112UL -#define LDT_PGD_ENTRY (pgtable_l5_enabled() ? LDT_PGD_ENTRY_L5 : LDT_PGD_ENTRY_L4) +#define LDT_PGD_ENTRY -240UL#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)#define LDT_END_ADDR (LDT_BASE_ADDR + PGDIR_SIZE)
arch/x86/kernel/early_printk.c +19 -10
@@ -213,8 +213,9 @@ static unsigned int mem32_serial_in(unsigned long addr, int offset)* early_pci_serial_init() * * This function is invoked when the early_printk param starts with "pciserial" -* The rest of the param should be ",B:D.F,baud" where B, D & F describe the -* location of a PCI device that must be a UART device. +* The rest of the param should be "[force],B:D.F,baud", where B, D & F describe +* the location of a PCI device that must be a UART device. "force" is optional +* and overrides the use of an UART device with a wrong PCI class code. */ static __init void early_pci_serial_init (char *s) {
@@ -224,17 +225,23 @@ static __init void early_pci_serial_init(char *s)u32 classcode, bar0;u16 cmdreg;char *e; +int force =0 ; - -/* -* First, part the param to get the BDF values -*/ if (*s ==',' ) ++s;if (*s ==0 )return ; +/* Force the use of an UART device with wrong class code */ +if (!strncmp (s,"force," ,6 )) { + force =1 ; + s +=6 ; + } + +/* +* Part the param to get the BDF values +*/ bus = (u8 )simple_strtoul (s, &e,16 ); s = e;if (*s !=':' )
@@ -253,7 +260,7 @@ static __init void early_pci_serial_init(char *s) s++;/* -* Second, find the device from the BDF +* Find the device from the BDF */ cmdreg =read_pci_config (bus, slot, func,PCI_COMMAND ); classcode =read_pci_config (bus, slot, func,PCI_CLASS_REVISION );
@@ -264,8 +271,10 @@ static __init void early_pci_serial_init(char *s)*/ if (((classcode >>16 !=PCI_CLASS_COMMUNICATION_MODEM ) && (classcode >>16 !=PCI_CLASS_COMMUNICATION_SERIAL )) || - (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ -return ; + (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ { +if (!force) +return ; + }/* * Determine if it is IO or memory mapped
@@ -289,7 +298,7 @@ static __init void early_pci_serial_init(char *s) }/* -* Lastly, initialize the hardware +* Initialize the hardware */ if (*s) {if (strcmp (s,"nocfg" ) ==0 )
arch/x86/kernel/ldt.c +38 -21
101 lines not on this page · raw message
arch/x86/xen/mmu_pv.c +3 -3
@@ -1897,7 +1897,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) init_top_pgt[0 ] =__pgd (0 );/* Pre-constructed entries are in pfn, so convert to mfn */ -/* L4[272] -> level3_ident_pgt */ +/* L4[273] -> level3_ident_pgt */ /* L4[511] -> level3_kernel_pgt */ convert_pfn_mfn (init_top_pgt);
@@ -1917,8 +1917,8 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) addr[0 ] = (unsigned long )pgd; addr[1 ] = (unsigned long )l3; addr[2 ] = (unsigned long )l2; -/* Graft it onto L4[272][0]. Note that we creating an aliasing problem: -* Both L4[272][0] and L4[511][510] have entries that point to the same +/* Graft it onto L4[273][0]. Note that we creating an aliasing problem: +* Both L4[273][0] and L4[511][510] have entries that point to the same * L2 (PMD) tables. Meaning that if you modify it in __va space * it will be also modified in the __ka space! (But if you just * modify the PMD table to point to other PTE's or none, then you
block/bio.c +1 -0
@@ -1261,6 +1261,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,if (ret) goto cleanup; }else { +zero_fill_bio (bio);iov_iter_advance (iter, bio->bi_iter.bi_size); }
drivers/acpi/acpi_platform.c +1 -0
@@ -30,6 +30,7 @@ static const struct acpi_device_id forbidden_id_list[] = { {"PNP0200", 0}, /* AT DMA Controller */ {"ACPI0009", 0}, /* IOxAPIC */ {"ACPI000A", 0}, /* IOAPIC */ + {"SMB0001", 0}, /* ACPI SMBUS virtual device */ {"", 0}, };
drivers/block/brd.c +11 -5
@@ -396,15 +396,14 @@ static struct brd_device *brd_alloc(int i) disk->first_minor = i * max_part; disk->fops = &brd_fops; disk->private_data = brd; - disk->queue = brd->brd_queue; disk->flags =GENHD_FL_EXT_DEVT ;sprintf (disk->disk_name,"ram%d" , i);set_capacity (disk, rd_size *2 ); - disk->queue->backing_dev_info->capabilities |=BDI_CAP_SYNCHRONOUS_IO ; + brd->brd_queue->backing_dev_info->capabilities |=BDI_CAP_SYNCHRONOUS_IO ;/* Tell the block layer that this is not a rotational device */ -blk_queue_flag_set (QUEUE_FLAG_NONROT , disk->queue); -blk_queue_flag_clear (QUEUE_FLAG_ADD_RANDOM , disk->queue); +blk_queue_flag_set (QUEUE_FLAG_NONROT , brd->brd_queue); +blk_queue_flag_clear (QUEUE_FLAG_ADD_RANDOM , brd->brd_queue);return brd;
@@ -436,6 +435,7 @@ static struct brd_device *brd_init_one(int i, bool *new) brd =brd_alloc (i);if (brd) { + brd->brd_disk->queue = brd->brd_queue;add_disk (brd->brd_disk);list_add_tail (&brd->brd_list, &brd_devices); }
@@ -503,8 +503,14 @@ static int __init brd_init(void)/* point of no return */ -list_for_each_entry (brd, &brd_devices, brd_list) +list_for_each_entry (brd, &brd_devices, brd_list) { +/* +* associate with queue just before adding disk for +* avoiding to mess up failure path +*/ + brd->brd_disk->queue = brd->brd_queue;add_disk (brd->brd_disk); + }blk_register_region (MKDEV (RAMDISK_MAJOR ,0 ),1UL <<MINORBITS ,THIS_MODULE , brd_probe,NULL ,NULL );
drivers/clk/clk-fixed-factor.c +1 -0
@@ -210,6 +210,7 @@ static int of_fixed_factor_clk_remove(struct platform_device *pdev) {struct clk *clk =platform_get_drvdata (pdev); +of_clk_del_provider (pdev->dev.of_node);clk_unregister_fixed_factor (clk);return 0 ;
drivers/clk/clk-fixed-rate.c +1 -0
@@ -200,6 +200,7 @@ static int of_fixed_clk_remove(struct platform_device *pdev) {struct clk *clk =platform_get_drvdata (pdev); +of_clk_del_provider (pdev->dev.of_node);clk_unregister_fixed_rate (clk);return 0 ;
drivers/clk/meson/axg.c +4 -3
@@ -96,7 +96,6 @@ static struct clk_regmap axg_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -713,12 +712,14 @@ static struct clk_regmap axg_pcie_mux = { .offset = HHI_PCIE_PLL_CNTL6, .mask = 0x1, .shift = 2, +/* skip the parent mpll3, reserved for debug */ + .table = (u32[]){ 1 }, }, .hw.init = &(struct clk_init_data ){ .name ="pcie_mux" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"mpll3" ,"pcie_pll" }, - .num_parents =2 , + .parent_names = (const char *[]){"pcie_pll" }, + .num_parents =1 , .flags =CLK_SET_RATE_PARENT , }, };
drivers/clk/meson/gxbb.c +8 -4
@@ -213,7 +213,6 @@ static struct clk_regmap gxbb_fixed_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -276,6 +275,10 @@ static struct clk_regmap gxbb_hdmi_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "hdmi_pll_pre_mult" }, .num_parents = 1, +/* +* Display directly handle hdmi pll registers ATM, we need +* NOCACHE to keep our view of the clock as accurate as possible +*/ .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -334,6 +337,10 @@ static struct clk_regmap gxl_hdmi_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, +/* +* Display directly handle hdmi pll registers ATM, we need +* NOCACHE to keep our view of the clock as accurate as possible +*/ .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -371,7 +378,6 @@ static struct clk_regmap gxbb_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -418,7 +424,6 @@ static struct clk_regmap gxbb_gp0_pll = { .ops = &meson_clk_pll_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -472,7 +477,6 @@ static struct clk_regmap gxl_gp0_pll = { .ops = &meson_clk_pll_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
drivers/clk/meson/meson8b.c +0 -3
@@ -132,7 +132,6 @@ static struct clk_regmap meson8b_fixed_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -169,7 +168,6 @@ static struct clk_regmap meson8b_vid_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
@@ -207,7 +205,6 @@ static struct clk_regmap meson8b_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, };
drivers/clk/renesas/r9a06g032-clocks.c +2 -1
@@ -539,7 +539,8 @@ r9a06g032_div_round_rate(struct clk_hw *hw,* several uarts attached to this divider, and changing this impacts * everyone. */ -if (clk->index ==R9A06G032_DIV_UART ) { +if (clk->index ==R9A06G032_DIV_UART || + clk->index ==R9A06G032_DIV_P2_PG ) {pr_devel ("%s div uart hack!\n" , __func__);return clk_get_rate (hw->clk); }
drivers/clk/samsung/clk-exynos5420.c +1 -0
@@ -281,6 +281,7 @@ static const struct samsung_clk_reg_dump exynos5420_set_clksrc[] = { { .offset = GATE_BUS_TOP, .value = 0xffffffff, }, { .offset = GATE_BUS_DISP1, .value = 0xffffffff, }, { .offset = GATE_IP_PERIC, .value = 0xffffffff, }, + { .offset = GATE_IP_PERIS, .value = 0xffffffff, }, }; static int exynos5420_clk_suspend(void)
drivers/clk/ti/clk.c +9 -4
@@ -129,7 +129,7 @@ int ti_clk_setup_ll_ops(struct ti_clk_ll_ops *ops)void __init ti_dt_clocks_register (struct ti_dt_clk oclks[]) {struct ti_dt_clk *c; -struct device_node *node; +struct device_node *node, *parent;struct clk *clk;struct of_phandle_args clkspec;char buf[64 ];
@@ -164,8 +164,12 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[])continue ; node =of_find_node_by_name (NULL , buf); -if (num_args) - node =of_find_node_by_name (node,"clk" ); +if (num_args) { + parent = node; + node =of_get_child_by_name (parent,"clk" ); +of_node_put (parent); + } + clkspec.np = node; clkspec.args_count = num_args;for (i =0 ; i < num_args; i++) {
@@ -173,11 +177,12 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[])if (ret) {pr_warn ("Bad tag in %s at %d: %s\n" , c->node_name, i, tags[i]); +of_node_put (node);return ; } } clk =of_clk_get_from_provider (&clkspec); - +of_node_put (node);if (!IS_ERR (clk)) { c->lk.clk = clk;clkdev_add (&c->lk);
drivers/gnss/serial.c +2 -1
@@ -13,6 +13,7 @@#include <linux/of.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h>
@@ -63,7 +64,7 @@ static int gnss_serial_write_raw(struct gnss_device *gdev,int ret;/* write is only buffered synchronously */ - ret =serdev_device_write (serdev, buf, count,0 ); + ret =serdev_device_write (serdev, buf, count,MAX_SCHEDULE_TIMEOUT );if (ret <0 )return ret;
drivers/gnss/sirf.c +2 -1
@@ -16,6 +16,7 @@#include <linux/pm.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h> #include <linux/wait.h>
@@ -83,7 +84,7 @@ static int sirf_write_raw(struct gnss_device *gdev, const unsigned char *buf,int ret;/* write is only buffered synchronously */ - ret =serdev_device_write (serdev, buf, count,0 ); + ret =serdev_device_write (serdev, buf, count,MAX_SCHEDULE_TIMEOUT );if (ret <0 )return ret;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -3167,7 +3167,7 @@ void dm_drm_plane_destroy_state(struct drm_plane *plane,static const struct drm_plane_funcs dm_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = drm_plane_cleanup, + .destroy = drm_primary_helper_destroy, .reset = dm_drm_plane_reset, .atomic_duplicate_state = dm_drm_plane_duplicate_state, .atomic_destroy_state = dm_drm_plane_destroy_state,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +0 -2
@@ -173,8 +173,6 @@ struct amdgpu_dm_connector {struct mutex hpd_lock;bool fake_enable; - -bool mst_connected; };#define to_amdgpu_dm_connector (x) container_of(x, struct amdgpu_dm_connector, base)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +7 -38
92 lines not on this page · raw message
drivers/gpu/drm/drm_edid.c +3 -0
@@ -122,6 +122,9 @@ static const struct edid_quirk {/* SDC panel of Lenovo B50-80 reports 8 bpc, but is a 6 bpc panel */ { "SDC", 0x3652, EDID_QUIRK_FORCE_6BPC }, +/* BOE model 0x0771 reports 8 bpc, but is a 6 bpc panel */ + { "BOE", 0x0771, EDID_QUIRK_FORCE_6BPC }, +/* Belinea 10 15 55 */ { "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 }, { "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +0 -9
@@ -164,13 +164,6 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end)return frm; } -static u32 decon_get_vblank_counter (struct exynos_drm_crtc *crtc) -{ -struct decon_context *ctx = crtc->ctx; - -return decon_get_frame_count (ctx, false); -} -static void decon_setup_trigger (struct decon_context *ctx) {if (!ctx->crtc->i80_mode && !(ctx->out_type &I80_HW_TRG ))
@@ -536,7 +529,6 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { .disable = decon_disable, .enable_vblank = decon_enable_vblank, .disable_vblank = decon_disable_vblank, - .get_vblank_counter = decon_get_vblank_counter, .atomic_begin = decon_atomic_begin, .update_plane = decon_update_plane, .disable_plane = decon_disable_plane,
@@ -554,7 +546,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)int ret; ctx->drm_dev = drm_dev; - drm_dev->max_vblank_count =0xffffffff ;for (win = ctx->first_win; win <WINDOWS_NR ; win++) { ctx->configs[win].pixel_formats = decon_formats;
drivers/gpu/drm/exynos/exynos_drm_crtc.c +0 -11
@@ -162,16 +162,6 @@ static void exynos_drm_crtc_disable_vblank(struct drm_crtc *crtc) exynos_crtc->ops->disable_vblank (exynos_crtc); } -static u32 exynos_drm_crtc_get_vblank_counter (struct drm_crtc *crtc) -{ -struct exynos_drm_crtc *exynos_crtc =to_exynos_crtc (crtc); - -if (exynos_crtc->ops->get_vblank_counter) -return exynos_crtc->ops->get_vblank_counter (exynos_crtc); - -return 0 ; -} -static const struct drm_crtc_funcs exynos_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip,
@@ -181,7 +171,6 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = { .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .enable_vblank = exynos_drm_crtc_enable_vblank, .disable_vblank = exynos_drm_crtc_disable_vblank, - .get_vblank_counter = exynos_drm_crtc_get_vblank_counter, }; struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
@@ -133,7 +133,6 @@ struct exynos_drm_crtc_ops {void (*disable)(struct exynos_drm_crtc *crtc);int (*enable_vblank)(struct exynos_drm_crtc *crtc);void (*disable_vblank)(struct exynos_drm_crtc *crtc); -u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc);enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,const struct drm_display_mode *mode); bool (*mode_fixup)(struct exynos_drm_crtc *crtc,
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2248,7 +2248,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)#define for_each_sgt_dma (__dmap, __iter, __sgt) \ for ((__iter) = __sgt_iter((__sgt)->sgl, true); \ ((__dmap) = (__iter).dma + (__iter).curr); \ - (((__iter).curr += PAGE_SIZE) >= (__iter).max) ? \ + (((__iter).curr += I915_GTT_PAGE_SIZE) >= (__iter).max) ? \ (__iter) = __sgt_iter(__sg_next((__iter).sgp), true), 0 : 0)/**
drivers/gpu/drm/i915/i915_gem_gtt.c +9 -9
@@ -1058,7 +1058,7 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt, do { vaddr[idx->pte] = pte_encode | iter->dma; - iter->dma += PAGE_SIZE; + iter->dma += I915_GTT_PAGE_SIZE; if (iter->dma >= iter->max) { iter->sg = __sg_next(iter->sg); if (!iter->sg) {
@@ -1770,7 +1770,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *base, struct seq_file *m)seq_printf (m,"\t\t(%03d, %04d) %08llx: " , pde, pte, - (pde *GEN6_PTES + pte) *PAGE_SIZE ); + (pde *GEN6_PTES + pte) *I915_GTT_PAGE_SIZE );for (i =0 ; i <4 ; i++) {if (vaddr[pte + i] != scratch_pte)seq_printf (m," %08x" , vaddr[pte + i]);
@@ -1910,7 +1910,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, do { vaddr[act_pte] = pte_encode | GEN6_PTE_ADDR_ENCODE(iter.dma); - iter.dma += PAGE_SIZE; + iter.dma += I915_GTT_PAGE_SIZE; if (iter.dma == iter.max) { iter.sg = __sg_next(iter.sg); if (!iter.sg)
@@ -2048,7 +2048,7 @@ static int pd_vma_bind(struct i915_vma *vma, {struct i915_ggtt *ggtt =i915_vm_to_ggtt (vma->vm);struct gen6_hw_ppgtt *ppgtt = vma->private; -u32 ggtt_offset =i915_ggtt_offset (vma) /PAGE_SIZE ; +u32 ggtt_offset =i915_ggtt_offset (vma) /I915_GTT_PAGE_SIZE ;struct i915_page_table *pt;unsigned int pde;
@@ -2174,7 +2174,7 @@ static struct i915_hw_ppgtt *gen6_ppgtt_create(struct drm_i915_private *i915) ppgtt->base.vm.i915 = i915; ppgtt->base.vm.dma = &i915->drm.pdev->dev; - ppgtt->base.vm.total =I915_PDES *GEN6_PTES *PAGE_SIZE ; + ppgtt->base.vm.total =I915_PDES *GEN6_PTES *I915_GTT_PAGE_SIZE ;i915_address_space_init (&ppgtt->base.vm, i915);
@@ -3031,7 +3031,7 @@ static unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl) bdw_gmch_ctl =1 << bdw_gmch_ctl;#ifdef CONFIG_X86_32 -/* Limit 32b platforms to a 2GB GGTT: 4 << 20 / pte size * PAGE_SIZE */ +/* Limit 32b platforms to a 2GB GGTT: 4 << 20 / pte size * I915_GTT_PAGE_SIZE */ if (bdw_gmch_ctl >4 ) bdw_gmch_ctl =4 ;#endif
@@ -3729,9 +3729,9 @@ rotate_pages(const dma_addr_t *in, unsigned int offset,* the entries so the sg list can be happily traversed. * The only thing we need are DMA addresses. */ -sg_set_page (sg,NULL ,PAGE_SIZE ,0 ); +sg_set_page (sg,NULL ,I915_GTT_PAGE_SIZE ,0 );sg_dma_address (sg) = in[offset + src_idx]; -sg_dma_len (sg) =PAGE_SIZE ; +sg_dma_len (sg) =I915_GTT_PAGE_SIZE ; sg =sg_next (sg); src_idx -= stride; }
@@ -3744,7 +3744,7 @@ static noinline struct sg_table * intel_rotate_pages(struct intel_rotation_info *rot_info, struct drm_i915_gem_object *obj) { -const unsigned long n_pages = obj->base.size /PAGE_SIZE ; +const unsigned long n_pages = obj->base.size /I915_GTT_PAGE_SIZE ;unsigned int size =intel_rotation_info_size (rot_info);struct sgt_iter sgt_iter;dma_addr_t dma_addr;
drivers/hid/hid-alps.c +18 -0
@@ -660,6 +660,20 @@ static int T4_init(struct hid_device *hdev, struct alps_dev *pri_data)return ret; } +static int alps_sp_open (struct input_dev *dev) +{ +struct hid_device *hid =input_get_drvdata (dev); + +return hid_hw_open (hid); +} + +static void alps_sp_close (struct input_dev *dev) +{ +struct hid_device *hid =input_get_drvdata (dev); + +hid_hw_close (hid); +} +static int alps_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct alps_dev *data =hid_get_drvdata (hdev);
@@ -733,6 +747,10 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) input2->id.version = input->id.version; input2->dev.parent = input->dev.parent; +input_set_drvdata (input2, hdev); + input2->open = alps_sp_open; + input2->close = alps_sp_close; +__set_bit (EV_KEY , input2->evbit); data->sp_btn_cnt = (data->sp_btn_info &0x0F );for (i =0 ; i < data->sp_btn_cnt; i++)
drivers/hid/hid-ids.h +6 -0
@@ -799,6 +799,7 @@#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9#define USB_DEVICE_ID_MS_POWER_COVER 0x07da +#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb#define USB_VENDOR_ID_MOJO 0x8282#define USB_DEVICE_ID_RETRO_ADAPTER 0x3201
@@ -921,6 +922,9 @@#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3003 0x3003#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 +#define I2C_VENDOR_ID_RAYDIUM 0x2386 +#define I2C_PRODUCT_ID_RAYDIUM_4B33 0x4b33 +#define USB_VENDOR_ID_RAZER 0x1532#define USB_DEVICE_ID_RAZER_BLADE_14 0x011D
@@ -1195,6 +1199,8 @@#define USB_DEVICE_ID_PRIMAX_MOUSE_4D22 0x4d22#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05#define USB_DEVICE_ID_PRIMAX_REZEL 0x4e72 +#define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F 0x4d0f +#define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22 0x4e22#define USB_VENDOR_ID_RISO_KAGAKU 0x1294/* Riso Kagaku Corp. */
drivers/hid/hid-quirks.c +3 -1
@@ -106,7 +106,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK), HID_QUIRK_MULTI_INPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS), HID_QUIRK_NOGET }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PIXART_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
@@ -129,6 +129,8 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4D22), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3003), HID_QUIRK_NOGET },
drivers/hid/i2c-hid/i2c-hid.c +19 -0
@@ -48,6 +48,7 @@#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1)#define I2C_HID_QUIRK_NO_RUNTIME_PM BIT(2) +#define I2C_HID_QUIRK_DELAY_AFTER_SLEEP BIT(3)/* flags */ #define I2C_HID_STARTED 0
@@ -157,6 +158,8 @@ struct i2c_hid {bool irq_wake_enabled;struct mutex reset_lock; + +unsigned long sleep_delay; }; static const struct i2c_hid_quirks {
@@ -171,6 +174,8 @@ static const struct i2c_hid_quirks { {I2C_VENDOR_ID_HANTICK ,I2C_PRODUCT_ID_HANTICK_5288 ,I2C_HID_QUIRK_NO_IRQ_AFTER_RESET | I2C_HID_QUIRK_NO_RUNTIME_PM }, + { I2C_VENDOR_ID_RAYDIUM, I2C_PRODUCT_ID_RAYDIUM_4B33, + I2C_HID_QUIRK_DELAY_AFTER_SLEEP }, { 0, 0 } };
@@ -386,6 +391,7 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state) {struct i2c_hid *ihid =i2c_get_clientdata (client);int ret; +unsigned long now, delay;i2c_hid_dbg (ihid,"%s\n" , __func__);
@@ -403,9 +409,22 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state) goto set_pwr_exit; } +if (ihid->quirks &I2C_HID_QUIRK_DELAY_AFTER_SLEEP && + power_state ==I2C_HID_PWR_ON ) { + now = jiffies; +if (time_after (ihid->sleep_delay, now)) { + delay =jiffies_to_usecs (ihid->sleep_delay - now); +usleep_range (delay, delay +1 ); + } + } + ret =__i2c_hid_command (client, &hid_set_power_cmd, power_state,0 ,NULL ,0 ,NULL ,0 ); +if (ihid->quirks &I2C_HID_QUIRK_DELAY_AFTER_SLEEP && + power_state ==I2C_HID_PWR_SLEEP ) + ihid->sleep_delay = jiffies +msecs_to_jiffies (20 ); +if (ret)dev_err (&client->dev,"failed to change power setting.\n" );
drivers/hid/uhid.c +12 -0
@@ -12,6 +12,7 @@#include <linux/atomic.h> #include <linux/compat.h> +#include <linux/cred.h> #include <linux/device.h> #include <linux/fs.h> #include <linux/hid.h>
@@ -722,6 +723,17 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,switch (uhid->input_buf.type) {case UHID_CREATE : +/* +* 'struct uhid_create_req' contains a __user pointer which is +* copied from, so it's unsafe to allow this with elevated +* privileges (e.g. from a setuid binary) or via kernel_write(). +*/ +if (file->f_cred !=current_cred () ||uaccess_kernel ()) { +pr_err_once ("UHID_CREATE from different security context by process %d (%s), this is not allowed.\n" , +task_tgid_vnr (current), current->comm); + ret = -EACCES ; + goto unlock; + } ret =uhid_dev_create (uhid, &uhid->input_buf);break ;case UHID_CREATE2 :
drivers/hwmon/ibmpowernv.c +3 -4
@@ -181,7 +181,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr,return sprintf (buf,"%s\n" , sdata->label); } -static int __init get_logical_cpu (int hwcpu) +static int get_logical_cpu (int hwcpu) {int cpu;
@@ -192,9 +192,8 @@ static int __init get_logical_cpu(int hwcpu)return -ENOENT ; } -static void __init make_sensor_label (struct device_node *np, -struct sensor_data *sdata, -const char *label) +static void make_sensor_label (struct device_node *np, +struct sensor_data *sdata,const char *label) {u32 id;size_t n;
drivers/i2c/busses/Kconfig +1 -1
@@ -751,7 +751,7 @@ config I2C_OCORES config I2C_OMAP tristate "OMAP I2C adapter" - depends on ARCH_OMAP + depends on ARCH_OMAP || ARCH_K3 default y if MACH_OMAP_H3 || MACH_OMAP_OSK help If you say yes to this option, support will be included for the
drivers/i2c/busses/i2c-qcom-geni.c +8 -7
@@ -590,18 +590,19 @@ static int geni_i2c_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"i2c fifo/se-dma mode. fifo depth:%d\n" , tx_depth); - ret =i2c_add_adapter (&gi2c->adap); -if (ret) { -dev_err (&pdev->dev,"Error adding i2c adapter %d\n" , ret); -return ret; - } - gi2c->suspended =1 ;pm_runtime_set_suspended (gi2c->se.dev);pm_runtime_set_autosuspend_delay (gi2c->se.dev,I2C_AUTO_SUSPEND_DELAY );pm_runtime_use_autosuspend (gi2c->se.dev);pm_runtime_enable (gi2c->se.dev); + ret =i2c_add_adapter (&gi2c->adap); +if (ret) { +dev_err (&pdev->dev,"Error adding i2c adapter %d\n" , ret); +pm_runtime_disable (gi2c->se.dev); +return ret; + } +return 0 ; }
@@ -609,8 +610,8 @@ static int geni_i2c_remove(struct platform_device *pdev) {struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); -pm_runtime_disable (gi2c->se.dev);i2c_del_adapter (&gi2c->adap); +pm_runtime_disable (gi2c->se.dev);return 0 ; }
drivers/media/v4l2-core/v4l2-event.c +24 -19
78 lines not on this page · raw message
drivers/misc/atmel-ssc.c +1 -1
@@ -132,7 +132,7 @@ static const struct of_device_id atmel_ssc_dt_ids[] = {MODULE_DEVICE_TABLE (of, atmel_ssc_dt_ids);#endif -static inline const struct atmel_ssc_platform_data *__init +static inline const struct atmel_ssc_platform_data *atmel_ssc_get_driver_data (struct platform_device *pdev) {if (pdev->dev.of_node) {
drivers/misc/sgi-gru/grukdump.c +4 -0
@@ -27,6 +27,9 @@#include <linux/delay.h> #include <linux/bitops.h> #include <asm/uv/uv_hub.h> + +#include <linux/nospec.h> +#include "gru.h" #include "grutables.h" #include "gruhandles.h"
@@ -196,6 +199,7 @@ int gru_dump_chiplet_request(unsigned long arg)/* Currently, only dump by gid is implemented */ if (req.gid >= gru_max_gids)return -EINVAL ; + req.gid =array_index_nospec (req.gid, gru_max_gids); gru =GID_TO_GRU (req.gid); ubuf = req.buf;
drivers/mtd/nand/raw/atmel/nand-controller.c +7 -4
@@ -2061,8 +2061,7 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)int ret; nand_np = dev->of_node; - nfc_np =of_find_compatible_node (dev->of_node,NULL , -"atmel,sama5d3-nfc" ); + nfc_np =of_get_compatible_child (dev->of_node,"atmel,sama5d3-nfc" );if (!nfc_np) {dev_err (dev,"Could not find device node for sama5d3-nfc\n" );return -ENODEV ;
@@ -2476,15 +2475,19 @@ static int atmel_nand_controller_probe(struct platform_device *pdev) }if (caps->legacy_of_bindings) { +struct device_node *nfc_node;u32 ale_offs =21 ;/* * If we are parsing legacy DT props and the DT contains a * valid NFC node, forward the request to the sama5 logic. */ -if (of_find_compatible_node (pdev->dev.of_node,NULL , -"atmel,sama5d3-nfc" )) + nfc_node =of_get_compatible_child (pdev->dev.of_node, +"atmel,sama5d3-nfc" ); +if (nfc_node) { caps = &atmel_sama5_nand_caps; +of_node_put (nfc_node); + }/* * Even if the compatible says we are dealing with an
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +2 -2
@@ -528,7 +528,6 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb, context = &priv->tx_contexts[i]; context->echo_index = i; -can_put_echo_skb (skb, netdev, context->echo_index); ++priv->active_tx_contexts;if (priv->active_tx_contexts >= (int )dev->max_tx_urbs)netif_stop_queue (netdev);
@@ -553,7 +552,6 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,dev_kfree_skb (skb);spin_lock_irqsave (&priv->tx_contexts_lock, flags); -can_free_echo_skb (netdev, context->echo_index); context->echo_index = dev->max_tx_urbs; --priv->active_tx_contexts;netif_wake_queue (netdev);
@@ -564,6 +562,8 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb, context->priv = priv; +can_put_echo_skb (skb, netdev, context->echo_index); + usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, dev->bulk_out->bEndpointAddress),
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +5 -5
@@ -1019,6 +1019,11 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv, new_state :CAN_STATE_ERROR_ACTIVE ;can_change_state (netdev, cf, tx_state, rx_state); + +if (priv->can.restart_ms && + old_state >=CAN_STATE_BUS_OFF && + new_state <CAN_STATE_BUS_OFF ) + cf->can_id |=CAN_ERR_RESTARTED ; }if (new_state ==CAN_STATE_BUS_OFF ) {
@@ -1028,11 +1033,6 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,can_bus_off (netdev); } - -if (priv->can.restart_ms && - old_state >=CAN_STATE_BUS_OFF && - new_state <CAN_STATE_BUS_OFF ) - cf->can_id |=CAN_ERR_RESTARTED ; }if (!skb) {
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +1 -1
@@ -590,7 +590,7 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev) } } -if (i >0 && i <AQ_HW_MULTICAST_ADDRESS_MAX ) { +if (i >0 && i <=AQ_HW_MULTICAST_ADDRESS_MAX ) { packet_filter |=IFF_MULTICAST ; self->mc_list.count = i; self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +23 -12
@@ -172,6 +172,27 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)return !!budget; } +static void aq_rx_checksum (struct aq_ring_s *self, +struct aq_ring_buff_s *buff, +struct sk_buff *skb) +{ +if (!(self->aq_nic->ndev->features &NETIF_F_RXCSUM )) +return ; + +if (unlikely (buff->is_cso_err)) { + ++self->stats.rx.errors; + skb->ip_summed =CHECKSUM_NONE ; +return ; + } +if (buff->is_ip_cso) { +__skb_incr_checksum_unnecessary (skb); +if (buff->is_udp_cso || buff->is_tcp_cso) +__skb_incr_checksum_unnecessary (skb); + }else { + skb->ip_summed =CHECKSUM_NONE ; + } +} +#define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) int aq_ring_rx_clean(struct aq_ring_s *self, struct napi_struct *napi,
@@ -267,18 +288,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, } skb->protocol =eth_type_trans (skb, ndev); -if (unlikely (buff->is_cso_err)) { - ++self->stats.rx.errors; - skb->ip_summed =CHECKSUM_NONE ; - }else { -if (buff->is_ip_cso) { -__skb_incr_checksum_unnecessary (skb); -if (buff->is_udp_cso || buff->is_tcp_cso) -__skb_incr_checksum_unnecessary (skb); - }else { - skb->ip_summed =CHECKSUM_NONE ; - } - } + +aq_rx_checksum (self, buff, skb); skb_set_hash(skb, buff->rss_hash, buff->is_hash_l4 ? PKT_HASH_TYPE_L4 :
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +24 -18
74 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +8 -0
@@ -619,6 +619,14 @@ void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode HW_ATL_RPB_RX_FC_MODE_SHIFT, rx_flow_ctl_mode); } +void hw_atl_rdm_rx_dma_desc_cache_init_set (struct aq_hw_s *aq_hw,u32 init) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR , +HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK , +HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT , + init); +} +void hw_atl_rpb_rx_pkt_buff_size_per_tc_set (struct aq_hw_s *aq_hw,u32 rx_pkt_buff_size_per_tc,u32 buffer) {
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +3 -0
@@ -325,6 +325,9 @@ void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,u32 rx_pkt_buff_size_per_tc, u32 buffer); +/* set rdm rx dma descriptor cache init */ +void hw_atl_rdm_rx_dma_desc_cache_init_set (struct aq_hw_s *aq_hw,u32 init); +/* set rx xoff enable (per tc) */ void hw_atl_rpb_rx_xoff_en_per_tc_set (struct aq_hw_s *aq_hw,u32 rx_xoff_en_per_tc,u32 buffer);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +18 -0
@@ -293,6 +293,24 @@/* default value of bitfield desc{d}_reset */ #define HW_ATL_RDM_DESCDRESET_DEFAULT 0x0 +/* rdm_desc_init_i bitfield definitions +* preprocessor definitions for the bitfield rdm_desc_init_i. +* port="pif_rdm_desc_init_i" +*/ + +/* register address for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR 0x00005a00 +/* bitmask for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK 0xffffffff +/* inverted bitmask for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSKN 0x00000000 +/* lower bit position of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT 0 +/* width of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_WIDTH 32 +/* default value of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_DEFAULT 0x0 +/* rx int_desc_wrb_en bitfield definitions * preprocessor definitions for the bitfield "int_desc_wrb_en". * port="pif_rdm_int_desc_wrb_en_i"
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c +10 -4
@@ -304,6 +304,10 @@ int hclge_cmd_queue_init(struct hclge_dev *hdev) {int ret; +/* Setup the lock for command queue */ +spin_lock_init (&hdev->hw.cmq.csq.lock); +spin_lock_init (&hdev->hw.cmq.crq.lock); +/* Setup the queue entries for use cmd queue */ hdev->hw.cmq.csq.desc_num =HCLGE_NIC_CMQ_DESC_NUM ; hdev->hw.cmq.crq.desc_num =HCLGE_NIC_CMQ_DESC_NUM ;
@@ -337,18 +341,20 @@ int hclge_cmd_init(struct hclge_dev *hdev)u32 version;int ret; +spin_lock_bh (&hdev->hw.cmq.csq.lock); +spin_lock_bh (&hdev->hw.cmq.crq.lock); + hdev->hw.cmq.csq.next_to_clean =0 ; hdev->hw.cmq.csq.next_to_use =0 ; hdev->hw.cmq.crq.next_to_clean =0 ; hdev->hw.cmq.crq.next_to_use =0 ; -/* Setup the lock for command queue */ -spin_lock_init (&hdev->hw.cmq.csq.lock); -spin_lock_init (&hdev->hw.cmq.crq.lock); -hclge_cmd_init_regs (&hdev->hw);clear_bit (HCLGE_STATE_CMD_DISABLE , &hdev->state); +spin_unlock_bh (&hdev->hw.cmq.crq.lock); +spin_unlock_bh (&hdev->hw.cmq.csq.lock); + ret =hclge_cmd_query_firmware_version (&hdev->hw, &version);if (ret) { dev_err(&hdev->pdev->dev,
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -0
@@ -2804,14 +2804,17 @@ static void hclge_reset(struct hclge_dev *hdev) handle = &hdev->vport[0 ].nic;rtnl_lock ();hclge_notify_client (hdev,HNAE3_DOWN_CLIENT ); +rtnl_unlock ();if (!hclge_reset_wait (hdev)) { +rtnl_lock ();hclge_notify_client (hdev,HNAE3_UNINIT_CLIENT );hclge_reset_ae_dev (hdev->ae_dev);hclge_notify_client (hdev,HNAE3_INIT_CLIENT );hclge_clear_reset_cause (hdev); }else { +rtnl_lock ();/* schedule again to check pending resets later */ set_bit (hdev->reset_type, &hdev->reset_pending);hclge_reset_task_schedule (hdev);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +6 -0
@@ -458,6 +458,12 @@ void hclge_mbx_handler(struct hclge_dev *hdev)/* handle all the mailbox requests in the queue */ while (!hclge_cmd_crq_empty (&hdev->hw)) { +if (test_bit (HCLGE_STATE_CMD_DISABLE , &hdev->state)) { +dev_warn (&hdev->pdev->dev, +"command queue needs re-initializing\n" ); +return ; + } + desc = &crq->desc[crq->next_to_use]; req = (struct hclge_mbx_vf_to_pf_cmd *)desc->data;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +4 -6
@@ -1167,14 +1167,14 @@ static int hclge_pfc_setup_hw(struct hclge_dev *hdev)*/ static int hclge_bp_setup_hw (struct hclge_dev *hdev,u8 tc) { -struct hclge_vport *vport = hdev->vport; -u32 i, k, qs_bitmap; -int ret; +int i;for (i =0 ; i <HCLGE_BP_GRP_NUM ; i++) { - qs_bitmap =0 ; +u32 qs_bitmap =0 ; +int k, ret;for (k =0 ; k < hdev->num_alloc_vport; k++) { +struct hclge_vport *vport = &hdev->vport[k];u16 qs_id = vport->qs_offset + tc;u8 grp, sub_grp;
@@ -1184,8 +1184,6 @@ static int hclge_bp_setup_hw(struct hclge_dev *hdev, u8 tc) HCLGE_BP_SUB_GRP_ID_S);if (i == grp) qs_bitmap |= (1 << sub_grp); - - vport++; } ret =hclge_tm_qs_bp_cfg (hdev, tc, i, qs_bitmap);
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +5 -0
@@ -1065,6 +1065,8 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)/* bring down the nic to stop any ongoing TX/RX */ hclgevf_notify_client (hdev,HNAE3_DOWN_CLIENT ); +rtnl_unlock (); +/* check if VF could successfully fetch the hardware reset completion * status from the hardware */
@@ -1076,12 +1078,15 @@ static int hclgevf_reset(struct hclgevf_dev *hdev) ret);dev_warn (&hdev->pdev->dev,"VF reset failed, disabling VF!\n" ); +rtnl_lock ();hclgevf_notify_client (hdev,HNAE3_UNINIT_CLIENT );rtnl_unlock ();return ret; } +rtnl_lock (); +/* now, re-initialize the nic client and ae device*/ ret =hclgevf_reset_stack (hdev);if (ret)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -0
@@ -11926,6 +11926,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)NETIF_F_GSO_GRE |NETIF_F_GSO_GRE_CSUM |NETIF_F_GSO_PARTIAL | +NETIF_F_GSO_IPXIP4 | +NETIF_F_GSO_IPXIP6 |NETIF_F_GSO_UDP_TUNNEL |NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC |
drivers/net/ethernet/intel/ice/ice_ethtool.c +6 -1
@@ -797,10 +797,15 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) }if (!test_bit (__ICE_DOWN, pf->state)) { -/* Give it a little more time to try to come back */ +/* Give it a little more time to try to come back. If still +* down, restart autoneg link or reinitialize the interface. +*/ msleep (75 );if (!test_bit (__ICE_DOWN, pf->state))return ice_nway_reset (netdev); + +ice_down (vsi); +ice_up (vsi); }return err;
drivers/net/ethernet/intel/ice/ice_txrx.c +1 -1
@@ -1519,7 +1519,7 @@ int ice_tso(struct ice_tx_buf *first, struct ice_tx_offload_params *off)/* update gso_segs and bytecount */ first->gso_segs =skb_shinfo (skb)->gso_segs; - first->bytecount = (first->gso_segs -1 ) * off->header_len; + first->bytecount += (first->gso_segs -1 ) * off->header_len; cd_tso_len = skb->len - off->header_len; cd_mss =skb_shinfo (skb)->gso_size;
drivers/net/ethernet/intel/ice/ice_type.h +1 -1
@@ -83,12 +83,12 @@ struct ice_link_status {u64 phy_type_low;u16 max_frame_size;u16 link_speed; +u16 req_speeds;u8 lse_ena;/* Link Status Event notification */ u8 link_info;u8 an_info;u8 ext_info;u8 pacing; -u8 req_speeds;/* Refer to #define from module_type[ICE_MODULE_TYPE_TOTAL_BYTE] of * ice_aqc_get_phy_caps structure */
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +3 -1
@@ -721,8 +721,10 @@ static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)ixgbe_set_vmvir (adapter, vfinfo->pf_vlan, adapter->default_up, vf); -if (vfinfo->spoofchk_enabled) +if (vfinfo->spoofchk_enabled) { hw->mac.ops.set_vlan_anti_spoofing (hw, true, vf); + hw->mac.ops.set_mac_anti_spoofing (hw, true, vf); + } }/* reset multicast table array for vf */
drivers/net/ethernet/qlogic/qed/qed_fcoe.c +8 -3
@@ -147,7 +147,8 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn,"Cannot satisfy CQ amount. CQs requested %d, CQs available %d. Aborting function start\n" , fcoe_pf_params->num_cqs, p_hwfn->hw_info.feat_num[QED_FCOE_CQ]); -return -EINVAL ; + rc = -EINVAL ; + goto err; } p_data->mtu =cpu_to_le16 (fcoe_pf_params->mtu);
@@ -156,14 +157,14 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, rc =qed_cxt_acquire_cid (p_hwfn,PROTOCOLID_FCOE , &dummy_cid);if (rc) -return rc; + goto err; cxt_info.iid = dummy_cid; rc =qed_cxt_get_cid_info (p_hwfn, &cxt_info);if (rc) {DP_NOTICE (p_hwfn,"Cannot find context info for dummy cid=%d\n" , dummy_cid); -return rc; + goto err; } p_cxt = cxt_info.p_cxt; SET_FIELD(p_cxt->tstorm_ag_context.flags3,
@@ -240,6 +241,10 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, rc =qed_spq_post (p_hwfn, p_ent,NULL );return rc; + +err: +qed_sp_destroy_request (p_hwfn, p_ent); +return rc; } static int
drivers/net/ethernet/qlogic/qed/qed_iscsi.c +1 -0
@@ -200,6 +200,7 @@ qed_sp_iscsi_func_start(struct qed_hwfn *p_hwfn,"Cannot satisfy CQ amount. Queues requested %d, CQs available %d. Aborting function start\n" , p_params->num_queues, p_hwfn->hw_info.feat_num[QED_ISCSI_CQ]); +qed_sp_destroy_request (p_hwfn, p_ent);return -EINVAL ; }
drivers/net/ethernet/qlogic/qed/qed_l2.c +8 -4
@@ -740,8 +740,7 @@ int qed_sp_vport_update(struct qed_hwfn *p_hwfn, rc =qed_sp_vport_update_rss (p_hwfn, p_ramrod, p_rss_params);if (rc) { -/* Return spq entry which is taken in qed_sp_init_request()*/ -qed_spq_return_entry (p_hwfn, p_ent); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; }
@@ -1355,6 +1354,7 @@ qed_filter_ucast_common(struct qed_hwfn *p_hwfn,DP_NOTICE (p_hwfn,"%d is not supported yet\n" , p_filter_cmd->opcode); +qed_sp_destroy_request (p_hwfn, *pp_ent);return -EINVAL ; }
@@ -2056,13 +2056,13 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, }else { rc =qed_fw_vport (p_hwfn, p_params->vport_id, &abs_vport_id);if (rc) -return rc; + goto err;if (p_params->qid !=QED_RFS_NTUPLE_QID_RSS ) { rc =qed_fw_l2_queue (p_hwfn, p_params->qid, &abs_rx_q_id);if (rc) -return rc; + goto err; p_ramrod->rx_qid_valid =1 ; p_ramrod->rx_qid =cpu_to_le16 (abs_rx_q_id);
@@ -2083,6 +2083,10 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, (u64)p_params->addr, p_params->length);return qed_spq_post (p_hwfn, p_ent,NULL ); + +err: +qed_sp_destroy_request (p_hwfn, p_ent); +return rc; } int qed_get_rxq_coalesce(struct qed_hwfn *p_hwfn,
drivers/net/ethernet/qlogic/qed/qed_rdma.c +1 -0
@@ -1514,6 +1514,7 @@ qed_rdma_register_tid(void *rdma_cxt,default : rc = -EINVAL ;DP_VERBOSE (p_hwfn,QED_MSG_RDMA ,"rc = %d\n" , rc); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; } SET_FIELD(p_ramrod->flags1,
drivers/net/ethernet/qlogic/qed/qed_roce.c +1 -0
@@ -745,6 +745,7 @@ static int qed_roce_sp_destroy_qp_responder(struct qed_hwfn *p_hwfn,DP_NOTICE (p_hwfn,"qed destroy responder failed: cannot allocate memory (ramrod). rc = %d\n" , rc); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; }
drivers/net/ethernet/qlogic/qed/qed_sp.h +14 -0
@@ -167,6 +167,9 @@ struct qed_spq_entry {enum spq_mode comp_mode;struct qed_spq_comp_cb comp_cb;struct qed_spq_comp_done comp_done;/* SPQ_MODE_EBLOCK */ + +/* Posted entry for unlimited list entry in EBLOCK mode */ +struct qed_spq_entry *post_ent; };struct qed_eq {
@@ -396,6 +399,17 @@ struct qed_sp_init_data {struct qed_spq_comp_cb *p_comp_data; }; +/** +* @brief Returns a SPQ entry to the pool / frees the entry if allocated. +* Should be called on in error flows after initializing the SPQ entry +* and before posting it. +* +* @param p_hwfn +* @param p_ent +*/ +void qed_sp_destroy_request (struct qed_hwfn *p_hwfn, +struct qed_spq_entry *p_ent); + int qed_sp_init_request(struct qed_hwfn *p_hwfn, struct qed_spq_entry **pp_ent, u8 cmd,
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +20 -2
@@ -47,6 +47,19 @@#include "qed_sp.h" #include "qed_sriov.h" +void qed_sp_destroy_request (struct qed_hwfn *p_hwfn, +struct qed_spq_entry *p_ent) +{ +/* qed_spq_get_entry() can either get an entry from the free_pool, +* or, if no entries are left, allocate a new entry and add it to +* the unlimited_pending list. +*/ +if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending) +kfree (p_ent); +else +qed_spq_return_entry (p_hwfn, p_ent); +} +int qed_sp_init_request (struct qed_hwfn *p_hwfn,struct qed_spq_entry **pp_ent,u8 cmd,u8 protocol,struct qed_sp_init_data *p_data)
@@ -80,7 +93,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,case QED_SPQ_MODE_BLOCK :if (!p_data->p_comp_data) -return -EINVAL ; + goto err; p_ent->comp_cb.cookie = p_data->p_comp_data->cookie;break ;
@@ -95,7 +108,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,default :DP_NOTICE (p_hwfn,"Unknown SPQE completion mode %d\n" , p_ent->comp_mode); -return -EINVAL ; + goto err; } DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
@@ -109,6 +122,11 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,memset (&p_ent->ramrod,0 ,sizeof (p_ent->ramrod));return 0 ; + +err: +qed_sp_destroy_request (p_hwfn, p_ent); + +return -EINVAL ; }static enum tunnel_clss qed_tunn_clss_to_fw_clss (u8 type)
drivers/net/ethernet/qlogic/qed/qed_spq.c +35 -34
125 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_sriov.c +1 -0
@@ -101,6 +101,7 @@ static int qed_sp_vf_start(struct qed_hwfn *p_hwfn, struct qed_vf_info *p_vf)default :DP_NOTICE (p_hwfn,"Unknown VF personality %d\n" , p_hwfn->hw_info.personality); +qed_sp_destroy_request (p_hwfn, p_ent);return -EINVAL ; }
drivers/net/ethernet/stmicro/stmmac/common.h +2 -1
@@ -365,7 +365,8 @@ struct dma_features {/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ #define BUF_SIZE_16KiB 16384 -#define BUF_SIZE_8KiB 8192 +/* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */ +#define BUF_SIZE_8KiB 8188#define BUF_SIZE_4KiB 4096#define BUF_SIZE_2KiB 2048
drivers/net/ethernet/stmicro/stmmac/descs_com.h +1 -1
@@ -31,7 +31,7 @@/* Enhanced descriptors */ static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_8KiB -1 ) + p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB <<ERDES1_BUFFER2_SIZE_SHIFT ) &ERDES1_BUFFER2_SIZE_MASK );
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +1 -1
@@ -262,7 +262,7 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode, int end) { p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB -1 ) &ERDES1_BUFFER1_SIZE_MASK ); + p->des1 |=cpu_to_le32 (BUF_SIZE_8KiB &ERDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ehn_desc_rx_set_on_chain (p);
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +1 -1
@@ -140,7 +140,7 @@ static void clean_desc3(void *priv_ptr, struct dma_desc *p)static int set_16kib_bfsize (int mtu) {int ret =0 ; -if (unlikely (mtu >= BUF_SIZE_8KiB)) +if (unlikely (mtu > BUF_SIZE_8KiB)) ret = BUF_SIZE_16KiB;return ret; }
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +2 -2
@@ -757,10 +757,10 @@ __mt76x0_phy_set_channel(struct mt76x0_dev *dev,/* Vendor driver don't do it */ /* mt76x0_phy_set_tx_power(dev, channel, rf_bw_band); */ +mt76x0_vco_cal (dev, channel);if (scan) -mt76x0_vco_cal (dev, channel); +mt76x0_mcu_calibrate (dev,MCU_CAL_RXDCOC ,1 ); -mt76x0_mcu_calibrate (dev,MCU_CAL_RXDCOC ,1 );mt76x0_phy_set_chan_pwr (dev, channel); dev->mt76.chandef = *chandef;
drivers/nvme/host/core.c +3 -1
@@ -1519,8 +1519,10 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)if (ns->ndev)nvme_nvm_update_nvm_info (ns);#ifdef CONFIG_NVME_MULTIPATH -if (ns->head->disk) +if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id); +blk_queue_stack_limits (ns->head->disk->queue, ns->queue); + }#endif }
drivers/nvme/host/multipath.c +1 -0
@@ -257,6 +257,7 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)blk_queue_flag_set (QUEUE_FLAG_NONROT , q);/* set to a default value for 512 until disk is validated */ blk_queue_logical_block_size (q,512 ); +blk_set_stacking_limits (&q->limits);/* we need to propagate up the VMC settings */ if (ctrl->vwc &NVME_CTRL_VWC_PRESENT )
drivers/of/device.c +3 -1
@@ -149,9 +149,11 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)* set by the driver. */ mask =DMA_BIT_MASK (ilog2 (dma_addr + size -1 ) +1 ); - dev->bus_dma_mask = mask; dev->coherent_dma_mask &= mask; *dev->dma_mask &= mask; +/* ...but only set bus mask if we found valid dma-ranges earlier */ +if (!ret) + dev->bus_dma_mask = mask; coherent =of_dma_is_coherent (np); dev_dbg(dev, "device is%sdma coherent\n",
drivers/platform/x86/acerhdf.c +1 -0
@@ -233,6 +233,7 @@ static const struct bios_settings bios_tbl[] = { {"Gateway", "LT31", "v1.3201", 0x55, 0x58, {0x9e, 0x00}, 0}, {"Gateway", "LT31", "v1.3302", 0x55, 0x58, {0x9e, 0x00}, 0}, {"Gateway", "LT31", "v1.3303t", 0x55, 0x58, {0x9e, 0x00}, 0}, + {"Gateway", "LT31", "v1.3307", 0x55, 0x58, {0x9e, 0x00}, 0},/* Packard Bell */ {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00}, 0}, {"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00}, 0},
drivers/platform/x86/intel_telemetry_debugfs.c +6 -2
@@ -951,12 +951,16 @@ static int __init telemetry_debugfs_init(void) debugfs_conf = (struct telemetry_debugfs_conf *)id->driver_data; err =telemetry_pltconfig_valid (); -if (err <0 ) +if (err <0 ) { +pr_info ("Invalid pltconfig, ensure IPC1 device is enabled in BIOS\n" );return -ENODEV ; + } err =telemetry_debugfs_check_evts (); -if (err <0 ) +if (err <0 ) { +pr_info ("telemetry_debugfs_check_evts failed\n" );return -EINVAL ; + }register_pm_notifier (&pm_notifier);
drivers/s390/net/qeth_core.h +5 -0
@@ -826,6 +826,11 @@ struct qeth_trap_id {/*some helper functions*/ #define QETH_CARD_IFNAME (card) (((card)->dev)? (card)->dev->name : "") +static inline bool qeth_netdev_is_registered (struct net_device *dev) +{ +return dev->netdev_ops !=NULL ; +} +static inline void qeth_scrub_qdio_buffer (struct qdio_buffer *buf,unsigned int elements) {
drivers/s390/net/qeth_l2_main.c +3 -2
@@ -854,7 +854,8 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)if (cgdev->state ==CCWGROUP_ONLINE )qeth_l2_set_offline (cgdev); -unregister_netdev (card->dev); +if (qeth_netdev_is_registered (card->dev)) +unregister_netdev (card->dev); }static const struct ethtool_ops qeth_l2_ethtool_ops = {
@@ -894,7 +895,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) {int rc; -if (card->dev->netdev_ops) +if (qeth_netdev_is_registered (card->dev))return 0 ; card->dev->priv_flags |=IFF_UNICAST_FLT ;
drivers/s390/net/qeth_l3_main.c +8 -5
@@ -279,9 +279,6 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)QETH_CARD_TEXT (card,4 ,"clearip" ); -if (recover && card->options.sniffer) -return ; -spin_lock_bh (&card->ip_lock);hash_for_each_safe (card->ip_htable, i, tmp, addr, hnode) {
@@ -664,6 +661,8 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,int rc =0 ;int cnt =3 ; +if (card->options.sniffer) +return 0 ;if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"setaddr4" );
@@ -698,6 +697,9 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card, {int rc =0 ; +if (card->options.sniffer) +return 0 ; +if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"deladdr4" );QETH_CARD_HEX (card,3 , &addr->u.a4.addr,sizeof (int ));
@@ -2512,7 +2514,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) {int rc; -if (card->dev->netdev_ops) +if (qeth_netdev_is_registered (card->dev))return 0 ; if (card->info.type == QETH_CARD_TYPE_OSD ||
@@ -2609,7 +2611,8 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)if (cgdev->state ==CCWGROUP_ONLINE )qeth_l3_set_offline (cgdev); -unregister_netdev (card->dev); +if (qeth_netdev_is_registered (card->dev)) +unregister_netdev (card->dev);qeth_l3_clear_ip_htable (card,0 );qeth_l3_clear_ipato_list (card); }
drivers/tty/serial/sh-sci.c +2 -2
@@ -1614,10 +1614,10 @@ static void sci_request_dma(struct uart_port *port)hrtimer_init (&s->rx_timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); s->rx_timer.function = rx_timer_fn; + s->chan_rx_saved = s->chan_rx = chan; +if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB )sci_submit_rx (s); - - s->chan_rx_saved = s->chan_rx = chan; } }
drivers/uio/uio.c +5 -2
@@ -959,6 +959,8 @@ int __uio_register_device(struct module *owner,if (ret) goto err_uio_dev_add_attributes; + info->uio_dev = idev; +if (info->irq && (info->irq !=UIO_IRQ_CUSTOM )) {/* * Note that we deliberately don't use devm_request_irq
@@ -970,11 +972,12 @@ int __uio_register_device(struct module *owner,*/ ret =request_irq (info->irq, uio_interrupt, info->irq_flags, info->name, idev); -if (ret) +if (ret) { + info->uio_dev =NULL ; goto err_request_irq; + } } - info->uio_dev = idev;return 0 ; err_request_irq:
drivers/usb/class/cdc-acm.c +3 -0
@@ -1711,6 +1711,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */ .driver_info =NO_UNION_NORMAL ,/* has no union descriptor */ }, + { USB_DEVICE(0x0572, 0x1349), /* Hiro (Conexant) USB MODEM H50228 */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */ .driver_info = QUIRK_CONTROL_LINE_STATE, }, { USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */
drivers/usb/core/hub.c +11 -3
@@ -2791,6 +2791,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1,int i, status;u16 portchange, portstatus;struct usb_port *port_dev = hub->ports[port1 -1 ]; +int reset_recovery_time;if (!hub_is_superspeed (hub->hdev)) {if (warm) {
@@ -2882,11 +2883,18 @@ static int hub_port_reset(struct usb_hub *hub, int port1, done:if (status ==0 ) { -/* TRSTRCY = 10 ms; plus some extra */ if (port_dev->quirks &USB_PORT_QUIRK_FAST_ENUM )usleep_range (10000 ,12000 ); -else -msleep (10 +40 ); +else { +/* TRSTRCY = 10 ms; plus some extra */ + reset_recovery_time =10 +40 ; + +/* Hub needs extra delay after resetting its port. */ +if (hub->hdev->quirks &USB_QUIRK_HUB_SLOW_RESET ) + reset_recovery_time +=100 ; + +msleep (reset_recovery_time); + }if (udev) {struct usb_hcd *hcd =bus_to_hcd (udev->bus);
drivers/usb/core/quirks.c +14 -0
@@ -128,6 +128,9 @@ static int quirks_param_set(const char *val, const struct kernel_param *kp)case 'n' : flags |=USB_QUIRK_DELAY_CTRL_MSG ;break ; +case 'o' : + flags |=USB_QUIRK_HUB_SLOW_RESET ; +break ;/* Ignore unrecognized flag characters */ } }
@@ -380,6 +383,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1a0a, 0x0200), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Terminus Technology Inc. Hub */ + { USB_DEVICE(0x1a40, 0x0101), .driver_info = USB_QUIRK_HUB_SLOW_RESET }, + /* Corsair K70 RGB */ { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -391,6 +397,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT | USB_QUIRK_DELAY_CTRL_MSG }, + /* Corsair K70 LUX RGB */ + { USB_DEVICE(0x1b1c, 0x1b33), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Corsair K70 LUX */ { USB_DEVICE(0x1b1c, 0x1b36), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -411,6 +420,11 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x2040, 0x7200), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Raydium Touchscreen */ + { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM }, + + { USB_DEVICE(0x2386, 0x3119), .driver_info = USB_QUIRK_NO_LPM }, + /* DJI CineSSD */ { USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
drivers/usb/misc/appledisplay.c +1 -0
@@ -50,6 +50,7 @@ static const struct usb_device_id appledisplay_table[] = { { APPLEDISPLAY_DEVICE(0x9219) }, { APPLEDISPLAY_DEVICE(0x921c) }, { APPLEDISPLAY_DEVICE(0x921d) }, + { APPLEDISPLAY_DEVICE(0x9222) }, { APPLEDISPLAY_DEVICE(0x9236) },/* Terminating entry */
drivers/xen/grant-table.c +1 -1
@@ -914,7 +914,7 @@ int gnttab_dma_free_pages(struct gnttab_dma_alloc_args *args) ret =xenmem_reservation_increase (args->nr_pages, args->frames);if (ret != args->nr_pages) { -pr_debug ("Failed to decrease reservation for DMA buffer\n" ); +pr_debug ("Failed to increase reservation for DMA buffer\n" ); ret = -EFAULT ; }else { ret =0 ;
fs/afs/rxrpc.c +4 -1
@@ -500,7 +500,6 @@ static void afs_deliver_to_call(struct afs_call *call)case -EINPROGRESS :case -EAGAIN : goto out; -case -EIO :case -ECONNABORTED : ASSERTCMP(state, ==, AFS_CALL_COMPLETE); goto done;
@@ -509,6 +508,10 @@ static void afs_deliver_to_call(struct afs_call *call)rxrpc_kernel_abort_call (call->net->socket, call->rxcall, abort_code, ret,"KIV" ); goto local_abort; +case -EIO : +pr_err ("kAFS: Call %u in bad state %u\n" , + call->debug_id, state); +/* Fall through */ case -ENODATA :case -EBADMSG :case -EMSGSIZE :
fs/ceph/quota.c +2 -1
@@ -237,7 +237,8 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,ceph_put_snap_realm (mdsc, realm); realm = next; } -ceph_put_snap_realm (mdsc, realm); +if (realm) +ceph_put_snap_realm (mdsc, realm);up_read (&mdsc->snap_rwsem);return exceeded;
fs/cifs/cifsfs.c +5 -2
@@ -981,8 +981,8 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,struct inode *src_inode =file_inode (src_file);struct inode *target_inode =file_inode (dst_file);struct cifsFileInfo *smb_file_src = src_file->private_data; -struct cifsFileInfo *smb_file_target = dst_file->private_data; -struct cifs_tcon *target_tcon =tlink_tcon (smb_file_target->tlink); +struct cifsFileInfo *smb_file_target; +struct cifs_tcon *target_tcon;unsigned int xid;int rc;
@@ -996,6 +996,9 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off, goto out; } + smb_file_target = dst_file->private_data; + target_tcon =tlink_tcon (smb_file_target->tlink); +/* * Note: cifs case is easier than btrfs since server responsible for * checks for proper open modes and file type and if it wants
fs/cifs/smb2ops.c +6 -5
@@ -686,6 +686,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size,int rc =0 ;unsigned int ea_name_len = ea_name ?strlen (ea_name) :0 ;char *name, *value; +size_t buf_size = dst_size;size_t name_len, value_len, user_name_len;while (src_size >0 ) {
@@ -721,9 +722,10 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size,/* 'user.' plus a terminating null */ user_name_len =5 +1 + name_len; - rc += user_name_len; - -if (dst_size >= user_name_len) { +if (buf_size ==0 ) { +/* skip copy - calc size only */ + rc += user_name_len; + }else if (dst_size >= user_name_len) { dst_size -= user_name_len;memcpy (dst,"user." ,5 ); dst +=5 ;
@@ -731,8 +733,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, dst += name_len; *dst =0 ; ++dst; - }else if (dst_size ==0 ) { -/* skip copy - calc size only */ + rc += user_name_len; }else {/* stop before overrun buffer */ rc = -ERANGE ;
fs/exofs/super.c +4 -1
@@ -101,6 +101,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts) token =match_token (p, tokens, args);switch (token) {case Opt_name: +kfree (opts->dev_name); opts->dev_name =match_strdup (&args[0 ]);if (unlikely (!opts->dev_name)) {EXOFS_ERR ("Error allocating dev_name" );
@@ -866,8 +867,10 @@ static struct dentry *exofs_mount(struct file_system_type *type,int ret; ret =parse_options (data, &opts); -if (ret) +if (ret) { +kfree (opts.dev_name);return ERR_PTR (ret); + }if (!opts.dev_name) opts.dev_name = dev_name;
fs/hfs/brec.c +4 -0
@@ -425,6 +425,10 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)if (new_node) {__be32 cnid; +if (!new_node->parent) { +hfs_btree_inc_height (tree); + new_node->parent = tree->root; + } fd->bnode =hfs_bnode_find (tree, new_node->parent);/* create index key and entry */ hfs_bnode_read_key (new_node, fd->search_key,14 );
fs/hfsplus/brec.c +4 -0
@@ -429,6 +429,10 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)if (new_node) {__be32 cnid; +if (!new_node->parent) { +hfs_btree_inc_height (tree); + new_node->parent = tree->root; + } fd->bnode =hfs_bnode_find (tree, new_node->parent);/* create index key and entry */ hfs_bnode_read_key (new_node, fd->search_key,14 );
fs/reiserfs/xattr.c +7 -0
@@ -185,6 +185,7 @@ struct reiserfs_dentry_buf {struct dir_context ctx;struct dentry *xadir;int count; +int err;struct dentry *dentries[8 ]; };
@@ -207,6 +208,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen, dentry =lookup_one_len (name, dbuf->xadir, namelen);if (IS_ERR (dentry)) { + dbuf->err =PTR_ERR (dentry);return PTR_ERR (dentry); }else if (d_really_is_negative (dentry)) {/* A directory entry exists, but no file? */
@@ -215,6 +217,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,"not found for file %pd.\n" , dentry, dbuf->xadir);dput (dentry); + dbuf->err = -EIO ;return -EIO ; }
@@ -262,6 +265,10 @@ static int reiserfs_for_each_xattr(struct inode *inode, err =reiserfs_readdir_inode (d_inode (dir), &buf.ctx);if (err)break ; +if (buf.err) { + err = buf.err; +break ; + }if (!buf.count)break ;for (i =0 ; !err && i < buf.count && buf.dentries[i]; i++) {
include/linux/mtd/nand.h +1 -1
@@ -568,7 +568,7 @@ static inline void nanddev_pos_next_eraseblock(struct nand_device *nand, }/** -* nanddev_pos_next_eraseblock() - Move a position to the next page +* nanddev_pos_next_page() - Move a position to the next page * @nand: NAND device * @pos: the position to update *
include/linux/netfilter/ipset/ip_set.h +1 -1
@@ -314,7 +314,7 @@ enum {extern ip_set_id_t ip_set_get_byname (struct net *net,const char *name,struct ip_set **set);extern void ip_set_put_byindex (struct net *net,ip_set_id_t index); -extern const char *ip_set_name_byindex (struct net *net,ip_set_id_t index); +extern void ip_set_name_byindex (struct net *net,ip_set_id_t index,char *name);extern ip_set_id_t ip_set_nfnl_get_byindex (struct net *net,ip_set_id_t index);extern void ip_set_nfnl_put (struct net *net,ip_set_id_t index);
include/linux/netfilter/ipset/ip_set_comment.h +2 -2
@@ -43,11 +43,11 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment,rcu_assign_pointer (comment->c, c); } -/* Used only when dumping a set, protected by rcu_read_lock_bh() */ +/* Used only when dumping a set, protected by rcu_read_lock() */ static inline int ip_set_put_comment (struct sk_buff *skb,const struct ip_set_comment *comment) { -struct ip_set_comment_rcu *c =rcu_dereference_bh (comment->c); +struct ip_set_comment_rcu *c =rcu_dereference (comment->c);if (!c)return 0 ;
include/linux/usb/quirks.h +3 -0
@@ -66,4 +66,7 @@/* Device needs a pause after every control message. */ #define USB_QUIRK_DELAY_CTRL_MSG BIT(13) +/* Hub needs extra delay after resetting its port. */ +#define USB_QUIRK_HUB_SLOW_RESET BIT(14) +#endif /* __LINUX_USB_QUIRKS_H */
include/uapi/linux/netfilter/nf_tables.h +2 -2
@@ -1581,8 +1581,8 @@ enum nft_ng_attributes {NFTA_NG_MODULUS ,NFTA_NG_TYPE ,NFTA_NG_OFFSET , -NFTA_NG_SET_NAME , -NFTA_NG_SET_ID , +NFTA_NG_SET_NAME ,/* deprecated */ +NFTA_NG_SET_ID ,/* deprecated */ __NFTA_NG_MAX };#define NFTA_NG_MAX (__NFTA_NG_MAX - 1)
include/uapi/linux/netfilter_bridge.h +4 -0
@@ -11,6 +11,10 @@#include <linux/if_vlan.h> #include <linux/if_pppox.h> +#ifndef __KERNEL__ +#include <limits.h> /* for INT_MIN, INT_MAX */ +#endif +/* Bridge Hooks */ /* After promisc drops, checksum checks. */ #define NF_BR_PRE_ROUTING 0
kernel/bpf/syscall.c +1 -0
@@ -1974,6 +1974,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, info.jited_prog_len =0 ; info.xlated_prog_len =0 ; info.nr_jited_ksyms =0 ; + info.nr_jited_func_lens =0 ; goto done; }
kernel/sched/core.c +4 -1
@@ -5854,11 +5854,14 @@ void __init sched_init_smp(void)/* * There's no userspace yet to cause hotplug operations; hence all the * CPU masks are stable and all blatant races in the below code cannot -* happen. +* happen. The hotplug lock is nevertheless taken to satisfy lockdep, +* but there won't be any contention on it. */ +cpus_read_lock ();mutex_lock (&sched_domains_mutex);sched_init_domains (cpu_active_mask);mutex_unlock (&sched_domains_mutex); +cpus_read_unlock ();/* Move init over to a non-isolated CPU */ if (set_cpus_allowed_ptr (current,housekeeping_cpumask (HK_FLAG_DOMAIN )) <0 )
lib/raid6/test/Makefile +2 -2
@@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif
@@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) else ifeq ($(HAS_NEON),yes) - OBJS += neon.o neon1.o neon2.o neon4.o neon8.o + OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
net/ceph/messenger.c +9 -3
@@ -593,9 +593,15 @@ static int ceph_tcp_sendpage(struct socket *sock, struct page *page,struct bio_vec bvec;int ret; -/* sendpage cannot properly handle pages with page_count == 0, -* we need to fallback to sendmsg if that's the case */ -if (page_count (page) >=1 ) +/* +* sendpage cannot properly handle pages with page_count == 0, +* we need to fall back to sendmsg if that's the case. +* +* Same goes for slab pages: skb_can_coalesce() allows +* coalescing neighboring slab objects into a single frag which +* triggers one of hardened usercopy checks. +*/ +if (page_count (page) >=1 && !PageSlab (page))return __ceph_tcp_sendpage (sock, page, offset, size, more); bvec.bv_page = page;
net/ipv6/netfilter/nf_conntrack_reasm.c +9 -4
@@ -587,11 +587,16 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)*/ ret = -EINPROGRESS ;if (fq->q.flags == (INET_FRAG_FIRST_IN |INET_FRAG_LAST_IN ) && - fq->q.meat == fq->q.len && -nf_ct_frag6_reasm (fq, skb, dev)) - ret =0 ; -else + fq->q.meat == fq->q.len) { +unsigned long orefdst = skb->_skb_refdst; + + skb->_skb_refdst =0UL ; +if (nf_ct_frag6_reasm (fq, skb, dev)) + ret =0 ; + skb->_skb_refdst = orefdst; + }else {skb_dst_drop (skb); + } out_unlock:spin_unlock_bh (&fq->q.lock);
net/netfilter/ipset/ip_set_core.c +23 -20
111 lines not on this page · raw message
net/netfilter/ipset/ip_set_hash_netportnet.c +4 -4
@@ -213,13 +213,13 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
@@ -493,13 +493,13 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
net/netfilter/ipset/ip_set_list_set.c +11 -6
@@ -148,9 +148,7 @@ __list_set_del_rcu(struct rcu_head * rcu) { struct set_elem *e = container_of(rcu, struct set_elem, rcu);struct ip_set *set = e->set; -struct list_set *map = set->data; -ip_set_put_byindex (map->net, e->id);ip_set_ext_destroy (set, e);kfree (e); }
@@ -158,15 +156,21 @@ __list_set_del_rcu(struct rcu_head * rcu)static inline void list_set_del (struct ip_set *set,struct set_elem *e) { +struct list_set *map = set->data; + set->elements--;list_del_rcu (&e->list); +ip_set_put_byindex (map->net, e->id);call_rcu (&e->rcu, __list_set_del_rcu); }static inline void -list_set_replace (struct set_elem *e,struct set_elem *old) +list_set_replace (struct ip_set *set,struct set_elem *e,struct set_elem *old) { +struct list_set *map = set->data; +list_replace_rcu (&old->list, &e->list); +ip_set_put_byindex (map->net, old->id);call_rcu (&old->rcu, __list_set_del_rcu); }
@@ -298,7 +302,7 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext,INIT_LIST_HEAD (&e->list);list_set_init_extensions (set, ext, e);if (n) -list_set_replace (e, n); +list_set_replace (set, e, n);else if (next)list_add_tail_rcu (&e->list, &next->list);else if (prev)
@@ -486,6 +490,7 @@ list_set_list(const struct ip_set *set,const struct list_set *map = set->data;struct nlattr *atd, *nested;u32 i =0 , first = cb->args[IPSET_CB_ARG0 ]; +char name[IPSET_MAXNAMELEN ];struct set_elem *e;int ret =0 ;
@@ -504,8 +509,8 @@ list_set_list(const struct ip_set *set, nested =ipset_nest_start (skb,IPSET_ATTR_DATA );if (!nested) goto nla_put_failure; -if (nla_put_string (skb,IPSET_ATTR_NAME , -ip_set_name_byindex (map->net, e->id))) +ip_set_name_byindex (map->net, e->id, name); +if (nla_put_string (skb,IPSET_ATTR_NAME , name)) goto nla_put_failure;if (ip_set_put_extensions (skb, set, e, true)) goto nla_put_failure;
net/netfilter/nft_compat.c +12 -9
@@ -54,9 +54,11 @@ static bool nft_xt_put(struct nft_xt *xt)return false; } -static int nft_compat_chain_validate_dependency (const char *tablename, -const struct nft_chain *chain) +static int nft_compat_chain_validate_dependency (const struct nft_ctx *ctx, +const char *tablename) { +enum nft_chain_types type =NFT_CHAIN_T_DEFAULT ; +const struct nft_chain *chain = ctx->chain;const struct nft_base_chain *basechain; if (!tablename ||
@@ -64,9 +66,12 @@ static int nft_compat_chain_validate_dependency(const char *tablename,return 0 ; basechain =nft_base_chain (chain); -if (strcmp (tablename,"nat" ) ==0 && - basechain->type->type !=NFT_CHAIN_T_NAT ) -return -EINVAL ; +if (strcmp (tablename,"nat" ) ==0 ) { +if (ctx->family !=NFPROTO_BRIDGE ) + type =NFT_CHAIN_T_NAT ; +if (basechain->type->type != type) +return -EINVAL ; + }return 0 ; }
@@ -323,8 +328,7 @@ static int nft_target_validate(const struct nft_ctx *ctx,if (target->hooks && !(hook_mask & target->hooks))return -EINVAL ; - ret =nft_compat_chain_validate_dependency (target->table, - ctx->chain); + ret =nft_compat_chain_validate_dependency (ctx, target->table);if (ret <0 )return ret; }
@@ -570,8 +574,7 @@ static int nft_match_validate(const struct nft_ctx *ctx,if (match->hooks && !(hook_mask & match->hooks))return -EINVAL ; - ret =nft_compat_chain_validate_dependency (match->table, - ctx->chain); + ret =nft_compat_chain_validate_dependency (ctx, match->table);if (ret <0 )return ret; }
net/netfilter/nft_numgen.c +0 -127
7 lines not on this page · raw message
tools/perf/jvmti/jvmti_agent.c +38 -11
49 lines not on this page · raw message
tools/perf/tests/attr/test-record-group-sampling +0 -1
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.