Linux 4.14.51
Greg KH
maintainerI'm announcing the release of the 4.14.51 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/display/panel/panel-common.txt | 2 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt | 2 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/boot/compressed/head.S | 20 arch/arm/boot/dts/bcm-cygnus.dtsi | 2 arch/arm/boot/dts/da850.dtsi | 2 arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 arch/arm/kernel/machine_kexec.c | 34 - arch/arm/mach-davinci/board-da830-evm.c | 9 arch/arm/mach-davinci/board-da850-evm.c | 9 arch/arm/mach-davinci/board-dm355-evm.c | 6 arch/arm/mach-davinci/board-dm646x-evm.c | 5 arch/arm/mach-davinci/board-omapl138-hawk.c | 10 arch/arm/mach-davinci/dm646x.c | 3 arch/arm/mach-keystone/pm_domain.c | 1 arch/arm/mach-omap1/ams-delta-fiq.c | 28 arch/arm/mach-omap2/powerdomain.c | 4 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 arch/arm64/include/asm/cputype.h | 6 arch/arm64/kernel/ptrace.c | 20 arch/hexagon/include/asm/io.h | 6 arch/hexagon/lib/checksum.c | 1 arch/mips/boot/dts/img/boston.dts | 6 arch/mips/include/asm/io.h | 4 arch/parisc/kernel/drivers.c | 7 arch/parisc/kernel/smp.c | 3 arch/parisc/kernel/time.c | 2 arch/powerpc/platforms/powernv/memtrace.c | 17 arch/sh/kernel/cpu/sh2/probe.c | 4 arch/x86/events/intel/core.c | 9 arch/x86/include/asm/insn.h | 18 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/kexec-bzimage64.c | 5 arch/x86/kernel/kprobes/core.c | 4 arch/x86/kernel/uprobes.c | 4 arch/x86/kvm/hyperv.c | 2 arch/x86/kvm/svm.c | 5 arch/x86/kvm/vmx.c | 15 arch/x86/kvm/x86.c | 19 arch/x86/net/bpf_jit_comp.c | 4 arch/x86/xen/enlighten_hvm.c | 13 block/blk-cgroup.c | 22 block/blk-mq.c | 19 block/blk-mq.h | 4 block/genhd.c | 12 block/partition-generic.c | 10 drivers/acpi/acpi_watchdog.c | 59 +- drivers/acpi/sleep.c | 13 drivers/ata/ahci.c | 6 drivers/ata/ahci.h | 7 drivers/ata/ahci_mvebu.c | 56 + drivers/ata/ahci_qoriq.c | 2 drivers/ata/ahci_xgene.c | 4 drivers/ata/libahci.c | 20 drivers/ata/libata-eh.c | 4 drivers/ata/sata_highbank.c | 2 drivers/char/agp/uninorth-agp.c | 4 drivers/clk/clk-mux.c | 10 drivers/clk/clk.c | 7 drivers/clk/imx/clk-imx6ul.c | 2 drivers/clocksource/timer-imx-tpm.c | 8 drivers/firmware/efi/libstub/arm64-stub.c | 10 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 drivers/gpu/drm/drm_dumb_buffers.c | 7 drivers/gpu/drm/msm/dsi/dsi_host.c | 2 drivers/gpu/drm/msm/msm_fbdev.c | 11 drivers/gpu/drm/msm/msm_gem.c | 20 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 drivers/gpu/drm/omapdrm/omap_connector.c | 10 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 drivers/gpu/drm/omapdrm/tcm-sita.c | 2 drivers/hid/Kconfig | 7 drivers/hid/hid-ids.h | 8 drivers/hid/hid-lenovo.c | 36 + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 drivers/hid/wacom_sys.c | 4 drivers/i2c/busses/i2c-pmcmsp.c | 4 drivers/i2c/busses/i2c-sprd.c | 22 drivers/i2c/busses/i2c-viperboard.c | 2 drivers/infiniband/Kconfig | 5 drivers/infiniband/core/cma.c | 60 +- drivers/infiniband/core/iwpm_util.c | 5 drivers/infiniband/core/mad.c | 4 drivers/infiniband/core/uverbs_ioctl.c | 9 drivers/infiniband/hw/hfi1/affinity.c | 11 drivers/infiniband/hw/hfi1/init.c | 4 drivers/infiniband/sw/rxe/rxe_opcode.c | 2 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/infiniband/sw/rxe/rxe_resp.c | 6 drivers/infiniband/ulp/srp/Kconfig | 2 drivers/infiniband/ulp/srpt/Kconfig | 2 drivers/input/rmi4/rmi_spi.c | 7 drivers/input/touchscreen/atmel_mxt_ts.c | 186 +++--- drivers/iommu/dmar.c | 2 drivers/net/can/dev.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 drivers/net/phy/marvell.c | 9 drivers/nvme/host/Kconfig | 2 drivers/nvme/host/core.c | 1 drivers/nvme/host/fabrics.c | 6 drivers/nvme/target/Kconfig | 2 drivers/pci/dwc/pcie-kirin.c | 2 drivers/remoteproc/qcom_q6v5_pil.c | 2 drivers/rpmsg/rpmsg_char.c | 2 drivers/s390/net/smsgiucv.c | 2 drivers/scsi/isci/port_config.c | 3 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 drivers/scsi/scsi_transport_iscsi.c | 29 - drivers/scsi/storvsc_drv.c | 7 drivers/scsi/vmw_pvscsi.c | 2 drivers/soc/bcm/raspberrypi-power.c | 2 drivers/spi/spi-bcm2835aux.c | 5 drivers/spi/spi-cadence.c | 8 drivers/spi/spi-sh-msiof.c | 1 drivers/target/target_core_pscsi.c | 2 drivers/tee/tee_core.c | 11 drivers/thermal/int340x_thermal/int3403_thermal.c | 3 drivers/usb/musb/musb_host.c | 5 drivers/usb/musb/musb_host.h | 7 drivers/usb/musb/musb_virthub.c | 25 drivers/usb/typec/ucsi/Makefile | 2 drivers/xen/xenbus/xenbus_dev_frontend.c | 3 fs/afs/rxrpc.c | 7 fs/btrfs/scrub.c | 44 + fs/cifs/smb2ops.c | 6 fs/ecryptfs/crypto.c | 41 - fs/ecryptfs/file.c | 21 fs/isofs/inode.c | 3 fs/namespace.c | 2 fs/notify/fsnotify.c | 25 fs/ocfs2/refcounttree.c | 14 fs/proc/base.c | 6 fs/proc/kcore.c | 23 fs/proc/task_mmu.c | 6 include/linux/clk-provider.h | 3 include/linux/ethtool.h | 2 include/linux/genhd.h | 4 include/linux/kvm_host.h | 8 include/linux/mtd/map.h | 2 include/linux/percpu-rwsem.h | 6 include/linux/rwsem.h | 6 include/linux/sched.h | 50 + include/linux/sched/signal.h | 2 include/linux/stringhash.h | 4 include/soc/bcm2835/raspberrypi-firmware.h | 4 init/main.c | 7 kernel/kthread.c | 7 kernel/locking/rwsem-xadd.c | 19 kernel/locking/rwsem.c | 2 kernel/locking/rwsem.h | 30 - kernel/module.c | 5 kernel/sched/core.c | 17 kernel/sched/deadline.c | 4 kernel/sched/rt.c | 2 kernel/sched/sched.h | 5 kernel/signal.c | 17 kernel/stop_machine.c | 19 mm/memcontrol.c | 2 net/ipv4/tcp_input.c | 2 net/ipv6/netfilter/Kconfig | 55 - net/mac80211/agg-tx.c | 4 net/mac80211/mlme.c | 25 net/mac80211/tx.c | 3 net/netfilter/nf_tables_api.c | 2 net/rds/ib_cm.c | 3 net/rxrpc/af_rxrpc.c | 2 net/rxrpc/local_object.c | 57 +- net/sched/act_skbedit.c | 3 net/smc/af_smc.c | 6 net/tipc/monitor.c | 2 net/tipc/node.c | 28 sound/soc/codecs/msm8916-wcd-analog.c | 9 sound/soc/codecs/rt5514.c | 3 sound/soc/soc-topology.c | 6 tools/net/bpf_dbg.c | 7 tools/objtool/arch/x86/include/asm/insn.h | 18 tools/perf/util/symbol.c | 8 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc | 44 + tools/testing/selftests/x86/Makefile | 2 tools/testing/selftests/x86/mov_ss_trap.c | 285 ++++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 tools/testing/selftests/x86/protection_keys.c | 254 ++++++-- virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 194 files changed, 1863 insertions(+), 664 deletions(-)
Adam Ford (2):
ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues
ARM: dts: logicpd-som-lv: Fix Audio Mute
Alexey Dobriyan (1):
proc: revalidate kernel thread inodes to root:root
Amir Goldstein (2):
fsnotify: fix ignore mask logic in send_to_group() <linux/stringhash.h>: fix end_name_hash() for 64bit long
Andres Rodriguez (1):
drm/amdkfd: fix clock counter retrieval for node without GPU
Andy Lutomirski (1):
x86/selftests: Add mov_to_ss test
Anson Huang (1):
clocksource/drivers/imx-tpm: Correct some registers operation flow
Arnaldo Carvalho de Melo (1):
perf report: Fix switching to another perf.data file
Arnd Bergmann (2):
hexagon: add memset_io() helper
hexagon: export csum_partial_copy_nocheck
Arvind Yadav (2):
HID: wacom: Release device resource data obtained by devres_alloc()
HID: intel-ish-hid: use put_device() instead of kfree()
Ashish Samant (1):
ocfs2: take inode cluster lock before moving reflinked inode from orphan dir
Balbir Singh (1):
powerpc/powernv/memtrace: Let the arch hotunplug code flush cache
Baolin Wang (3):
parisc: time: Convert read_persistent_clock() to read_persistent_clock64()
i2c: sprd: Prevent i2c accesses after suspend is called
i2c: sprd: Fix the i2c count issue
Ben Hutchings (2):
drm/msm: Fix possible null dereference on failure of get_pages()
mtd: Fix comparison in map_word_andequal()
Bhadram Varka (1):
arm64: tegra: Make BCM89610 PHY interrupt as active low
Changbin Du (1):
iommu/vt-d: fix shift-out-of-bounds in bug checking
Chen Yu (1):
ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
Chengguang Xu (2):
isofs: fix potential memory leak in mount option parsing
nvme: fix potential memory leak in option parsing
Chris Leech (1):
scsi: iscsi: respond to netlink with unicast when appropriate
Christophe JAILLET (1):
Input: synaptics-rmi4 - fix an unchecked out of memory error path
Clément Péron (1):
ARM: dts: cygnus: fix irq type for arm global timer
Colin Ian King (2):
scsi: isci: Fix infinite loop in while loop
RDMA/iwpm: fix memory leak on map_info
Dag Moxnes (1):
rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp
Dan Carpenter (2):
drm/omap: silence unititialized variable warning drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl()
Daniel Borkmann (1):
bpf, x64: fix memleak when not converging after image
Daniel Glöckner (1):
usb: musb: fix remote wakeup racing with suspend
Dave Hansen (10):
x86/pkeys/selftests: Give better unexpected fault error messages x86/pkeys/selftests: Stop using assert() x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal x86/pkeys/selftests: Allow faults on unknown keys x86/pkeys/selftests: Factor out "instruction page" x86/pkeys/selftests: Add PROT_EXEC test x86/pkeys/selftests: Fix pkey exhaustion test off-by-one x86/pkeys/selftests: Fix pointer math x86/pkeys/selftests: Save off 'prot' for allocations x86/pkeys/selftests: Add a test for pkey 0
Dave Young (1):
kexec_file: do not add extra alignment to efi memmap
David Gilhooley (1):
arm64: Add MIDR encoding for NVIDIA CPUs
David Howells (4):
vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion
rxrpc: Fix error reception on AF_INET6 sockets
rxrpc: Fix the min security level for kernel calls
afs: Fix the non-encryption of calls
Emil Tantilov (1):
ixgbe: return error on unsupported SFP module when resetting
Emil Velikov (1):
drm/msm: don't deref error pointer in the msm_fbdev_create error path
Eric Dumazet (1):
tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
Etienne Carriere (1):
tee: check shm references are consistent in offset/size
Evan Wang (2):
libahci: Allow drivers to override stop_engine
ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI
Florian Fainelli (2):
soc: bcm: raspberrypi-power: Fix use of __packed
net: ethtool: Add missing kernel doc for FEC parameters
Geert Uytterhoeven (3):
soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure
dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/
dt-bindings: panel: lvds: Fix path to display timing bindings
Greg Kroah-Hartman (1):
Linux 4.14.51
Greg Thelen (5):
nvme: depend on INFINIBAND_ADDR_TRANS
nvmet-rdma: depend on INFINIBAND_ADDR_TRANS
ib_srpt: depend on INFINIBAND_ADDR_TRANS
ib_srp: depend on INFINIBAND_ADDR_TRANS
IB: make INFINIBAND_ADDR_TRANS configurable
Hans de Goede (1):
thermal: int3403_thermal: Fix NULL pointer deref on module load / probe
Helge Deller (2):
parisc: drivers.c: Fix section mismatches
parisc: Move setup_profiling_timer() out of init section
Huang Ying (1):
mm, pagemap: fix swap offset value for PMD migration entry
Håkon Bugge (1):
IB/core: Make ib_mad_client_id atomic
Igor Russkikh (1):
net: aquantia: driver should correctly declare vlan_features bits
Ilan Peer (1):
mac80211: Adjust SAE authentication timeout
Ingo Molnar (3):
objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI
Jacopo Mondi (2):
dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF
dt-bindings: dmaengine: rcar-dmac: document R8A77965 support
Jakob Unterwurzacher (1):
can: dev: increase bus-off message severity
Jakub Kicinski (1):
nfp: ignore signals when communicating with management FW
Janusz Krzysztofik (1):
ARM: OMAP1: ams-delta: fix deferred_fiq handler
Jeffrey Hugo (1):
init: fix false positives in W+X checking
Jerome Brunet (1):
clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux
Jianchao Wang (1):
IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV
Jiang Biao (2):
blkcg: don't hold blkcg lock when deactivating policy
blkcg: init root blkcg_gq under lock
Jim Gill (1):
scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts
Jingju Hou (1):
net: phy: marvell: clear wol event before setting it
John Fastabend (1):
bpf: fix uninitialized variable in bpf tools
Jon Maloy (1):
tipc: fix bug in function tipc_nl_node_dump_monitor
Kan Liang (1):
perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
Keith Busch (1):
nvme: Set integrity flag for user passthrough commands
Krish Sadhukhan (1):
x86: Add check for APIC access address for vmentry of L2 guests
Laura Abbott (1):
proc/kcore: don't bounds check against address 0
Liam Girdwood (1):
ASoC: topology: Check widget kcontrols before deref.
Liu Bo (2):
Btrfs: fix scrub to repair raid6 corruption
Btrfs: make raid6 rebuild retry more
Loic Poulain (1):
PCI: kirin: Fix reset gpio name
Long Li (1):
scsi: storvsc: Set up correct queue depth values for IDE devices
Lukasz Majewski (1):
doc: Add vendor prefix for Kieback & Peter GmbH
Marian Rotariu (1):
x86: Delay skip of emulated hypercall instruction
Mark Rutland (4):
arm64: ptrace: remove addr_limit manipulation
arm64: fix possible spectre-v1 in ptrace_hbp_get_event()
KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() efi/libstub/arm64: Handle randomized TEXT_OFFSET
Martin Schwidefsky (1):
s390/smsgiucv: disable SMSG on module unload
Masami Hiramatsu (3):
selftests: ftrace: Add a testcase for multiple actions on trigger kprobes/x86: Prohibit probing on exception masking instructions uprobes/x86: Prohibit probing on MOV SS instruction
Matan Barak (1):
IB/uverbs: Fix validating mandatory attributes
Matheus Castello (1):
dt-bindings: pinctrl: sunxi: Fix reference to driver
Mathieu Malaterre (4):
driver core: add __printf verification to __ata_ehi_pushv_desc
agp: uninorth: make two functions static
sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h sched/deadline: Make the grub_reclaim() function static
Matt Redfearn (1):
MIPS: dts: Boston: Fix PCI bus dtc warnings:
Michael J. Ruhl (1):
IB/hfi1 Use correct type for num_user_context
Michal Kalderon (2):
qed: Fix l2 initializations over iWARP personality
qede: Fix gfp flags sent to rdma event node allocation
Mika Westerberg (1):
ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
Minchan Kim (1):
mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create()
Ming Lei (1):
scsi: target: fix crash with iscsi target and dvd
Nick Dyer (1):
Input: atmel_mxt_ts - fix the firmware update
Omar Sandoval (1):
blk-mq: fix sysfs inflight counter
Pablo Neira Ayuso (1):
netfilter: nf_tables: NAT chain and extensions require NF_TABLES
Parav Pandit (2):
RDMA/cma: Fix use after destroy access to net namespace for IPoIB RDMA/cma: Do not query GID during QP state transition to RTR
Paulo Alcantara (1):
cifs: smb2ops: Fix listxattr() when there are no EAs
Peter Rosin (3):
i2c: pmcmsp: return message count on master_xfer success
i2c: pmcmsp: fix error return from master_xfer
i2c: viperboard: return message count on master_xfer success
Peter Zijlstra (3):
stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock kthread, sched/wait: Fix kthread_parkme() wait-loop sched/core: Introduce set_special_state()
Ramon Fried (1):
rpmsg: added MODULE_ALIAS for rpmsg_char
Rich Felker (1):
sh: fix build failure for J2 cpu with SMP disabled
Rob Herring (1):
spi: bcm2835aux: ensure interrupts are enabled for shared handler
Roman Mashak (1):
net sched actions: fix invalid pointer dereferencing if skbedit flags missing
Russell King (2):
ARM: keystone: fix platform_domain_notifier array overrun
ARM: kexec: fix kdump register saving on panic()
Sara Sharon (1):
mac80211: use timeout from the AddBA response instead of the request
Sasha Levin (1):
Revert "Btrfs: fix scrub to repair raid6 corruption"
Sebastian Sanchez (1):
IB/hfi1: Fix memory leak in exception path in get_irq_affinity()
Sekhar Nori (8):
ARM: dts: da850: fix W=1 warnings with pinmux node
ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD
ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD
ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup
ARM: davinci: board-dm355-evm: fix broken networking
ARM: davinci: dm646x: fix timer interrupt generation
ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF
ARM: davinci: board-dm646x-evm: set VPIF capture card name
Simon Gaiser (1):
xen: xenbus_dev_frontend: Really return response string
Sinan Kaya (2):
MIPS: io: Prevent compiler reordering writeX()
MIPS: io: Add barrier after register read in readX()
Srinivas Kandagatla (1):
ASoC: msm8916-wcd-analog: use threaded context for mbhc events
Stefan Agner (2):
drm/msm/dsi: use correct enum in dsi_get_cmd_fmt
clk: imx6ull: use OSC clock during AXI rate change
Stefan Raspl (1):
smc: fix sendpage() call
Taehee Yoo (1):
netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update
Tero Kristo (1):
ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace
Tobias Jordan (1):
remoteproc: qcom: Fix potential device node leaks
Tobias Regnery (1):
usb: typec: ucsi: fix tracepoint related build error
Tomi Valkeinen (4):
drm/omap: fix uninitialized ret variable drm/omap: fix possible NULL ref issue in tiler_reserve_2d drm/omap: check return value from soc_device_match drm/omap: handle alloc failures in omap_connector
Tung Nguyen (1):
tipc: fix infinite loop when dumping link monitor summary
Tyler Hicks (1):
eCryptfs: don't pass up plaintext names when using filename encryption
Vinson Lee (1):
scsi: megaraid_sas: Do not log an error if FW successfully initializes.
Vladimir Zapolskiy (1):
spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR
Waiman Long (2):
locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN
Wanpeng Li (1):
KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs
Yan Wang (1):
ASoC: topology: Fix bugs of freeing soc topology
Ying Xue (1):
tipc: eliminate KMSAN uninit-value in strcmp complaint
Zhu Yanjun (1):
IB/rxe: avoid double kfree_skb
dann frazier (1):
net: hns: Avoid action name truncation
hu huajun (1):
KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update
[email protected] (1):
x86/cpu/intel: Add missing TLB cpuid values
[email protected] (1):
ASoC: rt5514: Add the missing register in the readable table
pgzh (1):
HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice
sxauwsk (1):
spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo()
van der Linden, Frank (1):
x86/xen: Reset VCPU0 info pointer after shared_info remap
Łukasz Stelmach (2):
ARM: 8753/1: decompressor: add a missing parameter to the addruart macro
ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel
Greg KH
maintainerDocumentation/devicetree/bindings/display/panel/panel-common.txt +1 -1
@@ -38,7 +38,7 @@ Display Timings require specific display timings. The panel-timing subnode expresses those timings as specified in the timing subnode section of the display timing bindings defined in - Documentation/devicetree/bindings/display/display-timing.txt. + Documentation/devicetree/bindings/display/panel/display-timing.txt. Connectivity
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +1 -0
@@ -25,6 +25,7 @@ Required Properties: - "renesas,dmac-r8a7794" (R-Car E2) - "renesas,dmac-r8a7795" (R-Car H3) - "renesas,dmac-r8a7796" (R-Car M3-W) + - "renesas,dmac-r8a77965" (R-Car M3-N) - "renesas,dmac-r8a77970" (R-Car V3M) - reg: base address and length of the registers block for the DMAC
Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt +3 -3
@@ -55,9 +55,9 @@ pins it needs, and how they should be configured, with regard to muxer configuration, drive strength and pullups. If one of these options is not set, its actual value will be unspecified. -This driver supports the generic pin multiplexing and configuration -bindings. For details on each properties, you can refer to -./pinctrl-bindings.txt. +Allwinner A1X Pin Controller supports the generic pin multiplexing and +configuration bindings. For details on each properties, you can refer to + ./pinctrl-bindings.txt. Required sub-node properties: - pins
Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt +1 -1
@@ -21,7 +21,7 @@ Required properties: - interrupts : identifier to the device interrupt - clocks : a list of phandle + clock-specifier pairs, one for each entry in clock names. -- clocks-names : +- clock-names : * "xtal" for external xtal clock identifier * "pclk" for the bus core clock, either the clk81 clock or the gate clock * "baud" for the source of the baudrate generator, can be either the xtal
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt +2 -0
@@ -41,6 +41,8 @@ Required properties: - "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART. - "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART. - "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART. + - "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART. + - "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART. - "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART. - "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART. - "renesas,scif-r8a77995" for R8A77995 (R-Car D3) SCIF compatible UART.
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -172,6 +172,7 @@ karo Ka-Ro electronics GmbH keithkoep Keith & Koep GmbH keymile Keymile GmbH khadas Khadas +kiebackpeter Kieback & Peter GmbH kinetic Kinetic Technologies kingnovel Kingnovel Technology Co., Ltd. kosagi Sutajio Ko-Usagi PTE Ltd.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 50 +SUBLEVEL = 51 EXTRAVERSION = NAME = Petit Gorille
arch/arm/boot/compressed/head.S +10 -10
@@ -29,19 +29,19 @@ #if defined(CONFIG_DEBUG_ICEDCC) #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c0, c5, 0 .endm #elif defined(CONFIG_CPU_XSCALE) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c8, c0, 0 .endm #else - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c1, c0, 0
@@ -57,7 +57,7 @@ .endm #if defined(CONFIG_ARCH_SA1100) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 mov \rb, #0x80000000 @ physical base address #ifdef CONFIG_DEBUG_LL_SER3 add \rb, \rb, #0x00050000 @ Ser3
@@ -66,8 +66,8 @@ #endif .endm #else - .macro loadsp, rb, tmp - addruart \rb, \tmp + .macro loadsp, rb, tmp1, tmp2 + addruart \rb, \tmp1, \tmp2 .endm #endif #endif
@@ -559,8 +559,6 @@ not_relocated: mov r0, #0 bl decompress_kernel bl cache_clean_flush bl cache_off - mov r1, r7 @ restore architecture number - mov r2, r8 @ restore atags pointer #ifdef CONFIG_ARM_VIRT_EXT mrs r0, spsr @ Get saved CPU boot mode
@@ -1295,7 +1293,7 @@ phex: adr r3, phexbuf b 1b @ puts corrupts {r0, r1, r2, r3} -puts: loadsp r3, r1 +puts: loadsp r3, r2, r1 1: ldrb r2, [r0], #1 teq r2, #0 moveq pc, lr
@@ -1312,8 +1310,8 @@ puts: loadsp r3, r1 @ putc corrupts {r0, r1, r2, r3} putc: mov r2, r0 + loadsp r3, r1, r0 mov r0, #0 - loadsp r3, r1 b 2b @ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}
@@ -1363,6 +1361,8 @@ __hyp_reentry_vectors: __enter_kernel: mov r0, #0 @ must be 0 + mov r1, r7 @ restore architecture number + mov r2, r8 @ restore atags pointer ARM( mov pc, r4 ) @ call kernel M_CLASS( add r4, r4, #1 ) @ enter in Thumb mode for M class THUMB( bx r4 ) @ entry point is always ARM for A/R classes
arch/arm/boot/dts/bcm-cygnus.dtsi +1 -1
@@ -69,7 +69,7 @@ timer@20200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x20200 0x100>; - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; clocks = <&periph_clk>; };
arch/arm/boot/dts/da850.dtsi +0 -2
@@ -34,8 +34,6 @@ pmx_core: pinmux@14120 { compatible = "pinctrl-single"; reg = <0x14120 0x50>; - #address-cells = <1>; - #size-cells = <0>; #pinctrl-cells = <2>; pinctrl-single,bit-per-mux; pinctrl-single,register-width = <32>;
arch/arm/boot/dts/logicpd-som-lv.dtsi +9 -2
@@ -26,7 +26,7 @@ gpio = <&gpio1 3 0>; /* gpio_3 */ startup-delay-us = <70000>; enable-active-high; - vin-supply = <&vmmc2>; + vin-supply = <&vaux3>; }; /* HS USB Host PHY on PORT 1 */
@@ -108,6 +108,7 @@ twl_audio: audio { compatible = "ti,twl4030-audio"; codec { + ti,hs_extmute_gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>; }; }; };
@@ -221,6 +222,7 @@ pinctrl-single,pins = < OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */ OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */ + OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4) /* gpmc_ncs6.gpio_57 */ >; }; };
@@ -235,7 +237,7 @@ }; wl127x_gpio: pinmux_wl127x_gpio_pin { pinctrl-single,pins = < - OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */ + OMAP3_WKUP_IOPAD(0x2a0a, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ >; };
@@ -270,6 +272,11 @@ #include "twl4030.dtsi" #include "twl4030_omap3.dtsi" +&vaux3 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; +}; + &twl { twl_power: power { compatible = "ti,twl4030-power-idle-osc-off", "ti,twl4030-power-idle";
arch/arm/kernel/machine_kexec.c +22 -12
@@ -95,6 +95,27 @@ void machine_crash_nonpanic_core(void *unused)cpu_relax (); } +void crash_smp_send_stop (void ) +{ +static int cpus_stopped; +unsigned long msecs; + +if (cpus_stopped) +return ; + +atomic_set (&waiting_for_crash_ipi,num_online_cpus () -1 ); +smp_call_function (machine_crash_nonpanic_core,NULL , false); + msecs =1000 ;/* Wait at most a second for the other cpus to stop */ +while ((atomic_read (&waiting_for_crash_ipi) >0 ) && msecs) { +mdelay (1 ); + msecs--; + } +if (atomic_read (&waiting_for_crash_ipi) >0 ) +pr_warn ("Non-crashing CPUs did not react to IPI\n" ); + + cpus_stopped =1 ; +} +static void machine_kexec_mask_interrupts (void ) {unsigned int i;
@@ -120,19 +141,8 @@ static void machine_kexec_mask_interrupts(void)void machine_crash_shutdown (struct pt_regs *regs) { -unsigned long msecs; -local_irq_disable (); - -atomic_set (&waiting_for_crash_ipi,num_online_cpus () -1 ); -smp_call_function (machine_crash_nonpanic_core,NULL , false); - msecs =1000 ;/* Wait at most a second for the other cpus to stop */ -while ((atomic_read (&waiting_for_crash_ipi) >0 ) && msecs) { -mdelay (1 ); - msecs--; - } -if (atomic_read (&waiting_for_crash_ipi) >0 ) -pr_warn ("Non-crashing CPUs did not react to IPI\n" ); +crash_smp_send_stop ();crash_save_cpu (regs,smp_processor_id ());machine_kexec_mask_interrupts ();
arch/arm/mach-davinci/board-da830-evm.c +7 -2
@@ -205,12 +205,17 @@ static const short da830_evm_mmc_sd_pins[] = { -1 }; +#define DA830_MMCSD_WP_PIN GPIO_TO_PIN(2, 1) +#define DA830_MMCSD_CD_PIN GPIO_TO_PIN(2, 2) +static struct gpiod_lookup_table mmc_gpios_table = { .dev_id ="da830-mmc.0" , .table = {/* gpio chip 1 contains gpio range 32-63 */ -GPIO_LOOKUP ("davinci_gpio.1" ,2 ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.1" ,1 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA830_MMCSD_CD_PIN ,"cd" , +GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA830_MMCSD_WP_PIN ,"wp" , +GPIO_ACTIVE_LOW ), }, };
arch/arm/mach-davinci/board-da850-evm.c +7 -2
@@ -763,12 +763,17 @@ static const short da850_evm_mcasp_pins[] __initconst = { -1 }; +#define DA850_MMCSD_CD_PIN GPIO_TO_PIN(4, 0) +#define DA850_MMCSD_WP_PIN GPIO_TO_PIN(4, 1) +static struct gpiod_lookup_table mmc_gpios_table = { .dev_id ="da830-mmc.0" , .table = {/* gpio chip 2 contains gpio range 64-95 */ -GPIO_LOOKUP ("davinci_gpio.2" ,0 ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.2" ,1 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA850_MMCSD_CD_PIN ,"cd" , +GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA850_MMCSD_WP_PIN ,"wp" , +GPIO_ACTIVE_LOW ), }, };
arch/arm/mach-davinci/board-dm355-evm.c +6 -0
@@ -18,6 +18,7 @@#include <linux/i2c.h> #include <linux/gpio.h> #include <linux/clk.h> +#include <linux/dm9000.h> #include <linux/videodev2.h> #include <media/i2c/tvp514x.h> #include <linux/spi/spi.h>
@@ -168,11 +169,16 @@ static struct resource dm355evm_dm9000_rsrc[] = { }, }; +static struct dm9000_plat_data dm335evm_dm9000_platdata; +static struct platform_device dm355evm_dm9000 = { .name ="dm9000" , .id =-1 , .resource = dm355evm_dm9000_rsrc, .num_resources =ARRAY_SIZE (dm355evm_dm9000_rsrc), + .dev = { + .platform_data = &dm335evm_dm9000_platdata, + }, };static struct tvp514x_platform_data tvp5146_pdata = {
arch/arm/mach-davinci/board-dm646x-evm.c +4 -1
@@ -534,11 +534,12 @@ static struct vpif_display_config dm646x_vpif_display_config = { .set_clock = set_vpif_clock, .subdevinfo = dm646x_vpif_subdev, .subdev_count = ARRAY_SIZE(dm646x_vpif_subdev), + .i2c_adapter_id = 1, .chan_config[0] = { .outputs = dm6467_ch0_outputs, .output_count = ARRAY_SIZE(dm6467_ch0_outputs), }, - .card_name = "DM646x EVM", + .card_name = "DM646x EVM Video Display", };/**
@@ -676,6 +677,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { .setup_input_channel_mode = setup_vpif_input_channel_mode, .subdev_info = vpif_capture_sdev_info, .subdev_count = ARRAY_SIZE(vpif_capture_sdev_info), + .i2c_adapter_id = 1, .chan_config[0] = { .inputs = dm6467_ch0_inputs, .input_count = ARRAY_SIZE(dm6467_ch0_inputs),
@@ -696,6 +698,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { .fid_pol = 0, }, }, + .card_name = "DM646x EVM Video Capture", };static void __init evm_init_video (void )
arch/arm/mach-davinci/board-omapl138-hawk.c +7 -3
@@ -123,12 +123,16 @@ static const short hawk_mmcsd0_pins[] = { -1 }; +#define DA850_HAWK_MMCSD_CD_PIN GPIO_TO_PIN(3, 12) +#define DA850_HAWK_MMCSD_WP_PIN GPIO_TO_PIN(3, 13) +static struct gpiod_lookup_table mmc_gpios_table = { .dev_id ="da830-mmc.0" , .table = { -/* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/ -GPIO_LOOKUP ("davinci_gpio.0" ,28 ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.0" ,29 ,"wp" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA850_HAWK_MMCSD_CD_PIN ,"cd" , +GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("davinci_gpio.0" ,DA850_HAWK_MMCSD_WP_PIN ,"wp" , +GPIO_ACTIVE_LOW ), }, };
arch/arm/mach-davinci/dm646x.c +2 -1
@@ -495,7 +495,8 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = { [IRQ_DM646X_MCASP0TXINT] = 7, [IRQ_DM646X_MCASP0RXINT] = 7, [IRQ_DM646X_RESERVED_3] = 7, - [IRQ_DM646X_MCASP1TXINT] = 7, /* clockevent */ + [IRQ_DM646X_MCASP1TXINT] = 7, + [IRQ_TINT0_TINT12] = 7, /* clockevent */ [IRQ_TINT0_TINT34] = 7, /* clocksource */ [IRQ_TINT1_TINT12] = 7, /* DSP timer */ [IRQ_TINT1_TINT34] = 7, /* system tick */
arch/arm/mach-keystone/pm_domain.c +1 -0
@@ -29,6 +29,7 @@ static struct dev_pm_domain keystone_pm_domain = {static struct pm_clk_notifier_block platform_domain_notifier = { .pm_domain = &keystone_pm_domain, + .con_ids = {NULL }, };static const struct of_device_id of_keystone_table[] = {
arch/arm/mach-omap1/ams-delta-fiq.c +15 -13
@@ -58,22 +58,24 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id) irq_num =gpio_to_irq (gpio); fiq_count = fiq_buffer[FIQ_CNT_INT_00 + gpio]; -while (irq_counter[gpio] < fiq_count) { -if (gpio !=AMS_DELTA_GPIO_PIN_KEYBRD_CLK ) { -struct irq_data *d =irq_get_irq_data (irq_num); - -/* -* It looks like handle_edge_irq() that -* OMAP GPIO edge interrupts default to, -* expects interrupt already unmasked. -*/ -if (irq_chip && irq_chip->irq_unmask) +if (irq_counter[gpio] < fiq_count && + gpio !=AMS_DELTA_GPIO_PIN_KEYBRD_CLK ) { +struct irq_data *d =irq_get_irq_data (irq_num); + +/* +* handle_simple_irq() that OMAP GPIO edge +* interrupts default to since commit 80ac93c27441 +* requires interrupt already acked and unmasked. +*/ +if (irq_chip) { +if (irq_chip->irq_ack) + irq_chip->irq_ack (d); +if (irq_chip->irq_unmask) irq_chip->irq_unmask (d); } -generic_handle_irq (irq_num); - - irq_counter[gpio]++; } +for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++) +generic_handle_irq (irq_num); }return IRQ_HANDLED ; }
arch/arm/mach-omap2/powerdomain.c +2 -2
@@ -188,7 +188,7 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) ((prev & OMAP_POWERSTATE_MASK) << 0));trace_power_domain_target_rcuidle (pwrdm->name, trace_state, -smp_processor_id ()); +raw_smp_processor_id ()); }break ;default :
@@ -518,7 +518,7 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {/* Trace the pwrdm desired target state */ trace_power_domain_target_rcuidle (pwrdm->name, pwrst, -smp_processor_id ()); +raw_smp_processor_id ());/* Program the pwrdm desired target state */ ret = arch_pwrdm->pwrdm_set_next_pwrst (pwrdm, pwrst); }
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +1 -1
@@ -46,7 +46,7 @@ compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x0>; interrupt-parent = <&gpio>; - interrupts = <TEGRA_MAIN_GPIO(M, 5) IRQ_TYPE_LEVEL_HIGH>; + interrupts = <TEGRA_MAIN_GPIO(M, 5) IRQ_TYPE_LEVEL_LOW>; }; }; };
arch/arm64/include/asm/cputype.h +6 -0
@@ -75,6 +75,7 @@#define ARM_CPU_IMP_CAVIUM 0x43#define ARM_CPU_IMP_BRCM 0x42#define ARM_CPU_IMP_QCOM 0x51 +#define ARM_CPU_IMP_NVIDIA 0x4E#define ARM_CPU_PART_AEM_V8 0xD0F#define ARM_CPU_PART_FOUNDATION 0xD00
@@ -98,6 +99,9 @@#define QCOM_CPU_PART_FALKOR 0xC00#define QCOM_CPU_PART_KRYO 0x200 +#define NVIDIA_CPU_PART_DENVER 0x003 +#define NVIDIA_CPU_PART_CARMEL 0x004 +#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)#define MIDR_CORTEX_A55 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A55)#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
@@ -112,6 +116,8 @@#define MIDR_QCOM_FALKOR_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR_V1)#define MIDR_QCOM_FALKOR MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR)#define MIDR_QCOM_KRYO MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO) +#define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER) +#define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)#ifndef __ASSEMBLY__
arch/arm64/kernel/ptrace.c +10 -10
@@ -25,6 +25,7 @@#include <linux/sched/signal.h> #include <linux/sched/task_stack.h> #include <linux/mm.h> +#include <linux/nospec.h> #include <linux/smp.h> #include <linux/ptrace.h> #include <linux/user.h>
@@ -247,15 +248,20 @@ static struct perf_event *ptrace_hbp_get_event(unsigned int note_type,switch (note_type) {case NT_ARM_HW_BREAK : -if (idx <ARM_MAX_BRP ) - bp = tsk->thread.debug.hbp_break[idx]; +if (idx >=ARM_MAX_BRP ) + goto out; + idx =array_index_nospec (idx,ARM_MAX_BRP ); + bp = tsk->thread.debug.hbp_break[idx];break ;case NT_ARM_HW_WATCH : -if (idx <ARM_MAX_WRP ) - bp = tsk->thread.debug.hbp_watch[idx]; +if (idx >=ARM_MAX_WRP ) + goto out; + idx =array_index_nospec (idx,ARM_MAX_WRP ); + bp = tsk->thread.debug.hbp_watch[idx];break ; } +out:return bp; }
@@ -1194,9 +1200,7 @@ static int compat_ptrace_gethbpregs(struct task_struct *tsk, compat_long_t num, {int ret;u32 kdata; -mm_segment_t old_fs =get_fs (); -set_fs (KERNEL_DS );/* Watchpoint */ if (num <0 ) { ret =compat_ptrace_hbp_get (NT_ARM_HW_WATCH , tsk, num, &kdata);
@@ -1207,7 +1211,6 @@ static int compat_ptrace_gethbpregs(struct task_struct *tsk, compat_long_t num, }else { ret =compat_ptrace_hbp_get (NT_ARM_HW_BREAK , tsk, num, &kdata); } -set_fs (old_fs);if (!ret) ret =put_user (kdata, data);
@@ -1220,7 +1223,6 @@ static int compat_ptrace_sethbpregs(struct task_struct *tsk, compat_long_t num, {int ret;u32 kdata =0 ; -mm_segment_t old_fs =get_fs ();if (num ==0 )return 0 ;
@@ -1229,12 +1231,10 @@ static int compat_ptrace_sethbpregs(struct task_struct *tsk, compat_long_t num,if (ret)return ret; -set_fs (KERNEL_DS );if (num <0 ) ret =compat_ptrace_hbp_set (NT_ARM_HW_WATCH , tsk, num, &kdata);else ret =compat_ptrace_hbp_set (NT_ARM_HW_BREAK , tsk, num, &kdata); -set_fs (old_fs);return ret; }
arch/hexagon/include/asm/io.h +6 -0
@@ -216,6 +216,12 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src,memcpy ((void *) dst, src, count); } +static inline void memset_io (volatile void __iomem *addr,int value, +size_t size) +{ +memset ((void __force *)addr, value, size); +} +#define PCI_IO_ADDR (volatile void __iomem *)/*
arch/hexagon/lib/checksum.c +1 -0
@@ -199,3 +199,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)memcpy (dst, src, len);return csum_partial (dst, len, sum); } +EXPORT_SYMBOL (csum_partial_copy_nocheck);
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -51,6 +51,8 @@ ranges = <0x02000000 0 0x40000000 0x40000000 0 0x40000000>; + bus-range = <0x00 0xff>; + interrupt-map-mask = <0 0 0 7>; interrupt-map = <0 0 0 1 &pci0_intc 1>, <0 0 0 2 &pci0_intc 2>,
@@ -79,6 +81,8 @@ ranges = <0x02000000 0 0x20000000 0x20000000 0 0x20000000>; + bus-range = <0x00 0xff>; + interrupt-map-mask = <0 0 0 7>; interrupt-map = <0 0 0 1 &pci1_intc 1>, <0 0 0 2 &pci1_intc 2>,
@@ -107,6 +111,8 @@ ranges = <0x02000000 0 0x16000000 0x16000000 0 0x100000>; + bus-range = <0x00 0xff>; + interrupt-map-mask = <0 0 0 7>; interrupt-map = <0 0 0 1 &pci2_intc 1>, <0 0 0 2 &pci2_intc 2>,
arch/mips/include/asm/io.h +3 -1
@@ -307,7 +307,7 @@ static inline void iounmap(const volatile void __iomem *addr)#if defined(CONFIG_CPU_CAVIUM_OCTEON ) || defined(CONFIG_LOONGSON3_ENHANCEMENT )#define war_io_reorder_wmb () wmb()#else -#define war_io_reorder_wmb () do { } while (0) +#define war_io_reorder_wmb () barrier()#endif #define __BUILD_MEMORY_SINGLE (pfx, bwlq, type, irq) \
@@ -377,6 +377,8 @@ static inline type pfx##read##bwlq(const volatile void __iomem *mem) \BUG (); \ } \ \ +/* prevent prefetching of coherent DMA data prematurely */ \ +rmb (); \ return pfx##ioswab##bwlq(__mem, __val); \ }
arch/parisc/kernel/drivers.c +4 -3
@@ -448,7 +448,8 @@ static int match_by_id(struct device * dev, void * data)* Checks all the children of @parent for a matching @id. If none * found, it allocates a new device and returns it. */ -static struct parisc_device *alloc_tree_node (struct device *parent,char id) +static struct parisc_device *__init alloc_tree_node ( +struct device *parent,char id) {struct match_id_data d = { .id = id,
@@ -825,8 +826,8 @@ void walk_lower_bus(struct parisc_device *dev)* devices which are not physically connected (such as extra serial & * keyboard ports). This problem is not yet solved. */ -static void walk_native_bus (unsigned long io_io_low,unsigned long io_io_high, -struct device *parent) +static void __init walk_native_bus (unsigned long io_io_low, +unsigned long io_io_high,struct device *parent) {int i, devices_found =0 ;unsigned long hpa = io_io_low;
arch/parisc/kernel/smp.c +1 -2
@@ -418,8 +418,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) }#ifdef CONFIG_PROC_FS -int __init -setup_profiling_timer (unsigned int multiplier) +int setup_profiling_timer (unsigned int multiplier) {return -EINVAL ; }
arch/parisc/kernel/time.c +1 -1
@@ -205,7 +205,7 @@ static int __init rtc_init(void)device_initcall (rtc_init);#endif -void read_persistent_clock (struct timespec *ts) +void read_persistent_clock64 (struct timespec64 *ts) {static struct pdc_tod tod_data;if (pdc_tod_read (&tod_data) ==0 ) {
arch/powerpc/platforms/powernv/memtrace.c +0 -17
@@ -82,19 +82,6 @@ static const struct file_operations memtrace_fops = { .open = simple_open, }; -static void flush_memory_region (u64 base,u64 size) -{ -unsigned long line_size = ppc64_caches.l1d.size; -u64 end = base + size; -u64 addr; - - base =round_down (base, line_size); - end =round_up (end, line_size); - -for (addr = base; addr < end; addr += line_size) - asmvolatile ("dcbf 0,%0" :"=r" (addr) ::"memory" ); -} -static int check_memblock_online (struct memory_block *mem,void *arg) {if (mem->state !=MEM_ONLINE )
@@ -132,10 +119,6 @@ static bool memtrace_offline_pages(u32 nid, u64 start_pfn, u64 nr_pages)walk_memory_range (start_pfn, end_pfn, (void *)MEM_OFFLINE , change_memblock_state); -/* RCU grace period? */ -flush_memory_region ((u64 )__va (start_pfn <<PAGE_SHIFT ), - nr_pages <<PAGE_SHIFT ); -lock_device_hotplug ();remove_memory (nid, start_pfn <<PAGE_SHIFT , nr_pages <<PAGE_SHIFT );unlock_device_hotplug ();
arch/sh/kernel/cpu/sh2/probe.c +4 -0
@@ -43,7 +43,11 @@ void __ref cpu_probe(void)#endif #if defined(CONFIG_CPU_J2 ) +#if defined(CONFIG_SMP )unsigned cpu =hard_smp_processor_id (); +#else +unsigned cpu =0 ; +#endif if (cpu ==0 )of_scan_flat_dt (scan_cache,NULL );if (j2_ccr_base)__raw_writel (0x80000303 , j2_ccr_base +4 *cpu);if (cpu !=0 )return ;
arch/x86/events/intel/core.c +6 -3
@@ -3331,7 +3331,8 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; -flip_smm_bit (&x86_pmu.attr_freeze_on_smi); +if (x86_pmu.version >1 ) +flip_smm_bit (&x86_pmu.attr_freeze_on_smi);if (!cpuc->shared_regs)return ;
@@ -3494,6 +3495,8 @@ static __initconst const struct x86_pmu core_pmu = { .cpu_dying = intel_pmu_cpu_dying, }; +static struct attribute *intel_pmu_attrs[]; +static __initconst const struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq,
@@ -3524,6 +3527,8 @@ static __initconst const struct x86_pmu intel_pmu = { .format_attrs = intel_arch3_formats_attr, .events_sysfs_show = intel_event_sysfs_show, + .attrs = intel_pmu_attrs, + .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying,
@@ -3902,8 +3907,6 @@ __init int intel_pmu_init(void) x86_pmu.max_pebs_events =min_t (unsigned,MAX_PEBS_EVENTS , x86_pmu.num_counters); - - x86_pmu.attrs = intel_pmu_attrs;/* * Quirk: v2 perfmon does not report fixed-purpose events, so * assume at least 3 events, when not running in a hypervisor:
arch/x86/include/asm/insn.h +18 -0
@@ -208,4 +208,22 @@ static inline int insn_offset_immediate(struct insn *insn) return insn_offset_displacement(insn) + insn->displacement.nbytes; } +#define POP_SS_OPCODE 0x1f +#define MOV_SREG_OPCODE 0x8e + +/* +* Intel SDM Vol.3A 6.8.3 states; +* "Any single-step trap that would be delivered following the MOV to SS +* instruction or POP to SS instruction (because EFLAGS.TF is 1) is +* suppressed." +* This function returns true if @insn is MOV SS or POP SS. On these +* instructions, single stepping is suppressed. +*/ +static inline int insn_masking_exception (struct insn *insn) +{ +return insn->opcode.bytes[0 ] ==POP_SS_OPCODE || + (insn->opcode.bytes[0 ] ==MOV_SREG_OPCODE && +X86_MODRM_REG (insn->modrm.bytes[0 ]) ==2 ); +} +#endif /* _ASM_X86_INSN_H */
arch/x86/kernel/cpu/intel.c +3 -0
@@ -751,6 +751,9 @@ static const struct _tlb_table intel_tlb_table[] = { { 0x5d, TLB_DATA_4K_4M, 256, " TLB_DATA 4 KByte and 4 MByte pages" }, { 0x61, TLB_INST_4K, 48, " TLB_INST 4 KByte pages, full associative" }, { 0x63, TLB_DATA_1G, 4, " TLB_DATA 1 GByte pages, 4-way set associative" }, + { 0x6b, TLB_DATA_4K, 256, " TLB_DATA 4 KByte pages, 8-way associative" }, + { 0x6c, TLB_DATA_2M_4M, 128, " TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" }, + { 0x6d, TLB_DATA_1G, 16, " TLB_DATA 1 GByte pages, fully associative" }, { 0x76, TLB_INST_2M_4M, 8, " TLB_INST 2-MByte or 4-MByte pages, fully associative" }, { 0xb0, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 4-way set associative" }, { 0xb1, TLB_INST_2M_4M, 4, " TLB_INST 2M pages, 4-way, 8 entries or 4M pages, 4-way entries" },
arch/x86/kernel/kexec-bzimage64.c +2 -3
@@ -398,11 +398,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel,* little bit simple */ efi_map_sz =efi_get_runtime_map_size (); - efi_map_sz =ALIGN (efi_map_sz,16 ); params_cmdline_sz =sizeof (struct boot_params ) + cmdline_len +MAX_ELFCOREHDR_STR_LEN ; params_cmdline_sz =ALIGN (params_cmdline_sz,16 ); - kbuf.bufsz = params_cmdline_sz + efi_map_sz + + kbuf.bufsz = params_cmdline_sz +ALIGN (efi_map_sz,16 ) +sizeof (struct setup_data ) +sizeof (struct efi_setup_data );
@@ -410,7 +409,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,if (!params)return ERR_PTR (-ENOMEM ); efi_map_offset = params_cmdline_sz; - efi_setup_data_offset = efi_map_offset + efi_map_sz; + efi_setup_data_offset = efi_map_offset +ALIGN (efi_map_sz,16 );/* Copy setup header onto bootparams. Documentation/x86/boot.txt */ setup_header_size =0x0202 + kernel[0x0201 ] - setup_hdr_offset;
arch/x86/kernel/kprobes/core.c +4 -0
@@ -369,6 +369,10 @@ int __copy_instruction(u8 *dest, u8 *src, struct insn *insn)if (insn->opcode.bytes[0 ] ==BREAKPOINT_INSTRUCTION )return 0 ; +/* We should not singlestep on the exception masking instructions */ +if (insn_masking_exception (insn)) +return 0 ; +#ifdef CONFIG_X86_64 /* Only x86_64 has RIP relative instructions */ if (insn_rip_relative (insn)) {
arch/x86/kernel/uprobes.c +4 -0
@@ -296,6 +296,10 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, boolif (is_prefix_bad (insn))return -ENOTSUPP ; +/* We should not singlestep on the exception masking instructions */ +if (insn_masking_exception (insn)) +return -ENOTSUPP ; +if (x86_64) good_insns = good_insns_64;else
arch/x86/kvm/hyperv.c +1 -1
@@ -1223,7 +1223,7 @@ static int kvm_hv_hypercall_complete_userspace(struct kvm_vcpu *vcpu)struct kvm_run *run = vcpu->run;kvm_hv_hypercall_set_result (vcpu, run->hyperv.u.hcall.result); -return 1 ; +return kvm_skip_emulated_instruction (vcpu); }int kvm_hv_hypercall (struct kvm_vcpu *vcpu)
arch/x86/kvm/svm.c +2 -3
@@ -4756,9 +4756,8 @@ static int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq, }if (!ret && svm) { -trace_kvm_pi_irte_update (svm->vcpu.vcpu_id, - host_irq, e->gsi, - vcpu_info.vector, +trace_kvm_pi_irte_update (host_irq, svm->vcpu.vcpu_id, + e->gsi, vcpu_info.vector, vcpu_info.pi_desc_addr, set); }
arch/x86/kvm/vmx.c +14 -1
@@ -10318,6 +10318,16 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu,return true; } +static int nested_vmx_check_apic_access_controls (struct kvm_vcpu *vcpu, +struct vmcs12 *vmcs12) +{ +if (nested_cpu_has2 (vmcs12,SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES ) && + !page_address_valid (vcpu, vmcs12->apic_access_addr)) +return -EINVAL ; +else +return 0 ; +} +static int nested_vmx_check_apicv_controls (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12) {
@@ -10961,6 +10971,9 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)if (nested_vmx_check_msr_bitmap_controls (vcpu, vmcs12))return VMXERR_ENTRY_INVALID_CONTROL_FIELD ; +if (nested_vmx_check_apic_access_controls (vcpu, vmcs12)) +return VMXERR_ENTRY_INVALID_CONTROL_FIELD ; +if (nested_vmx_check_tpr_shadow_controls (vcpu, vmcs12))return VMXERR_ENTRY_INVALID_CONTROL_FIELD ;
@@ -12171,7 +12184,7 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq, vcpu_info.pi_desc_addr =__pa (vcpu_to_pi_desc (vcpu)); vcpu_info.vector = irq.vector; -trace_kvm_pi_irte_update (vcpu->vcpu_id, host_irq, e->gsi, +trace_kvm_pi_irte_update (host_irq, vcpu->vcpu_id, e->gsi, vcpu_info.vector, vcpu_info.pi_desc_addr, set);if (set)
arch/x86/kvm/x86.c +11 -8
@@ -6297,12 +6297,13 @@ void kvm_vcpu_deactivate_apicv(struct kvm_vcpu *vcpu)int kvm_emulate_hypercall (struct kvm_vcpu *vcpu) {unsigned long nr, a0, a1, a2, a3, ret; -int op_64_bit, r; +int op_64_bit; - r =kvm_skip_emulated_instruction (vcpu); - -if (kvm_hv_hypercall_enabled (vcpu->kvm)) -return kvm_hv_hypercall (vcpu); +if (kvm_hv_hypercall_enabled (vcpu->kvm)) { +if (!kvm_hv_hypercall (vcpu)) +return 0 ; + goto out; + } nr =kvm_register_read (vcpu,VCPU_REGS_RAX ); a0 =kvm_register_read (vcpu,VCPU_REGS_RBX );
@@ -6323,7 +6324,7 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)if (kvm_x86_ops->get_cpl (vcpu) !=0 ) { ret = -KVM_EPERM ; - goto out; + goto out_error; }switch (nr) {
@@ -6343,12 +6344,14 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) ret = -KVM_ENOSYS ;break ; } -out: +out_error:if (!op_64_bit) ret = (u32 )ret;kvm_register_write (vcpu,VCPU_REGS_RAX , ret); + +out: ++vcpu->stat.hypercalls; -return r; +return kvm_skip_emulated_instruction (vcpu); }EXPORT_SYMBOL_GPL (kvm_emulate_hypercall);
arch/x86/net/bpf_jit_comp.c +2 -2
@@ -1159,6 +1159,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)for (pass =0 ; pass <20 || image; pass++) { proglen =do_jit (prog, addrs, image, oldproglen, &ctx);if (proglen <=0 ) { +out_image: image =NULL ;if (header)bpf_jit_binary_free (header);
@@ -1169,8 +1170,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)if (proglen != oldproglen) {pr_err ("bpf_jit: proglen=%d != oldproglen=%d\n" , proglen, oldproglen); - prog = orig_prog; - goto out_addrs; + goto out_image; }break ; }
arch/x86/xen/enlighten_hvm.c +13 -0
@@ -64,6 +64,19 @@ static void __init xen_hvm_init_mem_mapping(void) {early_memunmap (HYPERVISOR_shared_info,PAGE_SIZE ); HYPERVISOR_shared_info =__va (PFN_PHYS (shared_info_pfn)); + +/* +* The virtual address of the shared_info page has changed, so +* the vcpu_info pointer for VCPU 0 is now stale. +* +* The prepare_boot_cpu callback will re-initialize it via +* xen_vcpu_setup, but we can't rely on that to be called for +* old Xen versions (xen_have_vector_callback == 0). +* +* It is, in any case, bad to have a stale vcpu_info pointer +* so reset it now. +*/ +xen_vcpu_info_reset (0 ); }static void __init init_hvm_pv_info (void )
block/blk-cgroup.c +11 -11
@@ -1149,18 +1149,16 @@ int blkcg_init_queue(struct request_queue *q)rcu_read_lock ();spin_lock_irq (q->queue_lock); blkg =blkg_create (&blkcg_root, q, new_blkg); +if (IS_ERR (blkg)) + goto err_unlock; + q->root_blkg = blkg; + q->root_rl.blkg = blkg;spin_unlock_irq (q->queue_lock);rcu_read_unlock ();if (preloaded)radix_tree_preload_end (); -if (IS_ERR (blkg)) -return PTR_ERR (blkg); - - q->root_blkg = blkg; - q->root_rl.blkg = blkg; - ret =blk_throtl_init (q);if (ret) {spin_lock_irq (q->queue_lock);
@@ -1168,6 +1166,13 @@ int blkcg_init_queue(struct request_queue *q)spin_unlock_irq (q->queue_lock); }return ret; + +err_unlock: +spin_unlock_irq (q->queue_lock); +rcu_read_unlock (); +if (preloaded) +radix_tree_preload_end (); +return PTR_ERR (blkg); }/**
@@ -1374,17 +1379,12 @@ void blkcg_deactivate_policy(struct request_queue *q,__clear_bit (pol->plid, q->blkcg_pols);list_for_each_entry (blkg, &q->blkg_list, q_node) { -/* grab blkcg lock too while removing @pd from @blkg */ -spin_lock (&blkg->blkcg->lock); -if (blkg->pd[pol->plid]) {if (pol->pd_offline_fn) pol->pd_offline_fn (blkg->pd[pol->plid]); pol->pd_free_fn (blkg->pd[pol->plid]); blkg->pd[pol->plid] =NULL ; } - -spin_unlock (&blkg->blkcg->lock); }spin_unlock_irq (q->queue_lock);
block/blk-mq.c +19 -0
@@ -118,6 +118,25 @@ void blk_mq_in_flight(struct request_queue *q, struct hd_struct *part,blk_mq_queue_tag_busy_iter (q, blk_mq_check_inflight, &mi); } +static void blk_mq_check_inflight_rw (struct blk_mq_hw_ctx *hctx, +struct request *rq,void *priv, +bool reserved) +{ +struct mq_inflight *mi = priv; + +if (rq->part == mi->part) + mi->inflight[rq_data_dir (rq)]++; +} + +void blk_mq_in_flight_rw (struct request_queue *q,struct hd_struct *part, +unsigned int inflight[2 ]) +{ +struct mq_inflight mi = { .part = part, .inflight = inflight, }; + + inflight[0 ] = inflight[1 ] =0 ; +blk_mq_queue_tag_busy_iter (q, blk_mq_check_inflight_rw, &mi); +} +void blk_freeze_queue_start (struct request_queue *q) {int freeze_depth;
block/blk-mq.h +3 -1
@@ -136,6 +136,8 @@ static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx) }void blk_mq_in_flight (struct request_queue *q,struct hd_struct *part, -unsigned int inflight[2 ]); +unsigned int inflight[2 ]); +void blk_mq_in_flight_rw (struct request_queue *q,struct hd_struct *part, +unsigned int inflight[2 ]);#endif
block/genhd.c +12 -0
@@ -82,6 +82,18 @@ void part_in_flight(struct request_queue *q, struct hd_struct *part, } } +void part_in_flight_rw (struct request_queue *q,struct hd_struct *part, +unsigned int inflight[2 ]) +{ +if (q->mq_ops) { +blk_mq_in_flight_rw (q, part, inflight); +return ; + } + + inflight[0 ] =atomic_read (&part->in_flight[0 ]); + inflight[1 ] =atomic_read (&part->in_flight[1 ]); +} +struct hd_struct *__disk_get_part (struct gendisk *disk,int partno) {struct disk_part_tbl *ptbl =rcu_dereference (disk->part_tbl);
block/partition-generic.c +6 -4
@@ -145,13 +145,15 @@ ssize_t part_stat_show(struct device *dev, jiffies_to_msecs(part_stat_read(p, time_in_queue))); } -ssize_t part_inflight_show (struct device *dev, -struct device_attribute *attr,char *buf) +ssize_t part_inflight_show (struct device *dev,struct device_attribute *attr, +char *buf) {struct hd_struct *p =dev_to_part (dev); +struct request_queue *q =part_to_disk (p)->queue; +unsigned int inflight[2 ]; -return sprintf (buf,"%8u %8u\n" ,atomic_read (&p->in_flight[0 ]), -atomic_read (&p->in_flight[1 ])); +part_in_flight_rw (q, p, inflight); +return sprintf (buf,"%8u %8u\n" , inflight[0 ], inflight[1 ]); }#ifdef CONFIG_FAIL_MAKE_REQUEST
drivers/acpi/acpi_watchdog.c +49 -10
84 lines not on this page · raw message
drivers/acpi/sleep.c +13 -0
@@ -364,6 +364,19 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"), }, }, +/* +* ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using +* the Low Power S0 Idle firmware interface (see +* https://bugzilla.kernel.org/show_bug.cgi?id=199057). +*/ + { + .callback = init_no_lps0, + .ident = "ThinkPad X1 Tablet(2016)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), + }, + }, {}, };
drivers/ata/ahci.c +3 -3
@@ -686,7 +686,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class,DPRINTK ("ENTER\n" ); -ahci_stop_engine (ap); + hpriv->stop_engine (ap); rc =sata_link_hardreset (link,sata_ehc_deb_timing (&link->eh_context), deadline, &online,NULL );
@@ -712,7 +712,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,bool online;int rc; -ahci_stop_engine (ap); + hpriv->stop_engine (ap);/* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init (link->device, &tf);
@@ -776,7 +776,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,DPRINTK ("ENTER\n" ); -ahci_stop_engine (ap); + hpriv->stop_engine (ap);for (i =0 ; i <2 ; i++) {u16 val;
drivers/ata/ahci.h +7 -0
@@ -361,6 +361,13 @@ struct ahci_host_priv {* be overridden anytime before the host is activated. */ void (*start_engine)(struct ata_port *ap); +/* +* Optional ahci_stop_engine override, if not set this gets set to the +* default ahci_stop_engine during ahci_save_initial_config, this can +* be overridden anytime before the host is activated. +*/ +int (*stop_engine)(struct ata_port *ap); +irqreturn_t (*irq_handler)(int irq,void *dev_instance);/* only required for per-port MSI(-X) support */
drivers/ata/ahci_mvebu.c +56 -0
68 lines not on this page · raw message
drivers/ata/ahci_qoriq.c +1 -1
@@ -94,7 +94,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,DPRINTK ("ENTER\n" ); -ahci_stop_engine (ap); + hpriv->stop_engine (ap);/* * There is a errata on ls1021a Rev1.0 and Rev2.0 which is:
drivers/ata/ahci_xgene.c +2 -2
@@ -165,7 +165,7 @@ static int xgene_ahci_restart_engine(struct ata_port *ap) PORT_CMD_ISSUE, 0x0, 1, 100))return -EBUSY ; -ahci_stop_engine (ap); + hpriv->stop_engine (ap);ahci_start_fis_rx (ap);/*
@@ -421,7 +421,7 @@ static int xgene_ahci_hardreset(struct ata_link *link, unsigned int *class, portrxfis_saved =readl (port_mmio +PORT_FIS_ADDR ); portrxfishi_saved =readl (port_mmio +PORT_FIS_ADDR_HI ); -ahci_stop_engine (ap); + hpriv->stop_engine (ap); rc =xgene_ahci_do_hardreset (link, deadline, &online);
drivers/ata/libahci.c +12 -8
@@ -560,6 +560,9 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)if (!hpriv->start_engine) hpriv->start_engine = ahci_start_engine; +if (!hpriv->stop_engine) + hpriv->stop_engine = ahci_stop_engine; +if (!hpriv->irq_handler) hpriv->irq_handler = ahci_single_level_irq_intr; }
@@ -887,9 +890,10 @@ static void ahci_start_port(struct ata_port *ap)static int ahci_deinit_port (struct ata_port *ap,const char **emsg) {int rc; +struct ahci_host_priv *hpriv = ap->host->private_data;/* disable DMA */ - rc =ahci_stop_engine (ap); + rc = hpriv->stop_engine (ap);if (rc) { *emsg ="failed to stop engine" ;return rc;
@@ -1299,7 +1303,7 @@ int ahci_kick_engine(struct ata_port *ap)int busy, rc;/* stop engine */ - rc =ahci_stop_engine (ap); + rc = hpriv->stop_engine (ap);if (rc) goto out_restart;
@@ -1538,7 +1542,7 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class,DPRINTK ("ENTER\n" ); -ahci_stop_engine (ap); + hpriv->stop_engine (ap);/* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init (link->device, &tf);
@@ -2064,14 +2068,14 @@ void ahci_error_handler(struct ata_port *ap)if (!(ap->pflags &ATA_PFLAG_FROZEN )) {/* restart engine */ -ahci_stop_engine (ap); + hpriv->stop_engine (ap); hpriv->start_engine (ap); }sata_pmp_error_handler (ap);if (!ata_dev_enabled (ap->link.device)) -ahci_stop_engine (ap); + hpriv->stop_engine (ap); }EXPORT_SYMBOL_GPL (ahci_error_handler);
@@ -2118,7 +2122,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)return ;/* set DITO, MDAT, DETO and enable DevSlp, need to stop engine first */ - rc =ahci_stop_engine (ap); + rc = hpriv->stop_engine (ap);if (rc)return ;
@@ -2178,7 +2182,7 @@ static void ahci_enable_fbs(struct ata_port *ap)return ; } - rc =ahci_stop_engine (ap); + rc = hpriv->stop_engine (ap);if (rc)return ;
@@ -2211,7 +2215,7 @@ static void ahci_disable_fbs(struct ata_port *ap)return ; } - rc =ahci_stop_engine (ap); + rc = hpriv->stop_engine (ap);if (rc)return ;
drivers/ata/libata-eh.c +2 -2
@@ -175,8 +175,8 @@ static void ata_eh_handle_port_resume(struct ata_port *ap) { }#endif /* CONFIG_PM */ -static void __ata_ehi_pushv_desc (struct ata_eh_info *ehi,const char *fmt, -va_list args) +static __printf(2, 0) void __ata_ehi_pushv_desc(struct ata_eh_info *ehi, + const char *fmt, va_list args) { ehi->desc_len += vscnprintf(ehi->desc + ehi->desc_len, ATA_EH_DESC_LEN - ehi->desc_len,
drivers/ata/sata_highbank.c +1 -1
@@ -410,7 +410,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class,int rc;int retry =100 ; -ahci_stop_engine (ap); + hpriv->stop_engine (ap);/* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init (link->device, &tf);
drivers/char/agp/uninorth-agp.c +2 -2
@@ -195,7 +195,7 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start, int tyreturn 0 ; } -int uninorth_remove_memory (struct agp_memory *mem,off_t pg_start,int type) +static int uninorth_remove_memory (struct agp_memory *mem,off_t pg_start,int type) {size_t i;u32 *gp;
@@ -470,7 +470,7 @@ static int uninorth_free_gatt_table(struct agp_bridge_data *bridge)return 0 ; } -void null_cache_flush (void ) +static void null_cache_flush (void ) {mb (); }
drivers/clk/clk-mux.c +9 -1
@@ -101,10 +101,18 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)return 0 ; } +static int clk_mux_determine_rate (struct clk_hw *hw, +struct clk_rate_request *req) +{ +struct clk_mux *mux =to_clk_mux (hw); + +return clk_mux_determine_rate_flags (hw, req, mux->flags); +} +const struct clk_ops clk_mux_ops = { .get_parent = clk_mux_get_parent, .set_parent = clk_mux_set_parent, - .determine_rate = __clk_mux_determine_rate, + .determine_rate = clk_mux_determine_rate, };EXPORT_SYMBOL_GPL (clk_mux_ops);
drivers/clk/clk.c +4 -3
@@ -351,9 +351,9 @@ static bool mux_is_better_rate(unsigned long rate, unsigned long now,return now <= rate && now > best; } -static int -clk_mux_determine_rate_flags (struct clk_hw *hw,struct clk_rate_request *req, -unsigned long flags) +int clk_mux_determine_rate_flags (struct clk_hw *hw, +struct clk_rate_request *req, +unsigned long flags) {struct clk_core *core = hw->core, *parent, *best_parent =NULL ;int i, num_parents, ret;
@@ -413,6 +413,7 @@ clk_mux_determine_rate_flags(struct clk_hw *hw, struct clk_rate_request *req,return 0 ; } +EXPORT_SYMBOL_GPL (clk_mux_determine_rate_flags);struct clk *__clk_lookup (const char *name) {
drivers/clk/imx/clk-imx6ul.c +1 -1
@@ -461,7 +461,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)clk_set_rate (clks[IMX6UL_CLK_AHB ],99000000 );/* Change periph_pre clock to pll2_bus to adjust AXI rate to 264MHz */ -clk_set_parent (clks[IMX6UL_CLK_PERIPH_CLK2_SEL ], clks[IMX6UL_CLK_PLL3_USB_OTG ]); +clk_set_parent (clks[IMX6UL_CLK_PERIPH_CLK2_SEL ], clks[IMX6UL_CLK_OSC ]);clk_set_parent (clks[IMX6UL_CLK_PERIPH ], clks[IMX6UL_CLK_PERIPH_CLK2 ]);clk_set_parent (clks[IMX6UL_CLK_PERIPH_PRE ], clks[IMX6UL_CLK_PLL2_BUS ]);clk_set_parent (clks[IMX6UL_CLK_PERIPH ], clks[IMX6UL_CLK_PERIPH_PRE ]);
drivers/clocksource/timer-imx-tpm.c +7 -1
@@ -20,6 +20,7 @@#define TPM_SC 0x10#define TPM_SC_CMOD_INC_PER_CNT (0x1 << 3)#define TPM_SC_CMOD_DIV_DEFAULT 0x3 +#define TPM_SC_TOF_MASK (0x1 << 7)#define TPM_CNT 0x14#define TPM_MOD 0x18#define TPM_STATUS 0x1c
@@ -29,6 +30,7 @@#define TPM_C0SC_MODE_SHIFT 2#define TPM_C0SC_MODE_MASK 0x3c#define TPM_C0SC_MODE_SW_COMPARE 0x4 +#define TPM_C0SC_CHF_MASK (0x1 << 7)#define TPM_C0V 0x24static void __iomem *timer_base;
@@ -205,9 +207,13 @@ static int __init tpm_timer_init(struct device_node *np)* 4) Channel0 disabled * 5) DMA transfers disabled */ +/* make sure counter is disabled */ writel (0 , timer_base +TPM_SC ); +/* TOF is W1C */ +writel (TPM_SC_TOF_MASK , timer_base +TPM_SC );writel (0 , timer_base +TPM_CNT ); -writel (0 , timer_base +TPM_C0SC ); +/* CHF is W1C */ +writel (TPM_C0SC_CHF_MASK , timer_base +TPM_C0SC );/* increase per cnt, div 8 by default */ writel(TPM_SC_CMOD_INC_PER_CNT | TPM_SC_CMOD_DIV_DEFAULT,
drivers/firmware/efi/libstub/arm64-stub.c +10 -0
@@ -97,6 +97,16 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg,u32 offset = !IS_ENABLED (CONFIG_DEBUG_ALIGN_RODATA ) ? (phys_seed >>32 ) & mask :TEXT_OFFSET ; +/* +* With CONFIG_RANDOMIZE_TEXT_OFFSET=y, TEXT_OFFSET may not +* be a multiple of EFI_KIMG_ALIGN, and we must ensure that +* we preserve the misalignment of 'offset' relative to +* EFI_KIMG_ALIGN so that statically allocated objects whose +* alignment exceeds PAGE_SIZE appear correctly aligned in +* memory. +*/ + offset |=TEXT_OFFSET %EFI_KIMG_ALIGN ; +/* * If KASLR is enabled, and we have some randomness available, * locate the kernel at a randomized offset in physical memory.
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +7 -6
@@ -716,12 +716,13 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,struct timespec64 time; dev =kfd_device_by_id (args->gpu_id); -if (dev ==NULL ) -return -EINVAL ; - -/* Reading GPU clock counter from KGD */ - args->gpu_clock_counter = - dev->kfd2kgd->get_gpu_clock_counter (dev->kgd); +if (dev) +/* Reading GPU clock counter from KGD */ + args->gpu_clock_counter = + dev->kfd2kgd->get_gpu_clock_counter (dev->kgd); +else +/* Node without GPU resource */ + args->gpu_clock_counter =0 ;/* No access to rdtsc. Using raw monotonic time */ getrawmonotonic64 (&time);
drivers/gpu/drm/drm_dumb_buffers.c +4 -3
@@ -65,12 +65,13 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev,return -EINVAL ;/* overflow checks for 32bit size calculations */ -/* NOTE: DIV_ROUND_UP() can overflow */ +if (args->bpp >U32_MAX -8 ) +return -EINVAL ; cpp =DIV_ROUND_UP (args->bpp,8 ); -if (!cpp || cpp >0xffffffffU / args->width) +if (cpp >U32_MAX / args->width)return -EINVAL ; stride = cpp * args->width; -if (args->height >0xffffffffU / stride) +if (args->height >U32_MAX / stride)return -EINVAL ;/* test for wrap-around */
drivers/gpu/drm/msm/dsi/dsi_host.c +1 -1
@@ -740,7 +740,7 @@ static inline enum dsi_cmd_dst_format dsi_get_cmd_fmt(switch (mipi_fmt) {case MIPI_DSI_FMT_RGB888 :return CMD_DST_FORMAT_RGB888 ;case MIPI_DSI_FMT_RGB666_PACKED : -case MIPI_DSI_FMT_RGB666 :return VID_DST_FORMAT_RGB666 ; +case MIPI_DSI_FMT_RGB666 :return CMD_DST_FORMAT_RGB666 ;case MIPI_DSI_FMT_RGB565 :return CMD_DST_FORMAT_RGB565 ;default :return CMD_DST_FORMAT_RGB888 ; }
drivers/gpu/drm/msm/msm_fbdev.c +2 -9
@@ -92,8 +92,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,if (IS_ERR (fb)) {dev_err (dev->dev,"failed to allocate fb\n" ); - ret =PTR_ERR (fb); - goto fail; +return PTR_ERR (fb); } bo =msm_framebuffer_bo (fb,0 );
@@ -151,13 +150,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, fail_unlock:mutex_unlock (&dev->struct_mutex); -fail: - -if (ret) { -if (fb) -drm_framebuffer_remove (fb); - } - +drm_framebuffer_remove (fb);return ret; }
drivers/gpu/drm/msm/msm_gem.c +11 -9
@@ -132,17 +132,19 @@ static void put_pages(struct drm_gem_object *obj)struct msm_gem_object *msm_obj =to_msm_bo (obj);if (msm_obj->pages) { -/* For non-cached buffers, ensure the new pages are clean -* because display controller, GPU, etc. are not coherent: -*/ -if (msm_obj->flags & (MSM_BO_WC |MSM_BO_UNCACHED )) -dma_unmap_sg (obj->dev->dev, msm_obj->sgt->sgl, - msm_obj->sgt->nents,DMA_BIDIRECTIONAL ); +if (msm_obj->sgt) { +/* For non-cached buffers, ensure the new +* pages are clean because display controller, +* GPU, etc. are not coherent: +*/ +if (msm_obj->flags & (MSM_BO_WC |MSM_BO_UNCACHED )) +dma_unmap_sg (obj->dev->dev, msm_obj->sgt->sgl, + msm_obj->sgt->nents, +DMA_BIDIRECTIONAL ); -if (msm_obj->sgt)sg_free_table (msm_obj->sgt); - -kfree (msm_obj->sgt); +kfree (msm_obj->sgt); + }if (use_pages (obj))drm_gem_put_pages (obj, msm_obj->pages, true, false);
drivers/gpu/drm/omapdrm/dss/hdmi4.c +1 -1
@@ -634,7 +634,7 @@ static int hdmi_audio_config(struct device *dev, struct omap_dss_audio *dss_audio) {struct omap_hdmi *hd =dev_get_drvdata (dev); -int ret; +int ret =0 ;mutex_lock (&hd->lock);
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +6 -1
@@ -926,8 +926,13 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core) {const struct hdmi4_features *features;struct resource *res; +const struct soc_device_attribute *soc; - features =soc_device_match (hdmi4_soc_devices)->data; + soc =soc_device_match (hdmi4_soc_devices); +if (!soc) +return -ENODEV ; + + features = soc->data; core->cts_swmode = features->cts_swmode; core->audio_use_mclk = features->audio_use_mclk;
drivers/gpu/drm/omapdrm/dss/hdmi5.c +1 -1
@@ -660,7 +660,7 @@ static int hdmi_audio_config(struct device *dev, struct omap_dss_audio *dss_audio) {struct omap_hdmi *hd =dev_get_drvdata (dev); -int ret; +int ret =0 ;mutex_lock (&hd->lock);
drivers/gpu/drm/omapdrm/omap_connector.c +10 -0
@@ -123,6 +123,9 @@ static int omap_connector_get_modes(struct drm_connector *connector)if (dssdrv->read_edid) {void *edid =kzalloc (MAX_EDID ,GFP_KERNEL ); +if (!edid) +return 0 ; +if ((dssdrv->read_edid (dssdev, edid,MAX_EDID ) >0 ) &&drm_edid_is_valid (edid)) { drm_mode_connector_update_edid_property(
@@ -141,6 +144,9 @@ static int omap_connector_get_modes(struct drm_connector *connector)struct drm_display_mode *mode =drm_mode_create (dev);struct videomode vm = {0 }; +if (!mode) +return 0 ; + dssdrv->get_timings (dssdev, &vm);drm_display_mode_from_videomode (&vm, mode);
@@ -196,6 +202,10 @@ static int omap_connector_mode_valid(struct drm_connector *connector,if (!r) {/* check if vrefresh is still valid */ new_mode =drm_mode_duplicate (dev, mode); + +if (!new_mode) +return MODE_BAD ; + new_mode->clock = vm.pixelclock /1000 ; new_mode->vrefresh =0 ;if (mode->vrefresh ==drm_mode_vrefresh (new_mode))
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +5 -1
@@ -389,12 +389,16 @@ int tiler_unpin(struct tiler_block *block)struct tiler_block *tiler_reserve_2d (enum tiler_fmt fmt,uint16_t w,uint16_t h,uint16_t align) { -struct tiler_block *block =kzalloc (sizeof (*block),GFP_KERNEL ); +struct tiler_block *block;u32 min_align =128 ;int ret;unsigned long flags;u32 slot_bytes; + block =kzalloc (sizeof (*block),GFP_KERNEL ); +if (!block) +return ERR_PTR (-ENOMEM ); +BUG_ON (!validfmt (fmt));/* convert width/height to slots */
drivers/gpu/drm/omapdrm/tcm-sita.c +1 -1
@@ -92,7 +92,7 @@ static int l2r_t2b(uint16_t w, uint16_t h, uint16_t a, int16_t offset, {int i;unsigned long index; -bool area_free; +bool area_free = false;unsigned long slots_per_band =PAGE_SIZE / slot_bytes;unsigned long bit_offset = (offset >0 ) ? offset / slot_bytes :0 ;unsigned long curr_bit = bit_offset;
drivers/hid/Kconfig +4 -3
@@ -436,10 +436,11 @@ config HID_LENOVO select NEW_LEDS select LEDS_CLASS ---help--- - Support for Lenovo devices that are not fully compliant with HID standard. + Support for IBM/Lenovo devices that are not fully compliant with HID standard. - Say Y if you want support for the non-compliant features of the Lenovo - Thinkpad standalone keyboards, e.g: + Say Y if you want support for horizontal scrolling of the IBM/Lenovo + Scrollpoint mice or the non-compliant features of the Lenovo Thinkpad + standalone keyboards, e.g: - ThinkPad USB Keyboard with TrackPoint (supports extra LEDs and trackpoint configuration) - ThinkPad Compact Bluetooth Keyboard with TrackPoint (supports Fn keys)
drivers/hid/hid-ids.h +8 -0
@@ -532,6 +532,13 @@#define USB_VENDOR_ID_HUION 0x256c#define USB_DEVICE_ID_HUION_TABLET 0x006e +#define USB_VENDOR_ID_IBM 0x04b3 +#define USB_DEVICE_ID_IBM_SCROLLPOINT_III 0x3100 +#define USB_DEVICE_ID_IBM_SCROLLPOINT_PRO 0x3103 +#define USB_DEVICE_ID_IBM_SCROLLPOINT_OPTICAL 0x3105 +#define USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL 0x3108 +#define USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL_PRO 0x3109 +#define USB_VENDOR_ID_IDEACOM 0x1cb6#define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650#define USB_DEVICE_ID_IDEACOM_IDC6651 0x6651
@@ -664,6 +671,7 @@#define USB_DEVICE_ID_LENOVO_TPKBD 0x6009#define USB_DEVICE_ID_LENOVO_CUSBKBD 0x6047#define USB_DEVICE_ID_LENOVO_CBTKBD 0x6048 +#define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL 0x6049#define USB_DEVICE_ID_LENOVO_TPPRODOCK 0x6067#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085#define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3
drivers/hid/hid-lenovo.c +36 -0
@@ -6,6 +6,17 @@* * Copyright (c) 2012 Bernhard Seibold * Copyright (c) 2014 Jamie Lentin <[email protected]> +* +* Linux IBM/Lenovo Scrollpoint mouse driver: +* - IBM Scrollpoint III +* - IBM Scrollpoint Pro +* - IBM Scrollpoint Optical +* - IBM Scrollpoint Optical 800dpi +* - IBM Scrollpoint Optical 800dpi Pro +* - Lenovo Scrollpoint Optical +* +* Copyright (c) 2012 Peter De Wachter <[email protected]> +* Copyright (c) 2018 Peter Ganzhorn <[email protected]> */ /*
@@ -160,6 +171,17 @@ static int lenovo_input_mapping_cptkbd(struct hid_device *hdev,return 0 ; } +static int lenovo_input_mapping_scrollpoint (struct hid_device *hdev, +struct hid_input *hi,struct hid_field *field, +struct hid_usage *usage,unsigned long **bit,int *max) +{ +if (usage->hid ==HID_GD_Z ) { +hid_map_usage (hi, usage, bit, max,EV_REL ,REL_HWHEEL ); +return 1 ; + } +return 0 ; +} +static int lenovo_input_mapping (struct hid_device *hdev,struct hid_input *hi,struct hid_field *field,struct hid_usage *usage,unsigned long **bit,int *max)
@@ -172,6 +194,14 @@ static int lenovo_input_mapping(struct hid_device *hdev,case USB_DEVICE_ID_LENOVO_CBTKBD :return lenovo_input_mapping_cptkbd (hdev, hi, field, usage, bit, max); +case USB_DEVICE_ID_IBM_SCROLLPOINT_III : +case USB_DEVICE_ID_IBM_SCROLLPOINT_PRO : +case USB_DEVICE_ID_IBM_SCROLLPOINT_OPTICAL : +case USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL : +case USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL_PRO : +case USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL : +return lenovo_input_mapping_scrollpoint (hdev, hi, field, + usage, bit, max);default :return 0 ; }
@@ -883,6 +913,12 @@ static const struct hid_device_id lenovo_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) }, + { HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_III) }, + { HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_PRO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_OPTICAL) }, + { HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL) }, + { HID_USB_DEVICE(USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_SCROLLPOINT_800DPI_OPTICAL_PRO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL) }, { } };
drivers/hid/intel-ish-hid/ishtp/bus.c +1 -1
@@ -418,7 +418,7 @@ static struct ishtp_cl_device *ishtp_bus_add_device(struct ishtp_device *dev,list_del (&device->device_link);spin_unlock_irqrestore (&dev->device_list_lock, flags);dev_err (dev->devc,"Failed to register ISHTP client device\n" ); -kfree (device); +put_device (&device->dev);return NULL ; }
drivers/hid/wacom_sys.c +3 -1
@@ -1102,8 +1102,10 @@ static int __wacom_devm_sysfs_create_group(struct wacom *wacom, devres->root = root; error =sysfs_create_group (devres->root, group); -if (error) +if (error) { +devres_free (devres);return error; + }devres_add (&wacom->hdev->dev, devres);
drivers/i2c/busses/i2c-pmcmsp.c +2 -2
@@ -564,10 +564,10 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,* TODO: We could potentially loop and retry in the case * of MSP_TWI_XFER_TIMEOUT. */ -return -1 ; +return -EIO ; } -return 0 ; +return num; }static u32 pmcmsptwi_i2c_func (struct i2c_adapter *adapter)
drivers/i2c/busses/i2c-sprd.c +18 -4
@@ -86,6 +86,7 @@ struct sprd_i2c {u32 count;int irq;int err; +bool is_suspended; };static void sprd_i2c_set_count (struct sprd_i2c *i2c_dev,u32 count)
@@ -283,6 +284,9 @@ static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap,struct sprd_i2c *i2c_dev = i2c_adap->algo_data;int im, ret; +if (i2c_dev->is_suspended) +return -EBUSY ; + ret =pm_runtime_get_sync (i2c_dev->dev);if (ret <0 )return ret;
@@ -364,13 +368,12 @@ static irqreturn_t sprd_i2c_isr_thread(int irq, void *dev_id)struct sprd_i2c *i2c_dev = dev_id;struct i2c_msg *msg = i2c_dev->msg;bool ack = !(readl (i2c_dev->base +I2C_STATUS ) &I2C_RX_ACK ); -u32 i2c_count =readl (i2c_dev->base +I2C_COUNT );u32 i2c_tran;if (msg->flags &I2C_M_RD ) i2c_tran = i2c_dev->count >=I2C_FIFO_FULL_THLD ;else - i2c_tran = i2c_count; + i2c_tran = i2c_dev->count;/* * If we got one ACK from slave when writing data, and we did not
@@ -408,14 +411,13 @@ static irqreturn_t sprd_i2c_isr(int irq, void *dev_id) {struct sprd_i2c *i2c_dev = dev_id;struct i2c_msg *msg = i2c_dev->msg; -u32 i2c_count =readl (i2c_dev->base +I2C_COUNT );bool ack = !(readl (i2c_dev->base +I2C_STATUS ) &I2C_RX_ACK );u32 i2c_tran;if (msg->flags &I2C_M_RD ) i2c_tran = i2c_dev->count >=I2C_FIFO_FULL_THLD ;else - i2c_tran = i2c_count; + i2c_tran = i2c_dev->count;/* * If we did not get one ACK from slave when writing data, then we
@@ -586,11 +588,23 @@ static int sprd_i2c_remove(struct platform_device *pdev)static int __maybe_unused sprd_i2c_suspend_noirq (struct device *pdev) { +struct sprd_i2c *i2c_dev =dev_get_drvdata (pdev); + +i2c_lock_adapter (&i2c_dev->adap); + i2c_dev->is_suspended = true; +i2c_unlock_adapter (&i2c_dev->adap); +return pm_runtime_force_suspend (pdev); }static int __maybe_unused sprd_i2c_resume_noirq (struct device *pdev) { +struct sprd_i2c *i2c_dev =dev_get_drvdata (pdev); + +i2c_lock_adapter (&i2c_dev->adap); + i2c_dev->is_suspended = false; +i2c_unlock_adapter (&i2c_dev->adap); +return pm_runtime_force_resume (pdev); }
drivers/i2c/busses/i2c-viperboard.c +1 -1
@@ -337,7 +337,7 @@ static int vprbrd_i2c_xfer(struct i2c_adapter *i2c, struct i2c_msg *msgs, }mutex_unlock (&vb->lock); } -return 0 ; +return num; error:mutex_unlock (&vb->lock);return error;
drivers/infiniband/Kconfig +4 -1
@@ -60,9 +60,12 @@ config INFINIBAND_ON_DEMAND_PAGING pages on demand instead. config INFINIBAND_ADDR_TRANS - bool + bool "RDMA/CM" depends on INFINIBAND default y + ---help--- + Support for RDMA communication manager (CM). + This allows for a generic connection abstraction over RDMA. config INFINIBAND_ADDR_TRANS_CONFIGFS bool
drivers/infiniband/core/cma.c +43 -17
105 lines not on this page · raw message
drivers/infiniband/core/iwpm_util.c +4 -1
@@ -114,7 +114,7 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr, struct sockaddr_storage *mapped_sockaddr, u8 nl_client) { -struct hlist_head *hash_bucket_head; +struct hlist_head *hash_bucket_head =NULL ;struct iwpm_mapping_info *map_info;unsigned long flags;int ret = -EINVAL ;
@@ -142,6 +142,9 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr, } }spin_unlock_irqrestore (&iwpm_mapinfo_lock, flags); + +if (!hash_bucket_head) +kfree (map_info);return ret; }
drivers/infiniband/core/mad.c +2 -2
@@ -60,7 +60,7 @@ module_param_named(recv_queue_size, mad_recvq_size, int, 0444);MODULE_PARM_DESC (recv_queue_size,"Size of receive queue in number of work requests" );static struct list_head ib_mad_port_list; -static u32 ib_mad_client_id =0 ; +static atomic_t ib_mad_client_id =ATOMIC_INIT (0 );/* Port list lock */ static DEFINE_SPINLOCK (ib_mad_port_list_lock);
@@ -378,7 +378,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, }spin_lock_irqsave (&port_priv->reg_lock, flags); - mad_agent_priv->agent.hi_tid = ++ib_mad_client_id; + mad_agent_priv->agent.hi_tid =atomic_inc_return (&ib_mad_client_id);/* * Make sure MAD registration (if supplied)
drivers/infiniband/core/uverbs_ioctl.c +9 -0
@@ -191,6 +191,15 @@ static int uverbs_validate_kernel_mandatory(const struct uverbs_method_spec *metreturn -EINVAL ; } +for (; i < method_spec->num_buckets; i++) { +struct uverbs_attr_spec_hash *attr_spec_bucket = + method_spec->attr_buckets[i]; + +if (!bitmap_empty (attr_spec_bucket->mandatory_attrs_bitmask, + attr_spec_bucket->num_attrs)) +return -EINVAL ; + } +return 0 ; }
drivers/infiniband/hw/hfi1/affinity.c +5 -6
@@ -412,7 +412,6 @@ static void hfi1_cleanup_sdma_notifier(struct hfi1_msix_entry *msix)static int get_irq_affinity (struct hfi1_devdata *dd,struct hfi1_msix_entry *msix) { -int ret;cpumask_var_t diff;struct hfi1_affinity_node *entry;struct cpu_mask_set *set =NULL ;
@@ -424,10 +423,6 @@ static int get_irq_affinity(struct hfi1_devdata *dd, extra[0 ] ='\0' ;cpumask_clear (&msix->mask); - ret =zalloc_cpumask_var (&diff,GFP_KERNEL ); -if (!ret) -return -ENOMEM ; - entry =node_affinity_lookup (dd->node);switch (msix->type) {
@@ -458,6 +453,9 @@ static int get_irq_affinity(struct hfi1_devdata *dd,* finds its CPU here. */ if (cpu ==-1 && set) { +if (!zalloc_cpumask_var (&diff,GFP_KERNEL )) +return -ENOMEM ; +if (cpumask_equal (&set->mask, &set->used)) {/* * We've used up all the CPUs, bump up the generation
@@ -469,6 +467,8 @@ static int get_irq_affinity(struct hfi1_devdata *dd,cpumask_andnot (diff, &set->mask, &set->used); cpu =cpumask_first (diff);cpumask_set_cpu (cpu, &set->used); + +free_cpumask_var (diff); }cpumask_set_cpu (cpu, &msix->mask);
@@ -482,7 +482,6 @@ static int get_irq_affinity(struct hfi1_devdata *dd,hfi1_setup_sdma_notifier (msix); } -free_cpumask_var (diff);return 0 ; }
drivers/infiniband/hw/hfi1/init.c +2 -2
@@ -88,9 +88,9 @@* pio buffers per ctxt, etc.) Zero means use one user context per CPU. */ int num_user_contexts =-1 ; -module_param_named (num_user_contexts, num_user_contexts, uint,S_IRUGO ); +module_param_named (num_user_contexts, num_user_contexts, int,0444 );MODULE_PARM_DESC ( - num_user_contexts,"Set max number of user contexts to use" ); + num_user_contexts,"Set max number of user contexts to use (default: -1 will use the real (non-HT) CPU count)" );uint krcvqs[RXE_NUM_DATA_VL ];int krcvqsset;
drivers/infiniband/sw/rxe/rxe_opcode.c +1 -1
@@ -390,7 +390,7 @@ struct rxe_opcode_info rxe_opcode[RXE_NUM_OPCODE] = { .name = "IB_OPCODE_RC_SEND_ONLY_INV", .mask =RXE_IETH_MASK |RXE_PAYLOAD_MASK |RXE_REQ_MASK |RXE_COMP_MASK |RXE_RWR_MASK |RXE_SEND_MASK - | RXE_END_MASK, + | RXE_END_MASK | RXE_START_MASK, .length = RXE_BTH_BYTES + RXE_IETH_BYTES, .offset = { [RXE_BTH] = 0,
drivers/infiniband/sw/rxe/rxe_req.c +0 -1
@@ -728,7 +728,6 @@ int rxe_requester(void *arg)rollback_state (wqe, qp, &rollback_wqe, rollback_psn);if (ret == -EAGAIN ) { -kfree_skb (skb);rxe_run_task (&qp->req.task,1 ); goto exit; }
drivers/infiniband/sw/rxe/rxe_resp.c +1 -5
@@ -742,7 +742,6 @@ static enum resp_states read_reply(struct rxe_qp *qp, err =rxe_xmit_packet (rxe, qp, &ack_pkt, skb);if (err) {pr_err ("Failed sending RDMA reply.\n" ); -kfree_skb (skb);return RESPST_ERR_RNR ; }
@@ -955,10 +954,8 @@ static int send_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt, } err =rxe_xmit_packet (rxe, qp, &ack_pkt, skb); -if (err) { +if (err)pr_err_ratelimited ("Failed sending ack\n" ); -kfree_skb (skb); - } err1:return err;
@@ -1151,7 +1148,6 @@ static enum resp_states duplicate_request(struct rxe_qp *qp,if (rc) {pr_err ("Failed resending result. This flow is not handled - skb ignored\n" );rxe_drop_ref (qp); -kfree_skb (skb_copy); rc =RESPST_CLEANUP ; goto out; }
drivers/infiniband/ulp/srp/Kconfig +1 -1
@@ -1,6 +1,6 @@ config INFINIBAND_SRP tristate "InfiniBand SCSI RDMA Protocol" - depends on SCSI + depends on SCSI && INFINIBAND_ADDR_TRANS select SCSI_SRP_ATTRS ---help--- Support for the SCSI RDMA Protocol over InfiniBand. This
drivers/infiniband/ulp/srpt/Kconfig +1 -1
@@ -1,6 +1,6 @@ config INFINIBAND_SRPT tristate "InfiniBand SCSI RDMA Protocol target support" - depends on INFINIBAND && TARGET_CORE + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE ---help--- Support for the SCSI RDMA Protocol (SRP) Target driver. The
drivers/input/rmi4/rmi_spi.c +5 -2
@@ -147,8 +147,11 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi,if (len >RMI_SPI_XFER_SIZE_LIMIT )return -EINVAL ; -if (rmi_spi->xfer_buf_size < len) -rmi_spi_manage_pools (rmi_spi, len); +if (rmi_spi->xfer_buf_size < len) { + ret =rmi_spi_manage_pools (rmi_spi, len); +if (ret <0 ) +return ret; + }if (addr ==0 )/*
drivers/input/touchscreen/atmel_mxt_ts.c +110 -76
340 lines not on this page · raw message
drivers/iommu/dmar.c +1 -1
@@ -1342,7 +1342,7 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,struct qi_desc desc;if (mask) { -BUG_ON (addr & ((1 << (VTD_PAGE_SHIFT + mask)) -1 )); +BUG_ON (addr & ((1ULL << (VTD_PAGE_SHIFT + mask)) -1 )); addr |= (1ULL << (VTD_PAGE_SHIFT + mask -1 )) -1 ; desc.high =QI_DEV_IOTLB_ADDR (addr) |QI_DEV_IOTLB_SIZE ; }else
drivers/net/can/dev.c +1 -1
@@ -604,7 +604,7 @@ void can_bus_off(struct net_device *dev) {struct can_priv *priv =netdev_priv (dev); -netdev_dbg (dev,"bus-off\n" ); +netdev_info (dev,"bus-off\n" );netif_carrier_off (dev);
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +2 -0
@@ -310,6 +310,8 @@ int aq_nic_ndev_init(struct aq_nic_s *self) self->ndev->hw_features |= aq_hw_caps->hw_features; self->ndev->features = aq_hw_caps->hw_features; + self->ndev->vlan_features |=NETIF_F_HW_CSUM |NETIF_F_RXCSUM | +NETIF_F_RXHASH |NETIF_F_SG |NETIF_F_LRO ; self->ndev->priv_flags = aq_hw_caps->hw_priv_flags; self->ndev->mtu = aq_nic_cfg->mtu -ETH_HLEN ; self->ndev->max_mtu = self->aq_hw_caps.mtu -ETH_FCS_LEN -ETH_HLEN ;
drivers/net/ethernet/hisilicon/hns/hnae.h +1 -1
@@ -87,7 +87,7 @@ do { \#define HNAE_AE_REGISTER 0x1 -#define RCB_RING_NAME_LEN 16 +#define RCB_RING_NAME_LEN (IFNAMSIZ + 4)#define HNAE_LOWEST_LATENCY_COAL_PARAM 30#define HNAE_LOW_LATENCY_COAL_PARAM 80
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +3 -0
@@ -3413,6 +3413,9 @@ static s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw) hw->phy.sfp_setup_needed = false; } +if (status ==IXGBE_ERR_SFP_NOT_SUPPORTED ) +return status; +/* Reset PHY */ if (!hw->phy.reset_disable && hw->phy.ops.reset) hw->phy.ops.reset (hw);
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c +1 -2
@@ -277,8 +277,7 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp, u64 *reg,if ((*reg & mask) == val)return 0 ; -if (msleep_interruptible (25 )) -return -ERESTARTSYS ; +msleep (25 );if (time_after (start_time, wait_until))return -ETIMEDOUT ;
drivers/net/ethernet/qlogic/qed/qed_l2.c +2 -4
@@ -115,8 +115,7 @@ int qed_l2_alloc(struct qed_hwfn *p_hwfn)void qed_l2_setup (struct qed_hwfn *p_hwfn) { -if (p_hwfn->hw_info.personality !=QED_PCI_ETH && - p_hwfn->hw_info.personality !=QED_PCI_ETH_ROCE ) +if (!QED_IS_L2_PERSONALITY (p_hwfn))return ;mutex_init (&p_hwfn->p_l2_info->lock);
@@ -126,8 +125,7 @@ void qed_l2_free(struct qed_hwfn *p_hwfn) {u32 i; -if (p_hwfn->hw_info.personality !=QED_PCI_ETH && - p_hwfn->hw_info.personality !=QED_PCI_ETH_ROCE ) +if (!QED_IS_L2_PERSONALITY (p_hwfn))return ;if (!p_hwfn->p_l2_info)
drivers/net/ethernet/qlogic/qede/qede_rdma.c +1 -1
@@ -238,7 +238,7 @@ qede_rdma_get_free_event_node(struct qede_dev *edev) }if (!found) { - event_node =kzalloc (sizeof (*event_node),GFP_KERNEL ); + event_node =kzalloc (sizeof (*event_node),GFP_ATOMIC );if (!event_node) {DP_NOTICE (edev,"qedr: Could not allocate memory for rdma work\n" );
drivers/net/phy/marvell.c +9 -0
@@ -1409,6 +1409,15 @@ static int m88e1318_set_wol(struct phy_device *phydev,if (err <0 )return err; +/* If WOL event happened once, the LED[2] interrupt pin +* will not be cleared unless we reading the interrupt status +* register. If interrupts are in use, the normal interrupt +* handling will clear the WOL event. Clear the WOL event +* before enabling it if !phy_interrupt_is_valid() +*/ +if (!phy_interrupt_is_valid (phydev)) +phy_read (phydev,MII_M1011_IEVENT ); +/* Enable the WOL interrupt */ temp =phy_read (phydev,MII_88E1318S_PHY_CSIER ); temp |=MII_88E1318S_PHY_CSIER_WOL_EIE ;
drivers/nvme/host/Kconfig +1 -1
@@ -18,7 +18,7 @@ config NVME_FABRICS config NVME_RDMA tristate "NVM Express over Fabrics RDMA host driver" - depends on INFINIBAND && BLOCK + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && BLOCK select NVME_CORE select NVME_FABRICS select SG_POOL
drivers/nvme/host/core.c +1 -0
@@ -665,6 +665,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, ret =PTR_ERR (meta); goto out_unmap; } + req->cmd_flags |=REQ_INTEGRITY ; } }
drivers/nvme/host/fabrics.c +6 -0
@@ -587,6 +587,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -ENOMEM ; goto out; } +kfree (opts->transport); opts->transport = p;break ;case NVMF_OPT_NQN :
@@ -595,6 +596,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -ENOMEM ; goto out; } +kfree (opts->subsysnqn); opts->subsysnqn = p; nqnlen =strlen (opts->subsysnqn);if (nqnlen >=NVMF_NQN_SIZE ) {
@@ -617,6 +619,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -ENOMEM ; goto out; } +kfree (opts->traddr); opts->traddr = p;break ;case NVMF_OPT_TRSVCID :
@@ -625,6 +628,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -ENOMEM ; goto out; } +kfree (opts->trsvcid); opts->trsvcid = p;break ;case NVMF_OPT_QUEUE_SIZE :
@@ -706,6 +710,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -EINVAL ; goto out; } +nvmf_host_put (opts->host); opts->host =nvmf_host_add (p);kfree (p);if (!opts->host) {
@@ -731,6 +736,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -ENOMEM ; goto out; } +kfree (opts->host_traddr); opts->host_traddr = p;break ;case NVMF_OPT_HOST_ID :
drivers/nvme/target/Kconfig +1 -1
@@ -27,7 +27,7 @@ config NVME_TARGET_LOOP config NVME_TARGET_RDMA tristate "NVMe over Fabrics RDMA target support" - depends on INFINIBAND + depends on INFINIBAND && INFINIBAND_ADDR_TRANS depends on NVME_TARGET help This enables the NVMe RDMA target support, which allows exporting NVMe
drivers/pci/dwc/pcie-kirin.c +1 -1
@@ -490,7 +490,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)return ret; kirin_pcie->gpio_id_reset =of_get_named_gpio (dev->of_node, -"reset-gpio" ,0 ); +"reset-gpios" ,0 );if (kirin_pcie->gpio_id_reset <0 )return -ENODEV ;
drivers/remoteproc/qcom_q6v5_pil.c +2 -0
@@ -915,6 +915,7 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)dev_err (qproc->dev,"unable to resolve mba region\n" );return ret; } +of_node_put (node); qproc->mba_phys = r.start; qproc->mba_size =resource_size (&r);
@@ -932,6 +933,7 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)dev_err (qproc->dev,"unable to resolve mpss region\n" );return ret; } +of_node_put (node); qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size =resource_size (&r);
drivers/rpmsg/rpmsg_char.c +2 -0
@@ -581,4 +581,6 @@ static void rpmsg_chrdev_exit(void)unregister_chrdev_region (rpmsg_major,RPMSG_DEV_MAX ); }module_exit (rpmsg_chrdev_exit); + +MODULE_ALIAS ("rpmsg:rpmsg_chrdev" );MODULE_LICENSE ("GPL v2" );
drivers/s390/net/smsgiucv.c +1 -1
@@ -189,7 +189,7 @@ static struct device_driver smsg_driver = { static void __exit smsg_exit(void) { -cpcmd ("SET SMSG IUCV" ,NULL ,0 ,NULL ); +cpcmd ("SET SMSG OFF" ,NULL ,0 ,NULL );device_unregister (smsg_dev);iucv_unregister (&smsg_handler,1 );driver_unregister (&smsg_driver);
drivers/scsi/isci/port_config.c +1 -2
@@ -291,7 +291,7 @@ sci_mpc_agent_validate_phy_configuration(struct isci_host *ihost,* Note: We have not moved the current phy_index so we will actually * compare the startting phy with itself. * This is expected and required to add the phy to the port. */ -while (phy_index <SCI_MAX_PHYS ) { +for (; phy_index <SCI_MAX_PHYS ; phy_index++) {if ((phy_mask & (1 << phy_index)) ==0 )continue ; sci_phy_get_sas_address(&ihost->phys[phy_index],
@@ -311,7 +311,6 @@ sci_mpc_agent_validate_phy_configuration(struct isci_host *ihost, &ihost->phys[phy_index]); assigned_phy_mask |= (1 << phy_index); - phy_index++; } }
drivers/scsi/megaraid/megaraid_sas_fusion.c +3 -3
@@ -903,7 +903,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) goto fail_fw_init; } - ret =0 ; +return 0 ; fail_fw_init:megasas_return_cmd (instance, cmd);
@@ -913,8 +913,8 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) IOCInitMessage, ioc_init_handle); fail_get_cmd:dev_err (&instance->pdev->dev, -"Init cmd return status %s for SCSI host %d\n" , - ret ?"FAILED" :"SUCCESS" , instance->host->host_no); +"Init cmd return status FAILED for SCSI host %d\n" , + instance->host->host_no);return ret; }
drivers/scsi/scsi_transport_iscsi.c +18 -11
@@ -2322,6 +2322,12 @@ iscsi_multicast_skb(struct sk_buff *skb, uint32_t group, gfp_t gfp)return nlmsg_multicast (nls, skb,0 , group, gfp); } +static int +iscsi_unicast_skb (struct sk_buff *skb,u32 portid) +{ +return nlmsg_unicast (nls, skb, portid); +} +int iscsi_recv_pdu (struct iscsi_cls_conn *conn,struct iscsi_hdr *hdr,char *data,uint32_t data_size) {
@@ -2524,14 +2530,11 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport,EXPORT_SYMBOL_GPL (iscsi_ping_comp_event);static int -iscsi_if_send_reply (uint32_t group,int seq,int type,int done,int multi, -void *payload,int size) +iscsi_if_send_reply (u32 portid,int type,void *payload,int size) {struct sk_buff *skb;struct nlmsghdr *nlh;int len =nlmsg_total_size (size); -int flags = multi ?NLM_F_MULTI :0 ; -int t = done ?NLMSG_DONE : type; skb =alloc_skb (len,GFP_ATOMIC );if (!skb) {
@@ -2539,10 +2542,9 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,return -ENOMEM ; } - nlh =__nlmsg_put (skb,0 ,0 , t, (len -sizeof (*nlh)),0 ); - nlh->nlmsg_flags = flags; + nlh =__nlmsg_put (skb,0 ,0 , type, (len -sizeof (*nlh)),0 );memcpy (nlmsg_data (nlh), payload, size); -return iscsi_multicast_skb (skb, group,GFP_ATOMIC ); +return iscsi_unicast_skb (skb, portid); } static int
@@ -3470,6 +3472,7 @@ static int iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) { int err = 0; +u32 portid;struct iscsi_uevent *ev =nlmsg_data (nlh);struct iscsi_transport *transport =NULL ;struct iscsi_internal *priv;
@@ -3490,10 +3493,12 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)if (!try_module_get (transport->owner))return -EINVAL ; + portid =NETLINK_CB (skb).portid; +switch (nlh->nlmsg_type) {case ISCSI_UEVENT_CREATE_SESSION : err =iscsi_if_create_session (priv, ep, ev, -NETLINK_CB (skb).portid, + portid, ev->u.c_session.initial_cmdsn, ev->u.c_session.cmds_max, ev->u.c_session.queue_depth);
@@ -3506,7 +3511,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) } err =iscsi_if_create_session (priv, ep, ev, -NETLINK_CB (skb).portid, + portid, ev->u.c_bound_session.initial_cmdsn, ev->u.c_bound_session.cmds_max, ev->u.c_bound_session.queue_depth);
@@ -3664,6 +3669,8 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)static void iscsi_if_rx (struct sk_buff *skb) { +u32 portid =NETLINK_CB (skb).portid; +mutex_lock (&rx_queue_mutex);while (skb->len >=NLMSG_HDRLEN ) {int err;
@@ -3699,8 +3706,8 @@ iscsi_if_rx(struct sk_buff *skb)break ;if (ev->type ==ISCSI_UEVENT_GET_CHAP && !err)break ; - err =iscsi_if_send_reply (group, nlh->nlmsg_seq, - nlh->nlmsg_type,0 ,0 , ev,sizeof (*ev)); + err =iscsi_if_send_reply (portid, nlh->nlmsg_type, + ev,sizeof (*ev)); }while (err <0 && err != -ECONNREFUSED && err != -ESRCH );skb_pull (skb, rlen); }
drivers/scsi/storvsc_drv.c +5 -2
@@ -1725,11 +1725,14 @@ static int storvsc_probe(struct hv_device *device, max_targets =STORVSC_MAX_TARGETS ; max_channels =STORVSC_MAX_CHANNELS ;/* -* On Windows8 and above, we support sub-channels for storage. +* On Windows8 and above, we support sub-channels for storage +* on SCSI and FC controllers. * The number of sub-channels offerred is based on the number of * VCPUs in the guest. */ - max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel); +if (!dev_is_ide) + max_sub_channels = + (num_cpus -1 ) / storvsc_vcpus_per_sub_channel; } scsi_driver.can_queue = (max_outstanding_req_per_channel *
drivers/scsi/vmw_pvscsi.c +1 -1
@@ -609,7 +609,7 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,break ;case BTSTAT_ABORTQUEUE : - cmd->result = (DID_ABORT <<16 ); + cmd->result = (DID_BUS_BUSY <<16 );break ;case BTSTAT_SCSIPARITY :
drivers/soc/bcm/raspberrypi-power.c +1 -1
@@ -45,7 +45,7 @@ struct rpi_power_domains {struct rpi_power_domain_packet {u32 domain;u32 on; -} __packet; +};/* * Asks the firmware to enable or disable power on a specific power
drivers/spi/spi-bcm2835aux.c +5 -0
@@ -184,6 +184,11 @@ static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)struct bcm2835aux_spi *bs =spi_master_get_devdata (master);irqreturn_t ret =IRQ_NONE ; +/* IRQ may be shared, so return if our interrupts are disabled */ +if (!(bcm2835aux_rd (bs,BCM2835_AUX_SPI_CNTL1 ) & + (BCM2835_AUX_SPI_CNTL1_TXEMPTY |BCM2835_AUX_SPI_CNTL1_IDLE ))) +return ret; +/* check if we have data to read */ while (bs->rx_len && (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &
drivers/spi/spi-cadence.c +8 -0
@@ -313,6 +313,14 @@ static void cdns_spi_fill_tx_fifo(struct cdns_spi *xspi)while ((trans_cnt <CDNS_SPI_FIFO_DEPTH ) && (xspi->tx_bytes >0 )) { + +/* When xspi in busy condition, bytes may send failed, +* then spi control did't work thoroughly, add one byte delay +*/ +if (cdns_spi_read (xspi,CDNS_SPI_ISR ) & +CDNS_SPI_IXR_TXFULL ) +usleep_range (10 ,20 ); +if (xspi->txbuf)cdns_spi_write (xspi,CDNS_SPI_TXD , *xspi->txbuf++);else
drivers/spi/spi-sh-msiof.c +1 -0
@@ -277,6 +277,7 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p, } k =min_t (int, k,ARRAY_SIZE (sh_msiof_spi_div_table) -1 ); + brps =min_t (int, brps,32 ); scr = sh_msiof_spi_div_table[k].brdv |SCR_BRPS (brps);sh_msiof_write (p,TSCR , scr);
drivers/target/target_core_pscsi.c +2 -0
@@ -890,6 +890,7 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, bytes =min (bytes, data_len);if (!bio) { +new_bio: nr_vecs =min_t (int,BIO_MAX_PAGES , nr_pages); nr_pages -= nr_vecs;/*
@@ -931,6 +932,7 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,* be allocated with pscsi_get_bio() above. */ bio =NULL ; + goto new_bio; } data_len -= bytes;
drivers/tee/tee_core.c +11 -0
@@ -181,6 +181,17 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params,if (IS_ERR (shm))return PTR_ERR (shm); +/* +* Ensure offset + size does not overflow offset +* and does not overflow the size of the referred +* shared memory object. +*/ +if ((ip.a + ip.b) < ip.a || + (ip.a + ip.b) > shm->size) { +tee_shm_put (shm); +return -EINVAL ; + } + params[n].u.memref.shm_offs = ip.a; params[n].u.memref.size = ip.b; params[n].u.memref.shm = shm;
drivers/thermal/int340x_thermal/int3403_thermal.c +1 -2
@@ -194,6 +194,7 @@ static int int3403_cdev_add(struct int3403_priv *priv)return -EFAULT ; } + priv->priv = obj; obj->max_state = p->package.count -1 ; obj->cdev = thermal_cooling_device_register(acpi_device_bid(priv->adev),
@@ -201,8 +202,6 @@ static int int3403_cdev_add(struct int3403_priv *priv)if (IS_ERR (obj->cdev)) result =PTR_ERR (obj->cdev); - priv->priv = obj; -kfree (buf.pointer);/* TODO: add ACPI notification support */
drivers/usb/musb/musb_host.c +4 -1
@@ -2560,8 +2560,11 @@ static int musb_bus_suspend(struct usb_hcd *hcd) {struct musb *musb =hcd_to_musb (hcd);u8 devctl; +int ret; -musb_port_suspend (musb, true); + ret =musb_port_suspend (musb, true); +if (ret) +return ret;if (!is_host_active (musb))return 0 ;
drivers/usb/musb/musb_host.h +5 -2
@@ -92,7 +92,7 @@ extern void musb_host_rx(struct musb *, u8);extern void musb_root_disconnect (struct musb *musb);extern void musb_host_resume_root_hub (struct musb *musb);extern void musb_host_poke_root_hub (struct musb *musb); -extern void musb_port_suspend (struct musb *musb,bool do_suspend); +extern int musb_port_suspend (struct musb *musb,bool do_suspend);extern void musb_port_reset (struct musb *musb,bool do_reset);extern void musb_host_finish_resume (struct work_struct *work);#else
@@ -124,7 +124,10 @@ static inline void musb_root_disconnect(struct musb *musb) {}static inline void musb_host_resume_root_hub (struct musb *musb) {}static inline void musb_host_poll_rh_status (struct musb *musb) {}static inline void musb_host_poke_root_hub (struct musb *musb) {} -static inline void musb_port_suspend (struct musb *musb,bool do_suspend) {} +static inline int musb_port_suspend (struct musb *musb,bool do_suspend) +{ +return 0 ; +}static inline void musb_port_reset (struct musb *musb,bool do_reset) {}static inline void musb_host_finish_resume (struct work_struct *work) {}#endif
drivers/usb/musb/musb_virthub.c +15 -10
@@ -73,14 +73,14 @@ void musb_host_finish_resume(struct work_struct *work)spin_unlock_irqrestore (&musb->lock, flags); } -void musb_port_suspend (struct musb *musb,bool do_suspend) +int musb_port_suspend (struct musb *musb,bool do_suspend) {struct usb_otg *otg = musb->xceiv->otg;u8 power;void __iomem *mbase = musb->mregs;if (!is_host_active (musb)) -return ; +return 0 ;/* NOTE: this doesn't necessarily put PHY into low power mode, * turning off its clock; that's a function of PHY integration and
@@ -91,16 +91,20 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)if (do_suspend) {int retries =10000 ; - power &= ~MUSB_POWER_RESUME ; - power |=MUSB_POWER_SUSPENDM ; -musb_writeb (mbase,MUSB_POWER , power); +if (power &MUSB_POWER_RESUME ) +return -EBUSY ; -/* Needed for OPT A tests */ - power =musb_readb (mbase,MUSB_POWER ); -while (power &MUSB_POWER_SUSPENDM ) { +if (!(power &MUSB_POWER_SUSPENDM )) { + power |=MUSB_POWER_SUSPENDM ; +musb_writeb (mbase,MUSB_POWER , power); + +/* Needed for OPT A tests */ power =musb_readb (mbase,MUSB_POWER ); -if (retries-- <1 ) -break ; +while (power &MUSB_POWER_SUSPENDM ) { + power =musb_readb (mbase,MUSB_POWER ); +if (retries-- <1 ) +break ; + } }musb_dbg (musb,"Root port suspended, power %02x" , power);
@@ -136,6 +140,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)schedule_delayed_work (&musb->finish_resume_work,msecs_to_jiffies (USB_RESUME_TIMEOUT )); } +return 0 ; }void musb_port_reset (struct musb *musb,bool do_reset)
drivers/usb/typec/ucsi/Makefile +1 -1
@@ -5,6 +5,6 @@ obj-$(CONFIG_TYPEC_UCSI) += typec_ucsi.o typec_ucsi-y := ucsi.o -typec_ucsi-$(CONFIG_FTRACE) += trace.o +typec_ucsi-$(CONFIG_TRACING) += trace.o obj-$(CONFIG_UCSI_ACPI) += ucsi_acpi.o
drivers/xen/xenbus/xenbus_dev_frontend.c +2 -1
@@ -403,7 +403,7 @@ static int xenbus_command_reply(struct xenbus_file_priv *u, {struct {struct xsd_sockmsg hdr; -const char body[16 ]; +char body[16 ]; } msg;int rc;
@@ -412,6 +412,7 @@ static int xenbus_command_reply(struct xenbus_file_priv *u, msg.hdr.len =strlen (reply) +1 ;if (msg.hdr.len >sizeof (msg.body))return -E2BIG ; +memcpy (&msg.body, reply, msg.hdr.len);mutex_lock (&u->reply_mutex); rc =queue_reply (&u->read_buffers, &msg,sizeof (msg.hdr) + msg.hdr.len);
fs/afs/rxrpc.c +7 -0
@@ -55,6 +55,7 @@ int afs_open_socket(void) {struct sockaddr_rxrpc srx;struct socket *socket; +unsigned int min_level;int ret;_enter ("" );
@@ -80,6 +81,12 @@ int afs_open_socket(void)memset (&srx.transport.sin.sin_addr,0 ,sizeof (srx.transport.sin.sin_addr)); + min_level =RXRPC_SECURITY_ENCRYPT ; + ret =kernel_setsockopt (socket,SOL_RXRPC ,RXRPC_MIN_SECURITY_LEVEL , + (void *)&min_level,sizeof (min_level)); +if (ret <0 ) + goto error_2; + ret =kernel_bind (socket, (struct sockaddr *) &srx,sizeof (srx));if (ret <0 ) goto error_2;
fs/btrfs/scrub.c +32 -12
25 lines not on this page · raw message
fs/ecryptfs/crypto.c +28 -13
41 lines not on this page · raw message
include/linux/sched.h +45 -5
50 lines not on this page · raw message
include/soc/bcm2835/raspberrypi-firmware.h +2 -2
Lines of this file are not shown. View the raw message.
net/ipv6/netfilter/Kconfig +28 -27
55 lines not on this page · raw message
net/rxrpc/local_object.c +42 -15
57 lines not on this page · raw message
tools/objtool/arch/x86/include/asm/insn.h +18 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc new file +44 -0
44 lines not on this page · raw message
tools/testing/selftests/x86/mov_ss_trap.c new file +285 -0
285 lines not on this page · raw message
tools/testing/selftests/x86/mpx-mini-test.c +5 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/x86/protection_keys.c +180 -74
254 lines not on this page · 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.