Skip to contentSkip to conversation

Linux 4.18.13

DISCUSSION Greg KH 1 participant 2 messages Oct 10, 2018 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.18.13 kernel.

All users of the 4.18 kernel series must upgrade.

The updated 4.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.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/net/sh_eth.txt                |    1 
 Makefile                                                        |    2 
 arch/arc/include/asm/atomic.h                                   |    2 
 arch/arm64/include/asm/jump_label.h                             |    4 
 arch/hexagon/include/asm/bitops.h                               |    4 
 arch/hexagon/kernel/dma.c                                       |    2 
 arch/nds32/include/asm/elf.h                                    |    4 
 arch/nds32/include/asm/uaccess.h                                |   26 -
 arch/nds32/kernel/atl2c.c                                       |    3 
 arch/nds32/kernel/module.c                                      |    4 
 arch/nds32/kernel/traps.c                                       |    2 
 arch/nds32/kernel/vmlinux.lds.S                                 |   12 
 arch/powerpc/kvm/book3s_64_mmu_hv.c                             |    2 
 arch/riscv/kernel/setup.c                                       |    7 
 arch/x86/events/intel/lbr.c                                     |    4 
 arch/x86/kernel/apm_32.c                                        |    2 
 block/blk-cgroup.c                                              |   78 +----
 drivers/ata/libata-core.c                                       |    2 
 drivers/base/firmware_loader/main.c                             |   35 +-
 drivers/cpufreq/qcom-cpufreq-kryo.c                             |    4 
 drivers/crypto/caam/caamalg.c                                   |    8 
 drivers/crypto/chelsio/chcr_algo.c                              |   32 +-
 drivers/crypto/chelsio/chcr_crypto.h                            |    2 
 drivers/crypto/mxs-dcp.c                                        |   53 ++-
 drivers/crypto/qat/qat_c3xxx/adf_drv.c                          |    6 
 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c                        |    6 
 drivers/crypto/qat/qat_c62x/adf_drv.c                           |    6 
 drivers/crypto/qat/qat_c62xvf/adf_drv.c                         |    6 
 drivers/crypto/qat/qat_dh895xcc/adf_drv.c                       |    6 
 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c                     |    6 
 drivers/firmware/arm_scmi/perf.c                                |    8 
 drivers/gpio/gpio-adp5588.c                                     |   24 +
 drivers/gpio/gpio-dwapb.c                                       |    1 
 drivers/gpio/gpiolib-acpi.c                                     |   86 +++--
 drivers/gpio/gpiolib-of.c                                       |    1 
 drivers/gpio/gpiolib.c                                          |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c                          |   23 +
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c                          |    7 
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c                |    8 
 drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c                |    6 
 drivers/gpu/drm/nouveau/nouveau_drm.c                           |   14 
 drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c                 |   14 
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c                   |   17 -
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h                  |    1 
 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c                 |    6 
 drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c                 |   17 -
 drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h                 |    4 
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c             |    3 
 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c                   |    2 
 drivers/hid/hid-apple.c                                         |    9 
 drivers/hid/hid-ids.h                                           |    7 
 drivers/hid/hid-saitek.c                                        |    2 
 drivers/hid/hid-sensor-hub.c                                    |   23 +
 drivers/hid/i2c-hid/i2c-hid.c                                   |   24 +
 drivers/hid/intel-ish-hid/ipc/hw-ish.h                          |    1 
 drivers/hid/intel-ish-hid/ipc/pci-ish.c                         |    1 
 drivers/hv/connection.c                                         |    8 
 drivers/i2c/busses/i2c-uniphier-f.c                             |    7 
 drivers/i2c/busses/i2c-uniphier.c                               |    7 
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c                  |   13 
 drivers/iio/temperature/maxim_thermocouple.c                    |    1 
 drivers/infiniband/core/ucma.c                                  |    6 
 drivers/infiniband/hw/bnxt_re/ib_verbs.c                        |    2 
 drivers/infiniband/hw/bnxt_re/qplib_fp.c                        |    2 
 drivers/iommu/amd_iommu.c                                       |    2 
 drivers/md/dm-raid.c                                            |  144 +++------
 drivers/md/dm-thin-metadata.c                                   |   34 ++
 drivers/md/dm-thin.c                                            |   73 ++++
 drivers/md/raid10.c                                             |    5 
 drivers/md/raid5-log.h                                          |    5 
 drivers/md/raid5.c                                              |    6 
 drivers/net/ethernet/amazon/ena/ena_com.c                       |    8 
 drivers/net/ethernet/amazon/ena/ena_netdev.c                    |   52 +--
 drivers/net/ethernet/amazon/ena/ena_netdev.h                    |   11 
 drivers/net/ethernet/cadence/macb_main.c                        |    2 
 drivers/net/ethernet/hisilicon/hns/hnae.h                       |    2 
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c               |   67 ++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c              |   36 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c               |   44 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h               |    8 
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c              |   29 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h              |    3 
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c               |   23 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h               |    1 
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c               |   23 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h               |    1 
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h               |    1 
 drivers/net/ethernet/hisilicon/hns/hns_enet.c                   |   21 +
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c                |    2 
 drivers/net/ethernet/ibm/emac/core.c                            |    6 
 drivers/net/ethernet/ibm/ibmvnic.c                              |   12 
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c                   |   12 
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c                 |    1 
 drivers/net/ethernet/mellanox/mlx5/core/dev.c                   |    7 
 drivers/net/ethernet/realtek/r8169.c                            |   11 
 drivers/net/ethernet/renesas/sh_eth.c                           |   36 ++
 drivers/net/wireless/broadcom/b43/dma.c                         |    6 
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c              |   50 ---
 drivers/net/wireless/mac80211_hwsim.c                           |   12 
 drivers/nvme/target/rdma.c                                      |   27 +
 drivers/s390/net/qeth_core_main.c                               |    5 
 drivers/s390/net/qeth_l2_main.c                                 |    2 
 drivers/s390/net/qeth_l3_main.c                                 |    2 
 drivers/scsi/aacraid/aacraid.h                                  |    2 
 drivers/scsi/csiostor/csio_hw.c                                 |   71 +++-
 drivers/scsi/csiostor/csio_hw.h                                 |    1 
 drivers/scsi/csiostor/csio_mb.c                                 |    6 
 drivers/scsi/qedi/qedi.h                                        |    7 
 drivers/scsi/qedi/qedi_main.c                                   |   28 +
 drivers/target/iscsi/iscsi_target.c                             |    9 
 drivers/target/iscsi/iscsi_target_login.c                       |  149 +++++-----
 drivers/target/iscsi/iscsi_target_login.h                       |    2 
 drivers/usb/gadget/udc/fotg210-udc.c                            |   15 -
 drivers/usb/host/xhci-plat.c                                    |   27 +
 drivers/usb/misc/yurex.c                                        |    3 
 drivers/xen/cpu_hotplug.c                                       |   15 -
 drivers/xen/events/events_base.c                                |    2 
 drivers/xen/manage.c                                            |    6 
 fs/afs/proc.c                                                   |   15 -
 fs/btrfs/ctree.h                                                |    1 
 fs/btrfs/disk-io.c                                              |    1 
 fs/btrfs/inode.c                                                |   25 -
 fs/btrfs/ioctl.c                                                |   16 +
 fs/btrfs/volumes.c                                              |    7 
 fs/ceph/super.c                                                 |   16 -
 fs/cifs/cifs_unicode.c                                          |    3 
 fs/cifs/cifssmb.c                                               |   11 
 fs/cifs/misc.c                                                  |    8 
 fs/cifs/smb2ops.c                                               |    2 
 fs/dcache.c                                                     |    2 
 fs/inode.c                                                      |   53 +++
 fs/notify/fsnotify.c                                            |   13 
 fs/ocfs2/dlm/dlmmaster.c                                        |    4 
 fs/overlayfs/dir.c                                              |    4 
 fs/overlayfs/namei.c                                            |    2 
 fs/overlayfs/overlayfs.h                                        |    4 
 fs/overlayfs/util.c                                             |    3 
 fs/proc/base.c                                                  |   14 
 fs/xattr.c                                                      |   24 -
 include/asm-generic/io.h                                        |    3 
 include/linux/blk-cgroup.h                                      |    1 
 include/linux/fs.h                                              |    6 
 include/net/cfg80211.h                                          |    4 
 include/net/regulatory.h                                        |    4 
 kernel/bpf/sockmap.c                                            |   64 ++--
 kernel/bpf/verifier.c                                           |   10 
 kernel/sched/topology.c                                         |    5 
 mm/madvise.c                                                    |    2 
 net/core/filter.c                                               |   57 ++-
 net/ipv4/netfilter/Kconfig                                      |    8 
 net/mac80211/ibss.c                                             |   22 -
 net/mac80211/main.c                                             |   28 +
 net/mac80211/mesh_hwmp.c                                        |    4 
 net/mac80211/mlme.c                                             |   70 ++++
 net/mac80211/tx.c                                               |   54 ++-
 net/mac80211/util.c                                             |   11 
 net/netfilter/Kconfig                                           |   12 
 net/netfilter/nf_tables_api.c                                   |    1 
 net/netfilter/nfnetlink_queue.c                                 |    1 
 net/netfilter/xt_CHECKSUM.c                                     |   22 +
 net/netfilter/xt_cluster.c                                      |   14 
 net/netfilter/xt_hashlimit.c                                    |   18 -
 net/tipc/diag.c                                                 |    2 
 net/tipc/netlink.c                                              |    2 
 net/tipc/socket.c                                               |   76 +++--
 net/tipc/socket.h                                               |    2 
 net/wireless/nl80211.c                                          |   15 -
 net/wireless/reg.c                                              |   91 ------
 net/wireless/util.c                                             |    2 
 sound/pci/hda/patch_realtek.c                                   |    1 
 tools/hv/hv_fcopy_daemon.c                                      |    1 
 tools/kvm/kvm_stat/kvm_stat                                     |   25 +
 tools/perf/arch/powerpc/util/sym-handling.c                     |    4 
 tools/perf/util/annotate.c                                      |   32 +-
 tools/perf/util/annotate.h                                      |    1 
 tools/perf/util/evsel.c                                         |    5 
 tools/perf/util/trace-event-info.c                              |    2 
 tools/testing/selftests/net/pmtu.sh                             |    7 
 tools/testing/selftests/rseq/param_test.c                       |   19 -
 tools/testing/selftests/tc-testing/tc-tests/actions/police.json |   48 +++
 tools/vm/page-types.c                                           |    6 
 tools/vm/slabinfo.c                                             |    4 
 182 files changed, 1827 insertions(+), 990 deletions(-)

Al Viro (1):
new primitive: discard_new_inode()

Alexey Khoroshilov (1):
gpio: dwapb: Fix error handling in dwapb_gpio_probe()

Amir Goldstein (3):
fsnotify: fix ignore mask logic in fsnotify()
ovl: fix access beyond unterminated strings
ovl: fix memory leak on unlink of indexed file

Anand Jain (1):
btrfs: btrfs_shrink_device should call commit transaction at the end

Andreas Bosch (1):
HID: intel-ish-hid: Enable Sunrise Point-H ish driver

Andreas Gruenbacher (1):
sysfs: Do not return POSIX ACL xattrs via listxattr

Andrew Murray (1):

      asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO

Andy Shevchenko (1):
gpiolib: acpi: Switch to cansleep version of GPIO library call

Anisse Astier (1):
HID: i2c-hid: disable runtime PM operations on hantick touchpad

Anton Vasilyev (1):

      usb: gadget: fotg210-udc: Fix memory leak of fotg210->ep[i]

Anurag Kumar Vulisha (1):
usb: host: xhci-plat: Iterate over parent nodes for finding quirks

Arunk Khandavalli (1):

      cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE

Ashish Samant (1):

      ocfs2: fix locking for res->tracking and dlm->tracking_list

Aurelien Aptel (1):
smb2: fix missing files in root share directory listing

Baruch Siach (1):
net: mvpp2: initialize port of_node pointer

Ben Hutchings (1):
USB: yurex: Check for truncation in yurex_read()

Ben Skeggs (5):
drm/nouveau: fix oops in client init failure path
drm/nouveau/mmu: don't attempt to dereference vmm without valid instance pointer drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS drm/nouveau/disp: fix DP disable race
drm/nouveau/disp/gm200-: enforce identity-mapped SOR assignment for LVDS/eDP panels

Bjorn Andersson (1):
firmware: Always initialize the fw_priv list object

Chris Brandt (1):

      sh_eth: Add R7S9210 support

Chris Phlipot (1):
perf util: Fix bad memory access in trace info.

Christian König (1):
drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk

Cong Wang (2):
tipc: switch to rhashtable iterator
netfilter: xt_hashlimit: use s->file instead of s->private

Dan Carpenter (3):
scsi: aacraid: fix a signedness bug
cfg80211: fix a type issue in ieee80211_chandef_to_operating_class()
cifs: read overflow in is_valid_oplock_break()

Danek Duvall (2):

      mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
      mac80211_hwsim: correct use of IEEE80211_VHT_CAP_RXSTBC_X

Daniel Black (1):
mm: madvise(MADV_DODUMP): allow hugetlbfs pages

Daniel Borkmann (6):
bpf, sockmap: fix potential use after free in bpf_tcp_close bpf, sockmap: fix psock refcount leak in bpf_tcp_recvmsg
bpf: fix several offset tests in bpf_msg_pull_data
bpf: fix msg->data/data_end after sg shift repair in bpf_msg_pull_data
bpf: fix shift upon scatterlist ring wrap-around in bpf_msg_pull_data
bpf: fix sg shift repair start offset in bpf_msg_pull_data

Daniel Jurgens (1):
net/mlx5: Consider PCI domain in search for next dev

David Howells (1):
afs: Fix cell specification to permit an empty address list

Dennis Zhou (Facebook) (1):
Revert "blk-throttle: fix race between blkcg_bio_issue_check() and cgroup_rmdir()"

Dexuan Cui (1):
Drivers: hv: vmbus: Use get/put_cpu() in vmbus_connect()

Dreyfuss, Haim (1):
mac80211: fix WMM TXOP calculation

Emmanuel Grumbach (3):
mac80211: fix a race between restart and CSA flows
mac80211: don't Tx a deauth frame if the AP forbade Tx
mac80211: shorten the IBSS debug messages

Florian Westphal (2):
netfilter: xt_checksum: ignore gso skbs
netfilter: kconfig: nat related expression depend on nftables core

Geert Uytterhoeven (1):
scsi: libata: Add missing newline at end of file

Greentime Hu (3):
nds32: fix logic for module
nds32: fix build error because of wrong semicolon
nds32: linker script: GCOV kernel may refers data in __exit

Greg Kroah-Hartman (2):
Revert "drm/amd/pp: Send khz clock values to DC for smu7/8" Linux 4.18.13

Guenter Roeck (1):
riscv: Do not overwrite initrd_start and initrd_end

Haim Dreyfuss (2):
nl80211: Fix nla_put_u8 to u16 for NL80211_WMMR_TXOP
nl80211: Pass center frequency in kHz instead of MHz

Hans de Goede (2):
gpiolib-acpi: Register GpioInt ACPI event handlers from a late_initcall
HID: sensor-hub: Restore fixup for Lenovo ThinkPad Helix 2 sensor hub report

Harry Mallon (1):
HID: hid-saitek: Add device ID for RAT 7 Contagion

Harsh Jain (1):
crypto: chelsio - Fix memory corruption in DMA Mapped buffers.

Heinz Mauelshagen (4):
dm raid: fix reshape race on small devices
dm raid: fix stripe adding reshape deadlock
dm raid: fix rebuild of specific devices by updating superblock dm raid: fix RAID leg rebuild errors

Hisao Tanabe (1):
perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()

Horia Geantă (1):
crypto: caam/jr - fix ablkcipher_edesc pointer arithmetic

Ilan Peer (1):
mac80211: Fix station bandwidth setting after channel switch

Ilya Dryomov (1):
ceph: avoid a use-after-free in ceph_destroy_options()

Ivan Mikhaylov (1):
net/ibm/emac: wrong emac_calc_base call was used by typo

Jacek Tomaka (1):
perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs

Jann Horn (3):
bpf: 32-bit RSH verification must truncate input before the ALU op RDMA/ucma: check fd type in ucma_migrate_id()
proc: restrict kernel stack dumps to root

Jia-Ju Bai (1):
net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()

Jinbum Park (1):
mac80211_hwsim: Fix possible Spectre-v1 for hwsim_world_regdom_custom

Joe Thornber (1):
dm thin metadata: try to avoid ever aborting transactions

Johannes Berg (3):
mac80211_hwsim: require at least one channel
cfg80211: remove division by size of sizeof(struct ieee80211_wmm_rule)
mac80211: always account for A-MSDU header changes

John Fastabend (2):
bpf: sockmap, decrement copied count correctly in redirect error case
bpf: avoid misuse of psock when TCP_ULP_BPF collides with another ULP

Jon Kuhn (1):
fs/cifs: don't translate SFM_SLASH (U+F026) to backslash

Josh Abraham (1):
xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage

Julian Wiedmann (1):
s390/qeth: don't dump past end of unknown HW header

Kai-Heng Feng (3):
HID: i2c-hid: Don't reset device upon system resume
r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760

Kim Phillips (1):
perf annotate: Fix parsing aarch64 branch instructions after objdump update

Larry Finger (1):
b43: fix DMA error related regression with proprietary firmware

Leonard Crestez (1):
crypto: mxs-dcp - Fix wait logic on chan threads

Lorenzo Bianconi (3):
mac80211: do not convert to A-MSDU if frag/subframe limited
mac80211: fix an off-by-one issue in A-MSDU max_subframe computation
iio: imu: st_lsm6dsx: take into account ts samples in wm configuration

Maciej S. Szmigiero (1):
r8169: set TxConfig register after TX / RX is enabled, just like RxConfig

Martin Liška (1):
perf annotate: Properly interpret indirect call

Martin Willi (1):
netfilter: xt_cluster: add dependency on conntrack module

Masahiro Yamada (2):
i2c: uniphier: issue STOP only for last message or I2C_M_STOP
i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP

Mathieu Desnoyers (1):
rseq/selftests: fix parametrized test with -fpie

Matt Ranostay (1):
Revert "iio: temperature: maxim_thermocouple: add MAX31856 part"

Michael Hennerich (1):
gpio: adp5588: Fix sleep-in-atomic-context bug

Michal 'vorner' Vaner (1):
netfilter: nfnetlink_queue: Solve the NFQUEUE/conntrack clash for NF_REPEAT

Miguel Ojeda (1):
arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"

Mike Christie (1):
scsi: iscsi: target: Fix conn_ops double free

Mike Snitzer (1):
dm thin metadata: fix __udivdi3 undefined on 32-bit

Miklos Szeredi (3):
vfs: don't evict uninitialized inode
ovl: set I_CREATING on inode being created
ovl: fix format of setxattr debug

Naoya Horiguchi (2):
tools/vm/slabinfo.c: fix sign-compare warning tools/vm/page-types.c: fix "defined but not used" warning

Nathan Chancellor (1):
cpufreq: qcom-kryo: Fix section annotations

Netanel Belgazal (6):
net: ena: fix surprise unplug NULL dereference kernel crash
net: ena: fix driver when PAGE_SIZE == 64kB
net: ena: fix device destruction to gracefully free resources
net: ena: fix potential double ena_destroy_device()
net: ena: fix missing lock during device destruction
net: ena: fix missing calls to READ_ONCE

Nilesh Javali (1):
scsi: qedi: Add the CRC size within iSCSI NVM image

Olaf Hering (1):
xen: avoid crash in disable_hotplug_cpu

Paolo Abeni (1):
tc-testing: add test-cases for numeric and invalid control action

Paul Mackerras (1):
KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function

Peng Li (2):
net: hns: add the code for cleaning pkt in chip
net: hns: add netif_carrier_off before change speed and duplex

Randy Dunlap (3):
arch/hexagon: fix kernel/dma.c build warning
hexagon: modify ffs() and fls() to return int x86/APM: Fix build warning when PROC_FS is not enabled

Ricardo Ribalda Delgado (1):
gpiolib: Free the last requested descriptor

Rishabh Bhatnagar (1):
firmware: Fix security issue with request_firmware_into_buf()

Robbie Ko (1):
Btrfs: fix unexpected failure of nocow buffered writes after snapshotting when low on space

Sabrina Dubroca (2):
selftests: pmtu: maximum MTU for vti4 is 2^16-1-20
selftests: pmtu: detect correct binary to ping ipv6 addresses

Sagi Grimberg (1):
nvmet-rdma: fix possible bogus dereference under heavy load

Sandipan Das (1):
perf probe powerpc: Ignore SyS symbols irrespective of endianness

Sara Sharon (1):
mac80211: avoid kernel panic when building AMSDU from non-linear SKB

Sean O'Brien (1):
HID: add support for Apple Magic Keyboards

Shaohua Li (1):
md/raid5-cache: disable reshape completely

Singh, Brijesh (1):
iommu/amd: Clear memory encryption mask from physical address

Somnath Kotur (1):
bnxt_re: Fix couple of memory leaks that could lead to IOMMU call traces

Song Liu (1):
ixgbe: check return value of napi_complete_done()

Srikar Dronamraju (1):
sched/topology: Set correct NUMA topology type

Stanislaw Gruszka (1):
cfg80211: make wmm_rule part of the reg_rule structure

Stefan Raspl (3):
tools/kvm_stat: fix python3 issues
tools/kvm_stat: fix handling of invalid paths in debugfs provider tools/kvm_stat: fix updates for dead guests

Stephen Rothwell (1):
fs/cifs: suppress a string overflow warning

Sudeep Holla (1):
firmware: arm_scmi: fix divide by zero when sustained_perf_level is zero

Taehee Yoo (1):
netfilter: nf_tables: release chain in flushing set

Tao Zhou (1):
drm/amdgpu: Fix SDMA hang in prt mode v2

Thomas Falcon (1):
ibmvnic: Include missing return code checks in reset function

Toke Høiland-Jørgensen (1):
mac80211: Run TXQ teardown code before de-registering interfaces

Tushar Dave (1):
bpf: Fix bpf_msg_pull_data()

Varun Prakash (2):
scsi: csiostor: add a check for NULL pointer after kmalloc()
scsi: csiostor: fix incorrect port capabilities

Vincent Pelletier (1):

      scsi: iscsi: target: Set conn->sess to NULL when iscsi_login_set_conn_values fails

Vincent Whitchurch (1):
gpio: Fix crash due to registration race

Vitaly Kuznetsov (2):
xen/manage: don't complain about an empty value in control/sysrq node
tools: hv: fcopy: set 'error' in case an unknown operation was requested

Waiman Long (1):
crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()

Wenjia Zhang (1):
s390/qeth: use vzalloc for QUERY OAT buffer

Will Deacon (1):
ARC: atomics: unbork atomic_fetch_##op()

Xiao Ni (1):

      RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0

Yuan-Chi Pang (1):
mac80211: mesh: fix HWMP sequence numbering to follow standard

YueHaibing (1):
nds32: add NULL entry to the end of_device_id array

Zong Li (2):
nds32: Fix empty call trace
nds32: Fix get_user/put_user macro expand pointer problem

author maintainer
#1 lore raw
Documentation/devicetree/bindings/net/sh_eth.txt +1 -0
index 82a4cf2c145d..a62fe3b613fc 100644
@@ -16,6 +16,7 @@ Required properties:
 	      "renesas,ether-r8a7794"  if the device is a part of R8A7794 SoC.
 	      "renesas,gether-r8a77980" if the device is a part of R8A77980 SoC.
 	      "renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
+	      "renesas,ether-r7s9210" if the device is a part of R7S9210 SoC.
 	      "renesas,rcar-gen1-ether" for a generic R-Car Gen1 device.
 	      "renesas,rcar-gen2-ether" for a generic R-Car Gen2 or RZ/G1
 	                                device.
Makefile +1 -1
index 466e07af8473..4442e9ea4b6d 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 18
-SUBLEVEL = 12
+SUBLEVEL = 13
 EXTRAVERSION =
 NAME = Merciless Moray
 
arch/arc/include/asm/atomic.h +1 -1
index 11859287c52a..c98b59ac0612 100644
@@ -84,7 +84,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v)			\
 	"1:	llock   %[orig], [%[ctr]]		\n"		\
 	"	" #asm_op " %[val], %[orig], %[i]	\n"		\
 	"	scond   %[val], [%[ctr]]		\n"		\
-	"						\n"		\
+	"	bnz     1b				\n"		\
 	: [val]	"=&r"	(val),						\
 	  [orig] "=&r" (orig)						\
 	: [ctr]	"r"	(&v->counter),					\
arch/arm64/include/asm/jump_label.h +2 -2
index 1b5e0e843c3a..7e2b3e360086 100644
@@ -28,7 +28,7 @@
 
 static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
-	asm goto("1: nop\n\t"
+	asm_volatile_goto("1: nop\n\t"
 		 ".pushsection __jump_table,  \"aw\"\n\t"
 		 ".align 3\n\t"
 		 ".quad 1b, %l[l_yes], %c0\n\t"
@@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
 
 static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
 {
-	asm goto("1: b %l[l_yes]\n\t"
+	asm_volatile_goto("1: b %l[l_yes]\n\t"
 		 ".pushsection __jump_table,  \"aw\"\n\t"
 		 ".align 3\n\t"
 		 ".quad 1b, %l[l_yes], %c0\n\t"
arch/hexagon/include/asm/bitops.h +2 -2
index 5e4a59b3ec1b..2691a1857d20 100644
@@ -211,7 +211,7 @@ static inline long ffz(int x)
  * This is defined the same way as ffs.
  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
  */
-static inline long fls(int x)
+static inline int fls(int x)
 {
 	int r;
 
@@ -232,7 +232,7 @@ static inline long fls(int x)
  * the libc and compiler builtin ffs routines, therefore
  * differs in spirit from the above ffz (man ffs).
  */
-static inline long ffs(int x)
+static inline int ffs(int x)
 {
 	int r;
 
arch/hexagon/kernel/dma.c +1 -1
index 77459df34e2e..7ebe7ad19d15 100644
@@ -60,7 +60,7 @@ static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
 			panic("Can't create %s() memory pool!", __func__);
 		else
 			gen_pool_add(coherent_pool,
-				pfn_to_virt(max_low_pfn),
+				(unsigned long)pfn_to_virt(max_low_pfn),
 				hexagon_coherent_pool_size, -1);
 	}
 
arch/nds32/include/asm/elf.h +2 -2
index 56c479058802..f5f9cf7e0544 100644
@@ -121,9 +121,9 @@ struct elf32_hdr;
  */
 #define ELF_CLASS	ELFCLASS32
 #ifdef __NDS32_EB__
-#define ELF_DATA	ELFDATA2MSB;
+#define ELF_DATA	ELFDATA2MSB
 #else
-#define ELF_DATA	ELFDATA2LSB;
+#define ELF_DATA	ELFDATA2LSB
 #endif
 #define ELF_ARCH	EM_NDS32
 #define USE_ELF_CORE_DUMP
arch/nds32/include/asm/uaccess.h +14 -12
index 18a009f3804d..3f771e0595e8 100644
@@ -78,8 +78,9 @@ static inline void set_fs(mm_segment_t fs)
 #define get_user(x,p)							\
 ({									\
 	long __e = -EFAULT;						\
-	if(likely(access_ok(VERIFY_READ,  p, sizeof(*p)))) {		\
-		__e = __get_user(x,p);					\
+	const __typeof__(*(p)) __user *__p = (p);			\
+	if(likely(access_ok(VERIFY_READ, __p, sizeof(*__p)))) {		\
+		__e = __get_user(x, __p);				\
 	} else								\
 		x = 0;							\
 	__e;								\
@@ -99,10 +100,10 @@ static inline void set_fs(mm_segment_t fs)
 
 #define __get_user_err(x,ptr,err)					\
 do {									\
-	unsigned long __gu_addr = (unsigned long)(ptr);			\
+	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);		\
 	unsigned long __gu_val;						\
-	__chk_user_ptr(ptr);						\
-	switch (sizeof(*(ptr))) {					\
+	__chk_user_ptr(__gu_addr);					\
+	switch (sizeof(*(__gu_addr))) {					\
 	case 1:								\
 		__get_user_asm("lbi",__gu_val,__gu_addr,err);		\
 		break;							\
@@ -119,7 +120,7 @@ do {									\
 		BUILD_BUG(); 						\
 		break;							\
 	}								\
-	(x) = (__typeof__(*(ptr)))__gu_val;				\
+	(x) = (__typeof__(*(__gu_addr)))__gu_val;			\
 } while (0)
 
 #define __get_user_asm(inst,x,addr,err)					\
@@ -169,8 +170,9 @@ do {									\
 #define put_user(x,p)							\
 ({									\
 	long __e = -EFAULT;						\
-	if(likely(access_ok(VERIFY_WRITE,  p, sizeof(*p)))) {		\
-		__e = __put_user(x,p);					\
+	__typeof__(*(p)) __user *__p = (p);				\
+	if(likely(access_ok(VERIFY_WRITE, __p, sizeof(*__p)))) {	\
+		__e = __put_user(x, __p);				\
 	}								\
 	__e;								\
 })
@@ -189,10 +191,10 @@ do {									\
 
 #define __put_user_err(x,ptr,err)					\
 do {									\
-	unsigned long __pu_addr = (unsigned long)(ptr);			\
-	__typeof__(*(ptr)) __pu_val = (x);				\
-	__chk_user_ptr(ptr);						\
-	switch (sizeof(*(ptr))) {					\
+	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\
+	__typeof__(*(__pu_addr)) __pu_val = (x);			\
+	__chk_user_ptr(__pu_addr);					\
+	switch (sizeof(*(__pu_addr))) {					\
 	case 1:								\
 		__put_user_asm("sbi",__pu_val,__pu_addr,err);		\
 		break;							\
arch/nds32/kernel/atl2c.c +2 -1
index 0c6d031a1c4a..0c5386e72098 100644
@@ -9,7 +9,8 @@
 
 void __iomem *atl2c_base;
 static const struct of_device_id atl2c_ids[] __initconst = {
-	{.compatible = "andestech,atl2c",}
+	{.compatible = "andestech,atl2c",},
+	{}
 };
 
 static int __init atl2c_of_init(void)
arch/nds32/kernel/module.c +2 -2
index 4167283d8293..1e31829cbc2a 100644
@@ -40,7 +40,7 @@ void do_reloc16(unsigned int val, unsigned int *loc, unsigned int val_mask,
 
 	tmp2 = tmp & loc_mask;
 	if (partial_in_place) {
-		tmp &= (!loc_mask);
+		tmp &= (~loc_mask);
 		tmp =
 		    tmp2 | ((tmp + ((val & val_mask) >> val_shift)) & val_mask);
 	} else {
@@ -70,7 +70,7 @@ void do_reloc32(unsigned int val, unsigned int *loc, unsigned int val_mask,
 
 	tmp2 = tmp & loc_mask;
 	if (partial_in_place) {
-		tmp &= (!loc_mask);
+		tmp &= (~loc_mask);
 		tmp =
 		    tmp2 | ((tmp + ((val & val_mask) >> val_shift)) & val_mask);
 	} else {
arch/nds32/kernel/traps.c +1 -1
index a6205fd4db52..f0e974347c26 100644
@@ -137,7 +137,7 @@ static void __dump(struct task_struct *tsk, unsigned long *base_reg)
 		       !((unsigned long)base_reg & 0x3) &&
 		       ((unsigned long)base_reg >= TASK_SIZE)) {
 			unsigned long next_fp;
-#if !defined(NDS32_ABI_2)
+#if !defined(__NDS32_ABI_2)
 			ret_addr = base_reg[0];
 			next_fp = base_reg[1];
 #else
arch/nds32/kernel/vmlinux.lds.S +12 -0
index 288313b886ef..9e90f30a181d 100644
@@ -13,14 +13,26 @@ OUTPUT_ARCH(nds32)
 ENTRY(_stext_lma)
 jiffies = jiffies_64;
 
+#if defined(CONFIG_GCOV_KERNEL)
+#define NDS32_EXIT_KEEP(x)	x
+#else
+#define NDS32_EXIT_KEEP(x)
+#endif
+
 SECTIONS
 {
 	_stext_lma = TEXTADDR - LOAD_OFFSET;
 	. = TEXTADDR;
 	__init_begin = .;
 	HEAD_TEXT_SECTION
+	.exit.text : {
+		NDS32_EXIT_KEEP(EXIT_TEXT)
+	}
 	INIT_TEXT_SECTION(PAGE_SIZE)
 	INIT_DATA_SECTION(16)
+	.exit.data : {
+		NDS32_EXIT_KEEP(EXIT_DATA)
+	}
 	PERCPU_SECTION(L1_CACHE_BYTES)
 	__init_end = .;
 
arch/powerpc/kvm/book3s_64_mmu_hv.c +1 -1
index 7f3a8cf5d66f..4c08f42f6406 100644
@@ -359,7 +359,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
 	unsigned long pp, key;
 	unsigned long v, orig_v, gr;
 	__be64 *hptep;
-	int index;
+	long int index;
 	int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR);
 
 	if (kvm_is_radix(vcpu->kvm))
arch/riscv/kernel/setup.c +0 -7
index f0d2070866d4..0efa5b29d0a3 100644
@@ -64,15 +64,8 @@ atomic_t hart_lottery;
 #ifdef CONFIG_BLK_DEV_INITRD
 static void __init setup_initrd(void)
 {
-	extern char __initramfs_start[];
-	extern unsigned long __initramfs_size;
 	unsigned long size;
 
-	if (__initramfs_size > 0) {
-		initrd_start = (unsigned long)(&__initramfs_start);
-		initrd_end = initrd_start + __initramfs_size;
-	}
-
 	if (initrd_start >= initrd_end) {
 		printk(KERN_INFO "initrd not found or empty");
 		goto disable;
arch/x86/events/intel/lbr.c +4 -0
index a4170048a30b..17fbd07e4245 100644
@@ -1250,4 +1250,8 @@ void intel_pmu_lbr_init_knl(void)
 
 	x86_pmu.lbr_sel_mask = LBR_SEL_MASK;
 	x86_pmu.lbr_sel_map  = snb_lbr_sel_map;
+
+	/* Knights Landing does have MISPREDICT bit */
+	if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_LIP)
+		x86_pmu.intel_cap.lbr_format = LBR_FORMAT_EIP_FLAGS;
 }
arch/x86/kernel/apm_32.c +2 -0
index ec00d1ff5098..f7151cd03cb0 100644
@@ -1640,6 +1640,7 @@ static int do_open(struct inode *inode, struct file *filp)
 	return 0;
 }
 
+#ifdef CONFIG_PROC_FS
 static int proc_apm_show(struct seq_file *m, void *v)
 {
 	unsigned short	bx;
@@ -1719,6 +1720,7 @@ static int proc_apm_show(struct seq_file *m, void *v)
 		   units);
 	return 0;
 }
+#endif
 
 static int apm(void *unused)
 {
block/blk-cgroup.c +16 -62

137 lines not on this page · raw message

drivers/ata/libata-core.c +1 -1
index 22a2bc5f25ce..99bf0c0394f8 100644
@@ -7403,4 +7403,4 @@ EXPORT_SYMBOL_GPL(ata_cable_unknown);
 EXPORT_SYMBOL_GPL(ata_cable_ignore);
 EXPORT_SYMBOL_GPL(ata_cable_sata);
 EXPORT_SYMBOL_GPL(ata_host_get);
-EXPORT_SYMBOL_GPL(ata_host_put);
\ No newline at end of file
+EXPORT_SYMBOL_GPL(ata_host_put);
drivers/base/firmware_loader/main.c +22 -13
index 0943e7065e0e..8e9213b36e31 100644
@@ -209,22 +209,28 @@ static struct fw_priv *__lookup_fw_priv(const char *fw_name)
 static int alloc_lookup_fw_priv(const char *fw_name,
 				struct firmware_cache *fwc,
 				struct fw_priv **fw_priv, void *dbuf,
-				size_t size)
+				size_t size, enum fw_opt opt_flags)
 {
 	struct fw_priv *tmp;
 
 	spin_lock(&fwc->lock);
-	tmp = __lookup_fw_priv(fw_name);
-	if (tmp) {
-		kref_get(&tmp->ref);
-		spin_unlock(&fwc->lock);
-		*fw_priv = tmp;
-		pr_debug("batched request - sharing the same struct fw_priv and lookup for multiple requests\n");
-		return 1;
+	if (!(opt_flags & FW_OPT_NOCACHE)) {
+		tmp = __lookup_fw_priv(fw_name);
+		if (tmp) {
+			kref_get(&tmp->ref);
+			spin_unlock(&fwc->lock);
+			*fw_priv = tmp;
+			pr_debug("batched request - sharing the same struct fw_priv and lookup for multiple requests\n");
+			return 1;
+		}
 	}
+
 	tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size);
-	if (tmp)
-		list_add(&tmp->list, &fwc->head);
+	if (tmp) {
+		INIT_LIST_HEAD(&tmp->list);
+		if (!(opt_flags & FW_OPT_NOCACHE))
+			list_add(&tmp->list, &fwc->head);
+	}
 	spin_unlock(&fwc->lock);
 
 	*fw_priv = tmp;
@@ -493,7 +499,8 @@ int assign_fw(struct firmware *fw, struct device *device,
  */
 static int
 _request_firmware_prepare(struct firmware **firmware_p, const char *name,
-			  struct device *device, void *dbuf, size_t size)
+			  struct device *device, void *dbuf, size_t size,
+			  enum fw_opt opt_flags)
 {
 	struct firmware *firmware;
 	struct fw_priv *fw_priv;
@@ -511,7 +518,8 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
 		return 0; /* assigned */
 	}
 
-	ret = alloc_lookup_fw_priv(name, &fw_cache, &fw_priv, dbuf, size);
+	ret = alloc_lookup_fw_priv(name, &fw_cache, &fw_priv, dbuf, size,
+				  opt_flags);
 
 	/*
 	 * bind with 'priv' now to avoid warning in failure path
@@ -571,7 +579,8 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
 		goto out;
 	}
 
-	ret = _request_firmware_prepare(&fw, name, device, buf, size);
+	ret = _request_firmware_prepare(&fw, name, device, buf, size,
+					opt_flags);
 	if (ret <= 0) /* error or already assigned */
 		goto out;
 
drivers/cpufreq/qcom-cpufreq-kryo.c +2 -2
index efc9a7ae4857..35e81d7dd929 100644
@@ -44,7 +44,7 @@ enum _msm8996_version {
 
 struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
 
-static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
+static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void)
 {
 	size_t len;
 	u32 *msm_id;
@@ -221,7 +221,7 @@ static int __init qcom_cpufreq_kryo_init(void)
 }
 module_init(qcom_cpufreq_kryo_init);
 
-static void __init qcom_cpufreq_kryo_exit(void)
+static void __exit qcom_cpufreq_kryo_exit(void)
 {
 	platform_device_unregister(kryo_cpufreq_pdev);
 	platform_driver_unregister(&qcom_cpufreq_kryo_driver);
drivers/crypto/caam/caamalg.c +4 -4
index d67667970f7e..ec40f991e6c6 100644
@@ -1553,8 +1553,8 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request
 	edesc->src_nents = src_nents;
 	edesc->dst_nents = dst_nents;
 	edesc->sec4_sg_bytes = sec4_sg_bytes;
-	edesc->sec4_sg = (void *)edesc + sizeof(struct ablkcipher_edesc) +
-			 desc_bytes;
+	edesc->sec4_sg = (struct sec4_sg_entry *)((u8 *)edesc->hw_desc +
+						  desc_bytes);
 	edesc->iv_dir = DMA_TO_DEVICE;
 
 	/* Make sure IV is located in a DMAable area */
@@ -1757,8 +1757,8 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc(
 	edesc->src_nents = src_nents;
 	edesc->dst_nents = dst_nents;
 	edesc->sec4_sg_bytes = sec4_sg_bytes;
-	edesc->sec4_sg = (void *)edesc + sizeof(struct ablkcipher_edesc) +
-			 desc_bytes;
+	edesc->sec4_sg = (struct sec4_sg_entry *)((u8 *)edesc->hw_desc +
+						  desc_bytes);
 	edesc->iv_dir = DMA_FROM_DEVICE;
 
 	/* Make sure IV is located in a DMAable area */
drivers/crypto/chelsio/chcr_algo.c +22 -10
index b916c4eb608c..e5d2ac5aec40 100644
@@ -367,7 +367,8 @@ static inline void dsgl_walk_init(struct dsgl_walk *walk,
 	walk->to = (struct phys_sge_pairs *)(dsgl + 1);
 }
 
-static inline void dsgl_walk_end(struct dsgl_walk *walk, unsigned short qid)
+static inline void dsgl_walk_end(struct dsgl_walk *walk, unsigned short qid,
+				 int pci_chan_id)
 {
 	struct cpl_rx_phys_dsgl *phys_cpl;
 
@@ -385,6 +386,7 @@ static inline void dsgl_walk_end(struct dsgl_walk *walk, unsigned short qid)
 	phys_cpl->rss_hdr_int.opcode = CPL_RX_PHYS_ADDR;
 	phys_cpl->rss_hdr_int.qid = htons(qid);
 	phys_cpl->rss_hdr_int.hash_val = 0;
+	phys_cpl->rss_hdr_int.channel = pci_chan_id;
 }
 
 static inline void dsgl_walk_add_page(struct dsgl_walk *walk,
@@ -718,7 +720,7 @@ static inline void create_wreq(struct chcr_context *ctx,
 		FILL_WR_RX_Q_ID(ctx->dev->rx_channel_id, qid,
 				!!lcb, ctx->tx_qidx);
 
-	chcr_req->ulptx.cmd_dest = FILL_ULPTX_CMD_DEST(ctx->dev->tx_channel_id,
+	chcr_req->ulptx.cmd_dest = FILL_ULPTX_CMD_DEST(ctx->tx_chan_id,
 						       qid);
 	chcr_req->ulptx.len = htonl((DIV_ROUND_UP(len16, 16) -
 				     ((sizeof(chcr_req->wreq)) >> 4)));
@@ -1339,16 +1341,23 @@ static int chcr_device_init(struct chcr_context *ctx)
 				    adap->vres.ncrypto_fc);
 		rxq_perchan = u_ctx->lldi.nrxq / u_ctx->lldi.nchan;
 		txq_perchan = ntxq / u_ctx->lldi.nchan;
-		rxq_idx = ctx->dev->tx_channel_id * rxq_perchan;
-		rxq_idx += id % rxq_perchan;
-		txq_idx = ctx->dev->tx_channel_id * txq_perchan;
-		txq_idx += id % txq_perchan;
 		spin_lock(&ctx->dev->lock_chcr_dev);
-		ctx->rx_qidx = rxq_idx;
-		ctx->tx_qidx = txq_idx;
+		ctx->tx_chan_id = ctx->dev->tx_channel_id;
 		ctx->dev->tx_channel_id = !ctx->dev->tx_channel_id;
 		ctx->dev->rx_channel_id = 0;
 		spin_unlock(&ctx->dev->lock_chcr_dev);
+		rxq_idx = ctx->tx_chan_id * rxq_perchan;
+		rxq_idx += id % rxq_perchan;
+		txq_idx = ctx->tx_chan_id * txq_perchan;
+		txq_idx += id % txq_perchan;
+		ctx->rx_qidx = rxq_idx;
+		ctx->tx_qidx = txq_idx;
+		/* Channel Id used by SGE to forward packet to Host.
+		 * Same value should be used in cpl_fw6_pld RSS_CH field
+		 * by FW. Driver programs PCI channel ID to be used in fw
+		 * at the time of queue allocation with value "pi->tx_chan"
+		 */
+		ctx->pci_chan_id = txq_idx / txq_perchan;
 	}
 out:
 	return err;
@@ -2503,6 +2512,7 @@ void chcr_add_aead_dst_ent(struct aead_request *req,
 	struct crypto_aead *tfm = crypto_aead_reqtfm(req);
 	struct dsgl_walk dsgl_walk;
 	unsigned int authsize = crypto_aead_authsize(tfm);
+	struct chcr_context *ctx = a_ctx(tfm);
 	u32 temp;
 
 	dsgl_walk_init(&dsgl_walk, phys_cpl);
@@ -2512,7 +2522,7 @@ void chcr_add_aead_dst_ent(struct aead_request *req,
 	dsgl_walk_add_page(&dsgl_walk, IV, &reqctx->iv_dma);
 	temp = req->cryptlen + (reqctx->op ? -authsize : authsize);
 	dsgl_walk_add_sg(&dsgl_walk, req->dst, temp, req->assoclen);
-	dsgl_walk_end(&dsgl_walk, qid);
+	dsgl_walk_end(&dsgl_walk, qid, ctx->pci_chan_id);
 }
 
 void chcr_add_cipher_src_ent(struct ablkcipher_request *req,
@@ -2544,6 +2554,8 @@ void chcr_add_cipher_dst_ent(struct ablkcipher_request *req,
 			     unsigned short qid)
 {
 	struct chcr_blkcipher_req_ctx *reqctx = ablkcipher_request_ctx(req);
+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(wrparam->req);
+	struct chcr_context *ctx = c_ctx(tfm);
 	struct dsgl_walk dsgl_walk;
 
 	dsgl_walk_init(&dsgl_walk, phys_cpl);
@@ -2552,7 +2564,7 @@ void chcr_add_cipher_dst_ent(struct ablkcipher_request *req,
 	reqctx->dstsg = dsgl_walk.last_sg;
 	reqctx->dst_ofst = dsgl_walk.last_sg_len;
 
-	dsgl_walk_end(&dsgl_walk, qid);
+	dsgl_walk_end(&dsgl_walk, qid, ctx->pci_chan_id);
 }
 
 void chcr_add_hash_src_ent(struct ahash_request *req,
drivers/crypto/chelsio/chcr_crypto.h +2 -0
index 54835cb109e5..0d2c70c344f3 100644
@@ -255,6 +255,8 @@ struct chcr_context {
 	struct chcr_dev *dev;
 	unsigned char tx_qidx;
 	unsigned char rx_qidx;
+	unsigned char tx_chan_id;
+	unsigned char pci_chan_id;
 	struct __crypto_ctx crypto_ctx[0];
 };
 
drivers/crypto/mxs-dcp.c +30 -23

111 lines not on this page · raw message

drivers/crypto/qat/qat_c3xxx/adf_drv.c +3 -3
index ba197f34c252..763c2166ee0e 100644
@@ -123,7 +123,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_C3XXX_PCI_DEVICE_ID:
@@ -235,8 +236,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/crypto/qat/qat_c3xxxvf/adf_drv.c +3 -3
index 24ec908eb26c..613c7d5644ce 100644
@@ -125,7 +125,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_C3XXXIOV_PCI_DEVICE_ID:
@@ -215,8 +216,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/crypto/qat/qat_c62x/adf_drv.c +3 -3
index 59a5a0df50b6..9cb832963357 100644
@@ -123,7 +123,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_C62X_PCI_DEVICE_ID:
@@ -235,8 +236,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = (hw_data->fuses & ADF_DEVICE_FUSECTL_MASK) ? 1 : 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/crypto/qat/qat_c62xvf/adf_drv.c +3 -3
index b9f3e0e4fde9..278452b8ef81 100644
@@ -125,7 +125,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_C62XIOV_PCI_DEVICE_ID:
@@ -215,8 +216,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/crypto/qat/qat_dh895xcc/adf_drv.c +3 -3
index be5c5a988ca5..3a9708ef4ce2 100644
@@ -123,7 +123,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_DH895XCC_PCI_DEVICE_ID:
@@ -237,8 +238,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/crypto/qat/qat_dh895xccvf/adf_drv.c +3 -3
index 26ab17bfc6da..3da0f951cb59 100644
@@ -125,7 +125,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct adf_hw_device_data *hw_data;
 	char name[ADF_DEVICE_NAME_LENGTH];
 	unsigned int i, bar_nr;
-	int ret, bar_mask;
+	unsigned long bar_mask;
+	int ret;
 
 	switch (ent->device) {
 	case ADF_DH895XCCIOV_PCI_DEVICE_ID:
@@ -215,8 +216,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Find and map all the device's BARS */
 	i = 0;
 	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, (const unsigned long *)&bar_mask,
-			 ADF_PCI_MAX_BARS * 2) {
+	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
 		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
 
 		bar->base_addr = pci_resource_start(pdev, bar_nr);
drivers/firmware/arm_scmi/perf.c +7 -1
index 2a219b1261b1..49cb74f54a10 100644
@@ -166,7 +166,13 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain,
 					le32_to_cpu(attr->sustained_freq_khz);
 		dom_info->sustained_perf_level =
 					le32_to_cpu(attr->sustained_perf_level);
-		dom_info->mult_factor =	(dom_info->sustained_freq_khz * 1000) /
+		if (!dom_info->sustained_freq_khz ||
+		    !dom_info->sustained_perf_level)
+			/* CPUFreq converts to kHz, hence default 1000 */
+			dom_info->mult_factor =	1000;
+		else
+			dom_info->mult_factor =
+					(dom_info->sustained_freq_khz * 1000) /
 					dom_info->sustained_perf_level;
 		memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
 	}
drivers/gpio/gpio-adp5588.c +20 -4
index 3530ccd17e04..da9781a2ef4a 100644
@@ -41,6 +41,8 @@ struct adp5588_gpio {
 	uint8_t int_en[3];
 	uint8_t irq_mask[3];
 	uint8_t irq_stat[3];
+	uint8_t int_input_en[3];
+	uint8_t int_lvl_cached[3];
 };
 
 static int adp5588_gpio_read(struct i2c_client *client, u8 reg)
@@ -173,12 +175,28 @@ static void adp5588_irq_bus_sync_unlock(struct irq_data *d)
 	struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
 	int i;
 
-	for (i = 0; i <= ADP5588_BANK(ADP5588_MAXGPIO); i++)
+	for (i = 0; i <= ADP5588_BANK(ADP5588_MAXGPIO); i++) {
+		if (dev->int_input_en[i]) {
+			mutex_lock(&dev->lock);
+			dev->dir[i] &= ~dev->int_input_en[i];
+			dev->int_input_en[i] = 0;
+			adp5588_gpio_write(dev->client, GPIO_DIR1 + i,
+					   dev->dir[i]);
+			mutex_unlock(&dev->lock);
+		}
+
+		if (dev->int_lvl_cached[i] != dev->int_lvl[i]) {
+			dev->int_lvl_cached[i] = dev->int_lvl[i];
+			adp5588_gpio_write(dev->client, GPIO_INT_LVL1 + i,
+					   dev->int_lvl[i]);
+		}
+
 		if (dev->int_en[i] ^ dev->irq_mask[i]) {
 			dev->int_en[i] = dev->irq_mask[i];
 			adp5588_gpio_write(dev->client, GPIO_INT_EN1 + i,
 					   dev->int_en[i]);
 		}
+	}
 
 	mutex_unlock(&dev->irq_lock);
 }
@@ -221,9 +239,7 @@ static int adp5588_irq_set_type(struct irq_data *d, unsigned int type)
 	else
 		return -EINVAL;
 
-	adp5588_gpio_direction_input(&dev->gpio_chip, gpio);
-	adp5588_gpio_write(dev->client, GPIO_INT_LVL1 + bank,
-			   dev->int_lvl[bank]);
+	dev->int_input_en[bank] |= bit;
 
 	return 0;
 }
drivers/gpio/gpio-dwapb.c +1 -0
index 7a2de3de6571..5b12d6fdd448 100644
@@ -726,6 +726,7 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
 out_unregister:
 	dwapb_gpio_unregister(gpio);
 	dwapb_irq_teardown(gpio);
+	clk_disable_unprepare(gpio->clk);
 
 	return err;
 }
drivers/gpio/gpiolib-acpi.c +50 -36

161 lines not on this page · raw message

drivers/gpio/gpiolib-of.c +1 -0
index 53a14ee8ad6d..a704d2e74421 100644
@@ -31,6 +31,7 @@ static int of_gpiochip_match_node_and_xlate(struct gpio_chip *chip, void *data)
 	struct of_phandle_args *gpiospec = data;
 
 	return chip->gpiodev->dev.of_node == gpiospec->np &&
+				chip->of_xlate &&
 				chip->of_xlate(chip, gpiospec, NULL) >= 0;
 }
 
drivers/gpio/gpiolib.c +1 -1
index e11a3bb03820..06dce16e22bb 100644
@@ -565,7 +565,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
 		if (ret)
 			goto out_free_descs;
 		lh->descs[i] = desc;
-		count = i;
+		count = i + 1;
 
 		if (lflags & GPIOHANDLE_REQUEST_ACTIVE_LOW)
 			set_bit(FLAG_ACTIVE_LOW, &desc->flags);
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +15 -8
index 7200eea4f918..d9d8964a6e97 100644
@@ -38,6 +38,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
 {
 	struct drm_gem_object *gobj;
 	unsigned long size;
+	int r;
 
 	gobj = drm_gem_object_lookup(p->filp, data->handle);
 	if (gobj == NULL)
@@ -49,20 +50,26 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
 	p->uf_entry.tv.shared = true;
 	p->uf_entry.user_pages = NULL;
 
-	size = amdgpu_bo_size(p->uf_entry.robj);
-	if (size != PAGE_SIZE || (data->offset + 8) > size)
-		return -EINVAL;
-
-	*offset = data->offset;
-
 	drm_gem_object_put_unlocked(gobj);
 
+	size = amdgpu_bo_size(p->uf_entry.robj);
+	if (size != PAGE_SIZE || (data->offset + 8) > size) {
+		r = -EINVAL;
+		goto error_unref;
+	}
+
 	if (amdgpu_ttm_tt_get_usermm(p->uf_entry.robj->tbo.ttm)) {
-		amdgpu_bo_unref(&p->uf_entry.robj);
-		return -EINVAL;
+		r = -EINVAL;
+		goto error_unref;
 	}
 
+	*offset = data->offset;
+
 	return 0;
+
+error_unref:
+	amdgpu_bo_unref(&p->uf_entry.robj);
+	return r;
 }
 
 static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +5 -2
index ca53b3fba422..3e3e4e907ee5 100644
@@ -67,6 +67,7 @@ static const struct soc15_reg_golden golden_settings_sdma_4[] = {
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_IB_CNTL, 0x800f0100, 0x00000100),
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_RB_WPTR_POLL_CNTL, 0x0000fff0, 0x00403000),
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_PAGE, 0x000003ff, 0x000003c0),
+	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x00000000),
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CHICKEN_BITS, 0xfe931f07, 0x02831f07),
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CLK_CTRL, 0xffffffff, 0x3f000100),
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GFX_IB_CNTL, 0x800f0100, 0x00000100),
@@ -78,7 +79,8 @@ static const struct soc15_reg_golden golden_settings_sdma_4[] = {
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_RLC0_RB_WPTR_POLL_CNTL, 0x0000fff0, 0x00403000),
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_RLC1_IB_CNTL, 0x800f0100, 0x00000100),
 	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_RLC1_RB_WPTR_POLL_CNTL, 0x0000fff0, 0x00403000),
-	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_UTCL1_PAGE, 0x000003ff, 0x000003c0)
+	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_UTCL1_PAGE, 0x000003ff, 0x000003c0),
+	SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_UTCL1_WATERMK, 0xfc000000, 0x00000000)
 };
 
 static const struct soc15_reg_golden golden_settings_sdma_vg10[] = {
@@ -106,7 +108,8 @@ static const struct soc15_reg_golden golden_settings_sdma_4_1[] =
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC0_RB_WPTR_POLL_CNTL, 0xfffffff7, 0x00403000),
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_IB_CNTL, 0x800f0111, 0x00000100),
 	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_RB_WPTR_POLL_CNTL, 0xfffffff7, 0x00403000),
-	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_PAGE, 0x000003ff, 0x000003c0)
+	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_PAGE, 0x000003ff, 0x000003c0),
+	SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x00000000)
 };
 
 static const struct soc15_reg_golden golden_settings_sdma_4_2[] =
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +4 -4
index 77779adeef28..f8e866ceda02 100644
@@ -4555,12 +4555,12 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
 			return -EINVAL;
 		dep_sclk_table = table_info->vdd_dep_on_sclk;
 		for (i = 0; i < dep_sclk_table->count; i++)
-			clocks->clock[i] = dep_sclk_table->entries[i].clk * 10;
+			clocks->clock[i] = dep_sclk_table->entries[i].clk;
 		clocks->count = dep_sclk_table->count;
 	} else if (hwmgr->pp_table_version == PP_TABLE_V0) {
 		sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk;
 		for (i = 0; i < sclk_table->count; i++)
-			clocks->clock[i] = sclk_table->entries[i].clk * 10;
+			clocks->clock[i] = sclk_table->entries[i].clk;
 		clocks->count = sclk_table->count;
 	}
 
@@ -4592,7 +4592,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
 			return -EINVAL;
 		dep_mclk_table = table_info->vdd_dep_on_mclk;
 		for (i = 0; i < dep_mclk_table->count; i++) {
-			clocks->clock[i] = dep_mclk_table->entries[i].clk * 10;
+			clocks->clock[i] = dep_mclk_table->entries[i].clk;
 			clocks->latency[i] = smu7_get_mem_latency(hwmgr,
 						dep_mclk_table->entries[i].clk);
 		}
@@ -4600,7 +4600,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
 	} else if (hwmgr->pp_table_version == PP_TABLE_V0) {
 		mclk_table = hwmgr->dyn_state.vddc_dependency_on_mclk;
 		for (i = 0; i < mclk_table->count; i++)
-			clocks->clock[i] = mclk_table->entries[i].clk * 10;
+			clocks->clock[i] = mclk_table->entries[i].clk;
 		clocks->count = mclk_table->count;
 	}
 	return 0;
drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +3 -3
index 0adfc5392cd3..617557bd8c24 100644
@@ -1605,17 +1605,17 @@ static int smu8_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type
 	switch (type) {
 	case amd_pp_disp_clock:
 		for (i = 0; i < clocks->count; i++)
-			clocks->clock[i] = data->sys_info.display_clock[i] * 10;
+			clocks->clock[i] = data->sys_info.display_clock[i];
 		break;
 	case amd_pp_sys_clock:
 		table = hwmgr->dyn_state.vddc_dependency_on_sclk;
 		for (i = 0; i < clocks->count; i++)
-			clocks->clock[i] = table->entries[i].clk * 10;
+			clocks->clock[i] = table->entries[i].clk;
 		break;
 	case amd_pp_mem_clock:
 		clocks->count = SMU8_NUM_NBPMEMORYCLOCK;
 		for (i = 0; i < clocks->count; i++)
-			clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i] * 10;
+			clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i];
 		break;
 	default:
 		return -1;
drivers/gpu/drm/nouveau/nouveau_drm.c +7 -7
index c2ebe5da34d0..89225adaa60a 100644
@@ -230,7 +230,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
 		mutex_unlock(&drm->master.lock);
 	}
 	if (ret) {
-		NV_ERROR(drm, "Client allocation failed: %d\n", ret);
+		NV_PRINTK(err, cli, "Client allocation failed: %d\n", ret);
 		goto done;
 	}
 
@@ -240,37 +240,37 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
 			       }, sizeof(struct nv_device_v0),
 			       &cli->device);
 	if (ret) {
-		NV_ERROR(drm, "Device allocation failed: %d\n", ret);
+		NV_PRINTK(err, cli, "Device allocation failed: %d\n", ret);
 		goto done;
 	}
 
 	ret = nvif_mclass(&cli->device.object, mmus);
 	if (ret < 0) {
-		NV_ERROR(drm, "No supported MMU class\n");
+		NV_PRINTK(err, cli, "No supported MMU class\n");
 		goto done;
 	}
 
 	ret = nvif_mmu_init(&cli->device.object, mmus[ret].oclass, &cli->mmu);
 	if (ret) {
-		NV_ERROR(drm, "MMU allocation failed: %d\n", ret);
+		NV_PRINTK(err, cli, "MMU allocation failed: %d\n", ret);
 		goto done;
 	}
 
 	ret = nvif_mclass(&cli->mmu.object, vmms);
 	if (ret < 0) {
-		NV_ERROR(drm, "No supported VMM class\n");
+		NV_PRINTK(err, cli, "No supported VMM class\n");
 		goto done;
 	}
 
 	ret = nouveau_vmm_init(cli, vmms[ret].oclass, &cli->vmm);
 	if (ret) {
-		NV_ERROR(drm, "VMM allocation failed: %d\n", ret);
+		NV_PRINTK(err, cli, "VMM allocation failed: %d\n", ret);
 		goto done;
 	}
 
 	ret = nvif_mclass(&cli->mmu.object, mems);
 	if (ret < 0) {
-		NV_ERROR(drm, "No supported MEM class\n");
+		NV_PRINTK(err, cli, "No supported MEM class\n");
 		goto done;
 	}
 
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +14 -0
index 32fa94a9773f..cbd33e87b799 100644
@@ -275,6 +275,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
 	struct nvkm_outp *outp, *outt, *pair;
 	struct nvkm_conn *conn;
 	struct nvkm_head *head;
+	struct nvkm_ior *ior;
 	struct nvbios_connE connE;
 	struct dcb_output dcbE;
 	u8  hpd = 0, ver, hdr;
@@ -399,6 +400,19 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
 			return ret;
 	}
 
+	/* Enforce identity-mapped SOR assignment for panels, which have
+	 * certain bits (ie. backlight controls) wired to a specific SOR.
+	 */
+	list_for_each_entry(outp, &disp->outp, head) {
+		if (outp->conn->info.type == DCB_CONNECTOR_LVDS ||
+		    outp->conn->info.type == DCB_CONNECTOR_eDP) {
+			ior = nvkm_ior_find(disp, SOR, ffs(outp->info.or) - 1);
+			if (!WARN_ON(!ior))
+				ior->identity = true;
+			outp->identity = true;
+		}
+	}
+
 	i = 0;
 	list_for_each_entry(head, &disp->head, head)
 		i = max(i, head->id + 1);
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +12 -5
index 7c5bed29ffef..6160a6158cf2 100644
@@ -412,14 +412,10 @@ nvkm_dp_train(struct nvkm_dp *dp, u32 dataKBps)
 }
 
 static void
-nvkm_dp_release(struct nvkm_outp *outp, struct nvkm_ior *ior)
+nvkm_dp_disable(struct nvkm_outp *outp, struct nvkm_ior *ior)
 {
 	struct nvkm_dp *dp = nvkm_dp(outp);
 
-	/* Prevent link from being retrained if sink sends an IRQ. */
-	atomic_set(&dp->lt.done, 0);
-	ior->dp.nr = 0;
-
 	/* Execute DisableLT script from DP Info Table. */
 	nvbios_init(&ior->disp->engine.subdev, dp->info.script[4],
 		init.outp = &dp->outp.info;
@@ -428,6 +424,16 @@ nvkm_dp_release(struct nvkm_outp *outp, struct nvkm_ior *ior)
 	);
 }
 
+static void
+nvkm_dp_release(struct nvkm_outp *outp)
+{
+	struct nvkm_dp *dp = nvkm_dp(outp);
+
+	/* Prevent link from being retrained if sink sends an IRQ. */
+	atomic_set(&dp->lt.done, 0);
+	dp->outp.ior->dp.nr = 0;
+}
+
 static int
 nvkm_dp_acquire(struct nvkm_outp *outp)
 {
@@ -576,6 +582,7 @@ nvkm_dp_func = {
 	.fini = nvkm_dp_fini,
 	.acquire = nvkm_dp_acquire,
 	.release = nvkm_dp_release,
+	.disable = nvkm_dp_disable,
 };
 
 static int
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h +1 -0
index e0b4e0c5704e..19911211a12a 100644
@@ -16,6 +16,7 @@ struct nvkm_ior {
 	char name[8];
 
 	struct list_head head;
+	bool identity;
 
 	struct nvkm_ior_state {
 		struct nvkm_outp *outp;
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +3 -3
index f89c7b977aa5..def005dd5fda 100644
@@ -501,11 +501,11 @@ nv50_disp_super_2_0(struct nv50_disp *disp, struct nvkm_head *head)
 	nv50_disp_super_ied_off(head, ior, 2);
 
 	/* If we're shutting down the OR's only active head, execute
-	 * the output path's release function.
+	 * the output path's disable function.
 	 */
 	if (ior->arm.head == (1 << head->id)) {
-		if ((outp = ior->arm.outp) && outp->func->release)
-			outp->func->release(outp, ior);
+		if ((outp = ior->arm.outp) && outp->func->disable)
+			outp->func->disable(outp, ior);
 	}
 }
 
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +14 -3
index be9e7f8c3b23..44df835e5473 100644
@@ -93,6 +93,8 @@ nvkm_outp_release(struct nvkm_outp *outp, u8 user)
 	if (ior) {
 		outp->acquired &= ~user;
 		if (!outp->acquired) {
+			if (outp->func->release && outp->ior)
+				outp->func->release(outp);
 			outp->ior->asy.outp = NULL;
 			outp->ior = NULL;
 		}
@@ -127,17 +129,26 @@ nvkm_outp_acquire(struct nvkm_outp *outp, u8 user)
 	if (proto == UNKNOWN)
 		return -ENOSYS;
 
+	/* Deal with panels requiring identity-mapped SOR assignment. */
+	if (outp->identity) {
+		ior = nvkm_ior_find(outp->disp, SOR, ffs(outp->info.or) - 1);
+		if (WARN_ON(!ior))
+			return -ENOSPC;
+		return nvkm_outp_acquire_ior(outp, user, ior);
+	}
+
 	/* First preference is to reuse the OR that is currently armed
 	 * on HW, if any, in order to prevent unnecessary switching.
 	 */
 	list_for_each_entry(ior, &outp->disp->ior, head) {
-		if (!ior->asy.outp && ior->arm.outp == outp)
+		if (!ior->identity && !ior->asy.outp && ior->arm.outp == outp)
 			return nvkm_outp_acquire_ior(outp, user, ior);
 	}
 
 	/* Failing that, a completely unused OR is the next best thing. */
 	list_for_each_entry(ior, &outp->disp->ior, head) {
-		if (!ior->asy.outp && ior->type == type && !ior->arm.outp &&
+		if (!ior->identity &&
+		    !ior->asy.outp && ior->type == type && !ior->arm.outp &&
 		    (ior->func->route.set || ior->id == __ffs(outp->info.or)))
 			return nvkm_outp_acquire_ior(outp, user, ior);
 	}
@@ -146,7 +157,7 @@ nvkm_outp_acquire(struct nvkm_outp *outp, u8 user)
 	 * but will be released during the next modeset.
 	 */
 	list_for_each_entry(ior, &outp->disp->ior, head) {
-		if (!ior->asy.outp && ior->type == type &&
+		if (!ior->identity && !ior->asy.outp && ior->type == type &&
 		    (ior->func->route.set || ior->id == __ffs(outp->info.or)))
 			return nvkm_outp_acquire_ior(outp, user, ior);
 	}
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h +3 -1
index ea84d7d5741a..3f932fb39c94 100644
@@ -17,6 +17,7 @@ struct nvkm_outp {
 
 	struct list_head head;
 	struct nvkm_conn *conn;
+	bool identity;
 
 	/* Assembly state. */
 #define NVKM_OUTP_PRIV 1
@@ -41,7 +42,8 @@ struct nvkm_outp_func {
 	void (*init)(struct nvkm_outp *);
 	void (*fini)(struct nvkm_outp *);
 	int (*acquire)(struct nvkm_outp *);
-	void (*release)(struct nvkm_outp *, struct nvkm_ior *);
+	void (*release)(struct nvkm_outp *);
+	void (*disable)(struct nvkm_outp *, struct nvkm_ior *);
 };
 
 #define OUTP_MSG(o,l,f,a...) do {                                              \
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c +2 -1
index b80618e35491..d65959ef0564 100644
@@ -158,7 +158,8 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)
 	}
 
 	/* load and execute some other ucode image (bios therm?) */
-	return pmu_load(init, 0x01, post, NULL, NULL);
+	pmu_load(init, 0x01, post, NULL, NULL);
+	return 0;
 }
 
 static const struct nvkm_devinit_func
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +1 -1
index de269eb482dd..7459def78d50 100644
@@ -1423,7 +1423,7 @@ nvkm_vmm_get(struct nvkm_vmm *vmm, u8 page, u64 size, struct nvkm_vma **pvma)
 void
 nvkm_vmm_part(struct nvkm_vmm *vmm, struct nvkm_memory *inst)
 {
-	if (vmm->func->part && inst) {
+	if (inst && vmm->func->part) {
 		mutex_lock(&vmm->mutex);
 		vmm->func->part(vmm, inst);
 		mutex_unlock(&vmm->mutex);
drivers/hid/hid-apple.c +8 -1
index 25b7bd56ae11..1cb41992aaa1 100644
@@ -335,7 +335,8 @@ static int apple_input_mapping(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_UP_CUSTOM | 0x0003)) {
+	if (usage->hid == (HID_UP_CUSTOM | 0x0003) ||
+			usage->hid == (HID_UP_MSVENDOR | 0x0003)) {
 		/* The fn key on Apple USB keyboards */
 		set_bit(EV_REP, hi->input->evbit);
 		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);
@@ -472,6 +473,12 @@ static const struct hid_device_id apple_devices[] = {
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),
 		.driver_data = APPLE_HAS_FN },
+	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),
+		.driver_data = APPLE_HAS_FN },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),
+		.driver_data = APPLE_HAS_FN },
+	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),
+		.driver_data = APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
 		.driver_data = APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
drivers/hid/hid-ids.h +3 -4
index e80bcd71fe1e..eee6b79fb131 100644
@@ -88,6 +88,7 @@
 #define USB_DEVICE_ID_ANTON_TOUCH_PAD	0x3101
 
 #define USB_VENDOR_ID_APPLE		0x05ac
+#define BT_VENDOR_ID_APPLE		0x004c
 #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304
 #define USB_DEVICE_ID_APPLE_MAGICMOUSE	0x030d
 #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD	0x030e
@@ -157,6 +158,7 @@
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267
+#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
@@ -526,10 +528,6 @@
 #define I2C_VENDOR_ID_HANTICK		0x0911
 #define I2C_PRODUCT_ID_HANTICK_5288	0x5288
 
-#define I2C_VENDOR_ID_RAYD		0x2386
-#define I2C_PRODUCT_ID_RAYD_3118	0x3118
-#define I2C_PRODUCT_ID_RAYD_4B33	0x4B33
-
 #define USB_VENDOR_ID_HANWANG		0x0b57
 #define USB_DEVICE_ID_HANWANG_TABLET_FIRST	0x5000
 #define USB_DEVICE_ID_HANWANG_TABLET_LAST	0x8fff
@@ -949,6 +947,7 @@
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17
 #define USB_DEVICE_ID_SAITEK_PS1000	0x0621
 #define USB_DEVICE_ID_SAITEK_RAT7_OLD	0x0ccb
+#define USB_DEVICE_ID_SAITEK_RAT7_CONTAGION	0x0ccd
 #define USB_DEVICE_ID_SAITEK_RAT7	0x0cd7
 #define USB_DEVICE_ID_SAITEK_RAT9	0x0cfa
 #define USB_DEVICE_ID_SAITEK_MMO7	0x0cd0
drivers/hid/hid-saitek.c +2 -0
index 39e642686ff0..683861f324e3 100644
@@ -183,6 +183,8 @@ static const struct hid_device_id saitek_devices[] = {
 		.driver_data = SAITEK_RELEASE_MODE_RAT7 },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7),
 		.driver_data = SAITEK_RELEASE_MODE_RAT7 },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_CONTAGION),
+		.driver_data = SAITEK_RELEASE_MODE_RAT7 },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT9),
 		.driver_data = SAITEK_RELEASE_MODE_RAT7 },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9),
drivers/hid/hid-sensor-hub.c +23 -0
index 50af72baa5ca..2b63487057c2 100644
@@ -579,6 +579,28 @@ void sensor_hub_device_close(struct hid_sensor_hub_device *hsdev)
 }
 EXPORT_SYMBOL_GPL(sensor_hub_device_close);
 
+static __u8 *sensor_hub_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+		unsigned int *rsize)
+{
+	/*
+	 * Checks if the report descriptor of Thinkpad Helix 2 has a logical
+	 * minimum for magnetic flux axis greater than the maximum.
+	 */
+	if (hdev->product == USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA &&
+		*rsize == 2558 && rdesc[913] == 0x17 && rdesc[914] == 0x40 &&
+		rdesc[915] == 0x81 && rdesc[916] == 0x08 &&
+		rdesc[917] == 0x00 && rdesc[918] == 0x27 &&
+		rdesc[921] == 0x07 && rdesc[922] == 0x00) {
+		/* Sets negative logical minimum for mag x, y and z */
+		rdesc[914] = rdesc[935] = rdesc[956] = 0xc0;
+		rdesc[915] = rdesc[936] = rdesc[957] = 0x7e;
+		rdesc[916] = rdesc[937] = rdesc[958] = 0xf7;
+		rdesc[917] = rdesc[938] = rdesc[959] = 0xff;
+	}
+
+	return rdesc;
+}
+
 static int sensor_hub_probe(struct hid_device *hdev,
 				const struct hid_device_id *id)
 {
@@ -743,6 +765,7 @@ static struct hid_driver sensor_hub_driver = {
 	.probe = sensor_hub_probe,
 	.remove = sensor_hub_remove,
 	.raw_event = sensor_hub_raw_event,
+	.report_fixup = sensor_hub_report_fixup,
 #ifdef CONFIG_PM
 	.suspend = sensor_hub_suspend,
 	.resume = sensor_hub_resume,
drivers/hid/i2c-hid/i2c-hid.c +15 -9
index 64773433b947..37013b58098c 100644
@@ -48,6 +48,7 @@
 #define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV	BIT(0)
 #define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(1)
 #define I2C_HID_QUIRK_RESEND_REPORT_DESCR	BIT(2)
+#define I2C_HID_QUIRK_NO_RUNTIME_PM		BIT(3)
 
 /* flags */
 #define I2C_HID_STARTED		0
@@ -169,13 +170,10 @@ static const struct i2c_hid_quirks {
 	{ USB_VENDOR_ID_WEIDA, USB_DEVICE_ID_WEIDA_8755,
 		I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
 	{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
-		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
-	{ I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_3118,
-		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
+		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET |
+		I2C_HID_QUIRK_NO_RUNTIME_PM },
 	{ USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS10FB_TOUCH,
 		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
-	{ I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_4B33,
-		I2C_HID_QUIRK_RESEND_REPORT_DESCR },
 	{ 0, 0 }
 };
 
@@ -1110,7 +1108,9 @@ static int i2c_hid_probe(struct i2c_client *client,
 		goto err_mem_free;
 	}
 
-	pm_runtime_put(&client->dev);
+	if (!(ihid->quirks & I2C_HID_QUIRK_NO_RUNTIME_PM))
+		pm_runtime_put(&client->dev);
+
 	return 0;
 
 err_mem_free:
@@ -1136,7 +1136,8 @@ static int i2c_hid_remove(struct i2c_client *client)
 	struct i2c_hid *ihid = i2c_get_clientdata(client);
 	struct hid_device *hid;
 
-	pm_runtime_get_sync(&client->dev);
+	if (!(ihid->quirks & I2C_HID_QUIRK_NO_RUNTIME_PM))
+		pm_runtime_get_sync(&client->dev);
 	pm_runtime_disable(&client->dev);
 	pm_runtime_set_suspended(&client->dev);
 	pm_runtime_put_noidle(&client->dev);
@@ -1237,11 +1238,16 @@ static int i2c_hid_resume(struct device *dev)
 	pm_runtime_enable(dev);
 
 	enable_irq(client->irq);
-	ret = i2c_hid_hwreset(client);
+
+	/* Instead of resetting device, simply powers the device on. This
+	 * solves "incomplete reports" on Raydium devices 2386:3118 and
+	 * 2386:4B33
+	 */
+	ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
 	if (ret)
 		return ret;
 
-	/* RAYDIUM device (2386:3118) need to re-send report descr cmd
+	/* Some devices need to re-send report descr cmd
 	 * after resume, after this it will be back normal.
 	 * otherwise it issues too many incomplete reports.
 	 */
drivers/hid/intel-ish-hid/ipc/hw-ish.h +1 -0
index 97869b7410eb..da133716bed0 100644
@@ -29,6 +29,7 @@
 #define CNL_Ax_DEVICE_ID	0x9DFC
 #define GLK_Ax_DEVICE_ID	0x31A2
 #define CNL_H_DEVICE_ID		0xA37C
+#define SPT_H_DEVICE_ID		0xA135
 
 #define	REVISION_ID_CHT_A0	0x6
 #define	REVISION_ID_CHT_Ax_SI	0x0
drivers/hid/intel-ish-hid/ipc/pci-ish.c +1 -0
index a2c53ea3b5ed..c7b8eb32b1ea 100644
@@ -38,6 +38,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},
 	{0, }
 };
 MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
drivers/hv/connection.c +5 -3
index ced041899456..f4d08c8ac7f8 100644
@@ -76,6 +76,7 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
 					__u32 version)
 {
 	int ret = 0;
+	unsigned int cur_cpu;
 	struct vmbus_channel_initiate_contact *msg;
 	unsigned long flags;
 
@@ -118,9 +119,10 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
 	 * the CPU attempting to connect may not be CPU 0.
 	 */
 	if (version >= VERSION_WIN8_1) {
-		msg->target_vcpu =
-			hv_cpu_number_to_vp_number(smp_processor_id());
-		vmbus_connection.connect_cpu = smp_processor_id();
+		cur_cpu = get_cpu();
+		msg->target_vcpu = hv_cpu_number_to_vp_number(cur_cpu);
+		vmbus_connection.connect_cpu = cur_cpu;
+		put_cpu();
 	} else {
 		msg->target_vcpu = 0;
 		vmbus_connection.connect_cpu = 0;
drivers/i2c/busses/i2c-uniphier-f.c +2 -5
index 9918bdd81619..a403e8579b65 100644
@@ -401,11 +401,8 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap,
 		return ret;
 
 	for (msg = msgs; msg < emsg; msg++) {
-		/* If next message is read, skip the stop condition */
-		bool stop = !(msg + 1 < emsg && msg[1].flags & I2C_M_RD);
-		/* but, force it if I2C_M_STOP is set */
-		if (msg->flags & I2C_M_STOP)
-			stop = true;
+		/* Emit STOP if it is the last message or I2C_M_STOP is set. */
+		bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP);
 
 		ret = uniphier_fi2c_master_xfer_one(adap, msg, stop);
 		if (ret)
drivers/i2c/busses/i2c-uniphier.c +2 -5
index bb181b088291..454f914ae66d 100644
@@ -248,11 +248,8 @@ static int uniphier_i2c_master_xfer(struct i2c_adapter *adap,
 		return ret;
 
 	for (msg = msgs; msg < emsg; msg++) {
-		/* If next message is read, skip the stop condition */
-		bool stop = !(msg + 1 < emsg && msg[1].flags & I2C_M_RD);
-		/* but, force it if I2C_M_STOP is set */
-		if (msg->flags & I2C_M_STOP)
-			stop = true;
+		/* Emit STOP if it is the last message or I2C_M_STOP is set. */
+		bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP);
 
 		ret = uniphier_i2c_master_xfer_one(adap, msg, stop);
 		if (ret)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +6 -7
index 4994f920a836..8653182be818 100644
@@ -187,12 +187,15 @@ static int st_lsm6dsx_set_fifo_odr(struct st_lsm6dsx_sensor *sensor,
 
 int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark)
 {
-	u16 fifo_watermark = ~0, cur_watermark, sip = 0, fifo_th_mask;
+	u16 fifo_watermark = ~0, cur_watermark, fifo_th_mask;
 	struct st_lsm6dsx_hw *hw = sensor->hw;
 	struct st_lsm6dsx_sensor *cur_sensor;
 	int i, err, data;
 	__le16 wdata;
 
+	if (!hw->sip)
+		return 0;
+
 	for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
 		cur_sensor = iio_priv(hw->iio_devs[i]);
 
@@ -203,14 +206,10 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark)
 						       : cur_sensor->watermark;
 
 		fifo_watermark = min_t(u16, fifo_watermark, cur_watermark);
-		sip += cur_sensor->sip;
 	}
 
-	if (!sip)
-		return 0;
-
-	fifo_watermark = max_t(u16, fifo_watermark, sip);
-	fifo_watermark = (fifo_watermark / sip) * sip;
+	fifo_watermark = max_t(u16, fifo_watermark, hw->sip);
+	fifo_watermark = (fifo_watermark / hw->sip) * hw->sip;
 	fifo_watermark = fifo_watermark * hw->settings->fifo_ops.th_wl;
 
 	err = regmap_read(hw->regmap, hw->settings->fifo_ops.fifo_th.addr + 1,
drivers/iio/temperature/maxim_thermocouple.c +0 -1
index 54e383231d1e..c31b9633f32d 100644
@@ -258,7 +258,6 @@ static int maxim_thermocouple_remove(struct spi_device *spi)
 static const struct spi_device_id maxim_thermocouple_id[] = {
 	{"max6675", MAX6675},
 	{"max31855", MAX31855},
-	{"max31856", MAX31855},
 	{},
 };
 MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
drivers/infiniband/core/ucma.c +6 -0
index ec8fb289621f..5f437d1570fb 100644
@@ -124,6 +124,8 @@ static DEFINE_MUTEX(mut);
 static DEFINE_IDR(ctx_idr);
 static DEFINE_IDR(multicast_idr);
 
+static const struct file_operations ucma_fops;
+
 static inline struct ucma_context *_ucma_find_context(int id,
 						      struct ucma_file *file)
 {
@@ -1581,6 +1583,10 @@ static ssize_t ucma_migrate_id(struct ucma_file *new_file,
 	f = fdget(cmd.fd);
 	if (!f.file)
 		return -ENOENT;
+	if (f.file->f_op != &ucma_fops) {
+		ret = -EINVAL;
+		goto file_put;
+	}
 
 	/* Validate current fd and prevent destruction of id. */
 	ctx = ucma_get_ctx(f.file->private_data, cmd.id);
drivers/infiniband/hw/bnxt_re/ib_verbs.c +2 -0
index a76e206704d4..cb1e69bdad0b 100644
@@ -844,6 +844,8 @@ int bnxt_re_destroy_qp(struct ib_qp *ib_qp)
 				"Failed to destroy Shadow QP");
 			return rc;
 		}
+		bnxt_qplib_free_qp_res(&rdev->qplib_res,
+				       &rdev->qp1_sqp->qplib_qp);
 		mutex_lock(&rdev->qp_lock);
 		list_del(&rdev->qp1_sqp->list);
 		atomic_dec(&rdev->qp_count);
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -1
index e426b990c1dd..6ad0d46ab879 100644
@@ -196,7 +196,7 @@ static int bnxt_qplib_alloc_qp_hdr_buf(struct bnxt_qplib_res *res,
 				       struct bnxt_qplib_qp *qp)
 {
 	struct bnxt_qplib_q *rq = &qp->rq;
-	struct bnxt_qplib_q *sq = &qp->rq;
+	struct bnxt_qplib_q *sq = &qp->sq;
 	int rc = 0;
 
 	if (qp->sq_hdr_buf_size && sq->hwq.max_elements) {
drivers/iommu/amd_iommu.c +1 -1
index d77c97fe4a23..c53363443280 100644
@@ -3073,7 +3073,7 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
 		return 0;
 
 	offset_mask = pte_pgsize - 1;
-	__pte	    = *pte & PM_ADDR_MASK;
+	__pte	    = __sme_clr(*pte & PM_ADDR_MASK);
 
 	return (__pte & ~offset_mask) | (iova & offset_mask);
 }
drivers/md/dm-raid.c +55 -89

288 lines not on this page · raw message

drivers/md/dm-thin-metadata.c +33 -1
index 72142021b5c9..20b0776e39ef 100644
@@ -188,6 +188,12 @@ struct dm_pool_metadata {
 	unsigned long flags;
 	sector_t data_block_size;
 
+	/*
+	 * We reserve a section of the metadata for commit overhead.
+	 * All reported space does *not* include this.
+	 */
+	dm_block_t metadata_reserve;
+
 	/*
 	 * Set if a transaction has to be aborted but the attempt to roll back
 	 * to the previous (good) transaction failed.  The only pool metadata
@@ -816,6 +822,20 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)
 	return dm_tm_commit(pmd->tm, sblock);
 }
 
+static void __set_metadata_reserve(struct dm_pool_metadata *pmd)
+{
+	int r;
+	dm_block_t total;
+	dm_block_t max_blocks = 4096; /* 16M */
+
+	r = dm_sm_get_nr_blocks(pmd->metadata_sm, &total);
+	if (r) {
+		DMERR("could not get size of metadata device");
+		pmd->metadata_reserve = max_blocks;
+	} else
+		pmd->metadata_reserve = min(max_blocks, div_u64(total, 10));
+}
+
 struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
 					       sector_t data_block_size,
 					       bool format_device)
@@ -849,6 +869,8 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
 		return ERR_PTR(r);
 	}
 
+	__set_metadata_reserve(pmd);
+
 	return pmd;
 }
 
@@ -1820,6 +1842,13 @@ int dm_pool_get_free_metadata_block_count(struct dm_pool_metadata *pmd,
 	down_read(&pmd->root_lock);
 	if (!pmd->fail_io)
 		r = dm_sm_get_nr_free(pmd->metadata_sm, result);
+
+	if (!r) {
+		if (*result < pmd->metadata_reserve)
+			*result = 0;
+		else
+			*result -= pmd->metadata_reserve;
+	}
 	up_read(&pmd->root_lock);
 
 	return r;
@@ -1932,8 +1961,11 @@ int dm_pool_resize_metadata_dev(struct dm_pool_metadata *pmd, dm_block_t new_cou
 	int r = -EINVAL;
 
 	down_write(&pmd->root_lock);
-	if (!pmd->fail_io)
+	if (!pmd->fail_io) {
 		r = __resize_space_map(pmd->metadata_sm, new_count);
+		if (!r)
+			__set_metadata_reserve(pmd);
+	}
 	up_write(&pmd->root_lock);
 
 	return r;
drivers/md/dm-thin.c +65 -8

141 lines not on this page · raw message

drivers/md/raid10.c +4 -1
index 35bd3a62451b..8c93d44a052c 100644
@@ -4531,11 +4531,12 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
 		allow_barrier(conf);
 	}
 
+	raise_barrier(conf, 0);
 read_more:
 	/* Now schedule reads for blocks from sector_nr to last */
 	r10_bio = raid10_alloc_init_r10buf(conf);
 	r10_bio->state = 0;
-	raise_barrier(conf, sectors_done != 0);
+	raise_barrier(conf, 1);
 	atomic_set(&r10_bio->remaining, 0);
 	r10_bio->mddev = mddev;
 	r10_bio->sector = sector_nr;
@@ -4631,6 +4632,8 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
 	if (sector_nr <= last)
 		goto read_more;
 
+	lower_barrier(conf);
+
 	/* Now that we have done the whole section we can
 	 * update reshape_progress
 	 */
drivers/md/raid5-log.h +5 -0
index a001808a2b77..bfb811407061 100644
@@ -46,6 +46,11 @@ extern int ppl_modify_log(struct r5conf *conf, struct md_rdev *rdev, bool add);
 extern void ppl_quiesce(struct r5conf *conf, int quiesce);
 extern int ppl_handle_flush_request(struct r5l_log *log, struct bio *bio);
 
+static inline bool raid5_has_log(struct r5conf *conf)
+{
+	return test_bit(MD_HAS_JOURNAL, &conf->mddev->flags);
+}
+
 static inline bool raid5_has_ppl(struct r5conf *conf)
 {
 	return test_bit(MD_HAS_PPL, &conf->mddev->flags);
drivers/md/raid5.c +3 -3
index 49107c52c8e6..9050bfc71309 100644
@@ -735,7 +735,7 @@ static bool stripe_can_batch(struct stripe_head *sh)
 {
 	struct r5conf *conf = sh->raid_conf;
 
-	if (conf->log || raid5_has_ppl(conf))
+	if (raid5_has_log(conf) || raid5_has_ppl(conf))
 		return false;
 	return test_bit(STRIPE_BATCH_READY, &sh->state) &&
 		!test_bit(STRIPE_BITMAP_PENDING, &sh->state) &&
@@ -7739,7 +7739,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors)
 	sector_t newsize;
 	struct r5conf *conf = mddev->private;
 
-	if (conf->log || raid5_has_ppl(conf))
+	if (raid5_has_log(conf) || raid5_has_ppl(conf))
 		return -EINVAL;
 	sectors &= ~((sector_t)conf->chunk_sectors - 1);
 	newsize = raid5_size(mddev, sectors, mddev->raid_disks);
@@ -7790,7 +7790,7 @@ static int check_reshape(struct mddev *mddev)
 {
 	struct r5conf *conf = mddev->private;
 
-	if (conf->log || raid5_has_ppl(conf))
+	if (raid5_has_log(conf) || raid5_has_ppl(conf))
 		return -EINVAL;
 	if (mddev->delta_disks == 0 &&
 	    mddev->new_layout == mddev->layout &&
drivers/net/ethernet/amazon/ena/ena_com.c +4 -4
index 17f12c18d225..c37deef3bcf1 100644
@@ -459,7 +459,7 @@ static void ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_qu
 	cqe = &admin_queue->cq.entries[head_masked];
 
 	/* Go over all the completions */
-	while ((cqe->acq_common_descriptor.flags &
+	while ((READ_ONCE(cqe->acq_common_descriptor.flags) &
 			ENA_ADMIN_ACQ_COMMON_DESC_PHASE_MASK) == phase) {
 		/* Do not read the rest of the completion entry before the
 		 * phase bit was validated
@@ -637,7 +637,7 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)
 
 	mmiowb();
 	for (i = 0; i < timeout; i++) {
-		if (read_resp->req_id == mmio_read->seq_num)
+		if (READ_ONCE(read_resp->req_id) == mmio_read->seq_num)
 			break;
 
 		udelay(1);
@@ -1796,8 +1796,8 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)
 	aenq_common = &aenq_e->aenq_common_desc;
 
 	/* Go over all the events */
-	while ((aenq_common->flags & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) ==
-	       phase) {
+	while ((READ_ONCE(aenq_common->flags) &
+		ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {
 		pr_debug("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n",
 			 aenq_common->group, aenq_common->syndrom,
 			 (u64)aenq_common->timestamp_low +
drivers/net/ethernet/amazon/ena/ena_netdev.c +26 -26

146 lines not on this page · raw message

drivers/net/ethernet/amazon/ena/ena_netdev.h +11 -0
index f1972b5ab650..7c7ae56c52cf 100644
@@ -355,4 +355,15 @@ void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf);
 
 int ena_get_sset_count(struct net_device *netdev, int sset);
 
+/* The ENA buffer length fields is 16 bit long. So when PAGE_SIZE == 64kB the
+ * driver passas 0.
+ * Since the max packet size the ENA handles is ~9kB limit the buffer length to
+ * 16kB.
+ */
+#if PAGE_SIZE > SZ_16K
+#define ENA_PAGE_SIZE SZ_16K
+#else
+#define ENA_PAGE_SIZE PAGE_SIZE
+#endif
+
 #endif /* !(ENA_H) */
drivers/net/ethernet/cadence/macb_main.c +1 -1
index 515d96e32143..c4d7479938e2 100644
@@ -648,7 +648,7 @@ static int macb_halt_tx(struct macb *bp)
 		if (!(status & MACB_BIT(TGO)))
 			return 0;
 
-		usleep_range(10, 250);
+		udelay(250);
 	} while (time_before(halt_time, timeout));
 
 	return -ETIMEDOUT;
drivers/net/ethernet/hisilicon/hns/hnae.h +2 -0
index cad52bd331f7..08a750fb60c4 100644
@@ -486,6 +486,8 @@ struct hnae_ae_ops {
 			u8 *auto_neg, u16 *speed, u8 *duplex);
 	void (*toggle_ring_irq)(struct hnae_ring *ring, u32 val);
 	void (*adjust_link)(struct hnae_handle *handle, int speed, int duplex);
+	bool (*need_adjust_link)(struct hnae_handle *handle,
+				 int speed, int duplex);
 	int (*set_loopback)(struct hnae_handle *handle,
 			    enum hnae_loop loop_mode, int en);
 	void (*get_ring_bdnum_limit)(struct hnae_queue *queue,
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +66 -1

90 lines not on this page · raw message

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +36 -0
index 74bd260ca02a..8c7bc5cf193c 100644
@@ -257,6 +257,16 @@ static void hns_gmac_get_pausefrm_cfg(void *mac_drv, u32 *rx_pause_en,
 	*tx_pause_en = dsaf_get_bit(pause_en, GMAC_PAUSE_EN_TX_FDFC_B);
 }
 
+static bool hns_gmac_need_adjust_link(void *mac_drv, enum mac_speed speed,
+				      int duplex)
+{
+	struct mac_driver *drv = (struct mac_driver *)mac_drv;
+	struct hns_mac_cb *mac_cb = drv->mac_cb;
+
+	return (mac_cb->speed != speed) ||
+		(mac_cb->half_duplex == duplex);
+}
+
 static int hns_gmac_adjust_link(void *mac_drv, enum mac_speed speed,
 				u32 full_duplex)
 {
@@ -309,6 +319,30 @@ static void hns_gmac_set_promisc(void *mac_drv, u8 en)
 		hns_gmac_set_uc_match(mac_drv, en);
 }
 
+int hns_gmac_wait_fifo_clean(void *mac_drv)
+{
+	struct mac_driver *drv = (struct mac_driver *)mac_drv;
+	int wait_cnt;
+	u32 val;
+
+	wait_cnt = 0;
+	while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+		val = dsaf_read_dev(drv, GMAC_FIFO_STATE_REG);
+		/* bit5~bit0 is not send complete pkts */
+		if ((val & 0x3f) == 0)
+			break;
+		usleep_range(100, 200);
+	}
+
+	if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+		dev_err(drv->dev,
+			"hns ge %d fifo was not idle.\n", drv->mac_id);
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
 static void hns_gmac_init(void *mac_drv)
 {
 	u32 port;
@@ -690,6 +724,7 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
 	mac_drv->mac_disable = hns_gmac_disable;
 	mac_drv->mac_free = hns_gmac_free;
 	mac_drv->adjust_link = hns_gmac_adjust_link;
+	mac_drv->need_adjust_link = hns_gmac_need_adjust_link;
 	mac_drv->set_tx_auto_pause_frames = hns_gmac_set_tx_auto_pause_frames;
 	mac_drv->config_max_frame_length = hns_gmac_config_max_frame_length;
 	mac_drv->mac_pausefrm_cfg = hns_gmac_pause_frm_cfg;
@@ -717,6 +752,7 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
 	mac_drv->get_strings = hns_gmac_get_strings;
 	mac_drv->update_stats = hns_gmac_update_stats;
 	mac_drv->set_promiscuous = hns_gmac_set_promisc;
+	mac_drv->wait_fifo_clean = hns_gmac_wait_fifo_clean;
 
 	return (void *)mac_drv;
 }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +44 -0

62 lines not on this page · raw message

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h +8 -0
index bbc0a98e7ca3..fbc75341bef7 100644
@@ -356,6 +356,9 @@ struct mac_driver {
 	/*adjust mac mode of port,include speed and duplex*/
 	int (*adjust_link)(void *mac_drv, enum mac_speed speed,
 			   u32 full_duplex);
+	/* need adjust link */
+	bool (*need_adjust_link)(void *mac_drv, enum mac_speed speed,
+				 int duplex);
 	/* config autoegotaite mode of port*/
 	void (*set_an_mode)(void *mac_drv, u8 enable);
 	/* config loopbank mode */
@@ -394,6 +397,7 @@ struct mac_driver {
 	void (*get_info)(void *mac_drv, struct mac_info *mac_info);
 
 	void (*update_stats)(void *mac_drv);
+	int (*wait_fifo_clean)(void *mac_drv);
 
 	enum mac_mode mac_mode;
 	u8 mac_id;
@@ -427,6 +431,7 @@ void *hns_xgmac_config(struct hns_mac_cb *mac_cb,
 
 int hns_mac_init(struct dsaf_device *dsaf_dev);
 void mac_adjust_link(struct net_device *net_dev);
+bool hns_mac_need_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex);
 void hns_mac_get_link_status(struct hns_mac_cb *mac_cb,	u32 *link_status);
 int hns_mac_change_vf_addr(struct hns_mac_cb *mac_cb, u32 vmid, char *addr);
 int hns_mac_set_multi(struct hns_mac_cb *mac_cb,
@@ -463,5 +468,8 @@ int hns_mac_add_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
 int hns_mac_rm_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
 		       const unsigned char *addr);
 int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn);
+void hns_mac_enable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode);
+void hns_mac_disable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode);
+int hns_mac_wait_fifo_clean(struct hns_mac_cb *mac_cb);
 
 #endif /* _HNS_DSAF_MAC_H */
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +29 -0
index 0ce07f6eb1e6..0ef6d429308f 100644
@@ -2733,6 +2733,35 @@ void hns_dsaf_set_promisc_tcam(struct dsaf_device *dsaf_dev,
 	soft_mac_entry->index = enable ? entry_index : DSAF_INVALID_ENTRY_IDX;
 }
 
+int hns_dsaf_wait_pkt_clean(struct dsaf_device *dsaf_dev, int port)
+{
+	u32 val, val_tmp;
+	int wait_cnt;
+
+	if (port >= DSAF_SERVICE_NW_NUM)
+		return 0;
+
+	wait_cnt = 0;
+	while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+		val = dsaf_read_dev(dsaf_dev, DSAF_VOQ_IN_PKT_NUM_0_REG +
+			(port + DSAF_XGE_NUM) * 0x40);
+		val_tmp = dsaf_read_dev(dsaf_dev, DSAF_VOQ_OUT_PKT_NUM_0_REG +
+			(port + DSAF_XGE_NUM) * 0x40);
+		if (val == val_tmp)
+			break;
+
+		usleep_range(100, 200);
+	}
+
+	if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+		dev_err(dsaf_dev->dev, "hns dsaf clean wait timeout(%u - %u).\n",
+			val, val_tmp);
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
 /**
  * dsaf_probe - probo dsaf dev
  * @pdev: dasf platform device
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h +3 -0
index 4507e8222683..0e1cd99831a6 100644
@@ -44,6 +44,8 @@ struct hns_mac_cb;
 #define DSAF_ROCE_CREDIT_CHN	8
 #define DSAF_ROCE_CHAN_MODE	3
 
+#define HNS_MAX_WAIT_CNT 10000
+
 enum dsaf_roce_port_mode {
 	DSAF_ROCE_6PORT_MODE,
 	DSAF_ROCE_4PORT_MODE,
@@ -463,5 +465,6 @@ int hns_dsaf_rm_mac_addr(
 
 int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev,
 			     u8 mac_id, u8 port_num);
+int hns_dsaf_wait_pkt_clean(struct dsaf_device *dsaf_dev, int port);
 
 #endif /* __HNS_DSAF_MAIN_H__ */
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +23 -0
index 93e71e27401b..a19932aeb9d7 100644
@@ -274,6 +274,29 @@ static void hns_ppe_exc_irq_en(struct hns_ppe_cb *ppe_cb, int en)
 	dsaf_write_dev(ppe_cb, PPE_INTEN_REG, msk_vlue & vld_msk);
 }
 
+int hns_ppe_wait_tx_fifo_clean(struct hns_ppe_cb *ppe_cb)
+{
+	int wait_cnt;
+	u32 val;
+
+	wait_cnt = 0;
+	while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+		val = dsaf_read_dev(ppe_cb, PPE_CURR_TX_FIFO0_REG) & 0x3ffU;
+		if (!val)
+			break;
+
+		usleep_range(100, 200);
+	}
+
+	if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+		dev_err(ppe_cb->dev, "hns ppe tx fifo clean wait timeout, still has %u pkt.\n",
+			val);
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
 /**
  * ppe_init_hw - init ppe
  * @ppe_cb: ppe device
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h +1 -0
index 9d8e643e8aa6..f670e63a5a01 100644
@@ -100,6 +100,7 @@ struct ppe_common_cb {
 
 };
 
+int hns_ppe_wait_tx_fifo_clean(struct hns_ppe_cb *ppe_cb);
 int hns_ppe_init(struct dsaf_device *dsaf_dev);
 
 void hns_ppe_uninit(struct dsaf_device *dsaf_dev);
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +23 -0
index e2e28532e4dc..1e43d7a3ca86 100644
@@ -66,6 +66,29 @@ void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag)
 			"queue(%d) wait fbd(%d) clean fail!!\n", i, fbd_num);
 }
 
+int hns_rcb_wait_tx_ring_clean(struct hnae_queue *qs)
+{
+	u32 head, tail;
+	int wait_cnt;
+
+	tail = dsaf_read_dev(&qs->tx_ring, RCB_REG_TAIL);
+	wait_cnt = 0;
+	while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+		head = dsaf_read_dev(&qs->tx_ring, RCB_REG_HEAD);
+		if (tail == head)
+			break;
+
+		usleep_range(100, 200);
+	}
+
+	if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+		dev_err(qs->dev->dev, "rcb wait timeout, head not equal to tail.\n");
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
 /**
  *hns_rcb_reset_ring_hw - ring reset
  *@q: ring struct pointer
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h +1 -0
index 602816498c8d..2319b772a271 100644
@@ -136,6 +136,7 @@ void hns_rcbv2_int_clr_hw(struct hnae_queue *q, u32 flag);
 void hns_rcb_init_hw(struct ring_pair_cb *ring);
 void hns_rcb_reset_ring_hw(struct hnae_queue *q);
 void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag);
+int hns_rcb_wait_tx_ring_clean(struct hnae_queue *qs);
 u32 hns_rcb_get_rx_coalesced_frames(
 	struct rcb_common_cb *rcb_common, u32 port_idx);
 u32 hns_rcb_get_tx_coalesced_frames(
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +1 -0
index 886cbbf25761..74d935d82cbc 100644
@@ -464,6 +464,7 @@
 #define RCB_RING_INTMSK_TX_OVERTIME_REG		0x000C4
 #define RCB_RING_INTSTS_TX_OVERTIME_REG		0x000C8
 
+#define GMAC_FIFO_STATE_REG			0x0000UL
 #define GMAC_DUPLEX_TYPE_REG			0x0008UL
 #define GMAC_FD_FC_TYPE_REG			0x000CUL
 #define GMAC_TX_WATER_LINE_REG			0x0010UL
drivers/net/ethernet/hisilicon/hns/hns_enet.c +18 -3
index ef994a715f93..b4518f45f048 100644
@@ -1212,11 +1212,26 @@ static void hns_nic_adjust_link(struct net_device *ndev)
 	struct hnae_handle *h = priv->ae_handle;
 	int state = 1;
 
+	/* If there is no phy, do not need adjust link */
 	if (ndev->phydev) {
-		h->dev->ops->adjust_link(h, ndev->phydev->speed,
-					 ndev->phydev->duplex);
-		state = ndev->phydev->link;
+		/* When phy link down, do nothing */
+		if (ndev->phydev->link == 0)
+			return;
+
+		if (h->dev->ops->need_adjust_link(h, ndev->phydev->speed,
+						  ndev->phydev->duplex)) {
+			/* because Hi161X chip don't support to change gmac
+			 * speed and duplex with traffic. Delay 200ms to
+			 * make sure there is no more data in chip FIFO.
+			 */
+			netif_carrier_off(ndev);
+			msleep(200);
+			h->dev->ops->adjust_link(h, ndev->phydev->speed,
+						 ndev->phydev->duplex);
+			netif_carrier_on(ndev);
+		}
 	}
+
 	state = state && h->dev->ops->get_status(h);
 
 	if (state != priv->link) {
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +2 -0
index 2e14a3ae1d8b..c1e947bb852f 100644
@@ -243,7 +243,9 @@ static int hns_nic_set_link_ksettings(struct net_device *net_dev,
 	}
 
 	if (h->dev->ops->adjust_link) {
+		netif_carrier_off(net_dev);
 		h->dev->ops->adjust_link(h, (int)speed, cmd->base.duplex);
+		netif_carrier_on(net_dev);
 		return 0;
 	}
 
drivers/net/ethernet/ibm/emac/core.c +3 -3
index 354c0982847b..372664686309 100644
@@ -494,9 +494,6 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
 	case 16384:
 		ret |= EMAC_MR1_RFS_16K;
 		break;
-	case 8192:
-		ret |= EMAC4_MR1_RFS_8K;
-		break;
 	case 4096:
 		ret |= EMAC_MR1_RFS_4K;
 		break;
@@ -537,6 +534,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_
 	case 16384:
 		ret |= EMAC4_MR1_RFS_16K;
 		break;
+	case 8192:
+		ret |= EMAC4_MR1_RFS_8K;
+		break;
 	case 4096:
 		ret |= EMAC4_MR1_RFS_4K;
 		break;
drivers/net/ethernet/ibm/ibmvnic.c +9 -3
index ffe7acbeaa22..d834308adf95 100644
@@ -1841,11 +1841,17 @@ static int do_reset(struct ibmvnic_adapter *adapter,
 			adapter->map_id = 1;
 			release_rx_pools(adapter);
 			release_tx_pools(adapter);
-			init_rx_pools(netdev);
-			init_tx_pools(netdev);
+			rc = init_rx_pools(netdev);
+			if (rc)
+				return rc;
+			rc = init_tx_pools(netdev);
+			if (rc)
+				return rc;
 
 			release_napi(adapter);
-			init_napi(adapter);
+			rc = init_napi(adapter);
+			if (rc)
+				return rc;
 		} else {
 			rc = reset_tx_pools(adapter);
 			if (rc)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +7 -5
index 62e57b05a0ae..56b31e903cc1 100644
@@ -3196,11 +3196,13 @@ int ixgbe_poll(struct napi_struct *napi, int budget)
 		return budget;
 
 	/* all work done, exit the polling mode */
-	napi_complete_done(napi, work_done);
-	if (adapter->rx_itr_setting & 1)
-		ixgbe_set_itr(q_vector);
-	if (!test_bit(__IXGBE_DOWN, &adapter->state))
-		ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector->v_idx));
+	if (likely(napi_complete_done(napi, work_done))) {
+		if (adapter->rx_itr_setting & 1)
+			ixgbe_set_itr(q_vector);
+		if (!test_bit(__IXGBE_DOWN, &adapter->state))
+			ixgbe_irq_enable_queues(adapter,
+						BIT_ULL(q_vector->v_idx));
+	}
 
 	return min(work_done, budget - 1);
 }
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -0
index 661fa5a38df2..b8bba64673e5 100644
@@ -4685,6 +4685,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
 	dev->min_mtu = ETH_MIN_MTU;
 	/* 9704 == 9728 - 20 and rounding to 8 */
 	dev->max_mtu = MVPP2_BM_JUMBO_PKT_SIZE;
+	dev->dev.of_node = port_node;
 
 	/* Phylink isn't used w/ ACPI as of now */
 	if (port_node) {
drivers/net/ethernet/mellanox/mlx5/core/dev.c +4 -3
index 922811fb66e7..37ba7c78859d 100644
@@ -396,16 +396,17 @@ void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol)
 		}
 }
 
-static u16 mlx5_gen_pci_id(struct mlx5_core_dev *dev)
+static u32 mlx5_gen_pci_id(struct mlx5_core_dev *dev)
 {
-	return (u16)((dev->pdev->bus->number << 8) |
+	return (u32)((pci_domain_nr(dev->pdev->bus) << 16) |
+		     (dev->pdev->bus->number << 8) |
 		     PCI_SLOT(dev->pdev->devfn));
 }
 
 /* Must be called with intf_mutex held */
 struct mlx5_core_dev *mlx5_get_next_phys_dev(struct mlx5_core_dev *dev)
 {
-	u16 pci_id = mlx5_gen_pci_id(dev);
+	u32 pci_id = mlx5_gen_pci_id(dev);
 	struct mlx5_core_dev *res = NULL;
 	struct mlx5_core_dev *tmp_dev;
 	struct mlx5_priv *priv;
drivers/net/ethernet/realtek/r8169.c +7 -4
index e5eb361b973c..1d1e66002232 100644
@@ -730,7 +730,7 @@ struct rtl8169_tc_offsets {
 };
 
 enum rtl_flag {
-	RTL_FLAG_TASK_ENABLED,
+	RTL_FLAG_TASK_ENABLED = 0,
 	RTL_FLAG_TASK_SLOW_PENDING,
 	RTL_FLAG_TASK_RESET_PENDING,
 	RTL_FLAG_TASK_PHY_PENDING,
@@ -5150,13 +5150,13 @@ static void rtl_hw_start(struct  rtl8169_private *tp)
 
 	rtl_set_rx_max_size(tp);
 	rtl_set_rx_tx_desc_registers(tp);
-	rtl_set_tx_config_registers(tp);
 	RTL_W8(tp, Cfg9346, Cfg9346_Lock);
 
 	/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
 	RTL_R8(tp, IntrMask);
 	RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
 	rtl_init_rxcfg(tp);
+	rtl_set_tx_config_registers(tp);
 
 	rtl_set_rx_mode(tp->dev);
 	/* no early-rx interrupts */
@@ -7125,7 +7125,8 @@ static int rtl8169_close(struct net_device *dev)
 	rtl8169_update_counters(tp);
 
 	rtl_lock_work(tp);
-	clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+	/* Clear all task flags */
+	bitmap_zero(tp->wk.flags, RTL_FLAG_MAX);
 
 	rtl8169_down(dev);
 	rtl_unlock_work(tp);
@@ -7301,7 +7302,9 @@ static void rtl8169_net_suspend(struct net_device *dev)
 
 	rtl_lock_work(tp);
 	napi_disable(&tp->napi);
-	clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+	/* Clear all task flags */
+	bitmap_zero(tp->wk.flags, RTL_FLAG_MAX);
+
 	rtl_unlock_work(tp);
 
 	rtl_pll_power_down(tp);
drivers/net/ethernet/renesas/sh_eth.c +36 -0
index 5614fd231bbe..6520379b390e 100644
@@ -807,6 +807,41 @@ static struct sh_eth_cpu_data r8a77980_data = {
 	.magic		= 1,
 	.cexcr		= 1,
 };
+
+/* R7S9210 */
+static struct sh_eth_cpu_data r7s9210_data = {
+	.soft_reset	= sh_eth_soft_reset,
+
+	.set_duplex	= sh_eth_set_duplex,
+	.set_rate	= sh_eth_set_rate_rcar,
+
+	.register_type	= SH_ETH_REG_FAST_SH4,
+
+	.edtrr_trns	= EDTRR_TRNS_ETHER,
+	.ecsr_value	= ECSR_ICD,
+	.ecsipr_value	= ECSIPR_ICDIP,
+	.eesipr_value	= EESIPR_TWBIP | EESIPR_TABTIP | EESIPR_RABTIP |
+			  EESIPR_RFCOFIP | EESIPR_ECIIP | EESIPR_FTCIP |
+			  EESIPR_TDEIP | EESIPR_TFUFIP | EESIPR_FRIP |
+			  EESIPR_RDEIP | EESIPR_RFOFIP | EESIPR_CNDIP |
+			  EESIPR_DLCIP | EESIPR_CDIP | EESIPR_TROIP |
+			  EESIPR_RMAFIP | EESIPR_RRFIP | EESIPR_RTLFIP |
+			  EESIPR_RTSFIP | EESIPR_PREIP | EESIPR_CERFIP,
+
+	.tx_check	= EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_TRO,
+	.eesr_err_check	= EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE |
+			  EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE,
+
+	.fdr_value	= 0x0000070f,
+
+	.apr		= 1,
+	.mpr		= 1,
+	.tpauser	= 1,
+	.hw_swap	= 1,
+	.rpadir		= 1,
+	.no_ade		= 1,
+	.xdfar_rw	= 1,
+};
 #endif /* CONFIG_OF */
 
 static void sh_eth_set_rate_sh7724(struct net_device *ndev)
@@ -3131,6 +3166,7 @@ static const struct of_device_id sh_eth_match_table[] = {
 	{ .compatible = "renesas,ether-r8a7794", .data = &rcar_gen2_data },
 	{ .compatible = "renesas,gether-r8a77980", .data = &r8a77980_data },
 	{ .compatible = "renesas,ether-r7s72100", .data = &r7s72100_data },
+	{ .compatible = "renesas,ether-r7s9210", .data = &r7s9210_data },
 	{ .compatible = "renesas,rcar-gen1-ether", .data = &rcar_gen1_data },
 	{ .compatible = "renesas,rcar-gen2-ether", .data = &rcar_gen2_data },
 	{ }
drivers/net/wireless/broadcom/b43/dma.c +4 -2
index 6b0e1ec346cb..d46d57b989ae 100644
@@ -1518,13 +1518,15 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 			}
 		} else {
 			/* More than a single header/data pair were missed.
-			 * Report this error, and reset the controller to
+			 * Report this error. If running with open-source
+			 * firmware, then reset the controller to
 			 * revive operation.
 			 */
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +5 -45

50 lines not on this page · raw message

drivers/net/wireless/mac80211_hwsim.c +9 -3
index 18e819d964f1..80e2c8595c7c 100644

Lines of this file are not shown. View the raw message.

drivers/nvme/target/rdma.c +25 -2
index 52e0c5d579a7..1d909e5ba657 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/qeth_core_main.c +3 -2
index ffdb78421a25..b0f0d4e86f67 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/qeth_l2_main.c +1 -1
index 2487f0aeb165..3bef60ae0480 100644

Lines of this file are not shown. View the raw message.

drivers/s390/net/qeth_l3_main.c +1 -1
index 5905dc63e256..3ea840542767 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/aacraid/aacraid.h +1 -1
index 29bf1e60f542..39eb415987fc 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/csiostor/csio_hw.c +53 -18

71 lines not on this page · raw message

drivers/scsi/csiostor/csio_hw.h +1 -0
index 9e73ef771eb7..e351af6e7c81 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/csiostor/csio_mb.c +3 -3
index c026417269c3..6f13673d6aa0 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qedi/qedi.h +6 -1
index fc3babc15fa3..a6f96b35e971 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qedi/qedi_main.c +15 -13
index cff83b9457f7..3e18a68c2b03 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target.c +1 -8
index 8e223799347a..a4ecc9d77624 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target_login.c +78 -71

149 lines not on this page · raw message

drivers/target/iscsi/iscsi_target_login.h +1 -1
index 74ac3abc44a0..3b8e3639ff5d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/fotg210-udc.c +10 -5
index 53a48f561458..587c5037ff07 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-plat.c +16 -11
index c1b22fc64e38..b5a14caa9297 100644

Lines of this file are not shown. View the raw message.

drivers/usb/misc/yurex.c +3 -0
index 1232dd49556d..6d9fd5f64903 100644

Lines of this file are not shown. View the raw message.

drivers/xen/cpu_hotplug.c +8 -7
index d4265c8ebb22..b1357aa4bc55 100644

Lines of this file are not shown. View the raw message.

drivers/xen/events/events_base.c +1 -1
index 08e4af04d6f2..e6c1934734b7 100644

Lines of this file are not shown. View the raw message.

drivers/xen/manage.c +4 -2
index c93d8ef8df34..5bb01a62f214 100644

Lines of this file are not shown. View the raw message.

fs/afs/proc.c +7 -8
index 0c3285c8db95..476dcbb79713 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/ctree.h +1 -0
index 118346aceea9..663ce0518d27 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/disk-io.c +1 -0
index dfed08e70ec1..891b1aab3480 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/inode.c +4 -21
index 071d949f69ec..d3736fbf6774 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/ioctl.c +16 -0
index f3d6be0c657b..ef7159646615 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/volumes.c +6 -1
index 5304b8d6ceb8..1a22c0ecaf67 100644

Lines of this file are not shown. View the raw message.

fs/ceph/super.c +11 -5
index 95a3b3ac9b6e..60f81ac369b5 100644

Lines of this file are not shown. View the raw message.

fs/cifs/cifs_unicode.c +0 -3
index b380e0871372..a2b2355e7f01 100644

Lines of this file are not shown. View the raw message.

fs/cifs/cifssmb.c +8 -3
index 93408eab92e7..f5baf777564c 100644

Lines of this file are not shown. View the raw message.

fs/cifs/misc.c +8 -0
index 53e8362cbc4a..6737f54d9a34 100644

Lines of this file are not shown. View the raw message.

fs/cifs/smb2ops.c +1 -1
index 5ecbc99f46e4..abb54b852bdc 100644

Lines of this file are not shown. View the raw message.

fs/dcache.c +1 -1
index d19a0dc46c04..baa89f092a2d 100644

Lines of this file are not shown. View the raw message.

fs/inode.c +47 -6

53 lines not on this page · raw message

fs/notify/fsnotify.c +3 -10
index f174397b63a0..ababdbfab537 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/dlm/dlmmaster.c +2 -2
index aaca0949fe53..826f0567ec43 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/dir.c +4 -0
index f480b1a2cd2e..da9b3ccfde23 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/namei.c +1 -1
index c993dd8db739..c2229f02389b 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/overlayfs.h +2 -2
index 7538b9b56237..e789924e9833 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/util.c +2 -1
index 6f1078028c66..319a7eeb388f 100644

Lines of this file are not shown. View the raw message.

fs/proc/base.c +14 -0
index aaffc0c30216..bbcad104505c 100644

Lines of this file are not shown. View the raw message.

fs/xattr.c +13 -11
index 1bee74682513..c689fd5b5679 100644

Lines of this file are not shown. View the raw message.

include/asm-generic/io.h +2 -1
index 66d1d45fa2e1..d356f802945a 100644

Lines of this file are not shown. View the raw message.

include/linux/blk-cgroup.h +0 -1
index 0fce47d5acb1..5d46b83d4820 100644

Lines of this file are not shown. View the raw message.

include/linux/fs.h +5 -1
index 805bf22898cf..a3afa50bb79f 100644

Lines of this file are not shown. View the raw message.

include/net/cfg80211.h +2 -2
index 1beb3ead0385..7229c186d199 100644

Lines of this file are not shown. View the raw message.

include/net/regulatory.h +2 -2
index 60f8cc86a447..3469750df0f4 100644

Lines of this file are not shown. View the raw message.

kernel/bpf/sockmap.c +36 -28

64 lines not on this page · raw message

kernel/bpf/verifier.c +9 -1
index adbe21c8876e..82e8edef6ea0 100644

Lines of this file are not shown. View the raw message.

kernel/sched/topology.c +1 -4
index 56a0fed30c0a..505a41c42b96 100644

Lines of this file are not shown. View the raw message.

mm/madvise.c +1 -1
index 4d3c922ea1a1..8534ea2978c5 100644

Lines of this file are not shown. View the raw message.

net/core/filter.c +31 -26

57 lines not on this page · raw message

net/ipv4/netfilter/Kconfig +5 -3
index bbfc356cb1b5..d7ecae5e93ea 100644

Lines of this file are not shown. View the raw message.

net/mac80211/ibss.c +11 -11
index 6449a1c2283b..f0f5fedb8caa 100644

Lines of this file are not shown. View the raw message.

net/mac80211/main.c +22 -6
index fb73451ed85e..66cbddd65b47 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh_hwmp.c +4 -0
index 35ad3983ae4b..daf9db3c8f24 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mlme.c +68 -2

70 lines not on this page · raw message

net/mac80211/tx.c +30 -24

54 lines not on this page · raw message

net/mac80211/util.c +5 -6
index d02fbfec3783..93b5bb849ad7 100644

Lines of this file are not shown. View the raw message.

net/netfilter/Kconfig +6 -6
index f0a1c536ef15..e6d5c87f0d96 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_tables_api.c +1 -0
index f5745e4c6513..77d690a87144 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nfnetlink_queue.c +1 -0
index ea4ba551abb2..d33094f4ec41 100644

Lines of this file are not shown. View the raw message.

net/netfilter/xt_CHECKSUM.c +21 -1
index 9f4151ec3e06..6c7aa6a0a0d2 100644

Lines of this file are not shown. View the raw message.

net/netfilter/xt_cluster.c +13 -1
index dfbdbb2fc0ed..51d0c257e7a5 100644

Lines of this file are not shown. View the raw message.

net/netfilter/xt_hashlimit.c +9 -9
index 9b16402f29af..3e7d259e5d8d 100644

Lines of this file are not shown. View the raw message.

net/tipc/diag.c +2 -0
index aaabb0b776dd..73137f4aeb68 100644

Lines of this file are not shown. View the raw message.

net/tipc/netlink.c +2 -0
index 6ff2254088f6..99ee419210ba 100644

Lines of this file are not shown. View the raw message.

net/tipc/socket.c +50 -26

76 lines not on this page · raw message

net/tipc/socket.h +2 -0
index aff9b2ae5a1f..d43032e26532 100644

Lines of this file are not shown. View the raw message.

net/wireless/nl80211.c +8 -7
index 80bc986c79e5..733ccf867972 100644

Lines of this file are not shown. View the raw message.

net/wireless/reg.c +13 -78

91 lines not on this page · raw message

net/wireless/util.c +1 -1
index 3c654cd7ba56..908bf5b6d89e 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_realtek.c +1 -0
index d14b05f68d6d..08b6369f930b 100644

Lines of this file are not shown. View the raw message.

tools/hv/hv_fcopy_daemon.c +1 -0
index d78aed86af09..8ff8cb1a11f4 100644

Lines of this file are not shown. View the raw message.

tools/kvm/kvm_stat/kvm_stat +21 -4
index 56c4b3f8a01b..7c92545931e3 100755

Lines of this file are not shown. View the raw message.

tools/perf/arch/powerpc/util/sym-handling.c +3 -1
index 20e7d74d86cd..10a44e946f77 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/annotate.c +29 -3
index f91775b4bc3c..3b05219c3ed7 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/annotate.h +1 -0
index a4c0d91907e6..61e0c7fd5efd 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/evsel.c +3 -2
index 0d5504751cc5..6324afba8fdd 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/trace-event-info.c +1 -1
index c85d0d1a65ed..7b0ca7cbb7de 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/net/pmtu.sh +5 -2
index f8cc38afffa2..32a194e3e07a 100755

Lines of this file are not shown. View the raw message.

tools/testing/selftests/rseq/param_test.c +10 -9
index 615252331813..4bc071525bf7 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/tc-testing/tc-tests/actions/police.json +48 -0

48 lines not on this page · raw message

tools/vm/page-types.c +0 -6
index cce853dca691..a4c31fb2887b 100644

Lines of this file are not shown. View the raw message.

tools/vm/slabinfo.c +2 -2
index f82c2eaa859d..334b16db0ebb 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.