Linux 5.0.14
Greg KH
maintainerI'm announcing the release of the 5.0.14 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.0.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/driver-api/usb/power-management.rst | 14 Makefile | 2 arch/arc/lib/memset-archs.S | 4 arch/arm/boot/dts/am33xx-l4.dtsi | 4 arch/arm/boot/dts/rk3288.dtsi | 12 arch/arm/mach-at91/pm.c | 6 arch/arm/mach-iop13xx/setup.c | 8 arch/arm/mach-iop13xx/tpmi.c | 10 arch/arm/mach-omap2/display.c | 4 arch/arm/plat-iop/adma.c | 6 arch/arm/plat-orion/common.c | 4 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 arch/arm64/kernel/sdei.c | 6 arch/powerpc/kernel/kvm.c | 7 arch/powerpc/mm/slice.c | 10 arch/riscv/include/asm/uaccess.h | 2 arch/sh/boards/of-generic.c | 4 arch/x86/events/amd/core.c | 111 +++ arch/x86/kernel/cpu/mce/severity.c | 5 arch/x86/kvm/lapic.c | 73 +- arch/x86/kvm/lapic.h | 4 arch/x86/kvm/svm.c | 12 arch/x86/kvm/vmx/nested.c | 2 arch/x86/kvm/vmx/vmx.c | 6 arch/x86/kvm/vmx/vmx.h | 8 arch/x86/kvm/x86.c | 15 arch/x86/kvm/x86.h | 2 arch/x86/mm/init.c | 6 arch/x86/mm/kaslr.c | 2 arch/x86/mm/tlb.c | 2 block/blk-mq.c | 5 drivers/block/null_blk_main.c | 5 drivers/block/xsysace.c | 2 drivers/bluetooth/btmtkuart.c | 2 drivers/bluetooth/btusb.c | 2 drivers/clk/qcom/gcc-msm8998.c | 1 drivers/clk/x86/clk-pmc-atom.c | 14 drivers/gpio/gpio-mxc.c | 5 drivers/hid/hid-core.c | 6 drivers/hid/hid-debug.c | 5 drivers/hid/hid-input.c | 1 drivers/hid/hid-logitech-hidpp.c | 8 drivers/hid/hid-quirks.c | 5 drivers/i2c/busses/i2c-imx.c | 4 drivers/i2c/busses/i2c-stm32f7.c | 2 drivers/i2c/busses/i2c-synquacer.c | 2 drivers/i2c/i2c-core-base.c | 4 drivers/infiniband/core/security.c | 11 drivers/infiniband/core/verbs.c | 41 - drivers/infiniband/ulp/srpt/ib_srpt.c | 11 drivers/input/keyboard/snvs_pwrkey.c | 6 drivers/input/touchscreen/stmfts.c | 30 - drivers/media/i2c/ov7670.c | 16 drivers/mfd/twl-core.c | 23 drivers/mtd/nand/raw/marvell_nand.c | 12 drivers/net/bonding/bond_sysfs_slave.c | 4 drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 9 drivers/net/ethernet/hisilicon/hns/hnae.c | 4 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 33 - drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 12 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 drivers/net/ethernet/intel/i40e/i40e_ptp.c | 5 drivers/net/ethernet/intel/igb/e1000_defines.h | 2 drivers/net/ethernet/intel/igb/igb_main.c | 57 -- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 drivers/net/ethernet/stmicro/stmmac/descs_com.h | 22 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 22 drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 12 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 34 - drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 drivers/net/wireless/marvell/mwifiex/sdio.c | 2 drivers/platform/x86/intel_pmc_core.c | 4 drivers/platform/x86/pmc_atom.c | 21 drivers/reset/reset-meson-audio-arb.c | 1 drivers/rtc/rtc-cros-ec.c | 4 drivers/rtc/rtc-da9063.c | 7 drivers/rtc/rtc-sh.c | 2 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 drivers/scsi/scsi_devinfo.c | 1 drivers/scsi/scsi_dh.c | 1 drivers/scsi/storvsc_drv.c | 13 drivers/staging/iio/addac/adt7316.c | 34 - drivers/usb/core/driver.c | 13 drivers/usb/core/message.c | 4 drivers/usb/dwc3/gadget.c | 2 drivers/usb/gadget/udc/dummy_hcd.c | 19 drivers/usb/misc/yurex.c | 1 drivers/usb/storage/realtek_cr.c | 13 drivers/usb/usbip/stub_rx.c | 12 drivers/usb/usbip/usbip_common.h | 7 drivers/vfio/pci/vfio_pci.c | 4 drivers/w1/masters/ds2490.c | 6 drivers/xen/xenbus/xenbus_dev_frontend.c | 4 fs/debugfs/inode.c | 13 fs/hugetlbfs/inode.c | 20 fs/jffs2/readinode.c | 5 fs/jffs2/super.c | 5 fs/open.c | 18 fs/read_write.c | 5 include/linux/fs.h | 4 include/linux/platform_data/x86/clk-pmc-atom.h | 3 include/linux/usb.h | 2 kernel/bpf/cpumap.c | 13 kernel/seccomp.c | 17 mm/kmemleak.c | 18 net/batman-adv/bat_v_elp.c | 6 net/batman-adv/bridge_loop_avoidance.c | 16 net/batman-adv/translation-table.c | 32 - net/mac80211/debugfs_netdev.c | 2 net/mac80211/key.c | 9 scripts/coccinelle/api/stream_open.cocci | 363 +++++++++++++ security/selinux/avc.c | 23 security/selinux/hooks.c | 44 + security/selinux/include/avc.h | 1 sound/pci/hda/patch_realtek.c | 13 sound/soc/codecs/wm_adsp.c | 4 sound/soc/intel/boards/bytcr_rt5651.c | 2 sound/soc/sh/rcar/gen.c | 24 sound/soc/sh/rcar/rsnd.h | 27 sound/soc/sh/rcar/ssiu.c | 24 sound/soc/soc-pcm.c | 7 sound/soc/stm/stm32_sai_sub.c | 2 sound/soc/sunxi/sun50i-codec-analog.c | 4 tools/testing/selftests/seccomp/seccomp_bpf.c | 34 - 132 files changed, 1345 insertions(+), 428 deletions(-)
Aaro Koskinen (6):
net: stmmac: use correct DMA buffer size in the RX descriptor
net: stmmac: ratelimit RX error logs
net: stmmac: don't stop NAPI processing when dropping a packet
net: stmmac: don't overwrite discard_frame status
net: stmmac: fix dropping of multi-descriptor RX frames
net: stmmac: don't log oversized frames
Al Viro (2):
jffs2: fix use-after-free on symlink traversal
debugfs: fix use-after-free on symlink traversal
Alan Kao (1):
riscv: fix accessing 8-byte variable from RV32
Alan Stern (5):
USB: yurex: Fix protection fault after device removal
USB: w1 ds2490: Fix bug caused by improper use of altsetting array
USB: dummy-hcd: Fix failure to give back unlinked URBs
USB: core: Fix unterminated string returned by usb_string()
USB: core: Fix bug caused by duplicate interface PM usage counter
Alexander Wetzel (1):
mac80211: Honor SW_CRYPTO_CONTROL for unicast keys in AP VLAN mode
Alexandre Belloni (1):
rtc: da9063: set uie_unsupported when relevant
Anders Roxell (1):
batman-adv: fix warning in function batadv_v_elp_get_throughput
Andreas Kemnade (1):
mfd: twl-core: Disable IRQ while suspended
Aneesh Kumar K.V (1):
powerpc/mm/hash: Handle mmap_min_addr correctly in get_unmapped_area topdown search
Anson Huang (3):
i2c: imx: correct the method of getting private data in notifier_call
Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
gpio: mxc: add check to return defer probe if clock tree NOT ready
Ard Biesheuvel (1):
i2c: synquacer: fix enumeration of slave devices
Arnaud Pouliquen (1):
ASoC: stm32: fix sai driver name initialisation
Arnd Bergmann (3):
ARM: orion: don't use using 64-bit DMA masks
ARM: iop: don't use using 64-bit DMA masks mm/kmemleak.c: fix unused-function warning
Arvind Sankar (1):
igb: Fix WARN_ONCE on runtime suspend
Axel Lin (1):
reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
Baoquan He (1):
x86/mm/KASLR: Fix the size of the direct mapping section
Bart Van Assche (1):
scsi: RDMA/srpt: Fix a credit leak for aborted commands
Brian Norris (1):
Bluetooth: btusb: request wake pin with NOAUTOEN
Catalin Marinas (1):
kmemleak: powerpc: skip scanning holes in the .bss section
Charles Keepax (2):
ASoC: wm_adsp: Correct handling of compressed streams that restart
ASoC: wm_adsp: Check for buffer in trigger stop
Chen-Yu Tsai (1):
ASoC: sunxi: sun50i-codec-analog: Rename hpvcc regulator supply to cpvdd
Daniel Jurgens (2):
IB/core: Unregister notifier before freeing MAD security IB/core: Fix potential memory leak while creating MAD agents
David Müller (1):
clk: x86: Add system specific quirk to mark clocks as critical
David Rientjes (1):
KVM: SVM: prevent DBG_DECRYPT and DBG_ENCRYPT overflow
Dmitry Torokhov (2):
HID: input: add mapping for Assistant key
Input: stmfts - acknowledge that setting brightness is a blocking call
Dongli Zhang (1):
blk-mq: do not reset plug->rq_count before the list is sorted
Douglas Anderson (2):
mwifiex: Make resume actually do something useful again on SDIO cards
ARM: dts: rockchip: Fix gpu opp node names for rk3288
Emmanuel Grumbach (1):
iwlwifi: fix driver operation for 5350
Eugeniy Paltsev (1):
ARC: memset: fix build with L1_CACHE_SHIFT != 6
Geert Uytterhoeven (1):
rtc: sh: Fix invalid alarm warning for non-enabled alarm
Greg Kroah-Hartman (1):
Linux 5.0.14
Guenter Roeck (1):
xsysace: Fix error handling in ace_setup
Hans de Goede (1):
ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping"
He, Bo (1):
HID: debug: fix race condition with between rdesc_show() and device removal
Ivan Vecera (1):
ixgbe: fix mdio bus registration
Jacob Keller (1):
i40e: fix i40e_ptp_adjtime when given a negative delta
Jacopo Mondi (1):
media: v4l2: i2c: ov7670: Fix PLL bypass register values
Jarkko Nikula (1):
i2c: Prevent runtime suspend of adapter when Host Notify is required
Jeffrey Hugo (2):
HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630
clk: qcom: Add missing freq for usb30_master_clk on 8998
Jeremy Fertic (4):
staging: iio: adt7316: allow adt751x to use internal vref for all dacs
staging: iio: adt7316: fix the dac read calculation
staging: iio: adt7316: fix handling of dac high resolution option
staging: iio: adt7316: fix the dac write calculation
Jerome Brunet (1):
ASoC: dpcm: skip missing substream while applying symmetry
Jesper Dangaard Brouer (1):
xdp: fix cpumap redirect SKB creation bug
Jiada Wang (1):
ASoC: rsnd: gen: fix SSI9 4/5/6/7 busif related register address
Johannes Berg (1):
mac80211: don't attempt to rename ERR_PTR() debugfs dirs
John Garry (1):
scsi: hisi_sas: Fix to only call scsi_get_prot_op() for non-NULL scsi_cmnd
John Pittman (1):
null_blk: prevent crash from bad home_node value
Julia Lawall (1):
ARM: OMAP2+: add missing of_node_put after of_device_is_available
Kai-Heng Feng (1):
HID: Increase maximum report size allowed by hid_field_extract()
Kailang Yang (2):
ALSA: hda/realtek - Add new Dell platform for headset mode
ALSA: hda/realtek - Fixed Dell AIO speaker noise
Kangjie Lu (1):
HID: logitech: check the return value of create_singlethread_workqueue
Kees Cook (1):
selftests/seccomp: Prepare for exclusive seccomp flags
Kim Phillips (1):
perf/x86/amd: Update generic hardware cache events for Family 17h
Kirill Smelkov (1):
fs: stream_open - opener for stream-like files so that read and write can run simultaneously without deadlock
Konstantin Khorenko (1):
bonding: show full hw address in sysfs for slave entries
Leonidas P. Papadakos (1):
arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay
Liran Alon (1):
KVM: x86: Consider LAPIC TSC-Deadline timer expired if deadline too short
Liubin Shu (1):
net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw()
Louis Taylor (1):
vfio/pci: use correct format characters
Malte Leip (1):
usb: usbip: fix isoc packet num validation in get_pipe
Michael Kelley (1):
scsi: storvsc: Fix calculation of sub-channel count
Mike Kravetz (1):
hugetlbfs: fix memory leak for resv_map
Miquel Raynal (1):
mtd: rawnand: marvell: Clean the controller state before each operation
Nicolas Le Bayon (1):
i2c: i2c-stm32f7: Fix SDADEL minimum formula
Omri Kahalon (1):
net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands
Ondrej Mosnacek (1):
selinux: never allow relabeling on context mounts
Peng Hao (1):
arm/mach-at91/pm : fix possible object reference leak
Peter Zijlstra (1):
x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"
Qian Cai (1):
x86/mm: Fix a crash with kmemleak_scan()
Rajneesh Bhardwaj (2):
platform/x86: intel_pmc_core: Fix PCH IP name platform/x86: intel_pmc_core: Handle CFL regmap properly
Randy Dunlap (1):
sh: fix multiple function definition build errors
Roi Dayan (1):
net/mlx5: E-Switch, Protect from invalid memory access in offload fdb table
Sean Christopherson (7):
KVM: lapic: Disable timer advancement if adaptive tuning goes haywire
KVM: lapic: Track lapic timer advance per vCPU
KVM: lapic: Allow user to disable adaptive tuning of timer advancement
KVM: lapic: Convert guest TSC to host time domain if necessary
KVM: VMX: Save RSI to an unused output in the vCPU-run asm blob
KVM: nVMX: Remove a rogue "rax" clobber from nested_vmx_check_vmentry_hw()
KVM: lapic: Check for in-kernel LAPIC before deferencing apic pointer
Sean Wang (1):
Bluetooth: mediatek: fix up an error path to restore bdev->tx_state
Shenghui Wang (1):
block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
Stefan Assmann (1):
i40e: fix WoL support check
Stephen Boyd (1):
rtc: cros-ec: Fail suspend/resume if wake IRQ can't be configured
Stephen Smalley (1):
selinux: avoid silent denials in permissive mode under RCU walk
Sven Eckelmann (3):
batman-adv: Reduce claim hash refcnt only for removed entry
batman-adv: Reduce tt_local hash refcnt only for removed entry
batman-adv: Reduce tt_global hash refcnt only for removed entry
Takashi Iwai (1):
ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR
Thinh Nguyen (1):
usb: dwc3: Reset num_trbs after skipping
Tony Lindgren (1):
ARM: dts: Fix dcan clkctrl clock for am3
Tony Luck (1):
x86/mce: Improve error message when kernel cannot recover, p2
Tycho Andersen (1):
seccomp: Make NEW_LISTENER and TSYNC flags exclusive
Varun Prakash (1):
libcxgb: fix incorrect ppmax calculation
Wei Li (1):
arm64: fix wrong check of on_sdei_stack in nmi context
Xi Wang (1):
net: hns3: fix compile error
Xose Vazquez Perez (1):
scsi: core: add new RDAC LENOVO/DE_Series device
Yonglong Liu (4):
net: hns: Use NAPI_POLL_WEIGHT for hns driver
net: hns: Fix probabilistic memory overwrite when HNS driver initialized
net: hns: fix ICMP6 neighbor solicitation messages discard problem
net: hns: Fix WARNING when remove HNS driver with SMMU enabled
Yu Zhang (1):
kvm: vmx: Fix typos in vmentry/vmexit control setting
Yuval Avnery (1):
IB/core: Destroy QP if XRC QP fails
Greg KH
maintainerDocumentation/driver-api/usb/power-management.rst +9 -5
@@ -370,11 +370,15 @@ autosuspend the interface's device. When the usage counter is = 0 then the interface is considered to be idle, and the kernel may autosuspend the device. -Drivers need not be concerned about balancing changes to the usage -counter; the USB core will undo any remaining "get"s when a driver -is unbound from its interface. As a corollary, drivers must not call -any of the ``usb_autopm_*`` functions after their ``disconnect`` -routine has returned. +Drivers must be careful to balance their overall changes to the usage +counter. Unbalanced "get"s will remain in effect when a driver is +unbound from its interface, preventing the device from going into +runtime suspend should the interface be bound to a driver again. On +the other hand, drivers are allowed to achieve this balance by calling +the ``usb_autopm_*`` functions even after their ``disconnect`` routine +has returned -- say from within a work-queue routine -- provided they +retain an active reference to the interface (via ``usb_get_intf`` and +``usb_put_intf``). Drivers using the async routines are responsible for their own synchronization and mutual exclusion.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 13 +SUBLEVEL = 14 EXTRAVERSION = NAME = Shy Crocodile
arch/arc/lib/memset-archs.S +2 -2
@@ -30,10 +30,10 @@ #else -.macro PREALLOC_INSTR +.macro PREALLOC_INSTR reg, off .endm -.macro PREFETCHW_INSTR +.macro PREFETCHW_INSTR reg, off .endm #endif
arch/arm/boot/dts/am33xx-l4.dtsi +2 -2
@@ -1763,7 +1763,7 @@ reg = <0xcc000 0x4>; reg-names = "rev"; /* Domains (P, C): per_pwrdm, l4ls_clkdm */ - clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>; + clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>; #size-cells = <1>;
@@ -1786,7 +1786,7 @@ reg = <0xd0000 0x4>; reg-names = "rev"; /* Domains (P, C): per_pwrdm, l4ls_clkdm */ - clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>; + clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/rk3288.dtsi +6 -6
@@ -1282,27 +1282,27 @@ gpu_opp_table: gpu-opp-table { compatible = "operating-points-v2"; - opp@100000000 { + opp-100000000 { opp-hz = /bits/ 64 <100000000>; opp-microvolt = <950000>; }; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <950000>; }; - opp@300000000 { + opp-300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <1000000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; }; - opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <1200000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <1250000>; };
arch/arm/mach-at91/pm.c +4 -2
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void) np =of_find_compatible_node (NULL ,NULL ,"atmel,sama5d2-securam" );if (!np) - goto securam_fail; + goto securam_fail_no_ref_dev; pdev =of_find_device_by_node (np);of_node_put (np);if (!pdev) {pr_warn ("%s: failed to find securam device!\n" , __func__); - goto securam_fail; + goto securam_fail_no_ref_dev; } sram_pool =gen_pool_get (&pdev->dev,NULL );
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)return 0 ; securam_fail: +put_device (&pdev->dev); +securam_fail_no_ref_dev:iounmap (pm_data.sfrbu); pm_data.sfrbu =NULL ;return ret;
arch/arm/mach-iop13xx/setup.c +4 -4
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { } }; -static u64 iop13xx_adma_dmamask =DMA_BIT_MASK (64 ); +static u64 iop13xx_adma_dmamask =DMA_BIT_MASK (32 );static struct iop_adma_platform_data iop13xx_adma_0_data = { .hw_id =0 , .pool_size =PAGE_SIZE ,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { .resource = iop13xx_adma_0_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_0_data, }, };
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { .resource = iop13xx_adma_1_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_1_data, }, };
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { .resource = iop13xx_adma_2_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_2_data, }, };
arch/arm/mach-iop13xx/tpmi.c +5 -5
@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { } }; -u64 iop13xx_tpmi_mask =DMA_BIT_MASK (64 ); +u64 iop13xx_tpmi_mask =DMA_BIT_MASK (32 );static struct platform_device iop13xx_tpmi_0_device = { .name ="iop-tpmi" , .id =0 ,
@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = { .resource = iop13xx_tpmi_0_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = { .resource = iop13xx_tpmi_1_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = { .resource = iop13xx_tpmi_2_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = { .resource = iop13xx_tpmi_3_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
arch/arm/mach-omap2/display.c +3 -1
@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void)if (!node)return 0 ; -if (!of_device_is_available (node)) +if (!of_device_is_available (node)) { +of_node_put (node);return 0 ; + } pdev =of_find_device_by_node (node);
arch/arm/plat-iop/adma.c +3 -3
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { .resource = iop3xx_dma_0_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_0_data, }, };
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { .resource = iop3xx_dma_1_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_1_data, }, };
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { .resource = iop3xx_aau_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_aau_data, }, };
arch/arm/plat-orion/common.c +2 -2
@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = { .resource = orion_xor0_shared_resources, .dev = { .dma_mask = &orion_xor_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &orion_xor0_pdata, }, };
@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = { .resource = orion_xor1_shared_resources, .dev = { .dma_mask = &orion_xor_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &orion_xor1_pdata, }, };
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +2 -2
@@ -107,8 +107,8 @@ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; - tx_delay = <0x25>; - rx_delay = <0x11>; + tx_delay = <0x24>; + rx_delay = <0x18>; status = "okay"; };
arch/arm64/kernel/sdei.c +6 -0
@@ -94,6 +94,9 @@ static bool on_sdei_normal_stack(unsigned long sp, struct stack_info *info)unsigned long low = (unsigned long )raw_cpu_read (sdei_stack_normal_ptr);unsigned long high = low +SDEI_STACK_SIZE ; +if (!low) +return false; +if (sp < low || sp >= high)return false;
@@ -111,6 +114,9 @@ static bool on_sdei_critical_stack(unsigned long sp, struct stack_info *info)unsigned long low = (unsigned long )raw_cpu_read (sdei_stack_critical_ptr);unsigned long high = low +SDEI_STACK_SIZE ; +if (!low) +return false; +if (sp < low || sp >= high)return false;
arch/powerpc/kernel/kvm.c +7 -0
@@ -22,6 +22,7 @@#include <linux/kvm_host.h> #include <linux/init.h> #include <linux/export.h> +#include <linux/kmemleak.h> #include <linux/kvm_para.h> #include <linux/slab.h> #include <linux/of.h>
@@ -712,6 +713,12 @@ static void kvm_use_magic_page(void)static __init void kvm_free_tmp (void ) { +/* +* Inform kmemleak about the hole in the .bss section since the +* corresponding pages will be unmapped with DEBUG_PAGEALLOC=y. +*/ +kmemleak_free_part (&kvm_tmp[kvm_tmp_index], +ARRAY_SIZE (kvm_tmp) - kvm_tmp_index);free_reserved_area (&kvm_tmp[kvm_tmp_index], &kvm_tmp[ARRAY_SIZE (kvm_tmp)],-1 ,NULL ); }
arch/powerpc/mm/slice.c +6 -4
@@ -32,6 +32,7 @@#include <linux/export.h> #include <linux/hugetlb.h> #include <linux/sched/mm.h> +#include <linux/security.h> #include <asm/mman.h> #include <asm/mmu.h> #include <asm/copro.h>
@@ -377,6 +378,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,int pshift =max_t (int, mmu_psize_defs[psize].shift,PAGE_SHIFT );unsigned long addr, found, prev;struct vm_unmapped_area_info info; +unsigned long min_addr =max (PAGE_SIZE , mmap_min_addr); info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len;
@@ -393,7 +395,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,if (high_limit >DEFAULT_MAP_WINDOW ) addr += mm->context.slb_addr_limit -DEFAULT_MAP_WINDOW ; -while (addr >PAGE_SIZE ) { +while (addr > min_addr) { info.high_limit = addr;if (!slice_scan_available (addr -1 , available,0 , &addr))continue ;
@@ -405,8 +407,8 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,* Check if we need to reduce the range, or if we can * extend it to cover the previous available slice. */ -if (addr <PAGE_SIZE ) - addr =PAGE_SIZE ; +if (addr < min_addr) + addr = min_addr;else if (slice_scan_available (addr -1 , available,0 , &prev)) { addr = prev; goto prev_slice;
@@ -528,7 +530,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, addr =_ALIGN_UP (addr, page_size);slice_dbg (" aligned addr=%lx\n" , addr);/* Ignore hint if it's too large or overlaps a VMA */ -if (addr > high_limit - len || +if (addr > high_limit - len || addr < mmap_min_addr || !slice_area_is_free (mm, addr, len)) addr =0 ; }
arch/riscv/include/asm/uaccess.h +1 -1
@@ -301,7 +301,7 @@ do { \" .balign 4\n" \"4:\n" \" li %0, %6\n" \ -" jump 2b, %1\n" \ +" jump 3b, %1\n" \" .previous\n" \" .section __ex_table,\"a\"\n" \" .balign " RISCV_SZPTR "\n" \
arch/sh/boards/of-generic.c +2 -2
@@ -164,10 +164,10 @@ static struct sh_machine_vector __initmv sh_of_generic_mv = {struct sh_clk_ops ; -void __init arch_init_clk_ops (struct sh_clk_ops **ops,int idx) +void __init __weak arch_init_clk_ops (struct sh_clk_ops **ops,int idx) { } -void __init plat_irq_setup (void ) +void __init __weak plat_irq_setup (void ) { }
arch/x86/events/amd/core.c +108 -3
123 lines not on this page · raw message
arch/x86/kernel/cpu/mce/severity.c +5 -0
@@ -165,6 +165,11 @@ static struct severity { SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA), KERNEL ), + MCESEV( + PANIC, "Instruction fetch error in kernel", + SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), + KERNEL + ),#endif MCESEV( PANIC, "Action required: unknown MCACOD",
arch/x86/kvm/lapic.c +52 -21
132 lines not on this page · raw message
arch/x86/kvm/lapic.h +3 -1
@@ -31,8 +31,10 @@ struct kvm_timer {u32 timer_mode_mask;u64 tscdeadline;u64 expired_tscdeadline; +u32 timer_advance_ns;atomic_t pending;/* accumulated triggered timers */ bool hv_timer_in_use; +bool timer_advance_adjust_done; };struct kvm_lapic {
@@ -62,7 +64,7 @@ struct kvm_lapic {struct dest_map ; -int kvm_create_lapic (struct kvm_vcpu *vcpu); +int kvm_create_lapic (struct kvm_vcpu *vcpu,int timer_advance_ns);void kvm_free_lapic (struct kvm_vcpu *vcpu);int kvm_apic_has_interrupt (struct kvm_vcpu *vcpu);
arch/x86/kvm/svm.c +9 -3
@@ -6815,7 +6815,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)struct page **src_p, **dst_p;struct kvm_sev_dbg debug;unsigned long n; -int ret, size; +unsigned int size; +int ret;if (!sev_guest (kvm))return -ENOTTY ;
@@ -6823,6 +6824,11 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)if (copy_from_user (&debug, (void __user *)(uintptr_t )argp->data,sizeof (debug)))return -EFAULT ; +if (!debug.len || debug.src_uaddr + debug.len < debug.src_uaddr) +return -EINVAL ; +if (!debug.dst_uaddr) +return -EINVAL ; + vaddr = debug.src_uaddr; size = debug.len; vaddr_end = vaddr + size;
@@ -6873,8 +6879,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) dst_vaddr, len, &argp->error); -sev_unpin_memory (kvm, src_p,1 ); -sev_unpin_memory (kvm, dst_p,1 ); +sev_unpin_memory (kvm, src_p, n); +sev_unpin_memory (kvm, dst_p, n);if (ret) goto err;
arch/x86/kvm/vmx/nested.c +1 -1
@@ -2793,7 +2793,7 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu) [fail]"i"(offsetof(struct vcpu_vmx, fail)), [host_rsp]"i"(offsetof(struct vcpu_vmx, host_rsp)), [wordsize]"i"(sizeof(ulong)) - : "rax", "cc", "memory" + : "cc", "memory" );preempt_enable ();
arch/x86/kvm/vmx/vmx.c +4 -2
@@ -6465,7 +6465,7 @@ static void __vmx_vcpu_run(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx) "xor %%edi, %%edi \n\t" "xor %%ebp, %%ebp \n\t" "pop %%" _ASM_BP "; pop %%" _ASM_DX " \n\t" - : ASM_CALL_CONSTRAINT + : ASM_CALL_CONSTRAINT, "=S"((int){0}) : "c"(vmx), "d"((unsigned long)HOST_RSP), "S"(evmcs_rsp), [launched]"i"(offsetof(struct vcpu_vmx, __launched)), [fail]"i"(offsetof(struct vcpu_vmx, fail)),
@@ -7133,6 +7133,7 @@ static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc) {struct vcpu_vmx *vmx;u64 tscl, guest_tscl, delta_tsc, lapic_timer_advance_cycles; +struct kvm_timer *ktimer = &vcpu->arch.apic->lapic_timer;if (kvm_mwait_in_guest (vcpu->kvm))return -EOPNOTSUPP ;
@@ -7141,7 +7142,8 @@ static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc) tscl =rdtsc (); guest_tscl =kvm_read_l1_tsc (vcpu, tscl); delta_tsc =max (guest_deadline_tsc, guest_tscl) - guest_tscl; - lapic_timer_advance_cycles =nsec_to_cycles (vcpu, lapic_timer_advance_ns); + lapic_timer_advance_cycles =nsec_to_cycles (vcpu, + ktimer->timer_advance_ns);if (delta_tsc > lapic_timer_advance_cycles) delta_tsc -= lapic_timer_advance_cycles;
arch/x86/kvm/vmx/vmx.h +5 -3
@@ -444,7 +444,8 @@ static inline u32 vmx_vmentry_ctrl(void) {u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;if (pt_mode ==PT_MODE_SYSTEM ) - vmentry_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP |VM_EXIT_CLEAR_IA32_RTIT_CTL ); + vmentry_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP | +VM_ENTRY_LOAD_IA32_RTIT_CTL );/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */ return vmentry_ctrl & ~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL |VM_ENTRY_LOAD_IA32_EFER );
@@ -454,9 +455,10 @@ static inline u32 vmx_vmexit_ctrl(void) {u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;if (pt_mode ==PT_MODE_SYSTEM ) - vmexit_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP |VM_ENTRY_LOAD_IA32_RTIT_CTL ); + vmexit_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP | +VM_EXIT_CLEAR_IA32_RTIT_CTL );/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */ -return vmcs_config.vmexit_ctrl & +return vmexit_ctrl & ~(VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL |VM_EXIT_LOAD_IA32_EFER ); }
arch/x86/kvm/x86.c +10 -5
@@ -136,10 +136,14 @@ EXPORT_SYMBOL_GPL(kvm_default_tsc_scaling_ratio);static u32 __read_mostly tsc_tolerance_ppm =250 ;module_param (tsc_tolerance_ppm, uint,S_IRUGO |S_IWUSR ); -/* lapic timer advance (tscdeadline mode only) in nanoseconds */ -unsigned int __read_mostly lapic_timer_advance_ns =1000 ; +/* +* lapic timer advance (tscdeadline mode only) in nanoseconds. '-1' enables +* adaptive tuning starting from default advancment of 1000ns. '0' disables +* advancement entirely. Any other value is used as-is and disables adaptive +* tuning, i.e. allows priveleged userspace to set an exact advancement time. +*/ +static int __read_mostly lapic_timer_advance_ns =-1 ;module_param (lapic_timer_advance_ns, uint,S_IRUGO |S_IWUSR ); -EXPORT_SYMBOL_GPL (lapic_timer_advance_ns);static bool __read_mostly vector_hashing = true;module_param (vector_hashing, bool,S_IRUGO );
@@ -7882,7 +7886,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) }trace_kvm_entry (vcpu->vcpu_id); -if (lapic_timer_advance_ns) +if (lapic_in_kernel (vcpu) && + vcpu->arch.apic->lapic_timer.timer_advance_ns)wait_lapic_expire (vcpu);guest_enter_irqoff ();
@@ -9070,7 +9075,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) goto fail_free_pio_data;if (irqchip_in_kernel (vcpu->kvm)) { - r =kvm_create_lapic (vcpu); + r =kvm_create_lapic (vcpu, lapic_timer_advance_ns);if (r <0 ) goto fail_mmu_destroy; }else
arch/x86/kvm/x86.h +0 -2
@@ -294,8 +294,6 @@ extern u64 kvm_supported_xcr0(void);extern unsigned int min_timer_period_us; -extern unsigned int lapic_timer_advance_ns; -extern bool enable_vmware_backdoor;extern struct static_key kvm_no_apic_vcpu;
arch/x86/mm/init.c +6 -0
@@ -5,6 +5,7 @@#include <linux/memblock.h> #include <linux/swapfile.h> #include <linux/swapops.h> +#include <linux/kmemleak.h> #include <asm/set_memory.h> #include <asm/e820/api.h>
@@ -766,6 +767,11 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)if (debug_pagealloc_enabled ()) {pr_info ("debug: unmapping init [mem %#010lx-%#010lx]\n" , begin, end -1 ); +/* +* Inform kmemleak about the hole in the memory since the +* corresponding pages will be unmapped. +*/ +kmemleak_free_part ((void *)begin, end - begin);set_memory_np (begin, (end - begin) >>PAGE_SHIFT ); }else {/*
arch/x86/mm/kaslr.c +1 -1
@@ -94,7 +94,7 @@ void __init kernel_randomize_memory(void)if (!kaslr_memory_enabled ())return ; - kaslr_regions[0 ].size_tb =1 << (__PHYSICAL_MASK_SHIFT -TB_SHIFT ); + kaslr_regions[0 ].size_tb =1 << (MAX_PHYSMEM_BITS -TB_SHIFT ); kaslr_regions[1 ].size_tb =VMALLOC_SIZE_TB ;/*
arch/x86/mm/tlb.c +1 -1
@@ -731,7 +731,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, {int cpu; -struct flush_tlb_info info__aligned(SMP_CACHE_BYTES) = { +struct flush_tlb_info info = { .mm = mm, .stride_shift = stride_shift, .freed_tables = freed_tables,
block/blk-mq.c +3 -2
@@ -1716,11 +1716,12 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)unsigned int depth;list_splice_init (&plug->mq_list, &list); - plug->rq_count =0 ;if (plug->rq_count >2 && plug->multiple_queues)list_sort (NULL , &list, plug_rq_cmp); + plug->rq_count =0 ; + this_q =NULL ; this_hctx =NULL ; this_ctx =NULL ;
@@ -2341,7 +2342,7 @@ static int blk_mq_init_hctx(struct request_queue *q,return 0 ; free_fq: -kfree (hctx->fq); +blk_free_flush_queue (hctx->fq); exit_hctx:if (set->ops->exit_hctx) set->ops->exit_hctx (hctx, hctx_idx);
drivers/block/null_blk_main.c +5 -0
@@ -1749,6 +1749,11 @@ static int __init null_init(void)return -EINVAL ; } +if (g_home_node !=NUMA_NO_NODE && g_home_node >= nr_online_nodes) { +pr_err ("null_blk: invalid home_node value\n" ); + g_home_node =NUMA_NO_NODE ; + } +if (g_queue_mode ==NULL_Q_RQ ) {pr_err ("null_blk: legacy IO path no longer available\n" );return -EINVAL ;
drivers/block/xsysace.c +2 -0
@@ -1090,6 +1090,8 @@ static int ace_setup(struct ace_device *ace)return 0 ; err_read: +/* prevent double queue cleanup */ + ace->gd->queue =NULL ;put_disk (ace->gd); err_alloc_disk:blk_cleanup_queue (ace->queue);
drivers/bluetooth/btmtkuart.c +2 -0
@@ -115,11 +115,13 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, u8 op, u8 flag, u16 plen, TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);if (err == -EINTR ) {bt_dev_err (hdev,"Execution of wmt command interrupted" ); +clear_bit (BTMTKUART_TX_WAIT_VND_EVT , &bdev->tx_state);return err; }if (err) {bt_dev_err (hdev,"Execution of wmt command timed out" ); +clear_bit (BTMTKUART_TX_WAIT_VND_EVT , &bdev->tx_state);return -ETIMEDOUT ; }
drivers/bluetooth/btusb.c +1 -1
@@ -2885,6 +2885,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)return 0 ; } +irq_set_status_flags (irq,IRQ_NOAUTOEN ); ret =devm_request_irq (&hdev->dev, irq, btusb_oob_wake_handler,0 ,"OOB Wake-on-BT" , data);if (ret) {
@@ -2899,7 +2900,6 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) } data->oob_wake_irq = irq; -disable_irq (irq);bt_dev_info (hdev,"OOB Wake-on-BT configured at IRQ %u" , irq);return 0 ; }
drivers/clk/qcom/gcc-msm8998.c +1 -0
@@ -1112,6 +1112,7 @@ static struct clk_rcg2 ufs_axi_clk_src = {static const struct freq_tbl ftbl_usb30_master_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), +F (60000000 ,P_GPLL0_OUT_MAIN ,10 ,0 ,0 ),F (120000000 ,P_GPLL0_OUT_MAIN ,5 ,0 ,0 ),F (150000000 ,P_GPLL0_OUT_MAIN ,4 ,0 ,0 ), { }
drivers/clk/x86/clk-pmc-atom.c +11 -3
@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops = { };static struct clk_plt *plt_clk_register (struct platform_device *pdev,int id, -void __iomem *base, +const struct pmc_clk_data *pmc_data,const char **parent_names,int num_parents) {
@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, init.num_parents = num_parents; pclk->hw.init = &init; - pclk->reg = base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ; + pclk->reg = pmc_data->base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ;spin_lock_init (&pclk->lock); +/* +* On some systems, the pmc_plt_clocks already enabled by the +* firmware are being marked as critical to avoid them being +* gated by the clock framework. +*/ +if (pmc_data->critical &&plt_clk_is_enabled (&pclk->hw)) + init.flags |=CLK_IS_CRITICAL ; + ret =devm_clk_hw_register (&pdev->dev, &pclk->hw);if (ret) { pclk =ERR_PTR (ret);
@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platform_device *pdev)return PTR_ERR (parent_names);for (i =0 ; i <PMC_CLK_NUM ; i++) { - data->clks[i] =plt_clk_register (pdev, i, pmc_data->base, + data->clks[i] =plt_clk_register (pdev, i, pmc_data, parent_names, data->nparents);if (IS_ERR (data->clks[i])) { err =PTR_ERR (data->clks[i]);
drivers/gpio/gpio-mxc.c +4 -1
@@ -438,8 +438,11 @@ static int mxc_gpio_probe(struct platform_device *pdev)/* the controller clock is optional */ port->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (port->clk)) +if (IS_ERR (port->clk)) { +if (PTR_ERR (port->clk) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; port->clk =NULL ; + } err =clk_prepare_enable (port->clk);if (err) {
drivers/hid/hid-core.c +3 -3
@@ -1301,10 +1301,10 @@ static u32 __extract(u8 *report, unsigned offset, int n)u32 hid_field_extract (const struct hid_device *hid,u8 *report,unsigned offset,unsigned n) { -if (n >32 ) { -hid_warn (hid,"hid_field_extract() called with n (%d) > 32! (%s)\n" , +if (n >256 ) { +hid_warn (hid,"hid_field_extract() called with n (%d) > 256! (%s)\n" , n, current->comm); - n =32 ; + n =256 ; }return __extract (report, offset, n);
drivers/hid/hid-debug.c +5 -0
@@ -1060,10 +1060,15 @@ static int hid_debug_rdesc_show(struct seq_file *f, void *p)seq_printf (f,"\n\n" );/* dump parsed data and input mappings */ +if (down_interruptible (&hdev->driver_input_lock)) +return 0 ; +hid_dump_device (hdev, f);seq_printf (f,"\n" );hid_dump_input_mapping (hdev, f); +up (&hdev->driver_input_lock); +return 0 ; }
drivers/hid/hid-input.c +1 -0
@@ -995,6 +995,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x1b8 :map_key_clear (KEY_VIDEO );break ;case 0x1bc :map_key_clear (KEY_MESSENGER );break ;case 0x1bd :map_key_clear (KEY_INFO );break ; +case 0x1cb :map_key_clear (KEY_ASSISTANT );break ;case 0x201 :map_key_clear (KEY_NEW );break ;case 0x202 :map_key_clear (KEY_OPEN );break ;case 0x203 :map_key_clear (KEY_CLOSE );break ;
drivers/hid/hid-logitech-hidpp.c +7 -1
@@ -2111,6 +2111,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)kfree (data);return -ENOMEM ; } + data->wq =create_singlethread_workqueue ("hidpp-ff-sendqueue" ); +if (!data->wq) { +kfree (data->effect_ids); +kfree (data); +return -ENOMEM ; + } + data->hidpp = hidpp; data->feature_index = feature_index; data->version = version;
@@ -2155,7 +2162,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)/* ignore boost value at response.fap.params[2] */ /* init the hardware command queue */ - data->wq =create_singlethread_workqueue ("hidpp-ff-sendqueue" );atomic_set (&data->workqueue_size,0 );/* initialize with zero autocenter to get wheel in usable state */
drivers/hid/hid-quirks.c +4 -1
@@ -744,7 +744,6 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, - { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) }, { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
@@ -1025,6 +1024,10 @@ bool hid_ignore(struct hid_device *hdev)if (hdev->product ==0x0401 &&strncmp (hdev->name,"ELAN0800" ,8 ) !=0 )return true; +/* Same with product id 0x0400 */ +if (hdev->product ==0x0400 && +strncmp (hdev->name,"QTEC0001" ,8 ) !=0 ) +return true;break ; }
drivers/i2c/busses/i2c-imx.c +2 -2
@@ -510,9 +510,9 @@ static int i2c_imx_clk_notifier_call(struct notifier_block *nb, unsigned long action, void *data) { struct clk_notifier_data *ndata = data; -struct imx_i2c_struct *i2c_imx =container_of (&ndata->clk, +struct imx_i2c_struct *i2c_imx =container_of (nb, struct imx_i2c_struct, - clk); + clk_change_nb);if (action &POST_RATE_CHANGE )i2c_imx_set_clk (i2c_imx, ndata->new_rate);
drivers/i2c/busses/i2c-stm32f7.c +1 -1
@@ -432,7 +432,7 @@ static int stm32f7_i2c_compute_timing(struct stm32f7_i2c_dev *i2c_dev, STM32F7_I2C_ANALOG_FILTER_DELAY_MAX : 0); dnf_delay = setup->dnf * i2cclk; - sdadel_min = setup->fall_time - i2c_specs[setup->speed].hddat_min - + sdadel_min = i2c_specs[setup->speed].hddat_min + setup->fall_time - af_delay_min - (setup->dnf +3 ) * i2cclk; sdadel_max = i2c_specs[setup->speed].vddat_max - setup->rise_time -
drivers/i2c/busses/i2c-synquacer.c +2 -0
@@ -602,6 +602,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev) i2c->adapter = synquacer_i2c_ops;i2c_set_adapdata (&i2c->adapter, i2c); i2c->adapter.dev.parent = &pdev->dev; + i2c->adapter.dev.of_node = pdev->dev.of_node; +ACPI_COMPANION_SET (&i2c->adapter.dev,ACPI_COMPANION (&pdev->dev)); i2c->adapter.nr = pdev->id;init_completion (&i2c->completion);
drivers/i2c/i2c-core-base.c +4 -0
@@ -327,6 +327,8 @@ static int i2c_device_probe(struct device *dev)if (client->flags &I2C_CLIENT_HOST_NOTIFY ) {dev_dbg (dev,"Using Host Notify IRQ\n" ); +/* Keep adapter active when Host Notify is required */ +pm_runtime_get_sync (&client->adapter->dev); irq =i2c_smbus_host_notify_to_irq (client); }else if (dev->of_node) { irq =of_irq_get_byname (dev->of_node,"irq" );
@@ -431,6 +433,8 @@ static int i2c_device_remove(struct device *dev)device_init_wakeup (&client->dev, false); client->irq = client->init_irq; +if (client->flags &I2C_CLIENT_HOST_NOTIFY ) +pm_runtime_put (&client->adapter->dev);return status; }
drivers/infiniband/core/security.c +8 -3
@@ -710,16 +710,20 @@ int ib_mad_agent_security_setup(struct ib_mad_agent *agent,dev_name (&agent->device->dev), agent->port_num);if (ret) -return ret; + goto free_security; agent->lsm_nb.notifier_call = ib_mad_agent_security_change; ret =register_lsm_notifier (&agent->lsm_nb);if (ret) -return ret; + goto free_security; agent->smp_allowed = true; agent->lsm_nb_reg = true;return 0 ; + +free_security: +security_ib_free_security (agent->security); +return ret; }void ib_mad_agent_security_cleanup (struct ib_mad_agent *agent)
@@ -727,9 +731,10 @@ void ib_mad_agent_security_cleanup(struct ib_mad_agent *agent)if (!rdma_protocol_ib (agent->device, agent->port_num))return ; -security_ib_free_security (agent->security);if (agent->lsm_nb_reg)unregister_lsm_notifier (&agent->lsm_nb); + +security_ib_free_security (agent->security); }int ib_mad_enforce_security (struct ib_mad_agent_private *map,u16 pkey_index)
drivers/infiniband/core/verbs.c +24 -17
77 lines not on this page · raw message
drivers/infiniband/ulp/srpt/ib_srpt.c +11 -0
@@ -2887,8 +2887,19 @@ static void srpt_queue_tm_rsp(struct se_cmd *cmd)srpt_queue_response (cmd); } +/* +* This function is called for aborted commands if no response is sent to the +* initiator. Make sure that the credits freed by aborting a command are +* returned to the initiator the next time a response is sent by incrementing +* ch->req_lim_delta. +*/ static void srpt_aborted_task (struct se_cmd *cmd) { +struct srpt_send_ioctx *ioctx =container_of (cmd, + struct srpt_send_ioctx, cmd); +struct srpt_rdma_ch *ch = ioctx->ch; + +atomic_inc (&ch->req_lim_delta); }static int srpt_queue_status (struct se_cmd *cmd)
drivers/input/keyboard/snvs_pwrkey.c +3 -3
@@ -148,6 +148,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } + pdata->input = input; +platform_set_drvdata (pdev, pdata); + error =devm_request_irq (&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt,0 , pdev->name, pdev);
@@ -163,9 +166,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } - pdata->input = input; -platform_set_drvdata (pdev, pdata); -device_init_wakeup (&pdev->dev, pdata->wakeup);return 0 ;
drivers/input/touchscreen/stmfts.c +16 -14
@@ -106,27 +106,29 @@ struct stmfts_data {bool running; }; -static void stmfts_brightness_set (struct led_classdev *led_cdev, +static int stmfts_brightness_set (struct led_classdev *led_cdev,enum led_brightness value) {struct stmfts_data *sdata =container_of (led_cdev, struct stmfts_data, led_cdev);int err; -if (value == sdata->led_status || !sdata->ledvdd) -return ; - -if (!value) { -regulator_disable (sdata->ledvdd); - }else { - err =regulator_enable (sdata->ledvdd); -if (err) -dev_warn (&sdata->client->dev, -"failed to disable ledvdd regulator: %d\n" , - err); +if (value != sdata->led_status && sdata->ledvdd) { +if (!value) { +regulator_disable (sdata->ledvdd); + }else { + err =regulator_enable (sdata->ledvdd); +if (err) { +dev_warn (&sdata->client->dev, +"failed to disable ledvdd regulator: %d\n" , + err); +return err; + } + } + sdata->led_status = value; } - sdata->led_status = value; +return 0 ; }static enum led_brightness stmfts_brightness_get (struct led_classdev *led_cdev)
@@ -608,7 +610,7 @@ static int stmfts_enable_led(struct stmfts_data *sdata) sdata->led_cdev.name =STMFTS_DEV_NAME ; sdata->led_cdev.max_brightness =LED_ON ; sdata->led_cdev.brightness =LED_OFF ; - sdata->led_cdev.brightness_set = stmfts_brightness_set; + sdata->led_cdev.brightness_set_blocking = stmfts_brightness_set; sdata->led_cdev.brightness_get = stmfts_brightness_get; err =devm_led_classdev_register (&sdata->client->dev, &sdata->led_cdev);
drivers/media/i2c/ov7670.c +6 -10
@@ -160,10 +160,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");#define REG_GFIX 0x69/* Fix gain control */ #define REG_DBLV 0x6b/* PLL control an debugging */ -#define DBLV_BYPASS 0x00/* Bypass PLL */ -#define DBLV_X4 0x01/* clock x4 */ -#define DBLV_X6 0x10/* clock x6 */ -#define DBLV_X8 0x11/* clock x8 */ +#define DBLV_BYPASS 0x0a/* Bypass PLL */ +#define DBLV_X4 0x4a/* clock x4 */ +#define DBLV_X6 0x8a/* clock x6 */ +#define DBLV_X8 0xca/* clock x8 */ #define REG_SCALING_XSC 0x70/* Test pattern and horizontal scale factor */ #define TEST_PATTTERN_0 0x80
@@ -863,7 +863,7 @@ static int ov7675_set_framerate(struct v4l2_subdev *sd,if (ret <0 )return ret; -return ov7670_write (sd,REG_DBLV ,DBLV_X4 ); +return 0 ; } static void ov7670_get_framerate_legacy(struct v4l2_subdev *sd,
@@ -1801,11 +1801,7 @@ static int ov7670_probe(struct i2c_client *client,if (config->clock_speed) info->clock_speed = config->clock_speed; -/* -* It should be allowed for ov7670 too when it is migrated to -* the new frame rate formula. -*/ -if (config->pll_bypass && id->driver_data !=MODEL_OV7670 ) +if (config->pll_bypass) info->pll_bypass = true;if (config->pclk_hb_disable)
drivers/mfd/twl-core.c +23 -0
@@ -1245,6 +1245,28 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)return status; } +static int __maybe_unused twl_suspend (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); + +if (client->irq) +disable_irq (client->irq); + +return 0 ; +} + +static int __maybe_unused twl_resume (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); + +if (client->irq) +enable_irq (client->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(twl_dev_pm_ops, twl_suspend, twl_resume); +static const struct i2c_device_id twl_ids[] = { {"twl4030" ,TWL4030_VAUX2 },/* "Triton 2" */ {"twl5030" ,0 },/* T2 updated */
@@ -1262,6 +1284,7 @@ static const struct i2c_device_id twl_ids[] = {/* One Client Driver , 4 Clients */ static struct i2c_driver twl_driver = { .driver.name =DRIVER_NAME , + .driver.pm = &twl_dev_pm_ops, .id_table = twl_ids, .probe = twl_probe, .remove = twl_remove,
drivers/mtd/nand/raw/marvell_nand.c +6 -6
@@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip,struct marvell_nfc *nfc =to_marvell_nfc (chip->controller);u32 ndcr_generic; -if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die) -return ; - -writel_relaxed (marvell_nand->ndtr0, nfc->regs +NDTR0 ); -writel_relaxed (marvell_nand->ndtr1, nfc->regs +NDTR1 ); -/* * Reset the NDCR register to a clean state for this particular chip, * also clear ND_RUN bit.
@@ -739,6 +733,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip,/* Also reset the interrupt status register */ marvell_nfc_clear_int (nfc,NDCR_ALL_INT ); +if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die) +return ; + +writel_relaxed (marvell_nand->ndtr0, nfc->regs +NDTR0 ); +writel_relaxed (marvell_nand->ndtr1, nfc->regs +NDTR1 ); + nfc->selected_chip = chip; marvell_nand->selected_die = die_nr; }
drivers/net/bonding/bond_sysfs_slave.c +3 -1
@@ -55,7 +55,9 @@ static SLAVE_ATTR_RO(link_failure_count);static ssize_t perm_hwaddr_show (struct slave *slave,char *buf) { -return sprintf (buf,"%pM\n" , slave->perm_hwaddr); +return sprintf (buf,"%*phC\n" , + slave->dev->addr_len, + slave->perm_hwaddr); }static SLAVE_ATTR_RO (perm_hwaddr);
drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c +8 -1
@@ -354,7 +354,10 @@ static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total, ppmax = max;/* pool size must be multiple of unsigned long */ - bmap =BITS_TO_LONGS (ppmax); + bmap = ppmax / BITS_PER_TYPE(unsigned long); +if (!bmap) +return NULL ; + ppmax = (bmap *sizeof (unsigned long )) <<3 ; alloc_sz =sizeof (*pools) +sizeof (unsigned long ) * bmap;
@@ -402,6 +405,10 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,if (reserve_factor) { ppmax_pool = ppmax / reserve_factor; pool =ppm_alloc_cpu_pool (&ppmax_pool, &pool_index_max); +if (!pool) { + ppmax_pool =0 ; + reserve_factor =0 ; + }pr_debug ("%s: ppmax %u, cpu total %u, per cpu %u.\n" , ndev->name, ppmax, ppmax_pool, pool_index_max);
drivers/net/ethernet/hisilicon/hns/hnae.c +3 -1
@@ -150,7 +150,6 @@ static int hnae_alloc_buffers(struct hnae_ring *ring)/* free desc along with its attached buffer */ static void hnae_free_desc (struct hnae_ring *ring) { -hnae_free_buffers (ring);dma_unmap_single (ring_to_dev (ring), ring->desc_dma_addr, ring->desc_num *sizeof (ring->desc[0 ]),ring_to_dma_dir (ring));
@@ -183,6 +182,9 @@ static int hnae_alloc_desc(struct hnae_ring *ring)/* fini ring, also free the buffer for the ring */ static void hnae_fini_ring (struct hnae_ring *ring) { +if (is_rx_ring (ring)) +hnae_free_buffers (ring); +hnae_free_desc (ring);kfree (ring->desc_cb); ring->desc_cb =NULL ;
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +27 -6
@@ -2750,6 +2750,17 @@ int hns_dsaf_get_regs_count(void)return DSAF_DUMP_REGS_NUM ; } +static int hns_dsaf_get_port_id (u8 port) +{ +if (port <DSAF_SERVICE_NW_NUM ) +return port; + +if (port >=DSAF_BASE_INNER_PORT_NUM ) +return port -DSAF_BASE_INNER_PORT_NUM +DSAF_SERVICE_NW_NUM ; + +return -EINVAL ; +} +static void set_promisc_tcam_enable (struct dsaf_device *dsaf_dev,u32 port) {struct dsaf_tbl_tcam_ucast_cfg tbl_tcam_ucast = {0 ,1 ,0 ,0 ,0x80 };
@@ -2815,23 +2826,33 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)memset (&temp_key,0x0 ,sizeof (temp_key)); mask_entry.addr[0 ] =0x01 ;hns_dsaf_set_mac_key (dsaf_dev, &mask_key, mask_entry.in_vlan_id, - port, mask_entry.addr); +0xf , mask_entry.addr); tbl_tcam_mcast.tbl_mcast_item_vld =1 ; tbl_tcam_mcast.tbl_mcast_old_en =0 ; -if (port <DSAF_SERVICE_NW_NUM ) { - mskid = port; - }else if (port >=DSAF_BASE_INNER_PORT_NUM ) { - mskid = port -DSAF_BASE_INNER_PORT_NUM +DSAF_SERVICE_NW_NUM ; - }else { +/* set MAC port to handle multicast */ + mskid =hns_dsaf_get_port_id (port); +if (mskid == -EINVAL ) {dev_err (dsaf_dev->dev,"%s,pnum(%d)error,key(%#x:%#x)\n" , dsaf_dev->ae_dev.name, port, mask_key.high.val, mask_key.low.val);return ; } +dsaf_set_bit (tbl_tcam_mcast.tbl_mcast_port_msk[mskid /32 ], + mskid %32 ,1 ); +/* set pool bit map to handle multicast */ + mskid =hns_dsaf_get_port_id (port_num); +if (mskid == -EINVAL ) { +dev_err (dsaf_dev->dev, +"%s, pool bit map pnum(%d)error,key(%#x:%#x)\n" , + dsaf_dev->ae_dev.name, port_num, + mask_key.high.val, mask_key.low.val); +return ; + }dsaf_set_bit (tbl_tcam_mcast.tbl_mcast_port_msk[mskid /32 ], mskid %32 ,1 ); +memcpy (&temp_key, &mask_key,sizeof (mask_key)); hns_dsaf_tcam_mc_cfg_vague(dsaf_dev, entry_index, &tbl_tcam_data_mc, (struct dsaf_tbl_tcam_data *)(&mask_key),
drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c +1 -1
@@ -129,7 +129,7 @@ static void hns_xgmac_lf_rf_control_init(struct mac_driver *mac_drv)dsaf_set_bit (val,XGMAC_UNIDIR_EN_B ,0 );dsaf_set_bit (val,XGMAC_RF_TX_EN_B ,1 );dsaf_set_field (val,XGMAC_LF_RF_INSERT_M ,XGMAC_LF_RF_INSERT_S ,0 ); -dsaf_write_reg (mac_drv,XGMAC_MAC_TX_LF_RF_CONTROL_REG , val); +dsaf_write_dev (mac_drv,XGMAC_MAC_TX_LF_RF_CONTROL_REG , val); }/**
drivers/net/ethernet/hisilicon/hns/hns_enet.c +5 -7
@@ -29,9 +29,6 @@#define SERVICE_TIMER_HZ (1 * HZ) -#define NIC_TX_CLEAN_MAX_NUM 256 -#define NIC_RX_CLEAN_MAX_NUM 64 -#define RCB_IRQ_NOT_INITED 0#define RCB_IRQ_INITED 1#define HNS_BUFFER_SIZE_2048 2048
@@ -376,8 +373,6 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,wmb ();/* commit all data before submit */ assert (skb->queue_mapping < priv->ae_handle->q_num);hnae_queue_xmit (priv->ae_handle->qs[skb->queue_mapping], buf_num); - ring->stats.tx_pkts++; - ring->stats.tx_bytes += skb->len;return NETDEV_TX_OK ;
@@ -999,6 +994,9 @@ static int hns_nic_tx_poll_one(struct hns_nic_ring_data *ring_data,/* issue prefetch for next Tx descriptor */ prefetch (&ring->desc_cb[ring->next_to_clean]); } +/* update tx ring statistics. */ + ring->stats.tx_pkts += pkts; + ring->stats.tx_bytes += bytes;NETIF_TX_UNLOCK (ring);
@@ -2152,7 +2150,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) hns_nic_tx_fini_pro_v2;netif_napi_add (priv->netdev, &rd->napi, - hns_nic_common_poll,NIC_TX_CLEAN_MAX_NUM ); + hns_nic_common_poll,NAPI_POLL_WEIGHT ); rd->ring->irq_init_flag =RCB_IRQ_NOT_INITED ; }for (i = h->q_num; i < h->q_num *2 ; i++) {
@@ -2165,7 +2163,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) hns_nic_rx_fini_pro_v2;netif_napi_add (priv->netdev, &rd->napi, - hns_nic_common_poll,NIC_RX_CLEAN_MAX_NUM ); + hns_nic_common_poll,NAPI_POLL_WEIGHT ); rd->ring->irq_init_flag =RCB_IRQ_NOT_INITED ; }
drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the HISILICON network device drivers. # -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_HNS3_HCLGE) += hclge.o hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_err.o hclge_debugfs.o
drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the HISILICON network device drivers. # -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o hclgevf-objs = hclgevf_main.o hclgevf_cmd.o hclgevf_mbx.o
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -2
@@ -2378,8 +2378,7 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)return -EOPNOTSUPP ;/* only magic packet is supported */ -if (wol->wolopts && (wol->wolopts !=WAKE_MAGIC ) - | (wol->wolopts !=WAKE_FILTER )) +if (wol->wolopts & ~WAKE_MAGIC )return -EOPNOTSUPP ;/* is this a new value? */
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3 -2
@@ -146,12 +146,13 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)static int i40e_ptp_adjtime (struct ptp_clock_info *ptp,s64 delta) { struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps); -struct timespec64 now; +struct timespec64 now, then; + then =ns_to_timespec64 (delta);mutex_lock (&pf->tmreg_lock);i40e_ptp_read (pf, &now,NULL ); -timespec64_add_ns (&now, delta); + now =timespec64_add (now, then);i40e_ptp_write (pf, (const struct timespec64 *)&now);mutex_unlock (&pf->tmreg_lock);
drivers/net/ethernet/intel/igb/e1000_defines.h +2 -0
@@ -194,6 +194,8 @@/* enable link status from external LINK_0 and LINK_1 pins */ #define E1000_CTRL_SWDPIN0 0x00040000/* SWDPIN 0 value */ #define E1000_CTRL_SWDPIN1 0x00080000/* SWDPIN 1 value */ +#define E1000_CTRL_ADVD3WUC 0x00100000/* D3 WUC */ +#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000/* PHY PM enable */ #define E1000_CTRL_SDP0_DIR 0x00400000/* SDP0 Data direction */ #define E1000_CTRL_SDP1_DIR 0x00800000/* SDP1 Data direction */ #define E1000_CTRL_RST 0x04000000/* Global reset */
drivers/net/ethernet/intel/igb/igb_main.c +8 -49
97 lines not on this page · raw message
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +9 -7
@@ -905,13 +905,12 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)struct pci_dev *pdev = adapter->pdev;struct device *dev = &adapter->netdev->dev;struct mii_bus *bus; +int err = -ENODEV ; - adapter->mii_bus =devm_mdiobus_alloc (dev); -if (!adapter->mii_bus) + bus =devm_mdiobus_alloc (dev); +if (!bus)return -ENOMEM ; - bus = adapter->mii_bus; -switch (hw->device_id) {/* C3000 SoCs */ case IXGBE_DEV_ID_X550EM_A_KR :
@@ -949,12 +948,15 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)*/ hw->phy.mdio.mode_support =MDIO_SUPPORTS_C45 |MDIO_SUPPORTS_C22 ; -return mdiobus_register (bus); + err =mdiobus_register (bus); +if (!err) { + adapter->mii_bus = bus; +return 0 ; + } ixgbe_no_mii_bus:devm_mdiobus_free (dev, bus); - adapter->mii_bus =NULL ; -return -ENODEV ; +return err; }/**
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +2 -4
@@ -81,8 +81,7 @@ static int arm_vport_context_events_cmd(struct mlx5_core_dev *dev, u16 vport, opcode, MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);MLX5_SET (modify_nic_vport_context_in, in, field_select.change_event,1 );MLX5_SET (modify_nic_vport_context_in, in, vport_number, vport); -if (vport) -MLX5_SET (modify_nic_vport_context_in, in, other_vport,1 ); +MLX5_SET (modify_nic_vport_context_in, in, other_vport,1 ); nic_vport_ctx =MLX5_ADDR_OF (modify_nic_vport_context_in, in, nic_vport_context);
@@ -110,8 +109,7 @@ static int modify_esw_vport_context_cmd(struct mlx5_core_dev *dev, u16 vport,MLX5_SET (modify_esw_vport_context_in, in, opcode,MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT );MLX5_SET (modify_esw_vport_context_in, in, vport_number, vport); -if (vport) -MLX5_SET (modify_esw_vport_context_in, in, other_vport,1 ); +MLX5_SET (modify_esw_vport_context_in, in, other_vport,1 );return mlx5_cmd_exec (dev, in, inlen, out,sizeof (out)); }
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +1 -0
@@ -1402,6 +1402,7 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) {int err; +memset (&esw->fdb_table.offloads,0 ,sizeof (struct offloads_fdb ));mutex_init (&esw->fdb_table.offloads.fdb_prio_lock); err =esw_create_offloads_fdb_tables (esw, nvports);
drivers/net/ethernet/stmicro/stmmac/descs_com.h +14 -8
@@ -29,11 +29,13 @@/* Specific functions used for Ring mode */ /* Enhanced descriptors */ -static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end, +int bfsize) { - p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB - <<ERDES1_BUFFER2_SIZE_SHIFT ) - &ERDES1_BUFFER2_SIZE_MASK ); +if (bfsize == BUF_SIZE_16KiB) + p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB + <<ERDES1_BUFFER2_SIZE_SHIFT ) + &ERDES1_BUFFER2_SIZE_MASK );if (end) p->des1 |=cpu_to_le32 (ERDES1_END_RING );
@@ -59,11 +61,15 @@ static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len) }/* Normal descriptors */ -static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end,int bfsize) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_2KiB -1 ) - <<RDES1_BUFFER2_SIZE_SHIFT ) - &RDES1_BUFFER2_SIZE_MASK ); +if (bfsize >= BUF_SIZE_2KiB) { +int bfsize2; + + bfsize2 =min (bfsize - BUF_SIZE_2KiB +1 , BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 ((bfsize2 <<RDES1_BUFFER2_SIZE_SHIFT ) + &RDES1_BUFFER2_SIZE_MASK ); + }if (end) p->des1 |=cpu_to_le32 (RDES1_END_RING );
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +1 -1
@@ -296,7 +296,7 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc, }static void dwmac4_rd_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) {dwmac4_set_rx_owner (p, disable_rx_ic); }
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +1 -1
@@ -123,7 +123,7 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc, }static void dwxgmac2_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) {dwxgmac2_set_rx_owner (p, disable_rx_ic); }
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +16 -6
@@ -201,6 +201,11 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,if (unlikely (rdes0 &RDES0_OWN ))return dma_own; +if (unlikely (!(rdes0 &RDES0_LAST_DESCRIPTOR ))) { + stats->rx_length_errors++; +return discard_frame; + } +if (unlikely (rdes0 &RDES0_ERROR_SUMMARY )) {if (unlikely (rdes0 &RDES0_DESCRIPTOR_ERROR )) { x->rx_desc++;
@@ -231,9 +236,10 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,* It doesn't match with the information reported into the databook. * At any rate, we need to understand if the CSUM hw computation is ok * and report this info to the upper layers. */ - ret =enh_desc_coe_rdes0 (!!(rdes0 &RDES0_IPC_CSUM_ERROR ), - !!(rdes0 &RDES0_FRAME_TYPE ), - !!(rdes0 &ERDES0_RX_MAC_ADDR )); +if (likely (ret == good_frame)) + ret =enh_desc_coe_rdes0 (!!(rdes0 &RDES0_IPC_CSUM_ERROR ), + !!(rdes0 &RDES0_FRAME_TYPE ), + !!(rdes0 &ERDES0_RX_MAC_ADDR ));if (unlikely (rdes0 &RDES0_DRIBBLING )) x->dribbling_bit++;
@@ -259,15 +265,19 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x, }static void enh_desc_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 (BUF_SIZE_8KiB &ERDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_8KiB); + p->des1 |=cpu_to_le32 (bfsize1 &ERDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ehn_desc_rx_set_on_chain (p);else -ehn_desc_rx_set_on_ring (p, end); +ehn_desc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (ERDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/hwif.h +1 -1
@@ -33,7 +33,7 @@ struct dma_extended_desc;struct stmmac_desc_ops {/* DMA RX descriptor ring initialization */ void (*init_rx_desc)(struct dma_desc *p,int disable_rx_ic,int mode, -int end); +int end,int bfsize);/* DMA TX descriptor ring initialization */ void (*init_tx_desc)(struct dma_desc *p,int mode,int end);/* Invoked by the xmit function to prepare the tx descriptor */
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +7 -5
@@ -91,8 +91,6 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,return dma_own;if (unlikely (!(rdes0 &RDES0_LAST_DESCRIPTOR ))) { -pr_warn ("%s: Oversized frame spanned multiple buffers\n" , - __func__); stats->rx_length_errors++;return discard_frame; }
@@ -135,15 +133,19 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x, }static void ndesc_init_rx_desc (struct dma_desc *p,int disable_rx_ic,int mode, -int end) +int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_2KiB -1 ) &RDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 (bfsize &RDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ndesc_rx_set_on_chain (p, end);else -ndesc_rx_set_on_ring (p, end); +ndesc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (RDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +19 -15
@@ -1114,11 +1114,13 @@ static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, u32 queue)if (priv->extend_desc)stmmac_init_rx_desc (priv, &rx_q->dma_erx[i].basic, priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), + priv->dma_buf_sz);else stmmac_init_rx_desc (priv, &rx_q->dma_rx[i], priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), + priv->dma_buf_sz); }/**
@@ -3326,9 +3328,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) {struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];struct stmmac_channel *ch = &priv->channel[queue]; -unsigned int entry = rx_q->cur_rx; +unsigned int next_entry = rx_q->cur_rx;int coe = priv->hw->rx_csum; -unsigned int next_entry;unsigned int count =0 ;bool xmac;
@@ -3346,10 +3347,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)stmmac_display_ring (priv, rx_head,DMA_RX_SIZE , true); }while (count < limit) { -int status; +int entry, status;struct dma_desc *p;struct dma_desc *np; + entry = next_entry; +if (priv->extend_desc) p = (struct dma_desc *)(rx_q->dma_erx + entry);else
@@ -3405,11 +3408,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)* ignored */ if (frame_len > priv->dma_buf_sz) { -netdev_err (priv->dev, -"len %d larger than size (%d)\n" , - frame_len, priv->dma_buf_sz); +if (net_ratelimit ()) +netdev_err (priv->dev, +"len %d larger than size (%d)\n" , + frame_len, priv->dma_buf_sz); priv->dev->stats.rx_length_errors++; -break ; +continue ; }/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
@@ -3444,7 +3448,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)dev_warn (priv->device,"packet dropped\n" ); priv->dev->stats.rx_dropped++; -break ; +continue ; } dma_sync_single_for_cpu(priv->device,
@@ -3464,11 +3468,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) }else { skb = rx_q->rx_skbuff[entry];if (unlikely (!skb)) { -netdev_err (priv->dev, -"%s: Inconsistent Rx chain\n" , - priv->dev->name); +if (net_ratelimit ()) +netdev_err (priv->dev, +"%s: Inconsistent Rx chain\n" , + priv->dev->name); priv->dev->stats.rx_dropped++; -break ; +continue ; }prefetch (skb->data -NET_IP_ALIGN ); rx_q->rx_skbuff[entry] =NULL ;
@@ -3503,7 +3508,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) priv->dev->stats.rx_packets++; priv->dev->stats.rx_bytes += frame_len; } - entry = next_entry; }stmmac_rx_refill (priv, queue);
drivers/net/wireless/intel/iwlwifi/cfg/5000.c +2 -1
@@ -1,7 +1,7 @@/****************************************************************************** * * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved. -* Copyright(c) 2018 Intel Corporation +* Copyright(c) 2018 - 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as
@@ -136,6 +136,7 @@ const struct iwl_cfg iwl5350_agn_cfg = { .ht_params = &iwl5000_ht_params, .led_mode = IWL_LED_BLINK, .internal_wimax_coex = true, + .csr = &iwl_csr_v1, };#define IWL_DEVICE_5150 \
drivers/net/wireless/marvell/mwifiex/sdio.c +1 -1
@@ -181,7 +181,7 @@ static int mwifiex_sdio_resume(struct device *dev) adapter = card->adapter; -if (test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) { +if (!test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) {mwifiex_dbg (adapter,WARN ,"device already resumed\n" );return 0 ;
drivers/platform/x86/intel_pmc_core.c +2 -2
@@ -205,7 +205,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = { {"CNVI", BIT(3)}, {"UFS0", BIT(4)}, {"EMMC", BIT(5)}, - {"Res_6", BIT(6)}, + {"SPF", BIT(6)}, {"SBR6", BIT(7)}, {"SBR7", BIT(0)},
@@ -802,7 +802,7 @@ static int __init pmc_core_probe(void)* Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap * in this case. */ -if (!pci_dev_present (pmc_pci_ids)) +if (pmcdev->map == &spt_reg_map && !pci_dev_present (pmc_pci_ids)) pmcdev->map = &cnp_reg_map;if (lpit_read_residency_count_address (&slp_s0_addr))
drivers/platform/x86/pmc_atom.c +21 -0
@@ -17,6 +17,7 @@#include <linux/debugfs.h> #include <linux/device.h> +#include <linux/dmi.h> #include <linux/init.h> #include <linux/io.h> #include <linux/platform_data/x86/clk-pmc-atom.h>
@@ -391,11 +392,27 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc) }#endif /* CONFIG_DEBUG_FS */ +/* +* Some systems need one or more of their pmc_plt_clks to be +* marked as critical. +*/ +static const struct dmi_system_id critclk_systems[]__initconst = { + { + .ident ="MPL CEC1x" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MPL AG" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"CEC10 Family" ), + }, + }, + {/*sentinel*/ } +}; +static int pmc_setup_clks (struct pci_dev *pdev,void __iomem *pmc_regmap,const struct pmc_data *pmc_data) {struct platform_device *clkdev;struct pmc_clk_data *clk_data; +const struct dmi_system_id *d =dmi_first_match (critclk_systems); clk_data =kzalloc (sizeof (*clk_data),GFP_KERNEL );if (!clk_data)
@@ -403,6 +420,10 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap, clk_data->base = pmc_regmap;/* offset is added by client */ clk_data->clks = pmc_data->clks; +if (d) { + clk_data->critical = true; +pr_info ("%s critclks quirk enabled\n" , d->ident); + } clkdev = platform_device_register_data(&pdev->dev, "clk-pmc-atom", PLATFORM_DEVID_NONE,
drivers/reset/reset-meson-audio-arb.c +1 -0
@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) arb->rstc.nr_resets =ARRAY_SIZE (axg_audio_arb_reset_bits); arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.of_node = dev->of_node; + arb->rstc.owner =THIS_MODULE ;/* * Enable general :
drivers/rtc/rtc-cros-ec.c +2 -2
@@ -298,7 +298,7 @@ static int cros_ec_rtc_suspend(struct device *dev)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (&pdev->dev);if (device_may_wakeup (dev)) -enable_irq_wake (cros_ec_rtc->cros_ec->irq); +return enable_irq_wake (cros_ec_rtc->cros_ec->irq);return 0 ; }
@@ -309,7 +309,7 @@ static int cros_ec_rtc_resume(struct device *dev)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (&pdev->dev);if (device_may_wakeup (dev)) -disable_irq_wake (cros_ec_rtc->cros_ec->irq); +return disable_irq_wake (cros_ec_rtc->cros_ec->irq);return 0 ; }
drivers/rtc/rtc-da9063.c +7 -0
@@ -480,6 +480,13 @@ static int da9063_rtc_probe(struct platform_device *pdev)da9063_data_to_tm (data, &rtc->alarm_time, rtc); rtc->rtc_sync = false; +/* +* TODO: some models have alarms on a minute boundary but still support +* real hardware interrupts. Add this once the core supports it. +*/ +if (config->rtc_data_start !=RTC_SEC ) + rtc->rtc_dev->uie_unsupported =1 ; + irq_alarm =platform_get_irq_byname (pdev,"ALARM" ); ret = devm_request_threaded_irq(&pdev->dev, irq_alarm, NULL, da9063_alarm_event,
drivers/rtc/rtc-sh.c +1 -1
@@ -374,7 +374,7 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm)static inline int sh_rtc_read_alarm_value (struct sh_rtc *rtc,int reg_off) {unsigned int byte; -int value =0xff ;/* return 0xff for ignored values */ +int value =-1 ;/* return -1 for ignored values */ byte =readb (rtc->regbase + reg_off);if (byte &AR_ENB ) {
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +2 -1
@@ -1033,8 +1033,8 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba,struct sas_ssp_task *ssp_task = &task->ssp_task;struct scsi_cmnd *scsi_cmnd = ssp_task->cmd;struct hisi_sas_tmf_task *tmf = slot->tmf; -unsigned char prot_op =scsi_get_prot_op (scsi_cmnd);int has_data =0 , priority = !!tmf; +unsigned char prot_op;u8 *buf_cmd;u32 dw1 =0 , dw2 =0 , len =0 ;
@@ -1049,6 +1049,7 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba, dw1 |=2 <<CMD_HDR_FRAME_TYPE_OFF ; dw1 |=DIR_NO_DATA <<CMD_HDR_DIR_OFF ; }else { + prot_op =scsi_get_prot_op (scsi_cmnd); dw1 |=1 <<CMD_HDR_FRAME_TYPE_OFF ;switch (scsi_cmnd->sc_data_direction) {case DMA_TO_DEVICE :
drivers/scsi/scsi_devinfo.c +1 -0
@@ -238,6 +238,7 @@ static struct { {"NETAPP", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN}, {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
drivers/scsi/scsi_dh.c +1 -0
@@ -75,6 +75,7 @@ static const struct scsi_dh_blist scsi_dh_blist[] = { {"NETAPP", "INF-01-00", "rdac", }, {"LSI", "INF-01-00", "rdac", }, {"ENGENIO", "INF-01-00", "rdac", }, + {"LENOVO", "DE_Series", "rdac", }, {NULL, NULL, NULL }, };
drivers/scsi/storvsc_drv.c +11 -2
@@ -668,13 +668,22 @@ static void handle_multichannel_storage(struct hv_device *device, int max_chns) {struct device *dev = &device->device;struct storvsc_device *stor_device; -int num_cpus =num_online_cpus ();int num_sc;struct storvsc_cmd_request *request;struct vstor_packet *vstor_packet;int ret, t; - num_sc = ((max_chns > num_cpus) ? num_cpus : max_chns); +/* +* If the number of CPUs is artificially restricted, such as +* with maxcpus=1 on the kernel boot line, Hyper-V could offer +* sub-channels >= the number of CPUs. These sub-channels +* should not be created. The primary channel is already created +* and assigned to one CPU, so check against # CPUs - 1. +*/ + num_sc =min ((int )(num_online_cpus () -1 ), max_chns); +if (!num_sc) +return ; + stor_device =get_out_stor_device (device);if (!stor_device)return ;
drivers/staging/iio/addac/adt7316.c +22 -12
@@ -47,6 +47,8 @@#define ADT7516_MSB_AIN3 0xA#define ADT7516_MSB_AIN4 0xB#define ADT7316_DA_DATA_BASE 0x10 +#define ADT7316_DA_10_BIT_LSB_SHIFT 6 +#define ADT7316_DA_12_BIT_LSB_SHIFT 4#define ADT7316_DA_MSB_DATA_REGS 4#define ADT7316_LSB_DAC_A 0x10#define ADT7316_MSB_DAC_A 0x11
@@ -632,9 +634,7 @@ static ssize_t adt7316_show_da_high_resolution(struct device *dev,struct adt7316_chip_info *chip =iio_priv (dev_info);if (chip->config3 &ADT7316_DA_HIGH_RESOLUTION ) { -if (chip->id ==ID_ADT7316 || chip->id ==ID_ADT7516 ) -return sprintf (buf,"1 (12 bits)\n" ); -if (chip->id ==ID_ADT7317 || chip->id ==ID_ADT7517 ) +if (chip->id !=ID_ADT7318 && chip->id !=ID_ADT7519 )return sprintf (buf,"1 (10 bits)\n" ); }
@@ -651,10 +651,12 @@ static ssize_t adt7316_store_da_high_resolution(struct device *dev,u8 config3;int ret; +if (chip->id ==ID_ADT7318 || chip->id ==ID_ADT7519 ) +return -EPERM ; + + config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION );if (buf[0 ] =='1' ) - config3 = chip->config3 |ADT7316_DA_HIGH_RESOLUTION ; -else - config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION ); + config3 |=ADT7316_DA_HIGH_RESOLUTION ; ret = chip->bus.write (chip->bus.client,ADT7316_CONFIG3 , config3);if (ret)
@@ -1079,7 +1081,7 @@ static ssize_t adt7316_store_DAC_internal_Vref(struct device *dev, ldac_config = chip->ldac_config & (~ADT7516_DAC_IN_VREF_MASK );if (data &0x1 ) ldac_config |=ADT7516_DAC_AB_IN_VREF ; -else if (data &0x2 ) +if (data &0x2 ) ldac_config |=ADT7516_DAC_CD_IN_VREF ; }else { ret =kstrtou8 (buf,16 , &data);
@@ -1403,7 +1405,7 @@ static IIO_DEVICE_ATTR(ex_analog_temp_offset, 0644,static ssize_t adt7316_show_DAC (struct adt7316_chip_info *chip,int channel,char *buf) { -u16 data; +u16 data =0 ;u8 msb, lsb, offset;int ret;
@@ -1428,7 +1430,11 @@ static ssize_t adt7316_show_DAC(struct adt7316_chip_info *chip,if (ret)return -EIO ; - data = (msb << offset) + (lsb & ((1 << offset) -1 )); +if (chip->dac_bits ==12 ) + data = lsb >>ADT7316_DA_12_BIT_LSB_SHIFT ; +else if (chip->dac_bits ==10 ) + data = lsb >>ADT7316_DA_10_BIT_LSB_SHIFT ; + data |= msb << offset;return sprintf (buf,"%d\n" , data); }
@@ -1436,7 +1442,7 @@ static ssize_t adt7316_show_DAC(struct adt7316_chip_info *chip,static ssize_t adt7316_store_DAC (struct adt7316_chip_info *chip,int channel,const char *buf,size_t len) { -u8 msb, lsb, offset; +u8 msb, lsb, lsb_reg, offset;u16 data;int ret;
@@ -1454,9 +1460,13 @@ static ssize_t adt7316_store_DAC(struct adt7316_chip_info *chip,return -EINVAL ;if (chip->dac_bits >8 ) { - lsb = data & (1 << offset); + lsb = data & ((1 << offset) -1 ); +if (chip->dac_bits ==12 ) + lsb_reg = lsb <<ADT7316_DA_12_BIT_LSB_SHIFT ; +else + lsb_reg = lsb <<ADT7316_DA_10_BIT_LSB_SHIFT ; ret = chip->bus.write (chip->bus.client, -ADT7316_DA_DATA_BASE + channel *2 , lsb); +ADT7316_DA_DATA_BASE + channel *2 , lsb_reg);if (ret)return -EIO ; }
drivers/usb/core/driver.c +0 -13
@@ -473,11 +473,6 @@ static int usb_unbind_interface(struct device *dev)pm_runtime_disable (dev);pm_runtime_set_suspended (dev); -/* Undo any residual pm_autopm_get_interface_* calls */ -for (r =atomic_read (&intf->pm_usage_cnt); r >0 ; --r) -usb_autopm_put_interface_no_suspend (intf); -atomic_set (&intf->pm_usage_cnt,0 ); -if (!error)usb_autosuspend_device (udev);
@@ -1633,7 +1628,6 @@ void usb_autopm_put_interface(struct usb_interface *intf)int status;usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt); status =pm_runtime_put_sync (&intf->dev); dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n", __func__, atomic_read(&intf->dev.power.usage_count),
@@ -1662,7 +1656,6 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)int status;usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt); status =pm_runtime_put (&intf->dev); dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n", __func__, atomic_read(&intf->dev.power.usage_count),
@@ -1684,7 +1677,6 @@ void usb_autopm_put_interface_no_suspend(struct usb_interface *intf)struct usb_device *udev =interface_to_usbdev (intf);usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt);pm_runtime_put_noidle (&intf->dev); }EXPORT_SYMBOL_GPL (usb_autopm_put_interface_no_suspend);
@@ -1715,8 +1707,6 @@ int usb_autopm_get_interface(struct usb_interface *intf) status =pm_runtime_get_sync (&intf->dev);if (status <0 )pm_runtime_put_sync (&intf->dev); -else -atomic_inc (&intf->pm_usage_cnt);dev_vdbg (&intf->dev,"%s: cnt %d -> %d\n" , __func__,atomic_read (&intf->dev.power.usage_count), status);
@@ -1750,8 +1740,6 @@ int usb_autopm_get_interface_async(struct usb_interface *intf) status =pm_runtime_get (&intf->dev);if (status <0 && status != -EINPROGRESS )pm_runtime_put_noidle (&intf->dev); -else -atomic_inc (&intf->pm_usage_cnt);dev_vdbg (&intf->dev,"%s: cnt %d -> %d\n" , __func__,atomic_read (&intf->dev.power.usage_count), status);
@@ -1775,7 +1763,6 @@ void usb_autopm_get_interface_no_resume(struct usb_interface *intf)struct usb_device *udev =interface_to_usbdev (intf);usb_mark_last_busy (udev); -atomic_inc (&intf->pm_usage_cnt);pm_runtime_get_noresume (&intf->dev); }EXPORT_SYMBOL_GPL (usb_autopm_get_interface_no_resume);
drivers/usb/core/message.c +3 -1
@@ -820,9 +820,11 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)if (dev->state ==USB_STATE_SUSPENDED )return -EHOSTUNREACH ; -if (size <=0 || !buf || !index) +if (size <=0 || !buf)return -EINVAL ; buf[0 ] =0 ; +if (index <=0 || index >=256 ) +return -EINVAL ; tbuf =kmalloc (256 ,GFP_NOIO );if (!tbuf)return -ENOMEM ;
drivers/usb/dwc3/gadget.c +2 -0
@@ -1506,6 +1506,8 @@ static void dwc3_gadget_ep_skip_trbs(struct dwc3_ep *dep, struct dwc3_request *r trb->ctrl &= ~DWC3_TRB_CTRL_HWO ;dwc3_ep_inc_deq (dep); } + + req->num_trbs =0 ; }static void dwc3_gadget_ep_cleanup_cancelled_requests (struct dwc3_ep *dep)
drivers/usb/gadget/udc/dummy_hcd.c +15 -4
@@ -979,8 +979,18 @@ static int dummy_udc_start(struct usb_gadget *g,struct dummy_hcd *dum_hcd =gadget_to_dummy_hcd (g);struct dummy *dum = dum_hcd->dum; -if (driver->max_speed ==USB_SPEED_UNKNOWN ) +switch (g->speed) { +/* All the speeds we support */ +case USB_SPEED_LOW : +case USB_SPEED_FULL : +case USB_SPEED_HIGH : +case USB_SPEED_SUPER : +break ; +default : +dev_err (dummy_dev (dum_hcd),"Unsupported driver max speed %d\n" , + driver->max_speed);return -EINVAL ; + }/* * SLAVE side init ... the layer above hardware, which
@@ -1784,9 +1794,10 @@ static void dummy_timer(struct timer_list *t)/* Bus speed is 500000 bytes/ms, so use a little less */ total =490000 ;break ; -default : +default :/* Can't happen */ dev_err (dummy_dev (dum_hcd),"bogus device speed\n" ); -return ; + total =0 ; +break ; }/* FIXME if HZ != 1000 this will probably misbehave ... */
@@ -1828,7 +1839,7 @@ static void dummy_timer(struct timer_list *t)/* Used up this frame's bandwidth? */ if (total <=0 ) -break ; +continue ;/* find the gadget's ep for this request (if configured) */ address =usb_pipeendpoint (urb->pipe);
drivers/usb/misc/yurex.c +1 -0
@@ -314,6 +314,7 @@ static void yurex_disconnect(struct usb_interface *interface)usb_deregister_dev (interface, &yurex_class);/* prevent more I/O from starting */ +usb_poison_urb (dev->urb);mutex_lock (&dev->io_mutex); dev->interface =NULL ;mutex_unlock (&dev->io_mutex);
drivers/usb/storage/realtek_cr.c +5 -8
@@ -763,18 +763,16 @@ static void rts51x_suspend_timer_fn(struct timer_list *t)break ;case RTS51X_STAT_IDLE :case RTS51X_STAT_SS : -usb_stor_dbg (us,"RTS51X_STAT_SS, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"RTS51X_STAT_SS, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); -if (atomic_read (&us->pusb_intf->pm_usage_cnt) >0 ) { +if (atomic_read (&us->pusb_intf->dev.power.usage_count) >0 ) {usb_stor_dbg (us,"Ready to enter SS state\n" );rts51x_set_stat (chip,RTS51X_STAT_SS );/* ignore mass storage interface's children */ pm_suspend_ignore_children (&us->pusb_intf->dev, true);usb_autopm_put_interface_async (us->pusb_intf); -usb_stor_dbg (us,"RTS51X_STAT_SS 01, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"RTS51X_STAT_SS 01, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); }break ;
@@ -807,11 +805,10 @@ static void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)int ret;if (working_scsi (srb)) { -usb_stor_dbg (us,"working scsi, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"working scsi, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); -if (atomic_read (&us->pusb_intf->pm_usage_cnt) <=0 ) { +if (atomic_read (&us->pusb_intf->dev.power.usage_count) <=0 ) { ret =usb_autopm_get_interface (us->pusb_intf);usb_stor_dbg (us,"working scsi, ret=%d\n" , ret); }
drivers/usb/usbip/stub_rx.c +3 -9
@@ -361,16 +361,10 @@ static int get_pipe(struct stub_device *sdev, struct usbip_header *pdu) }if (usb_endpoint_xfer_isoc (epd)) { -/* validate packet size and number of packets */ -unsigned int maxp, packets, bytes; - - maxp =usb_endpoint_maxp (epd); - maxp *=usb_endpoint_maxp_mult (epd); - bytes = pdu->u.cmd_submit.transfer_buffer_length; - packets =DIV_ROUND_UP (bytes, maxp); - +/* validate number of packets */ if (pdu->u.cmd_submit.number_of_packets <0 || - pdu->u.cmd_submit.number_of_packets > packets) { + pdu->u.cmd_submit.number_of_packets > +USBIP_MAX_ISO_PACKETS ) {dev_err (&sdev->udev->dev,"CMD_SUBMIT: isoc invalid num packets %d\n" , pdu->u.cmd_submit.number_of_packets);
drivers/usb/usbip/usbip_common.h +7 -0
@@ -121,6 +121,13 @@ extern struct device_attribute dev_attr_usbip_debug;#define USBIP_DIR_OUT 0x00#define USBIP_DIR_IN 0x01 +/* +* Arbitrary limit for the maximum number of isochronous packets in an URB, +* compare for example the uhci_submit_isochronous function in +* drivers/usb/host/uhci-q.c +*/ +#define USBIP_MAX_ISO_PACKETS 1024 +/** * struct usbip_header_basic - data pertinent to every request * @command: the usbip request type
drivers/vfio/pci/vfio_pci.c +2 -2
@@ -1597,11 +1597,11 @@ static void __init vfio_pci_fill_ids(void) rc =pci_add_dynid (&vfio_pci_driver, vendor, device, subvendor, subdevice, class, class_mask,0 );if (rc) -pr_warn ("failed to add dynamic id [%04hx:%04hx[%04hx:%04hx]] class %#08x/%08x (%d)\n" , +pr_warn ("failed to add dynamic id [%04x:%04x[%04x:%04x]] class %#08x/%08x (%d)\n" , vendor, device, subvendor, subdevice, class, class_mask, rc);else -pr_info ("add [%04hx:%04hx[%04hx:%04hx]] class %#08x/%08x\n" , +pr_info ("add [%04x:%04x[%04x:%04x]] class %#08x/%08x\n" , vendor, device, subvendor, subdevice, class, class_mask); }
drivers/w1/masters/ds2490.c +3 -3
@@ -1016,15 +1016,15 @@ static int ds_probe(struct usb_interface *intf,/* alternative 3, 1ms interrupt (greatly speeds search), 64 byte bulk */ alt =3 ; err =usb_set_interface (dev->udev, - intf->altsetting[alt].desc.bInterfaceNumber, alt); + intf->cur_altsetting->desc.bInterfaceNumber, alt);if (err) {dev_err (&dev->udev->dev,"Failed to set alternative setting %d " "for %d interface: err=%d.\n" , alt, - intf->altsetting[alt].desc.bInterfaceNumber, err); + intf->cur_altsetting->desc.bInterfaceNumber, err); goto err_out_clear; } - iface_desc = &intf->altsetting[alt]; + iface_desc = intf->cur_altsetting;if (iface_desc->desc.bNumEndpoints !=NUM_EP -1 ) {pr_info ("Num endpoints=%d. It is not DS9490R.\n" , iface_desc->desc.bNumEndpoints);
drivers/xen/xenbus/xenbus_dev_frontend.c +1 -3
@@ -622,9 +622,7 @@ static int xenbus_file_open(struct inode *inode, struct file *filp)if (xen_store_evtchn ==0 )return -ENOENT ; -nonseekable_open (inode, filp); - - filp->f_mode &= ~FMODE_ATOMIC_POS ;/* cdev-style semantics */ +stream_open (inode, filp); u =kzalloc (sizeof (*u),GFP_KERNEL );if (u ==NULL )
fs/debugfs/inode.c +9 -4
@@ -163,19 +163,24 @@ static int debugfs_show_options(struct seq_file *m, struct dentry *root)return 0 ; } -static void debugfs_evict_inode (struct inode *inode) +static void debugfs_i_callback (struct rcu_head *head) { -truncate_inode_pages_final (&inode->i_data); -clear_inode (inode); + struct inode *inode = container_of(head, struct inode, i_rcu);if (S_ISLNK (inode->i_mode))kfree (inode->i_link); +free_inode_nonrcu (inode); +} + +static void debugfs_destroy_inode (struct inode *inode) +{ +call_rcu (&inode->i_rcu, debugfs_i_callback); }static const struct super_operations debugfs_super_operations = { .statfs = simple_statfs, .remount_fs = debugfs_remount, .show_options = debugfs_show_options, - .evict_inode = debugfs_evict_inode, + .destroy_inode = debugfs_destroy_inode, };static void debugfs_release_dentry (struct dentry *dentry)
fs/hugetlbfs/inode.c +14 -6
@@ -741,11 +741,17 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, umode_t mode, dev_t dev) {struct inode *inode; -struct resv_map *resv_map; +struct resv_map *resv_map =NULL ; - resv_map =resv_map_alloc (); -if (!resv_map) -return NULL ; +/* +* Reserve maps are only needed for inodes that can have associated +* page allocations. +*/ +if (S_ISREG (mode) ||S_ISLNK (mode)) { + resv_map =resv_map_alloc (); +if (!resv_map) +return NULL ; + } inode =new_inode (sb);if (inode) {
@@ -780,8 +786,10 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,break ; }lockdep_annotate_inode_mutex_key (inode); - }else -kref_put (&resv_map->refs, resv_map_release); + }else { +if (resv_map) +kref_put (&resv_map->refs, resv_map_release); + }return inode; }
fs/jffs2/readinode.c +0 -5
@@ -1414,11 +1414,6 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f)jffs2_kill_fragtree (&f->fragtree, deleted?c:NULL ); -if (f->target) { -kfree (f->target); - f->target =NULL ; - } - fds = f->dents;while (fds) { fd = fds;
fs/jffs2/super.c +4 -1
@@ -47,7 +47,10 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb)static void jffs2_i_callback (struct rcu_head *head) { struct inode *inode = container_of(head, struct inode, i_rcu); -kmem_cache_free (jffs2_inode_cachep,JFFS2_INODE_INFO (inode)); +struct jffs2_inode_info *f =JFFS2_INODE_INFO (inode); + +kfree (f->target); +kmem_cache_free (jffs2_inode_cachep, f); }static void jffs2_destroy_inode (struct inode *inode)
fs/open.c +18 -0
@@ -1215,3 +1215,21 @@ int nonseekable_open(struct inode *inode, struct file *filp) }EXPORT_SYMBOL (nonseekable_open); + +/* +* stream_open is used by subsystems that want stream-like file descriptors. +* Such file descriptors are not seekable and don't have notion of position +* (file.f_pos is always 0). Contrary to file descriptors of other regular +* files, .read() and .write() can run simultaneously. +* +* stream_open never fails and is marked to return int so that it could be +* directly used as file_operations.open . +*/ +int stream_open (struct inode *inode,struct file *filp) +{ + filp->f_mode &= ~(FMODE_LSEEK |FMODE_PREAD |FMODE_PWRITE |FMODE_ATOMIC_POS ); + filp->f_mode |=FMODE_STREAM ; +return 0 ; +} + +EXPORT_SYMBOL (stream_open);
fs/read_write.c +3 -2
@@ -560,12 +560,13 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_static inline loff_t file_pos_read (struct file *file) { -return file->f_pos; +return file->f_mode &FMODE_STREAM ?0 : file->f_pos; }static inline void file_pos_write (struct file *file,loff_t pos) { - file->f_pos = pos; +if ((file->f_mode &FMODE_STREAM ) ==0 ) + file->f_pos = pos; }ssize_t ksys_read (unsigned int fd,char __user *buf,size_t count)
include/linux/fs.h +4 -0
@@ -153,6 +153,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,#define FMODE_OPENED ((__force fmode_t)0x80000)#define FMODE_CREATED ((__force fmode_t)0x100000) +/* File is stream-like */ +#define FMODE_STREAM ((__force fmode_t)0x200000) +/* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
@@ -3074,6 +3077,7 @@ extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t);extern loff_t no_seek_end_llseek (struct file *,loff_t ,int );extern int generic_file_open (struct inode * inode,struct file * filp);extern int nonseekable_open (struct inode * inode,struct file * filp); +extern int stream_open (struct inode * inode,struct file * filp);#ifdef CONFIG_BLOCK typedef void (dio_submit_t)(struct bio *bio, struct inode *inode,
include/linux/platform_data/x86/clk-pmc-atom.h +3 -0
@@ -35,10 +35,13 @@ struct pmc_clk {* * @base: PMC clock register base offset * @clks: pointer to set of registered clocks, typically 0..5 +* @critical: flag to indicate if firmware enabled pmc_plt_clks +* should be marked as critial or not */ struct pmc_clk_data {void __iomem *base;const struct pmc_clk *clks; +bool critical; };#endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */
include/linux/usb.h +0 -2
@@ -200,7 +200,6 @@ usb_find_last_int_out_endpoint(struct usb_host_interface *alt,* @dev: driver model's view of this device * @usb_dev: if an interface is bound to the USB major, this will point * to the sysfs representation for that device. -* @pm_usage_cnt: PM usage counter for this interface * @reset_ws: Used for scheduling resets from atomic context. * @resetting_device: USB core reset the device, so use alt setting 0 as * current; needs bandwidth alloc after reset.
@@ -257,7 +256,6 @@ struct usb_interface {struct device dev;/* interface specific device info */ struct device *usb_dev; -atomic_t pm_usage_cnt;/* usage counter for autosuspend */ struct work_struct reset_ws;/* for resets in atomic context */ };#define to_usb_interface (d) container_of(d, struct usb_interface, dev)
kernel/bpf/cpumap.c +10 -3
@@ -162,10 +162,14 @@ static void cpu_map_kthread_stop(struct work_struct *work)static struct sk_buff *cpu_map_build_skb (struct bpf_cpu_map_entry *rcpu,struct xdp_frame *xdpf) { +unsigned int hard_start_headroom;unsigned int frame_size;void *pkt_data_start;struct sk_buff *skb; +/* Part of headroom was reserved to xdpf */ + hard_start_headroom =sizeof (struct xdp_frame ) + xdpf->headroom; +/* build_skb need to place skb_shared_info after SKB end, and * also want to know the memory "truesize". Thus, need to * know the memory frame size backing xdp_buff.
@@ -183,15 +187,15 @@ static struct sk_buff *cpu_map_build_skb(struct bpf_cpu_map_entry *rcpu,* is not at a fixed memory location, with mixed length * packets, which is bad for cache-line hotness. */ - frame_size =SKB_DATA_ALIGN (xdpf->len + xdpf->headroom) + + frame_size =SKB_DATA_ALIGN (xdpf->len + hard_start_headroom) +SKB_DATA_ALIGN (sizeof (struct skb_shared_info )); - pkt_data_start = xdpf->data - xdpf->headroom; + pkt_data_start = xdpf->data - hard_start_headroom; skb =build_skb (pkt_data_start, frame_size);if (!skb)return NULL ; -skb_reserve (skb, xdpf->headroom); +skb_reserve (skb, hard_start_headroom);__skb_put (skb, xdpf->len);if (xdpf->metasize)skb_metadata_set (skb, xdpf->metasize);
@@ -205,6 +209,9 @@ static struct sk_buff *cpu_map_build_skb(struct bpf_cpu_map_entry *rcpu,* - RX ring dev queue index (skb_record_rx_queue) */ +/* Allow SKB to reuse area used by xdp_frame */ +xdp_scrub_frame (xdpf); +return skb; }
kernel/seccomp.c +15 -2
@@ -500,7 +500,10 @@ seccomp_prepare_user_filter(const char __user *user_filter)* * Caller must be holding current->sighand->siglock lock. * -* Returns 0 on success, -ve on error. +* Returns 0 on success, -ve on error, or +* - in TSYNC mode: the pid of a thread which was either not in the correct +* seccomp mode or did not have an ancestral seccomp filter +* - in NEW_LISTENER mode: the fd of the new listener */ static long seccomp_attach_filter (unsigned int flags,struct seccomp_filter *filter)
@@ -1256,6 +1259,16 @@ static long seccomp_set_mode_filter(unsigned int flags,if (flags & ~SECCOMP_FILTER_FLAG_MASK )return -EINVAL ; +/* +* In the successful case, NEW_LISTENER returns the new listener fd. +* But in the failure case, TSYNC returns the thread that died. If you +* combine these two flags, there's no way to tell whether something +* succeeded or failed. So, let's disallow this combination. +*/ +if ((flags &SECCOMP_FILTER_FLAG_TSYNC ) && + (flags &SECCOMP_FILTER_FLAG_NEW_LISTENER )) +return -EINVAL ; +/* Prepare the new filter before holding any locks. */ prepared =seccomp_prepare_user_filter (filter);if (IS_ERR (prepared))
@@ -1302,7 +1315,7 @@ static long seccomp_set_mode_filter(unsigned int flags,mutex_unlock (¤t->signal->cred_guard_mutex); out_put_fd:if (flags &SECCOMP_FILTER_FLAG_NEW_LISTENER ) { -if (ret <0 ) { +if (ret) { listener_f->private_data =NULL ;fput (listener_f);put_unused_fd (listener);
mm/kmemleak.c +13 -5
@@ -1401,6 +1401,7 @@ static void scan_block(void *_start, void *_end,/* * Scan a large memory block in MAX_SCAN_SIZE chunks to reduce the latency. */ +#ifdef CONFIG_SMP static void scan_large_block (void *start,void *end) {void *next;
@@ -1412,6 +1413,7 @@ static void scan_large_block(void *start, void *end) cond_resched(); } } +#endif /* * Scan a memory block corresponding to a kmemleak_object. A condition is
@@ -1529,11 +1531,6 @@ static void kmemleak_scan(void) }rcu_read_unlock (); -/* data/bss scanning */ -scan_large_block (_sdata, _edata); -scan_large_block (__bss_start, __bss_stop); -scan_large_block (__start_ro_after_init, __end_ro_after_init); -#ifdef CONFIG_SMP /* per-cpu sections scanning */ for_each_possible_cpu (i)
@@ -2071,6 +2068,17 @@ void __init kmemleak_init(void) }local_irq_restore (flags); +/* register the data/bss sections */ +create_object ((unsigned long )_sdata, _edata - _sdata, +KMEMLEAK_GREY ,GFP_ATOMIC ); +create_object ((unsigned long )__bss_start, __bss_stop - __bss_start, +KMEMLEAK_GREY ,GFP_ATOMIC ); +/* only register .data..ro_after_init if not within .data */ +if (__start_ro_after_init < _sdata || __end_ro_after_init > _edata) +create_object ((unsigned long )__start_ro_after_init, + __end_ro_after_init - __start_ro_after_init, +KMEMLEAK_GREY ,GFP_ATOMIC ); +/* * This is the point where tracking allocations is safe. Automatic * scanning is started during the late initcall. Add the early logged
net/batman-adv/bat_v_elp.c +4 -2
@@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) ret =cfg80211_get_station (real_netdev, neigh->addr, &sinfo); -/* free the TID stats immediately */ -cfg80211_sinfo_release_content (&sinfo); +if (!ret) { +/* free the TID stats immediately */ +cfg80211_sinfo_release_content (&sinfo); + }dev_put (real_netdev);if (ret == -ENOENT ) {
net/batman-adv/bridge_loop_avoidance.c +13 -3
@@ -803,6 +803,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, const u8 *mac, const unsigned short vid) {struct batadv_bla_claim search_claim, *claim; +struct batadv_bla_claim *claim_removed_entry; +struct hlist_node *claim_removed_node;ether_addr_copy (search_claim.addr, mac); search_claim.vid = vid;
@@ -813,10 +815,18 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,batadv_dbg (BATADV_DBG_BLA , bat_priv,"%s(): %pM, vid %d\n" , __func__, mac,batadv_print_vid (vid)); -batadv_hash_remove (bat_priv->bla.claim_hash, batadv_compare_claim, - batadv_choose_claim, claim); -batadv_claim_put (claim);/* reference from the hash is gone */ + claim_removed_node =batadv_hash_remove (bat_priv->bla.claim_hash, + batadv_compare_claim, + batadv_choose_claim, claim); +if (!claim_removed_node) + goto free_claim; +/* reference from the hash is gone */ + claim_removed_entry =hlist_entry (claim_removed_node, + struct batadv_bla_claim, hash_entry); +batadv_claim_put (claim_removed_entry); + +free_claim:/* don't need the reference from hash_find() anymore */ batadv_claim_put (claim); }
net/batman-adv/translation-table.c +24 -8
@@ -616,14 +616,26 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,struct batadv_tt_global_entry *tt_global, const char *message) { + struct batadv_tt_global_entry *tt_removed_entry; +struct hlist_node *tt_removed_node; +batadv_dbg (BATADV_DBG_TT , bat_priv,"Deleting global tt entry %pM (vid: %d): %s\n" , tt_global->common.addr,batadv_print_vid (tt_global->common.vid), message); -batadv_hash_remove (bat_priv->tt.global_hash, batadv_compare_tt, - batadv_choose_tt, &tt_global->common); -batadv_tt_global_entry_put (tt_global); + tt_removed_node =batadv_hash_remove (bat_priv->tt.global_hash, + batadv_compare_tt, + batadv_choose_tt, + &tt_global->common); +if (!tt_removed_node) +return ; + +/* drop reference of remove hash entry */ + tt_removed_entry =hlist_entry (tt_removed_node, + struct batadv_tt_global_entry, + common.hash_entry); +batadv_tt_global_entry_put (tt_removed_entry); }/**
@@ -1337,9 +1349,10 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid, const char *message, bool roaming) { + struct batadv_tt_local_entry *tt_removed_entry;struct batadv_tt_local_entry *tt_local_entry;u16 flags, curr_flags =BATADV_NO_FLAGS ; -void *tt_entry_exists; +struct hlist_node *tt_removed_node; tt_local_entry =batadv_tt_local_hash_find (bat_priv, addr, vid);if (!tt_local_entry)
@@ -1368,15 +1381,18 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,*/ batadv_tt_local_event (bat_priv, tt_local_entry,BATADV_TT_CLIENT_DEL ); - tt_entry_exists =batadv_hash_remove (bat_priv->tt.local_hash, + tt_removed_node =batadv_hash_remove (bat_priv->tt.local_hash, batadv_compare_tt, batadv_choose_tt, &tt_local_entry->common); -if (!tt_entry_exists) +if (!tt_removed_node) goto out; -/* extra call to free the local tt entry */ -batadv_tt_local_entry_put (tt_local_entry); +/* drop reference of remove hash entry */ + tt_removed_entry =hlist_entry (tt_removed_node, + struct batadv_tt_local_entry, + common.hash_entry); +batadv_tt_local_entry_put (tt_removed_entry); out:if (tt_local_entry)
net/mac80211/debugfs_netdev.c +1 -1
@@ -841,7 +841,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) dir = sdata->vif.debugfs_dir; -if (!dir) +if (IS_ERR_OR_NULL (dir))return ;sprintf (buf,"netdev:%s" , sdata->name);
net/mac80211/key.c +4 -5
@@ -167,8 +167,10 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)* The driver doesn't know anything about VLAN interfaces. * Hence, don't send GTKs for VLAN interfaces to the driver. */ -if (!(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE )) +if (!(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE )) { + ret =1 ; goto out_unsupported; + } } ret = drv_set_key(key->local, SET_KEY, sdata,
@@ -213,11 +215,8 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)/* all of these we can do in software - if driver can */ if (ret ==1 )return 0 ; -if (ieee80211_hw_check (&key->local->hw,SW_CRYPTO_CONTROL )) { -if (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) -return 0 ; +if (ieee80211_hw_check (&key->local->hw,SW_CRYPTO_CONTROL ))return -EINVAL ; - }return 0 ;default :return -EINVAL ;
scripts/coccinelle/api/stream_open.cocci new file +363 -0
204 lines not on this page · raw message
security/selinux/hooks.c +34 -10
44 lines not on this page · raw message
tools/testing/selftests/seccomp/seccomp_bpf.c +25 -9
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.
Thanks, a bunch Greg!
Quoted 454 lines · Greg KH
I'm announcing the release of the 5.0.14 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.0.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summarythanks,
greg k-h
------------
Documentation/driver-api/usb/power-management.rst | 14 Makefile | 2 arch/arc/lib/memset-archs.S | 4 arch/arm/boot/dts/am33xx-l4.dtsi | 4 arch/arm/boot/dts/rk3288.dtsi | 12 arch/arm/mach-at91/pm.c | 6 arch/arm/mach-iop13xx/setup.c | 8 arch/arm/mach-iop13xx/tpmi.c | 10 arch/arm/mach-omap2/display.c | 4 arch/arm/plat-iop/adma.c | 6 arch/arm/plat-orion/common.c | 4 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 arch/arm64/kernel/sdei.c | 6 arch/powerpc/kernel/kvm.c | 7 arch/powerpc/mm/slice.c | 10 arch/riscv/include/asm/uaccess.h | 2 arch/sh/boards/of-generic.c | 4 arch/x86/events/amd/core.c | 111 +++ arch/x86/kernel/cpu/mce/severity.c | 5 arch/x86/kvm/lapic.c | 73 +- arch/x86/kvm/lapic.h | 4 arch/x86/kvm/svm.c | 12 arch/x86/kvm/vmx/nested.c | 2 arch/x86/kvm/vmx/vmx.c | 6 arch/x86/kvm/vmx/vmx.h | 8 arch/x86/kvm/x86.c | 15 arch/x86/kvm/x86.h | 2 arch/x86/mm/init.c | 6 arch/x86/mm/kaslr.c | 2 arch/x86/mm/tlb.c | 2 block/blk-mq.c | 5 drivers/block/null_blk_main.c | 5 drivers/block/xsysace.c | 2 drivers/bluetooth/btmtkuart.c | 2 drivers/bluetooth/btusb.c | 2 drivers/clk/qcom/gcc-msm8998.c | 1 drivers/clk/x86/clk-pmc-atom.c | 14 drivers/gpio/gpio-mxc.c | 5 drivers/hid/hid-core.c | 6 drivers/hid/hid-debug.c | 5 drivers/hid/hid-input.c | 1 drivers/hid/hid-logitech-hidpp.c | 8 drivers/hid/hid-quirks.c | 5 drivers/i2c/busses/i2c-imx.c | 4 drivers/i2c/busses/i2c-stm32f7.c | 2 drivers/i2c/busses/i2c-synquacer.c | 2 drivers/i2c/i2c-core-base.c | 4 drivers/infiniband/core/security.c | 11 drivers/infiniband/core/verbs.c | 41 - drivers/infiniband/ulp/srpt/ib_srpt.c | 11 drivers/input/keyboard/snvs_pwrkey.c | 6 drivers/input/touchscreen/stmfts.c | 30 - drivers/media/i2c/ov7670.c | 16 drivers/mfd/twl-core.c | 23 drivers/mtd/nand/raw/marvell_nand.c | 12 drivers/net/bonding/bond_sysfs_slave.c | 4 drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 9 drivers/net/ethernet/hisilicon/hns/hnae.c | 4 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 33 - drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 12 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 drivers/net/ethernet/intel/i40e/i40e_ptp.c | 5 drivers/net/ethernet/intel/igb/e1000_defines.h | 2 drivers/net/ethernet/intel/igb/igb_main.c | 57 -- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 drivers/net/ethernet/stmicro/stmmac/descs_com.h | 22 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 22 drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 12 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 34 - drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 drivers/net/wireless/marvell/mwifiex/sdio.c | 2 drivers/platform/x86/intel_pmc_core.c | 4 drivers/platform/x86/pmc_atom.c | 21 drivers/reset/reset-meson-audio-arb.c | 1 drivers/rtc/rtc-cros-ec.c | 4 drivers/rtc/rtc-da9063.c | 7 drivers/rtc/rtc-sh.c | 2 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 drivers/scsi/scsi_devinfo.c | 1 drivers/scsi/scsi_dh.c | 1 drivers/scsi/storvsc_drv.c | 13 drivers/staging/iio/addac/adt7316.c | 34 - drivers/usb/core/driver.c | 13 drivers/usb/core/message.c | 4 drivers/usb/dwc3/gadget.c | 2 drivers/usb/gadget/udc/dummy_hcd.c | 19 drivers/usb/misc/yurex.c | 1 drivers/usb/storage/realtek_cr.c | 13 drivers/usb/usbip/stub_rx.c | 12 drivers/usb/usbip/usbip_common.h | 7 drivers/vfio/pci/vfio_pci.c | 4 drivers/w1/masters/ds2490.c | 6 drivers/xen/xenbus/xenbus_dev_frontend.c | 4 fs/debugfs/inode.c | 13 fs/hugetlbfs/inode.c | 20 fs/jffs2/readinode.c | 5 fs/jffs2/super.c | 5 fs/open.c | 18 fs/read_write.c | 5 include/linux/fs.h | 4 include/linux/platform_data/x86/clk-pmc-atom.h | 3 include/linux/usb.h | 2 kernel/bpf/cpumap.c | 13 kernel/seccomp.c | 17 mm/kmemleak.c | 18 net/batman-adv/bat_v_elp.c | 6 net/batman-adv/bridge_loop_avoidance.c | 16 net/batman-adv/translation-table.c | 32 - net/mac80211/debugfs_netdev.c | 2 net/mac80211/key.c | 9 scripts/coccinelle/api/stream_open.cocci | 363 +++++++++++++ security/selinux/avc.c | 23 security/selinux/hooks.c | 44 + security/selinux/include/avc.h | 1 sound/pci/hda/patch_realtek.c | 13 sound/soc/codecs/wm_adsp.c | 4 sound/soc/intel/boards/bytcr_rt5651.c | 2 sound/soc/sh/rcar/gen.c | 24 sound/soc/sh/rcar/rsnd.h | 27 sound/soc/sh/rcar/ssiu.c | 24 sound/soc/soc-pcm.c | 7 sound/soc/stm/stm32_sai_sub.c | 2 sound/soc/sunxi/sun50i-codec-analog.c | 4 tools/testing/selftests/seccomp/seccomp_bpf.c | 34 - 132 files changed, 1345 insertions(+), 428 deletions(-)Aaro Koskinen (6):
net: stmmac: use correct DMA buffer size in the RX descriptor
net: stmmac: ratelimit RX error logs
net: stmmac: don't stop NAPI processing when dropping a packet
net: stmmac: don't overwritediscard_framestatus
net: stmmac: fix dropping of multi-descriptor RX frames
net: stmmac: don't log oversized framesAl Viro (2):
jffs2: fix use-after-free on symlink traversal
debugfs: fix use-after-free on symlink traversalAlan Kao (1):
riscv: fix accessing 8-byte variable from RV32Alan Stern (5):
USB: yurex: Fix protection fault after device removal
USB: w1 ds2490: Fix bug caused by improper use of altsetting array
USB: dummy-hcd: Fix failure to give back unlinked URBs
USB: core: Fix unterminated string returned byusb_string()
USB: core: Fix bug caused by duplicate interface PM usage counterAlexander Wetzel (1):
mac80211: HonorSW_CRYPTO_CONTROLfor unicast keys in AP VLAN modeAlexandre Belloni (1):
rtc: da9063: setuie_unsupportedwhen relevantAnders Roxell (1):
batman-adv: fix warning in functionbatadv_v_elp_get_throughputAndreas Kemnade (1):
mfd: twl-core: Disable IRQ while suspendedAneesh Kumar K.V (1):
powerpc/mm/hash: Handlemmap_min_addrcorrectly inget_unmapped_areatopdown searchAnson Huang (3):
i2c: imx: correct the method of getting private data innotifier_call
Input:snvs_pwrkey- initialize necessary driver data before enabling IRQ
gpio: mxc: add check to return defer probe if clock tree NOT readyArd Biesheuvel (1):
i2c: synquacer: fix enumeration of slave devicesArnaud Pouliquen (1):
ASoC: stm32: fix sai driver name initialisationArnd Bergmann (3):
ARM: orion: don't use using 64-bit DMA masks
ARM: iop: don't use using 64-bit DMA masks
mm/kmemleak.c: fix unused-function warningArvind Sankar (1):
igb: FixWARN_ONCEon runtime suspendAxel Lin (1):
reset: meson-audio-arb: Fix missing .owner setting ofreset_controller_devBaoquan He (1):
x86/mm/KASLR: Fix the size of the direct mapping sectionBart Van Assche (1):
scsi: RDMA/srpt: Fix a credit leak for aborted commandsBrian Norris (1):
Bluetooth: btusb: request wake pin with NOAUTOENCatalin Marinas (1):
kmemleak: powerpc: skip scanning holes in the .bss sectionCharles Keepax (2):
ASoC:wm_adsp: Correct handling of compressed streams that restart
ASoC:wm_adsp: Check for buffer in trigger stopChen-Yu Tsai (1):
ASoC: sunxi: sun50i-codec-analog: Rename hpvcc regulator supply to cpvddDaniel Jurgens (2):
IB/core: Unregister notifier before freeing MAD security IB/core: Fix potential memory leak while creating MAD agentsDavid Müller (1):
clk: x86: Add system specific quirk to mark clocks as criticalDavid Rientjes (1):
KVM: SVM: preventDBG_DECRYPTandDBG_ENCRYPToverflowDmitry Torokhov (2):
HID: input: add mapping for Assistant key
Input: stmfts - acknowledge that setting brightness is a blocking callDongli Zhang (1):
blk-mq: do not reset plug->rq_count before the list is sortedDouglas Anderson (2):
mwifiex: Make resume actually do something useful again on SDIO cards
ARM: dts: rockchip: Fix gpu opp node names for rk3288Emmanuel Grumbach (1):
iwlwifi: fix driver operation for 5350Eugeniy Paltsev (1):
ARC: memset: fix build with L1_CACHE_SHIFT != 6Geert Uytterhoeven (1):
rtc: sh: Fix invalid alarm warning for non-enabled alarmGreg Kroah-Hartman (1):
Linux 5.0.14Guenter Roeck (1):
xsysace: Fix error handling inace_setupHans de Goede (1):
ASoC: Intel:bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping"He, Bo (1):
HID: debug: fix race condition with betweenrdesc_show()and device removalIvan Vecera (1):
ixgbe: fix mdio bus registrationJacob Keller (1):
i40e: fixi40e_ptp_adjtimewhen given a negative deltaJacopo Mondi (1):
media: v4l2: i2c: ov7670: Fix PLL bypass register valuesJarkko Nikula (1):
i2c: Prevent runtime suspend of adapter when Host Notify is requiredJeffrey Hugo (2):
HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630
clk: qcom: Add missing freq forusb30_master_clkon 8998Jeremy Fertic (4):
staging: iio: adt7316: allow adt751x to use internal vref for all dacs
staging: iio: adt7316: fix the dac read calculation
staging: iio: adt7316: fix handling of dac high resolution option
staging: iio: adt7316: fix the dac write calculationJerome Brunet (1):
ASoC: dpcm: skip missing substream while applying symmetryJesper Dangaard Brouer (1):
xdp: fix cpumap redirect SKB creation bugJiada Wang (1):
ASoC: rsnd: gen: fix SSI9 4/5/6/7 busif related register addressJohannes Berg (1):
mac80211: don't attempt to renameERR_PTR()debugfs dirsJohn Garry (1):
scsi:hisi_sas: Fix to only callscsi_get_prot_op()for non-NULLscsi_cmndJohn Pittman (1):
null_blk: prevent crash from badhome_nodevalueJulia Lawall (1):
ARM: OMAP2+: add missingof_node_putafterof_device_is_availableKai-Heng Feng (1):
HID: Increase maximum report size allowed byhid_field_extract()Kailang Yang (2):
ALSA: hda/realtek - Add new Dell platform for headset mode
ALSA: hda/realtek - Fixed Dell AIO speaker noiseKangjie Lu (1):
HID: logitech: check the return value ofcreate_singlethread_workqueueKees Cook (1):
selftests/seccomp: Prepare for exclusive seccomp flagsKim Phillips (1):
perf/x86/amd: Update generic hardware cache events for Family 17hKirill Smelkov (1):
fs:stream_open- opener for stream-like files so that read and write can run simultaneously without deadlockKonstantin Khorenko (1):
bonding: show full hw address in sysfs for slave entriesLeonidas P. Papadakos (1):
arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delayLiran Alon (1):
KVM: x86: Consider LAPIC TSC-Deadline timer expired if deadline too shortLiubin Shu (1):
net: hns: fix KASAN: use-after-free inhns_nic_net_xmit_hw()Louis Taylor (1):
vfio/pci: use correct format charactersMalte Leip (1):
usb: usbip: fix isoc packet num validation inget_pipeMichael Kelley (1):
scsi: storvsc: Fix calculation of sub-channel countMike Kravetz (1):
hugetlbfs: fix memory leak forresv_mapMiquel Raynal (1):
mtd: rawnand: marvell: Clean the controller state before each operationNicolas Le Bayon (1):
i2c: i2c-stm32f7: Fix SDADEL minimum formulaOmri Kahalon (1):
net/mlx5: E-Switch, Fix esw manager vport indication for more vport commandsOndrej Mosnacek (1):
selinux: never allow relabeling on context mountsPeng Hao (1):
arm/mach-at91/pm : fix possible object reference leakPeter Zijlstra (1):
x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"Qian Cai (1):
x86/mm: Fix a crash withkmemleak_scan()Rajneesh Bhardwaj (2):
platform/x86:intel_pmc_core: Fix PCH IP name platform/x86:intel_pmc_core: Handle CFL regmap properlyRandy Dunlap (1):
sh: fix multiple function definition build errorsRoi Dayan (1):
net/mlx5: E-Switch, Protect from invalid memory access in offload fdb tableSean Christopherson (7):
KVM: lapic: Disable timer advancement if adaptive tuning goes haywire
KVM: lapic: Track lapic timer advance per vCPU
KVM: lapic: Allow user to disable adaptive tuning of timer advancement
KVM: lapic: Convert guest TSC to host time domain if necessary
KVM: VMX: Save RSI to an unused output in the vCPU-run asm blob
KVM: nVMX: Remove a rogue "rax" clobber fromnested_vmx_check_vmentry_hw()
KVM: lapic: Check for in-kernel LAPIC before deferencing apic pointerSean Wang (1):
Bluetooth: mediatek: fix up an error path to restore bdev->tx_stateShenghui Wang (1):
block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctxStefan Assmann (1):
i40e: fix WoL support checkStephen Boyd (1):
rtc: cros-ec: Fail suspend/resume if wake IRQ can't be configuredStephen Smalley (1):
selinux: avoid silent denials in permissive mode under RCU walkSven Eckelmann (3):
batman-adv: Reduce claim hash refcnt only for removed entry
batman-adv: Reducett_localhash refcnt only for removed entry
batman-adv: Reducett_globalhash refcnt only for removed entryTakashi Iwai (1):
ALSA: hda/realtek - Apply the fixup for ASUS Q325UARThinh Nguyen (1):
usb: dwc3: Resetnum_trbsafter skippingTony Lindgren (1):
ARM: dts: Fix dcan clkctrl clock for am3Tony Luck (1):
x86/mce: Improve error message when kernel cannot recover, p2Tycho Andersen (1):
seccomp: MakeNEW_LISTENERand TSYNC flags exclusiveVarun Prakash (1):
libcxgb: fix incorrect ppmax calculationWei Li (1):
arm64: fix wrong check ofon_sdei_stackin nmi contextXi Wang (1):
net: hns3: fix compile errorXose Vazquez Perez (1):
scsi: core: add new RDAC LENOVO/DE_Series deviceYonglong Liu (4):
net: hns: UseNAPI_POLL_WEIGHTfor hns driver
net: hns: Fix probabilistic memory overwrite when HNS driver initialized
net: hns: fix ICMP6 neighbor solicitation messages discard problem
net: hns: Fix WARNING when remove HNS driver with SMMU enabledYu Zhang (1):
kvm: vmx: Fix typos in vmentry/vmexit control settingYuval Avnery (1):
IB/core: Destroy QP if XRC QP fails