Linux 5.4.23
Greg KH
maintainerI'm announcing the release of the 5.4.23 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/arm64/tagged-address-abi.rst | 11 + MAINTAINERS | 2 Makefile | 2 arch/arm64/include/asm/lse.h | 2 arch/arm64/include/asm/memory.h | 2 arch/powerpc/include/asm/page.h | 5 arch/powerpc/kernel/eeh_driver.c | 21 +-- arch/powerpc/kernel/entry_32.S | 4 arch/powerpc/kernel/head_8xx.S | 2 arch/powerpc/kernel/signal.c | 17 ++ arch/powerpc/kernel/signal_32.c | 28 ++-- arch/powerpc/kernel/signal_64.c | 22 +-- arch/powerpc/mm/hugetlbpage.c | 29 ++-- arch/s390/boot/kaslr.c | 2 arch/s390/include/asm/page.h | 2 arch/x86/include/asm/kvm_host.h | 2 arch/x86/include/asm/msr-index.h | 2 arch/x86/kernel/cpu/amd.c | 14 ++ arch/x86/kernel/cpu/mce/amd.c | 50 ++++--- arch/x86/kernel/ima_arch.c | 6 arch/x86/kvm/irq_comm.c | 2 arch/x86/kvm/lapic.c | 9 - arch/x86/kvm/svm.c | 7 - arch/x86/kvm/vmx/capabilities.h | 1 arch/x86/kvm/vmx/nested.c | 44 ++++-- arch/x86/kvm/vmx/nested.h | 5 arch/x86/kvm/vmx/vmx.c | 82 +++++++++--- crypto/hash_info.c | 2 drivers/acpi/acpica/evevent.c | 45 ++++++ drivers/acpi/sleep.c | 7 + drivers/ata/ahci.c | 7 + drivers/ata/libata-core.c | 21 +++ drivers/block/floppy.c | 7 - drivers/char/tpm/tpm2-cmd.c | 2 drivers/dma/imx-sdma.c | 19 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 drivers/gpu/drm/amd/amdgpu/soc15.c | 7 - drivers/gpu/drm/bridge/tc358767.c | 8 - drivers/gpu/drm/i915/Kconfig | 5 drivers/gpu/drm/i915/display/intel_display.c | 2 drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 drivers/gpu/drm/i915/gem/i915_gem_phys.c | 98 +++++++------- drivers/gpu/drm/i915/gt/intel_engine.h | 8 + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 drivers/gpu/drm/i915/gt/intel_lrc.c | 63 ++++----- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 drivers/gpu/drm/i915/gvt/gtt.c | 4 drivers/gpu/drm/i915/i915_gem.c | 8 - drivers/gpu/drm/i915/i915_gpu_error.c | 3 drivers/gpu/drm/i915/i915_scheduler.c | 6 drivers/gpu/drm/i915/i915_utils.c | 5 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 4 drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 drivers/gpu/drm/panfrost/panfrost_mmu.c | 7 - drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 - drivers/infiniband/ulp/isert/ib_isert.c | 12 + drivers/iommu/qcom_iommu.c | 28 +--- drivers/net/ethernet/intel/e1000e/netdev.c | 68 +++++----- drivers/net/ethernet/mellanox/mlx5/core/en/health.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 8 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 14 -- drivers/net/ethernet/mellanox/mlx5/core/wq.c | 39 ++++- drivers/net/ethernet/mellanox/mlx5/core/wq.h | 2 drivers/nvme/host/multipath.c | 1 drivers/staging/android/ashmem.c | 28 ++++ drivers/staging/greybus/audio_manager.c | 2 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 drivers/staging/vt6656/dpc.c | 2 drivers/target/iscsi/iscsi_target.c | 16 -- drivers/target/target_core_transport.c | 31 ++++ drivers/thunderbolt/switch.c | 7 + drivers/tty/serdev/serdev-ttyport.c | 6 drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 drivers/tty/serial/8250/8250_core.c | 5 drivers/tty/serial/8250/8250_of.c | 1 drivers/tty/serial/8250/8250_port.c | 4 drivers/tty/serial/atmel_serial.c | 3 drivers/tty/serial/imx.c | 2 drivers/tty/serial/qcom_geni_serial.c | 18 ++ drivers/tty/tty_port.c | 5 drivers/tty/vt/selection.c | 9 + drivers/tty/vt/vt.c | 15 +- drivers/tty/vt/vt_ioctl.c | 17 +- drivers/usb/core/config.c | 11 + drivers/usb/core/hub.c | 20 ++- drivers/usb/core/hub.h | 1 drivers/usb/core/quirks.c | 40 ++++++ drivers/usb/core/usb.h | 3 drivers/usb/dwc2/gadget.c | 40 +++--- drivers/usb/dwc3/debug.h | 39 ++--- drivers/usb/dwc3/gadget.c | 3 drivers/usb/gadget/composite.c | 8 - drivers/usb/host/xhci-hub.c | 25 ++- drivers/usb/host/xhci-mem.c | 71 ++++++---- drivers/usb/host/xhci-pci.c | 10 - drivers/usb/host/xhci-ring.c | 60 ++++++--- drivers/usb/host/xhci.h | 14 +- drivers/usb/misc/iowarrior.c | 31 ++++ drivers/usb/storage/uas.c | 23 +++ drivers/xen/preempt.c | 4 fs/btrfs/disk-io.c | 3 fs/btrfs/extent-tree.c | 2 fs/btrfs/inode.c | 26 +++ fs/btrfs/ordered-data.c | 7 - fs/btrfs/qgroup.c | 13 + fs/btrfs/qgroup.h | 1 fs/btrfs/transaction.c | 2 fs/ecryptfs/crypto.c | 6 fs/ecryptfs/keystore.c | 2 fs/ecryptfs/messaging.c | 1 fs/ext4/balloc.c | 14 +- fs/ext4/ext4.h | 39 ++++- fs/ext4/ialloc.c | 23 ++- fs/ext4/inode.c | 16 +- fs/ext4/mballoc.c | 61 ++++++--- fs/ext4/migrate.c | 27 ++-- fs/ext4/namei.c | 1 fs/ext4/resize.c | 62 +++++++-- fs/ext4/super.c | 113 +++++++++++------ fs/io_uring.c | 47 ++----- fs/jbd2/transaction.c | 8 - include/acpi/acpixf.h | 1 include/linux/intel-svm.h | 2 include/linux/irqdomain.h | 2 include/linux/libata.h | 1 include/linux/tty.h | 2 include/linux/usb/quirks.h | 3 include/scsi/iscsi_proto.h | 1 include/sound/rawmidi.h | 6 ipc/sem.c | 6 kernel/bpf/offload.c | 2 kernel/irq/internals.h | 2 kernel/irq/manage.c | 18 -- kernel/irq/proc.c | 22 +++ kernel/sched/psi.c | 3 lib/stackdepot.c | 8 - mm/memcontrol.c | 4 mm/mmap.c | 4 mm/mremap.c | 1 mm/sparse.c | 2 mm/vmscan.c | 9 - net/netfilter/xt_hashlimit.c | 10 + net/rxrpc/call_object.c | 22 ++- sound/core/seq/seq_clientmgr.c | 4 sound/core/seq/seq_queue.c | 29 +++- sound/core/seq/seq_timer.c | 13 + sound/core/seq/seq_timer.h | 3 sound/hda/hdmi_chmap.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/hda_eld.c | 2 sound/pci/hda/hda_sysfs.c | 4 sound/pci/hda/patch_realtek.c | 2 sound/soc/atmel/Kconfig | 4 sound/soc/atmel/Makefile | 10 + sound/soc/fsl/fsl_sai.c | 22 ++- sound/soc/soc-dapm.c | 3 sound/soc/sof/intel/hda-dai.c | 4 sound/soc/sunxi/sun8i-codec.c | 3 tools/testing/selftests/bpf/prog_tests/sockmap_basic.c | 5 163 files changed, 1509 insertions(+), 709 deletions(-)
Aditya Pakki (1):
ecryptfs: replace BUG_ON with error handling code
Alan Stern (1):
USB: hub: Don't record a connect-change event during reset-resume
Alex Deucher (3):
drm/amdgpu/soc15: fix xclk for raven drm/amdgpu/gfx9: disable gfxoff when reading rlc clock drm/amdgpu/gfx10: disable gfxoff when reading rlc clock
Alexander Duyck (1):
e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm
Alexander Potapenko (1):
lib/stackdepot.c: fix global out-of-bounds in stack_slabs
Andy Shevchenko (1):
serial: 8250: Check UPF_IRQ_SHARED in advance
Anurag Kumar Vulisha (1):
usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields
Ard Biesheuvel (1):
x86/ima: use correct identifier for SetupMode variable
Arnd Bergmann (1):
ASoC: atmel: fix atmel_ssc_set_audio link failure
Aya Levin (2):
net/mlx5e: Reset RQ doorbell counter before moving RQ state from RST to RDY net/mlx5e: Fix crash in recovery flow without devlink reporter
Bart Van Assche (3):
scsi: Revert "target/core: Inline transport_lun_remove_cmd()"
scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout"
scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session"
Boris Brezillon (1):
drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
Borislav Petkov (1):
x86/mce/amd: Publish the bank pointer only after setup has succeeded
Catalin Marinas (1):
mm: Avoid creating virtual address aliases in brk()/mmap()/mremap()
Chris Wilson (4):
drm/i915: Wean off drm_pci_alloc/drm_pci_free
drm/i915/gt: Detect if we miss WaIdleLiteRestore drm/i915/execlists: Always force a context reload when rewinding RING_TAIL drm/i915/gt: Protect defer_request() from new waiters
Christophe Leroy (4):
powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size powerpc/hugetlb: Fix 8M hugepages on 8xx
Colin Ian King (2):
usb: dwc3: debug: fix string position formatting mixup with ret and len
staging: rtl8723bs: fix copy of overlapping memory
Cong Wang (1):
netfilter: xt_hashlimit: limit the max size of hashtable
Dan Carpenter (1):
staging: greybus: use after free in gb_audio_manager_remove_all()
David Howells (1):
rxrpc: Fix call RCU cleanup using non-bh-safe locks
EJ Hsu (1):
usb: uas: fix a plug & unplug racing
Eric Biggers (2):
ext4: rename s_journal_flag_rwsem to s_writepages_rwsem
ext4: fix race between writepages and enabling EXT4_EXTENTS_FL
Eric Dumazet (1):
vt: vt_ioctl: fix race in VT_RESIZEX
Filipe Manana (3):
Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents
Btrfs: fix race between shrinking truncate and fiemap
Btrfs: fix deadlock during fast fsync when logging prealloc extents beyond eof
Fugang Duan (1):
tty: serial: imx: setup the correct sg entry for tx dma
Gavin Shan (1):
mm/vmscan.c: don't round up scan size for online memory cgroup
Greg Kroah-Hartman (5):
USB: misc: iowarrior: add support for 2 OEMed devices
USB: misc: iowarrior: add support for the 28 and 28L devices
USB: misc: iowarrior: add support for the 100 device Revert "dmaengine: imx-sdma: Fix memory leak" Linux 5.4.23
Gustavo Luiz Duarte (1):
powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery
Hardik Gajjar (1):
USB: hub: Fix the broken detection of USB3 device in SMSC hub
Huy Nguyen (1):
net/mlx5: Fix sleep while atomic in mlx5_eswitch_get_vepa
Igor Druzhinin (1):
drm/i915/gvt: more locking for ppgtt mm LRU list
Ioanna Alifieraki (1):
Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()"
Jack Pham (1):
usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
Jan Kara (1):
ext4: fix mount failure with quota configured as module
Jani Nikula (2):
MAINTAINERS: Update drm/i915 bug filing URL
drm/i915: Update drm/i915 bug filing URL
Jeff Mahoney (1):
btrfs: destroy qgroup extent records on transaction abort
Jiri Slaby (1):
vt: selection, handle pending signals in paste_selection
Joerg Roedel (1):
iommu/vt-d: Fix compile warning from intel-svm.h
Johan Hovold (3):
USB: core: add endpoint-blacklist quirk
USB: quirks: blacklist duplicate ep on Sound Devices USBPre2
serdev: ttyport: restore client ops on deregistration
Johannes Krude (1):
bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill
John Fastabend (1):
bpf: Selftests build error in sockmap_basic.c
Josef Bacik (5):
btrfs: handle logged extent failure properly
btrfs: fix bytes_may_use underflow in prealloc error condtition
btrfs: reset fs_root to NULL on error in open_ctree
btrfs: do not check delayed items are empty for single transaction cleanup
btrfs: don't set path->leave_spinning for truncate
Kim Phillips (1):
x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF
Larry Finger (4):
staging: rtl8188eu: Fix potential security hole
staging: rtl8188eu: Fix potential overuse of kernel memory
staging: rtl8723bs: Fix potential security hole
staging: rtl8723bs: Fix potential overuse of kernel memory
Linus Torvalds (1):
floppy: check FDC index for errors before assigning it
Logan Gunthorpe (1):
nvme-multipath: Fix memory leak with ana_log_buf
Lyude Paul (1):
drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets
Malcolm Priestley (1):
staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi.
Mathias Nyman (4):
xhci: Force Maximum Packet size for Full-speed bulk devices to valid range.
xhci: fix runtime pm enabling for quirky Intel hosts
xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms
xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2
Miaohe Lin (2):
KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI
KVM: apic: avoid calculating pending eoi from an uninitialized val
Mika Westerberg (1):
thunderbolt: Prevent crash if non-active NVMem file is read
Minas Harutyunyan (2):
usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows
usb: dwc2: Fix in ISOC request length checking
Nathan Chancellor (2):
s390/kaslr: Fix casts in get_random
s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range
Nicolas Ferre (1):
tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode
Nicolas Pitre (1):
vt: fix scrollback flushing on background consoles
Oleksandr Suvorov (1):
ASoC: fsl_sai: Fix exiting path on probing failure
Oliver Upton (2):
KVM: nVMX: Refactor IO bitmap checks into helper function
KVM: nVMX: Check IO instruction VM-exit conditions
Paolo Bonzini (1):
KVM: nVMX: Don't emulate instructions in guest mode
Peter Chen (1):
usb: host: xhci: update event ring dequeue pointer on purpose
Prabhakar Kushwaha (1):
ata: ahci: Add shutdown to freeze hardware resources of ahci
Qian Cai (1):
ext4: fix a data race in EXT4_I(inode)->i_disksize
Rafael J. Wysocki (1):
ACPI: PM: s2idle: Check fixed wakeup events in acpi_s2idle_wake()
Richard Dodd (1):
USB: Fix novation SourceControl XL after suspend
Rob Clark (1):
drm/msm/dpu: fix BGR565 vs RGB565 confusion
Roberto Sassu (1):
tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST
Robin Murphy (1):
iommu/qcom: Fix bogus detach logic
Sam Bobroff (1):
powerpc/eeh: Fix deadlock handling dead PHB
Samuel Holland (2):
ASoC: codec2codec: avoid invalid/double-free of pcm runtime
ASoC: sun8i-codec: Fix setting DAI data format
Sathyanarayana Nujella (1):
ASoC: SOF: Intel: hda: Add iDisp4 DAI
Shijie Luo (1):
ext4: add cond_resched() to __ext4_find_entry()
Stefano Garzarella (1):
io_uring: prevent sq_thread from spinning when it should stop
Suraj Jitindar Singh (2):
ext4: fix potential race between s_group_info online resizing and access
ext4: fix potential race between s_flex_groups online resizing and access
Suren Baghdasaryan (2):
staging: android: ashmem: Disallow ashmem memory from being remapped sched/psi: Fix OOB write when writing 0 bytes to PSI files
Takashi Iwai (6):
ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs
ALSA: hda/realtek - Apply quirk for MSI GP63, too
ALSA: hda/realtek - Apply quirk for yet another MSI laptop
ALSA: rawmidi: Avoid bit fields for state flags
ALSA: seq: Avoid concurrent access to queue flags
ALSA: seq: Fix concurrent access to queue current tick/time
Theodore Ts'o (1):
ext4: fix potential race between online resizing and write operations
Thomas Gleixner (3):
x86/mce/amd: Fix kobject lifetime genirq/proc: Reject invalid affinity masks (again)
xen: Enable interrupts when calling _cond_resched()
Tianjia Zhang (1):
crypto: rename sm3-256 to sm3 in hash_algo_name
Tomi Valkeinen (1):
drm/bridge: tc358767: fix poll timeouts
Vasily Averin (1):
mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps()
Vincenzo Frascino (1):
arm64: lse: Fix LSE atomics with LLVM
Vitaly Kuznetsov (2):
KVM: nVMX: clear PIN_BASED_POSTED_INTR from nested pinbased_ctls only when apicv is globally disabled
KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1
Wei Yang (1):
mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM
Wenwen Wang (2):
ecryptfs: fix a memory leak bug in parse_tag_1_packet()
ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()
Will Deacon (1):
arm64: memory: Add missing brackets to untagged_addr() macro
Xiaoguang Wang (1):
io_uring: fix __io_iopoll_check deadlock in io_sq_thread
Zenghui Yu (1):
genirq/irqdomain: Make sure all irq domain flags are distinct
satya priya (1):
tty: serial: qcom_geni_serial: Fix RX cancel command failure
wangyan (1):
jbd2: fix ocfs2 corrupt when clearing block group bits
Greg KH
maintainerDocumentation/arm64/tagged-address-abi.rst +9 -2
@@ -44,8 +44,15 @@ The AArch64 Tagged Address ABI has two stages of relaxation depending how the user addresses are used by the kernel: 1. User addresses not accessed by the kernel but used for address space - management (e.g. ``mmap()``, ``mprotect()``, ``madvise()``). The use - of valid tagged pointers in this context is always allowed. + management (e.g. ``mprotect()``, ``madvise()``). The use of valid + tagged pointers in this context is allowed with the exception of + ``brk()``, ``mmap()`` and the ``new_address`` argument to + ``mremap()`` as these have the potential to alias with existing + user addresses. + + NOTE: This behaviour changed in v5.6 and so some earlier kernels may + incorrectly accept valid tagged pointers for the ``brk()``, + ``mmap()`` and ``mremap()`` system calls. 2. User addresses accessed by the kernel (e.g. ``write()``). This ABI relaxation is disabled by default and the application thread needs to
MAINTAINERS +1 -1
@@ -8201,7 +8201,7 @@ M: Joonas Lahtinen <[email protected]> M: Rodrigo Vivi <[email protected]> L: [email protected] W: https://01.org/linuxgraphics/ -B: https://01.org/linuxgraphics/documentation/how-report-bugs +B: https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs C: irc://chat.freenode.net/intel-gfx Q: http://patchwork.freedesktop.org/project/intel-gfx/ T: git git://anongit.freedesktop.org/drm-intel
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 22 +SUBLEVEL = 23 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm64/include/asm/lse.h +1 -1
@@ -6,7 +6,7 @@#if defined(CONFIG_AS_LSE ) && defined(CONFIG_ARM64_LSE_ATOMICS ) -#define __LSE_PREAMBLE ".arch armv8-a+lse\n" +#define __LSE_PREAMBLE ".arch_extension lse\n"#include <linux/compiler_types.h> #include <linux/export.h>
arch/arm64/include/asm/memory.h +1 -1
@@ -219,7 +219,7 @@ static inline unsigned long kaslr_offset(void) ((__force __typeof__(addr))sign_extend64((__force u64)(addr), 55))#define untagged_addr (addr) ({ \ - u64 __addr = (__force u64)addr; \ + u64 __addr = (__force u64)(addr); \ __addr &= __untagged_addr(__addr); \ (__force __typeof__(addr))__addr; \ })
arch/powerpc/include/asm/page.h +5 -0
@@ -295,8 +295,13 @@ static inline bool pfn_valid(unsigned long pfn)/* * Some number of bits at the level of the page table that points to * a hugepte are used to encode the size. This masks those bits. +* On 8xx, HW assistance requires 4k alignment for the hugepte. */ +#ifdef CONFIG_PPC_8xx +#define HUGEPD_SHIFT_MASK 0xfff +#else #define HUGEPD_SHIFT_MASK 0x3f +#endif #ifndef __ASSEMBLY__
arch/powerpc/kernel/eeh_driver.c +11 -10
@@ -1200,6 +1200,17 @@ void eeh_handle_special_event(void)eeh_pe_state_mark (pe,EEH_PE_RECOVERING );eeh_handle_normal_event (pe); }else { +eeh_for_each_pe (pe, tmp_pe) +eeh_pe_for_each_dev (tmp_pe, edev, tmp_edev) + edev->mode &= ~EEH_DEV_NO_HANDLER ; + +/* Notify all devices to be down */ +eeh_pe_state_clear (pe,EEH_PE_PRI_BUS , true); +eeh_set_channel_state (pe, pci_channel_io_perm_failure); +eeh_pe_report ( +"error_detected(permanent failure)" , pe, + eeh_report_failure,NULL ); +pci_lock_rescan_remove ();list_for_each_entry (hose, &hose_list, list_node) { phb_pe =eeh_phb_pe_get (hose);
@@ -1208,16 +1219,6 @@ void eeh_handle_special_event(void) (phb_pe->state & EEH_PE_RECOVERING))continue ; -eeh_for_each_pe (pe, tmp_pe) -eeh_pe_for_each_dev (tmp_pe, edev, tmp_edev) - edev->mode &= ~EEH_DEV_NO_HANDLER ; - -/* Notify all devices to be down */ -eeh_pe_state_clear (pe,EEH_PE_PRI_BUS , true); -eeh_set_channel_state (pe, pci_channel_io_perm_failure); -eeh_pe_report ( -"error_detected(permanent failure)" , pe, - eeh_report_failure,NULL ); bus =eeh_pe_bus_get (phb_pe);if (!bus) { pr_err("%s: Cannot find PCI bus for "
arch/powerpc/kernel/entry_32.S +2 -2
@@ -778,7 +778,7 @@ fast_exception_return: 1: lis r3,exc_exit_restart_end@ha addi r3,r3,exc_exit_restart_end@l cmplw r12,r3 -#if CONFIG_PPC_BOOK3S_601 +#ifdef CONFIG_PPC_BOOK3S_601 bge 2b #else bge 3f
@@ -786,7 +786,7 @@ fast_exception_return: lis r4,exc_exit_restart@ha addi r4,r4,exc_exit_restart@l cmplw r12,r4 -#if CONFIG_PPC_BOOK3S_601 +#ifdef CONFIG_PPC_BOOK3S_601 blt 2b #else blt 3f
arch/powerpc/kernel/head_8xx.S +1 -1
@@ -289,7 +289,7 @@ InstructionTLBMiss: * set. All other Linux PTE bits control the behavior * of the MMU. */ - rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */ + rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */ rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */ ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */ mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
arch/powerpc/kernel/signal.c +15 -2
@@ -200,14 +200,27 @@ unsigned long get_tm_stackpointer(struct task_struct *tsk)* normal/non-checkpointed stack pointer. */ +unsigned long ret = tsk->thread.regs->gpr[1 ]; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM BUG_ON (tsk != current);if (MSR_TM_ACTIVE (tsk->thread.regs->msr)) { +preempt_disable ();tm_reclaim_current (TM_CAUSE_SIGNAL );if (MSR_TM_TRANSACTIONAL (tsk->thread.regs->msr)) -return tsk->thread.ckpt_regs.gpr[1 ]; + ret = tsk->thread.ckpt_regs.gpr[1 ]; + +/* +* If we treclaim, we must clear the current thread's TM bits +* before re-enabling preemption. Otherwise we might be +* preempted and have the live MSR[TS] changed behind our back +* (tm_recheckpoint_new_task() would recheckpoint). Besides, we +* enter the signal handler in non-transactional state. +*/ + tsk->thread.regs->msr &= ~MSR_TS_MASK ; +preempt_enable (); }#endif -return tsk->thread.regs->gpr[1 ]; +return ret; }
arch/powerpc/kernel/signal_32.c +14 -14
@@ -489,19 +489,11 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,*/ static int save_tm_user_regs (struct pt_regs *regs,struct mcontext __user *frame, -struct mcontext __user *tm_frame,int sigret) +struct mcontext __user *tm_frame,int sigret, +unsigned long msr) { -unsigned long msr = regs->msr; -WARN_ON (tm_suspend_disabled); -/* Remove TM bits from thread's MSR. The MSR in the sigcontext -* just indicates to userland that we were doing a transaction, but we -* don't want to return in transactional state. This also ensures -* that flush_fp_to_thread won't set TIF_RESTORE_TM again. -*/ - regs->msr &= ~MSR_TS_MASK ; -/* Save both sets of general registers */ if (save_general_regs (¤t->thread.ckpt_regs, frame) ||save_general_regs (regs, tm_frame))
@@ -912,6 +904,10 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,int sigret;unsigned long tramp;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -944,13 +940,13 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,#ifdef CONFIG_PPC_TRANSACTIONAL_MEM tm_frame = &rt_sf->uc_transact.uc_mcontext; -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {if (__put_user ((unsigned long )&rt_sf->uc_transact, &rt_sf->uc.uc_link) ||__put_user ((unsigned long )tm_frame, &rt_sf->uc_transact.uc_regs)) goto badframe; -if (save_tm_user_regs (regs, frame, tm_frame, sigret)) +if (save_tm_user_regs (regs, frame, tm_frame, sigret, msr)) goto badframe; }else
@@ -1369,6 +1365,10 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,int sigret;unsigned long tramp;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -1402,9 +1402,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,#ifdef CONFIG_PPC_TRANSACTIONAL_MEM tm_mctx = &frame->mctx_transact; -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {if (save_tm_user_regs (regs, &frame->mctx, &frame->mctx_transact, - sigret)) + sigret, msr)) goto badframe; }else
arch/powerpc/kernel/signal_64.c +10 -12
@@ -192,7 +192,8 @@ static long setup_sigcontext(struct sigcontext __user *sc,static long setup_tm_sigcontexts (struct sigcontext __user *sc,struct sigcontext __user *tm_sc,struct task_struct *tsk, -int signr,sigset_t *set,unsigned long handler) +int signr,sigset_t *set,unsigned long handler, +unsigned long msr) {/* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the * process never used altivec yet (MSR_VEC is zero in pt_regs of
@@ -207,12 +208,11 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,elf_vrreg_t __user *tm_v_regs =sigcontext_vmx_regs (tm_sc);#endif struct pt_regs *regs = tsk->thread.regs; -unsigned long msr = tsk->thread.regs->msr;long err =0 ;BUG_ON (tsk != current); -BUG_ON (!MSR_TM_ACTIVE (regs->msr)); +BUG_ON (!MSR_TM_ACTIVE (msr));WARN_ON (tm_suspend_disabled);
@@ -222,13 +222,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,*/ msr |= tsk->thread.ckpt_regs.msr & (MSR_FP |MSR_VEC |MSR_VSX ); -/* Remove TM bits from thread's MSR. The MSR in the sigcontext -* just indicates to userland that we were doing a transaction, but we -* don't want to return in transactional state. This also ensures -* that flush_fp_to_thread won't set TIF_RESTORE_TM again. -*/ - regs->msr &= ~MSR_TS_MASK ; -#ifdef CONFIG_ALTIVEC err |=__put_user (v_regs, &sc->v_regs); err |=__put_user (tm_v_regs, &tm_sc->v_regs);
@@ -824,6 +817,10 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set,unsigned long newsp =0 ;long err =0 ;struct pt_regs *regs = tsk->thread.regs; +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +/* Save the thread's msr before get_tm_stackpointer() changes it */ +unsigned long msr = regs->msr; +#endif BUG_ON (tsk != current);
@@ -841,7 +838,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, err |=__put_user (0 , &frame->uc.uc_flags); err |=__save_altstack (&frame->uc.uc_stack, regs->gpr[1 ]);#ifdef CONFIG_PPC_TRANSACTIONAL_MEM -if (MSR_TM_ACTIVE (regs->msr)) { +if (MSR_TM_ACTIVE (msr)) {/* The ucontext_t passed to userland points to the second * ucontext_t (for transactional state) with its uc_link ptr. */
@@ -849,7 +846,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, err |=setup_tm_sigcontexts (&frame->uc.uc_mcontext, &frame->uc_transact.uc_mcontext, tsk, ksig->sig,NULL , - (unsigned long )ksig->ka.sa.sa_handler); + (unsigned long )ksig->ka.sa.sa_handler, + msr); } else#endif {
arch/powerpc/mm/hugetlbpage.c +18 -11
@@ -53,20 +53,24 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,if (pshift >= pdshift) { cachep =PGT_CACHE (PTE_T_ORDER ); num_hugepd =1 << (pshift - pdshift); + new =NULL ; }else if (IS_ENABLED (CONFIG_PPC_8xx)) { - cachep =PGT_CACHE (PTE_INDEX_SIZE ); + cachep =NULL ; num_hugepd =1 ; + new =pte_alloc_one (mm); }else { cachep =PGT_CACHE (pdshift - pshift); num_hugepd =1 ; + new =NULL ; } -if (!cachep) { +if (!cachep && !new) {WARN_ONCE (1 ,"No page table cache created for hugetlb tables" );return -ENOMEM ; } - new =kmem_cache_alloc (cachep,pgtable_gfp_flags (mm,GFP_KERNEL )); +if (cachep) + new =kmem_cache_alloc (cachep,pgtable_gfp_flags (mm,GFP_KERNEL ));BUG_ON (pshift >HUGEPD_SHIFT_MASK );BUG_ON ((unsigned long )new &HUGEPD_SHIFT_MASK );
@@ -97,7 +101,10 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,if (i < num_hugepd) {for (i = i -1 ; i >=0 ; i--, hpdp--) *hpdp =__hugepd (0 ); -kmem_cache_free (cachep, new); +if (cachep) +kmem_cache_free (cachep, new); +else +pte_free (mm, new); }else {kmemleak_ignore (new); }
@@ -324,8 +331,7 @@ static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshifif (shift >= pdshift)hugepd_free (tlb, hugepte);else if (IS_ENABLED (CONFIG_PPC_8xx)) -pgtable_free_tlb (tlb, hugepte, -get_hugepd_cache_index (PTE_INDEX_SIZE )); +pgtable_free_tlb (tlb, hugepte,0 );else pgtable_free_tlb (tlb, hugepte,get_hugepd_cache_index (pdshift - shift));
@@ -639,12 +645,13 @@ static int __init hugetlbpage_init(void)* if we have pdshift and shift value same, we don't * use pgt cache for hugepd. */ -if (pdshift > shift &&IS_ENABLED (CONFIG_PPC_8xx)) -pgtable_cache_add (PTE_INDEX_SIZE ); -else if (pdshift > shift) -pgtable_cache_add (pdshift - shift); -else if (IS_ENABLED (CONFIG_PPC_FSL_BOOK3E ) ||IS_ENABLED (CONFIG_PPC_8xx)) +if (pdshift > shift) { +if (!IS_ENABLED (CONFIG_PPC_8xx)) +pgtable_cache_add (pdshift - shift); + }else if (IS_ENABLED (CONFIG_PPC_FSL_BOOK3E ) || +IS_ENABLED (CONFIG_PPC_8xx)) {pgtable_cache_add (PTE_T_ORDER ); + } configured = true; }
arch/s390/boot/kaslr.c +1 -1
@@ -75,7 +75,7 @@ static unsigned long get_random(unsigned long limit) *(unsigned long *) prng.parm_block ^= seed;for (i =0 ; i <16 ; i++) {cpacf_kmc (CPACF_KMC_PRNG , prng.parm_block, - (char *) entropy, (char *) entropy, + (u8 *) entropy, (u8 *) entropy,sizeof (entropy));memcpy (prng.parm_block, entropy,sizeof (entropy)); }
arch/s390/include/asm/page.h +1 -1
@@ -42,7 +42,7 @@ void __storage_key_init_range(unsigned long start, unsigned long end);static inline void storage_key_init_range (unsigned long start,unsigned long end) { -if (PAGE_DEFAULT_KEY ) +if (PAGE_DEFAULT_KEY !=0 )__storage_key_init_range (start, end); }
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1098,7 +1098,7 @@ struct kvm_x86_ops {void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu,u64 *eoi_exit_bitmap);void (*set_virtual_apic_mode)(struct kvm_vcpu *vcpu);void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu,hpa_t hpa); -void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu,int vector); +int (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu,int vector);int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);int (*set_tss_addr)(struct kvm *kvm,unsigned int addr);int (*set_identity_map_addr)(struct kvm *kvm,u64 ident_addr);
arch/x86/include/asm/msr-index.h +2 -0
@@ -510,6 +510,8 @@#define MSR_K7_HWCR 0xc0010015#define MSR_K7_HWCR_SMMLOCK_BIT 0#define MSR_K7_HWCR_SMMLOCK BIT_ULL(MSR_K7_HWCR_SMMLOCK_BIT) +#define MSR_K7_HWCR_IRPERF_EN_BIT 30 +#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)#define MSR_K7_FID_VID_CTL 0xc0010041#define MSR_K7_FID_VID_STATUS 0xc0010042
arch/x86/kernel/cpu/amd.c +14 -0
@@ -28,6 +28,7 @@static const int amd_erratum_383[];static const int amd_erratum_400[]; +static const int amd_erratum_1054[];static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum);/*
@@ -978,6 +979,15 @@ static void init_amd(struct cpuinfo_x86 *c)/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */ if (!cpu_has (c,X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); + +/* +* Turn on the Instructions Retired free counter on machines not +* susceptible to erratum #1054 "Instructions Retired Performance +* Counter May Be Inaccurate". +*/ +if (cpu_has (c,X86_FEATURE_IRPERF ) && + !cpu_has_amd_erratum (c, amd_erratum_1054)) +msr_set_bit (MSR_K7_HWCR ,MSR_K7_HWCR_IRPERF_EN_BIT ); }#ifdef CONFIG_X86_32
@@ -1105,6 +1115,10 @@ static const int amd_erratum_400[] =static const int amd_erratum_383[] =AMD_OSVW_ERRATUM (3 ,AMD_MODEL_RANGE (0x10 ,0 ,0 ,0xff ,0xf )); +/* #1054: Instructions Retired Performance Counter May Be Inaccurate */ +static const int amd_erratum_1054[] = +AMD_OSVW_ERRATUM (0 ,AMD_MODEL_RANGE (0x17 ,0 ,0 ,0x2f ,0xf )); +static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum) {
arch/x86/kernel/cpu/mce/amd.c +27 -23
105 lines not on this page · raw message
arch/x86/kernel/ima_arch.c +2 -4
@@ -10,8 +10,6 @@ extern struct boot_params boot_params;static enum efi_secureboot_mode get_sb_mode (void ) { -efi_char16_t efi_SecureBoot_name[] =L"SecureBoot" ; -efi_char16_t efi_SetupMode_name[] =L"SecureBoot" ;efi_guid_t efi_variable_guid =EFI_GLOBAL_VARIABLE_GUID ;efi_status_t status;unsigned long size;
@@ -25,7 +23,7 @@ static enum efi_secureboot_mode get_sb_mode(void) }/* Get variable contents into buffer */ - status = efi.get_variable (efi_SecureBoot_name, &efi_variable_guid, + status = efi.get_variable (L"SecureBoot" , &efi_variable_guid,NULL , &size, &secboot);if (status ==EFI_NOT_FOUND ) {pr_info ("ima: secureboot mode disabled\n" );
@@ -38,7 +36,7 @@ static enum efi_secureboot_mode get_sb_mode(void) } size =sizeof (setupmode); - status = efi.get_variable (efi_SetupMode_name, &efi_variable_guid, + status = efi.get_variable (L"SetupMode" , &efi_variable_guid,NULL , &size, &setupmode);if (status !=EFI_SUCCESS )/* ignore unknown SetupMode */
arch/x86/kvm/irq_comm.c +1 -1
@@ -416,7 +416,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,kvm_set_msi_irq (vcpu->kvm, entry, &irq); -if (irq.level &&kvm_apic_match_dest (vcpu,NULL ,0 , +if (irq.trig_mode &&kvm_apic_match_dest (vcpu,NULL ,0 , irq.dest_id, irq.dest_mode))__set_bit (irq.vector, ioapic_handled_vectors); }
arch/x86/kvm/lapic.c +4 -5
@@ -637,9 +637,11 @@ static inline bool pv_eoi_enabled(struct kvm_vcpu *vcpu)static bool pv_eoi_get_pending (struct kvm_vcpu *vcpu) {u8 val; -if (pv_eoi_get_user (vcpu, &val) <0 ) +if (pv_eoi_get_user (vcpu, &val) <0 ) {printk (KERN_WARNING "Can't read EOI MSR value: 0x%llx\n" , (unsigned long long )vcpu->arch.pv_eoi.msr_val); +return false; + }return val &0x1 ; }
@@ -1056,11 +1058,8 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, apic->regs + APIC_TMR); } -if (vcpu->arch.apicv_active) - kvm_x86_ops->deliver_posted_interrupt (vcpu, vector); -else { +if (kvm_x86_ops->deliver_posted_interrupt (vcpu, vector)) {kvm_lapic_set_irr (vector, apic); -kvm_make_request (KVM_REQ_EVENT , vcpu);kvm_vcpu_kick (vcpu); }
arch/x86/kvm/svm.c +6 -1
@@ -5141,8 +5141,11 @@ static void svm_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)return ; } -static void svm_deliver_avic_intr (struct kvm_vcpu *vcpu,int vec) +static int svm_deliver_avic_intr (struct kvm_vcpu *vcpu,int vec) { +if (!vcpu->arch.apicv_active) +return -1 ; +kvm_lapic_set_irr (vec, vcpu->arch.apic);smp_mb__after_atomic ();
@@ -5154,6 +5157,8 @@ static void svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)put_cpu (); }else kvm_vcpu_wake_up (vcpu); + +return 0 ; }static bool svm_dy_apicv_has_pending_interrupt (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/capabilities.h +1 -0
@@ -12,6 +12,7 @@ extern bool __read_mostly enable_ept;extern bool __read_mostly enable_unrestricted_guest;extern bool __read_mostly enable_ept_ad_bits;extern bool __read_mostly enable_pml; +extern bool __read_mostly enable_apicv;extern int __read_mostly pt_mode;#define PT_MODE_SYSTEM 0
arch/x86/kvm/vmx/nested.c +27 -17
72 lines not on this page · raw message
arch/x86/kvm/vmx/nested.h +3 -2
@@ -17,8 +17,7 @@ enum nvmx_vmentry_status { };void vmx_leave_nested (struct kvm_vcpu *vcpu); -void nested_vmx_setup_ctls_msrs (struct nested_vmx_msrs *msrs,u32 ept_caps, -bool apicv); +void nested_vmx_setup_ctls_msrs (struct nested_vmx_msrs *msrs,u32 ept_caps);void nested_vmx_hardware_unsetup (void );__init int nested_vmx_hardware_setup (int (*exit_handlers[])(struct kvm_vcpu *));void nested_vmx_vcpu_setup (void );
@@ -33,6 +32,8 @@ int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);int vmx_get_vmx_msr (struct nested_vmx_msrs *msrs,u32 msr_index,u64 *pdata);int get_vmx_mem_address (struct kvm_vcpu *vcpu,unsigned long exit_qualification,u32 vmx_instruction_info,bool wr,int len,gva_t *ret); +bool nested_vmx_check_io_bitmaps (struct kvm_vcpu *vcpu,unsigned int port, +int size);static inline struct vmcs12 *get_vmcs12 (struct kvm_vcpu *vcpu) {
arch/x86/kvm/vmx/vmx.c +65 -17
144 lines not on this page · raw message
crypto/hash_info.c +1 -1
@@ -26,7 +26,7 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = { [HASH_ALGO_TGR_128] = "tgr128", [HASH_ALGO_TGR_160] = "tgr160", [HASH_ALGO_TGR_192] = "tgr192", - [HASH_ALGO_SM3_256] = "sm3-256", + [HASH_ALGO_SM3_256] = "sm3", [HASH_ALGO_STREEBOG_256] = "streebog256", [HASH_ALGO_STREEBOG_512] = "streebog512", };
drivers/acpi/acpica/evevent.c +45 -0
49 lines not on this page · raw message
drivers/acpi/sleep.c +7 -0
@@ -992,6 +992,13 @@ static bool acpi_s2idle_wake(void)if (irqd_is_wakeup_armed (irq_get_irq_data (acpi_sci_irq)))return true; +/* +* If the status bit of any enabled fixed event is set, the +* wakeup is regarded as valid. +*/ +if (acpi_any_fixed_event_status_set ()) +return true; +/* * If there are no EC events to process and at least one of the * other enabled GPEs is active, the wakeup is regarded as a
drivers/ata/ahci.c +7 -0
@@ -80,6 +80,7 @@ enum board_ids {static int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);static void ahci_remove_one (struct pci_dev *dev); +static void ahci_shutdown_one (struct pci_dev *dev);static int ahci_vt8251_hardreset (struct ata_link *link,unsigned int *class,unsigned long deadline); static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
@@ -593,6 +594,7 @@ static struct pci_driver ahci_pci_driver = { .id_table = ahci_pci_tbl, .probe = ahci_init_one, .remove = ahci_remove_one, + .shutdown = ahci_shutdown_one, .driver = { .pm = &ahci_pci_pm_ops, },
@@ -1864,6 +1866,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)return 0 ; } +static void ahci_shutdown_one (struct pci_dev *pdev) +{ +ata_pci_shutdown_one (pdev); +} +static void ahci_remove_one (struct pci_dev *pdev) {pm_runtime_get_noresume (&pdev->dev);
drivers/ata/libata-core.c +21 -0
@@ -6762,6 +6762,26 @@ void ata_pci_remove_one(struct pci_dev *pdev)ata_host_detach (host); } +void ata_pci_shutdown_one (struct pci_dev *pdev) +{ +struct ata_host *host =pci_get_drvdata (pdev); +int i; + +for (i =0 ; i < host->n_ports; i++) { +struct ata_port *ap = host->ports[i]; + + ap->pflags |=ATA_PFLAG_FROZEN ; + +/* Disable port interrupts */ +if (ap->ops->freeze) + ap->ops->freeze (ap); + +/* Stop the port DMA engines */ +if (ap->ops->port_stop) + ap->ops->port_stop (ap); + } +} +/* move to PCI subsystem */ int pci_test_config_bits (struct pci_dev *pdev,const struct pci_bits *bits) {
@@ -7382,6 +7402,7 @@ EXPORT_SYMBOL_GPL(ata_timing_cycle2mode);#ifdef CONFIG_PCI EXPORT_SYMBOL_GPL (pci_test_config_bits); +EXPORT_SYMBOL_GPL (ata_pci_shutdown_one);EXPORT_SYMBOL_GPL (ata_pci_remove_one);#ifdef CONFIG_PM EXPORT_SYMBOL_GPL (ata_pci_device_do_suspend);
drivers/block/floppy.c +5 -2
@@ -853,14 +853,17 @@ static void reset_fdc_info(int mode)/* selects the fdc and drive, and enables the fdc's input/dma. */ static void set_fdc (int drive) { +unsigned int new_fdc = fdc; +if (drive >=0 && drive <N_DRIVE ) { - fdc =FDC (drive); + new_fdc =FDC (drive); current_drive = drive; } -if (fdc !=1 && fdc !=0 ) { +if (new_fdc >=N_FDC ) {pr_info ("bad fdc value\n" );return ; } + fdc = new_fdc;set_dor (fdc, ~0 ,8 );#if N_FDC >1 set_dor (1 - fdc, ~8 ,0 );
drivers/char/tpm/tpm2-cmd.c +2 -0
@@ -831,6 +831,8 @@ static int tpm2_init_bank_info(struct tpm_chip *chip, u32 bank_index)return 0 ; } + bank->crypto_id =HASH_ALGO__LAST ; +return tpm2_pcr_read (chip,0 , &digest, &bank->digest_size); }
drivers/dma/imx-sdma.c +8 -11
@@ -760,8 +760,12 @@ static void sdma_start_desc(struct sdma_channel *sdmac)return ; } sdmac->desc = desc =to_sdma_desc (&vd->tx); - -list_del (&vd->node); +/* +* Do not delete the node in desc_issued list in cyclic mode, otherwise +* the desc allocated will never be freed in vchan_dma_desc_free_list +*/ +if (!(sdmac->flags &IMX_DMA_SG_LOOP )) +list_del (&vd->node); sdma->channel_control[channel].base_bd_ptr = desc->bd_phys; sdma->channel_control[channel].current_bd_ptr = desc->bd_phys;
@@ -1067,6 +1071,7 @@ static void sdma_channel_terminate_work(struct work_struct *work)spin_lock_irqsave (&sdmac->vc.lock, flags);vchan_get_all_descriptors (&sdmac->vc, &head); + sdmac->desc =NULL ;spin_unlock_irqrestore (&sdmac->vc.lock, flags);vchan_dma_desc_free_list (&sdmac->vc, &head); sdmac->context_loaded = false;
@@ -1075,19 +1080,11 @@ static void sdma_channel_terminate_work(struct work_struct *work)static int sdma_disable_channel_async (struct dma_chan *chan) {struct sdma_channel *sdmac =to_sdma_chan (chan); -unsigned long flags; - -spin_lock_irqsave (&sdmac->vc.lock, flags);sdma_disable_channel (chan); -if (sdmac->desc) { -vchan_terminate_vdesc (&sdmac->desc->vd); - sdmac->desc =NULL ; +if (sdmac->desc)schedule_work (&sdmac->terminate_worker); - } - -spin_unlock_irqrestore (&sdmac->vc.lock, flags);return 0 ; }
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2 -0
@@ -3977,11 +3977,13 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev) {uint64_t clock; +amdgpu_gfx_off_ctrl (adev, false);mutex_lock (&adev->gfx.gpu_clock_mutex);WREG32_SOC15 (GC ,0 , mmRLC_CAPTURE_GPU_CLOCK_COUNT,1 ); clock = (uint64_t )RREG32_SOC15 (GC ,0 , mmRLC_GPU_CLOCK_COUNT_LSB) | ((uint64_t )RREG32_SOC15 (GC ,0 , mmRLC_GPU_CLOCK_COUNT_MSB) <<32ULL );mutex_unlock (&adev->gfx.gpu_clock_mutex); +amdgpu_gfx_off_ctrl (adev, true);return clock; }
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -0
@@ -4080,11 +4080,13 @@ static uint64_t gfx_v9_0_get_gpu_clock_counter(struct amdgpu_device *adev) {uint64_t clock; +amdgpu_gfx_off_ctrl (adev, false);mutex_lock (&adev->gfx.gpu_clock_mutex);WREG32_SOC15 (GC ,0 , mmRLC_CAPTURE_GPU_CLOCK_COUNT,1 ); clock = (uint64_t )RREG32_SOC15 (GC ,0 , mmRLC_GPU_CLOCK_COUNT_LSB) | ((uint64_t )RREG32_SOC15 (GC ,0 , mmRLC_GPU_CLOCK_COUNT_MSB) <<32ULL );mutex_unlock (&adev->gfx.gpu_clock_mutex); +amdgpu_gfx_off_ctrl (adev, true);return clock; }
drivers/gpu/drm/amd/amdgpu/soc15.c +6 -1
@@ -267,7 +267,12 @@ static u32 soc15_get_config_memsize(struct amdgpu_device *adev)static u32 soc15_get_xclk (struct amdgpu_device *adev) { -return adev->clock.spll.reference_freq; +u32 reference_clock = adev->clock.spll.reference_freq; + +if (adev->asic_type ==CHIP_RAVEN ) +return reference_clock /4 ; + +return reference_clock; }
drivers/gpu/drm/bridge/tc358767.c +4 -4
@@ -294,7 +294,7 @@ static inline int tc_poll_timeout(struct tc_data *tc, unsigned int addr,static int tc_aux_wait_busy (struct tc_data *tc) { -return tc_poll_timeout (tc,DP0_AUXSTATUS ,AUX_BUSY ,0 ,1000 ,100000 ); +return tc_poll_timeout (tc,DP0_AUXSTATUS ,AUX_BUSY ,0 ,100 ,100000 ); } static int tc_aux_write_data(struct tc_data *tc, const void *data,
@@ -637,7 +637,7 @@ static int tc_aux_link_setup(struct tc_data *tc)if (ret) goto err; - ret =tc_poll_timeout (tc,DP_PHY_CTRL ,PHY_RDY ,PHY_RDY ,1 ,1000 ); + ret =tc_poll_timeout (tc,DP_PHY_CTRL ,PHY_RDY ,PHY_RDY ,100 ,100000 );if (ret == -ETIMEDOUT ) {dev_err (tc->dev,"Timeout waiting for PHY to become ready" );return ret;
@@ -861,7 +861,7 @@ static int tc_wait_link_training(struct tc_data *tc)int ret; ret =tc_poll_timeout (tc,DP0_LTSTAT ,LT_LOOPDONE , -LT_LOOPDONE ,1 ,1000 ); +LT_LOOPDONE ,500 ,100000 );if (ret) {dev_err (tc->dev,"Link training timeout waiting for LT_LOOPDONE!\n" );return ret;
@@ -934,7 +934,7 @@ static int tc_main_link_enable(struct tc_data *tc) dp_phy_ctrl &= ~(DP_PHY_RST |PHY_M1_RST |PHY_M0_RST ); ret =regmap_write (tc->regmap,DP_PHY_CTRL , dp_phy_ctrl); - ret =tc_poll_timeout (tc,DP_PHY_CTRL ,PHY_RDY ,PHY_RDY ,1 ,1000 ); + ret =tc_poll_timeout (tc,DP_PHY_CTRL ,PHY_RDY ,PHY_RDY ,500 ,100000 );if (ret) {dev_err (dev,"timeout waiting for phy become ready" );return ret;
drivers/gpu/drm/i915/Kconfig +2 -3
@@ -75,9 +75,8 @@ config DRM_I915_CAPTURE_ERROR help This option enables capturing the GPU state when a hang is detected. This information is vital for triaging hangs and assists in debugging. - Please report any hang to - https://bugs.freedesktop.org/enter_bug.cgi?product=DRI - for triaging. + Please report any hang for triaging according to: + https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs If in doubt, say "Y".
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -10510,7 +10510,7 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)u32 base;if (INTEL_INFO (dev_priv)->display.cursor_needs_physical) - base = obj->phys_handle->busaddr; + base =sg_dma_address (obj->mm.pages->sgl);else base =intel_plane_ggtt_offset (plane_state);
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +0 -3
@@ -240,9 +240,6 @@ struct drm_i915_gem_object {void *gvt_info; }; - -/** for phys allocated objects */ -struct drm_dma_handle *phys_handle; }; static inline struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_phys.c +50 -48
160 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_engine.h +8 -0
@@ -250,6 +250,14 @@ static inline u32 intel_ring_wrap(const struct intel_ring *ring, u32 pos)return pos & (ring->size -1 ); } +static inline int intel_ring_direction (const struct intel_ring *ring, +u32 next,u32 prev) +{ +typecheck (typeof (ring->size), next); +typecheck (typeof (ring->size), prev); +return (next - prev) << ring->wrap; +} +static inline bool intel_ring_offset_valid (const struct intel_ring *ring,unsigned int pos)
drivers/gpu/drm/i915/gt/intel_engine_types.h +1 -0
@@ -107,6 +107,7 @@ struct intel_ring {u32 space;u32 size; +u32 wrap;u32 effective_size; };
drivers/gpu/drm/i915/gt/intel_lrc.c +32 -31
114 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +2 -0
@@ -1312,6 +1312,8 @@ intel_engine_create_ring(struct intel_engine_cs *engine, int size)kref_init (&ring->ref); ring->size = size; + ring->wrap =BITS_PER_TYPE (ring->size) -ilog2 (size); +/* Workaround an erratum on the i830 which causes a hang if * the TAIL pointer points to within the last 2 cachelines * of the buffer.
drivers/gpu/drm/i915/gvt/gtt.c +4 -0
@@ -1956,7 +1956,11 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)if (mm->type ==INTEL_GVT_MM_PPGTT ) {list_del (&mm->ppgtt_mm.list); + +mutex_lock (&mm->vgpu->gvt->gtt.ppgtt_mm_lock);list_del (&mm->ppgtt_mm.lru_list); +mutex_unlock (&mm->vgpu->gvt->gtt.ppgtt_mm_lock); +invalidate_ppgtt_mm (mm); }else {vfree (mm->ggtt_mm.virtual_ggtt);
drivers/gpu/drm/i915/i915_gem.c +4 -4
@@ -136,7 +136,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,struct drm_i915_gem_pwrite *args, struct drm_file *file) { - void *vaddr = obj->phys_handle->vaddr + args->offset; + void *vaddr = sg_page(obj->mm.pages->sgl) + args->offset;char __user *user_data =u64_to_user_ptr (args->data_ptr);/*
@@ -802,10 +802,10 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, ret =i915_gem_gtt_pwrite_fast (obj, args);if (ret == -EFAULT || ret == -ENOSPC ) { -if (obj->phys_handle) - ret =i915_gem_phys_pwrite (obj, args, file); -else +if (i915_gem_object_has_struct_page (obj)) ret =i915_gem_shmem_pwrite (obj, args); +else + ret =i915_gem_phys_pwrite (obj, args, file); }i915_gem_object_unpin_pages (obj);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
@@ -1768,7 +1768,8 @@ void i915_capture_error_state(struct drm_i915_private *i915,if (!xchg (&warned, true) &&ktime_get_real_seconds () -DRIVER_TIMESTAMP <DAY_AS_SECONDS (180 )) {pr_info ("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n" ); -pr_info ("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n" ); +pr_info ("Please file a _new_ bug report at https://gitlab.freedesktop.org/drm/intel/issues/new.\n" ); +pr_info ("Please see https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs for details.\n" );pr_info ("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n" );pr_info ("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n" ); pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
drivers/gpu/drm/i915/i915_scheduler.c +4 -2
@@ -418,8 +418,6 @@ bool __i915_sched_node_add_dependency(struct i915_sched_node *node,if (!node_signaled (signal)) {INIT_LIST_HEAD (&dep->dfs_link); -list_add (&dep->wait_link, &signal->waiters_list); -list_add (&dep->signal_link, &node->signalers_list); dep->signaler = signal; dep->waiter = node; dep->flags = flags;
@@ -429,6 +427,10 @@ bool __i915_sched_node_add_dependency(struct i915_sched_node *node, !node_started(signal)) node->flags |=I915_SCHED_HAS_SEMAPHORE_CHAIN ; +/* All set, now publish. Beware the lockless walkers. */ +list_add (&dep->signal_link, &node->signalers_list); +list_add_rcu (&dep->wait_link, &signal->waiters_list); +/* * As we do not allow WAIT to preempt inflight requests, * once we have executed a request, along with triggering
drivers/gpu/drm/i915/i915_utils.c +2 -3
@@ -8,9 +8,8 @@#include "i915_drv.h" #include "i915_utils.h" -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ - "providing the dmesg log by booting with drm.debug=0xf" +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs" +#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details." void __i915_printk(struct drm_i915_private *dev_priv, const char *level,
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +2 -2
@@ -255,13 +255,13 @@ static const struct dpu_format dpu_format_map[] = {INTERLEAVED_RGB_FMT (RGB565 ,0 ,COLOR_5BIT ,COLOR_6BIT ,COLOR_5BIT , - C2_R_Cr,C0_G_Y , C1_B_Cb,0 ,3 , + C1_B_Cb,C0_G_Y , C2_R_Cr,0 ,3 , false,2 ,0 ,DPU_FETCH_LINEAR ,1 ),INTERLEAVED_RGB_FMT (BGR565 ,0 ,COLOR_5BIT ,COLOR_6BIT ,COLOR_5BIT , - C1_B_Cb,C0_G_Y , C2_R_Cr,0 ,3 , + C2_R_Cr,C0_G_Y , C1_B_Cb,0 ,3 , false,2 ,0 , DPU_FETCH_LINEAR, 1),
drivers/gpu/drm/nouveau/dispnv50/wndw.c +2 -0
@@ -451,6 +451,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) asyw->clr.ntfy = armw->ntfy.handle !=0 ; asyw->clr.sema = armw->sema.handle !=0 ; asyw->clr.xlut = armw->xlut.handle !=0 ; +if (asyw->clr.xlut && asyw->visible) + asyw->set.xlut = asyw->xlut.handle !=0 ; asyw->clr.csc = armw->csc.valid;if (wndw->func->image_clr) asyw->clr.image = armw->image.handle[0 ] !=0 ;
drivers/gpu/drm/panfrost/panfrost_mmu.c +6 -1
@@ -151,7 +151,12 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu) as = mmu->as;if (as >=0 ) {int en =atomic_inc_return (&mmu->as_count); -WARN_ON (en >=NUM_JOB_SLOTS ); + +/* +* AS can be retained by active jobs or a perfcnt context, +* hence the '+ 1' here. +*/ +WARN_ON (en >= (NUM_JOB_SLOTS +1 ));list_move (&mmu->list, &pfdev->as_lru_list); goto out;
drivers/gpu/drm/panfrost/panfrost_perfcnt.c +4 -7
@@ -73,7 +73,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,struct panfrost_file_priv *user = file_priv->driver_priv;struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;struct drm_gem_shmem_object *bo; -u32 cfg; +u32 cfg, as;int ret;if (user == perfcnt->user)
@@ -126,12 +126,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, perfcnt->user = user; -/* -* Always use address space 0 for now. -* FIXME: this needs to be updated when we start using different -* address space. -*/ - cfg =GPU_PERFCNT_CFG_AS (0 ) | + as =panfrost_mmu_as_get (pfdev, perfcnt->mapping->mmu); + cfg =GPU_PERFCNT_CFG_AS (as) |GPU_PERFCNT_CFG_MODE (GPU_PERFCNT_CFG_MODE_MANUAL );/*
@@ -195,6 +191,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,drm_gem_shmem_vunmap (&perfcnt->mapping->obj->base.base, perfcnt->buf); perfcnt->buf =NULL ;panfrost_gem_close (&perfcnt->mapping->obj->base.base, file_priv); +panfrost_mmu_as_put (pfdev, perfcnt->mapping->mmu);panfrost_gem_mapping_put (perfcnt->mapping); perfcnt->mapping =NULL ;pm_runtime_mark_last_busy (pfdev->dev);
drivers/infiniband/ulp/isert/ib_isert.c +12 -0
@@ -2575,6 +2575,17 @@ isert_wait4logout(struct isert_conn *isert_conn) } } +static void +isert_wait4cmds (struct iscsi_conn *conn) +{ +isert_info ("iscsi_conn %p\n" , conn); + +if (conn->sess) { +target_sess_cmd_list_set_waiting (conn->sess->se_sess); +target_wait_for_sess_cmds (conn->sess->se_sess); + } +} +/** * isert_put_unsol_pending_cmds() - Drop commands waiting for * unsolicitate dataout
@@ -2622,6 +2633,7 @@ static void isert_wait_conn(struct iscsi_conn *conn)ib_drain_qp (isert_conn->qp);isert_put_unsol_pending_cmds (conn); +isert_wait4cmds (conn);isert_wait4logout (isert_conn);queue_work (isert_release_wq, &isert_conn->release_work);
drivers/iommu/qcom_iommu.c +12 -16
@@ -345,21 +345,19 @@ static void qcom_iommu_domain_free(struct iommu_domain *domain) {struct qcom_iommu_domain *qcom_domain =to_qcom_iommu_domain (domain); -if (WARN_ON (qcom_domain->iommu))/* forgot to detach? */ -return ; -iommu_put_dma_cookie (domain); -/* NOTE: unmap can be called after client device is powered off, -* for example, with GPUs or anything involving dma-buf. So we -* cannot rely on the device_link. Make sure the IOMMU is on to -* avoid unclocked accesses in the TLB inv path: -*/ -pm_runtime_get_sync (qcom_domain->iommu->dev); - -free_io_pgtable_ops (qcom_domain->pgtbl_ops); - -pm_runtime_put_sync (qcom_domain->iommu->dev); +if (qcom_domain->iommu) { +/* +* NOTE: unmap can be called after client device is powered +* off, for example, with GPUs or anything involving dma-buf. +* So we cannot rely on the device_link. Make sure the IOMMU +* is on to avoid unclocked accesses in the TLB inv path: +*/ +pm_runtime_get_sync (qcom_domain->iommu->dev); +free_io_pgtable_ops (qcom_domain->pgtbl_ops); +pm_runtime_put_sync (qcom_domain->iommu->dev); + }kfree (qcom_domain); }
@@ -405,7 +403,7 @@ static void qcom_iommu_detach_dev(struct iommu_domain *domain, struct device *destruct qcom_iommu_domain *qcom_domain =to_qcom_iommu_domain (domain);unsigned i; -if (!qcom_domain->iommu) +if (WARN_ON (!qcom_domain->iommu))return ;pm_runtime_get_sync (qcom_iommu->dev);
@@ -418,8 +416,6 @@ static void qcom_iommu_detach_dev(struct iommu_domain *domain, struct device *de ctx->domain =NULL ; }pm_runtime_put_sync (qcom_iommu->dev); - - qcom_domain->iommu =NULL ; } static int qcom_iommu_map(struct iommu_domain *domain, unsigned long iova,
drivers/net/ethernet/intel/e1000e/netdev.c +35 -33
121 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en/health.c +1 -1
@@ -200,7 +200,7 @@ int mlx5e_health_report(struct mlx5e_priv *priv,netdev_err (priv->netdev, err_str);if (!reporter) -return err_ctx->recover (&err_ctx->ctx); +return err_ctx->recover (err_ctx->ctx);return devlink_health_report (reporter, err_str, err_ctx); }
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +8 -0
@@ -179,6 +179,14 @@ mlx5e_tx_dma_unmap(struct device *pdev, struct mlx5e_sq_dma *dma) } } +static inline void mlx5e_rqwq_reset (struct mlx5e_rq *rq) +{ +if (rq->wq_type ==MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ) +mlx5_wq_ll_reset (&rq->mpwqe.wq); +else +mlx5_wq_cyc_reset (&rq->wqe.wq); +} +/* SW parser related functions */ struct mlx5e_swp_spec {
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +3 -0
@@ -723,6 +723,9 @@ int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state, int next_state)if (!in)return -ENOMEM ; +if (curr_state ==MLX5_RQC_STATE_RST && next_state ==MLX5_RQC_STATE_RDY ) +mlx5e_rqwq_reset (rq); + rqc =MLX5_ADDR_OF (modify_rq_in, in, ctx);MLX5_SET (modify_rq_in, in, rq_state, curr_state);
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +3 -11
@@ -2319,25 +2319,17 @@ int mlx5_eswitch_set_vepa(struct mlx5_eswitch *esw, u8 setting)int mlx5_eswitch_get_vepa (struct mlx5_eswitch *esw,u8 *setting) { -int err =0 ; -if (!esw)return -EOPNOTSUPP ;if (!ESW_ALLOWED (esw))return -EPERM ; -mutex_lock (&esw->state_lock); -if (esw->mode !=MLX5_ESWITCH_LEGACY ) { - err = -EOPNOTSUPP ; - goto out; - } +if (esw->mode !=MLX5_ESWITCH_LEGACY ) +return -EOPNOTSUPP ; *setting = esw->fdb_table.legacy.vepa_uplink_rule ?1 :0 ; - -out: -mutex_unlock (&esw->state_lock); -return err; +return 0 ; } int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,
drivers/net/ethernet/mellanox/mlx5/core/wq.c +30 -9
@@ -96,6 +96,13 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,return err; } +void mlx5_wq_cyc_reset (struct mlx5_wq_cyc *wq) +{ + wq->wqe_ctr =0 ; + wq->cur_sz =0 ; +mlx5_wq_cyc_update_db_record (wq); +} +int mlx5_wq_qp_create (struct mlx5_core_dev *mdev,struct mlx5_wq_param *param,void *qpc,struct mlx5_wq_qp *wq,struct mlx5_wq_ctrl *wq_ctrl)
@@ -194,6 +201,19 @@ int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,return err; } +static void mlx5_wq_ll_init_list (struct mlx5_wq_ll *wq) +{ +struct mlx5_wqe_srq_next_seg *next_seg; +int i; + +for (i =0 ; i < wq->fbc.sz_m1; i++) { + next_seg =mlx5_wq_ll_get_wqe (wq, i); + next_seg->next_wqe_index =cpu_to_be16 (i +1 ); + } + next_seg =mlx5_wq_ll_get_wqe (wq, i); + wq->tail_next = &next_seg->next_wqe_index; +} +int mlx5_wq_ll_create (struct mlx5_core_dev *mdev,struct mlx5_wq_param *param,void *wqc,struct mlx5_wq_ll *wq,struct mlx5_wq_ctrl *wq_ctrl)
@@ -201,9 +221,7 @@ int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,u8 log_wq_stride =MLX5_GET (wq, wqc, log_wq_stride);u8 log_wq_sz =MLX5_GET (wq, wqc, log_wq_sz);struct mlx5_frag_buf_ctrl *fbc = &wq->fbc; -struct mlx5_wqe_srq_next_seg *next_seg;int err; -int i; err =mlx5_db_alloc_node (mdev, &wq_ctrl->db, param->db_numa_node);if (err) {
@@ -222,13 +240,7 @@ int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,mlx5_init_fbc (wq_ctrl->buf.frags, log_wq_stride, log_wq_sz, fbc); -for (i =0 ; i < fbc->sz_m1; i++) { - next_seg =mlx5_wq_ll_get_wqe (wq, i); - next_seg->next_wqe_index =cpu_to_be16 (i +1 ); - } - next_seg =mlx5_wq_ll_get_wqe (wq, i); - wq->tail_next = &next_seg->next_wqe_index; - +mlx5_wq_ll_init_list (wq); wq_ctrl->mdev = mdev;return 0 ;
@@ -239,6 +251,15 @@ int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,return err; } +void mlx5_wq_ll_reset (struct mlx5_wq_ll *wq) +{ + wq->head =0 ; + wq->wqe_ctr =0 ; + wq->cur_sz =0 ; +mlx5_wq_ll_init_list (wq); +mlx5_wq_ll_update_db_record (wq); +} +void mlx5_wq_destroy (struct mlx5_wq_ctrl *wq_ctrl) {mlx5_frag_buf_free (wq_ctrl->mdev, &wq_ctrl->buf);
drivers/net/ethernet/mellanox/mlx5/core/wq.h +2 -0
@@ -80,10 +80,12 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param, void *wqc, struct mlx5_wq_cyc *wq, struct mlx5_wq_ctrl *wq_ctrl);u32 mlx5_wq_cyc_get_size (struct mlx5_wq_cyc *wq); +void mlx5_wq_cyc_reset (struct mlx5_wq_cyc *wq);int mlx5_wq_qp_create (struct mlx5_core_dev *mdev,struct mlx5_wq_param *param,void *qpc,struct mlx5_wq_qp *wq,struct mlx5_wq_ctrl *wq_ctrl); +void mlx5_wq_ll_reset (struct mlx5_wq_ll *wq); int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param, void *cqc, struct mlx5_cqwq *wq,
drivers/nvme/host/multipath.c +1 -0
@@ -711,6 +711,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) }INIT_WORK (&ctrl->ana_work, nvme_ana_work); +kfree (ctrl->ana_log_buf); ctrl->ana_log_buf =kmalloc (ctrl->ana_log_size,GFP_KERNEL );if (!ctrl->ana_log_buf) { error = -ENOMEM ;
drivers/staging/android/ashmem.c +28 -0
@@ -351,8 +351,23 @@ static inline vm_flags_t calc_vm_may_flags(unsigned long prot)_calc_vm_trans (prot,PROT_EXEC ,VM_MAYEXEC ); } +static int ashmem_vmfile_mmap (struct file *file,struct vm_area_struct *vma) +{ +/* do not allow to mmap ashmem backing shmem file directly */ +return -EPERM ; +} + +static unsigned long +ashmem_vmfile_get_unmapped_area (struct file *file,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +return current->mm->get_unmapped_area (file, addr, len, pgoff, flags); +} +static int ashmem_mmap (struct file *file,struct vm_area_struct *vma) { +static struct file_operations vmfile_fops;struct ashmem_area *asma = file->private_data;int ret =0 ;
@@ -393,6 +408,19 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) } vmfile->f_mode |=FMODE_LSEEK ; asma->file = vmfile; +/* +* override mmap operation of the vmfile so that it can't be +* remapped which would lead to creation of a new vma with no +* asma permission checks. Have to override get_unmapped_area +* as well to prevent VM_BUG_ON check for f_ops modification. +*/ +if (!vmfile_fops.mmap) { + vmfile_fops = *vmfile->f_op; + vmfile_fops.mmap = ashmem_vmfile_mmap; + vmfile_fops.get_unmapped_area = + ashmem_vmfile_get_unmapped_area; + } + vmfile->f_op = &vmfile_fops; }get_file (asma->file);
drivers/staging/greybus/audio_manager.c +1 -1
@@ -92,8 +92,8 @@ void gb_audio_manager_remove_all(void)list_for_each_entry_safe (module, next, &modules_list, list) {list_del (&module->list); -kobject_put (&module->kobj);ida_simple_remove (&module_id, module->id); +kobject_put (&module->kobj); } is_empty =list_empty (&modules_list);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +2 -2
@@ -2025,7 +2025,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)struct ieee_param *param;uint ret =0 ; -if (p->length <sizeof (struct ieee_param ) || !p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
@@ -2812,7 +2812,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) goto out; } -if (!p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +2 -3
@@ -476,14 +476,13 @@ int rtl8723bs_xmit_thread(void *context)s32 ret;struct adapter *padapter;struct xmit_priv *pxmitpriv; -u8 thread_name[20 ] ="RTWHALXT" ; - +u8 thread_name[20 ]; ret = _SUCCESS; padapter = context; pxmitpriv = &padapter->xmitpriv; -rtw_sprintf (thread_name,20 ,"%s-" ADPT_FMT , thread_name,ADPT_ARG (padapter)); +rtw_sprintf (thread_name,20 ,"RTWHALXT-" ADPT_FMT ,ADPT_ARG (padapter));thread_enter (thread_name);DBG_871X ("start " FUNC_ADPT_FMT "\n" ,FUNC_ADPT_ARG (padapter));
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +2 -2
@@ -3379,7 +3379,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)/* down(&ieee->wx_sem); */ -if (p->length <sizeof (struct ieee_param ) || !p->pointer) { +if (!p->pointer || p->length !=sizeof (struct ieee_param )) { ret = -EINVAL ; goto out; }
@@ -4213,7 +4213,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)/* if (p->length < sizeof(struct ieee_param) || !p->pointer) { */ -if (!p->pointer) { +if (!p->pointer || p->length !=sizeof (*param)) { ret = -EINVAL ; goto out; }
drivers/staging/vt6656/dpc.c +1 -1
@@ -130,7 +130,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,vnt_rf_rssi_to_dbm (priv, *rssi, &rx_dbm); - priv->bb_pre_ed_rssi = (u8 )rx_dbm +1 ; + priv->bb_pre_ed_rssi = (u8)-rx_dbm +1 ; priv->current_rssi = priv->bb_pre_ed_rssi;skb_pull (skb,8 );
drivers/target/iscsi/iscsi_target.c +5 -11
@@ -1165,9 +1165,7 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, hdr->cmdsn,be32_to_cpu (hdr->data_length), payload_length, conn->cid); -if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) -return iscsit_add_reject_cmd (cmd, -ISCSI_REASON_WAITING_FOR_LOGOUT , buf); +target_get_sess_cmd (&cmd->se_cmd, true); cmd->sense_reason =transport_lookup_cmd_lun (&cmd->se_cmd,scsilun_to_int (&hdr->lun));
@@ -2004,9 +2002,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, conn->sess->se_sess,0 ,DMA_NONE , TCM_SIMPLE_TAG, cmd->sense_buffer + 2); -if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) -return iscsit_add_reject_cmd (cmd, -ISCSI_REASON_WAITING_FOR_LOGOUT , buf); +target_get_sess_cmd (&cmd->se_cmd, true);/* * TASK_REASSIGN for ERL=2 / connection stays inside of
@@ -4151,6 +4147,9 @@ int iscsit_close_connection(iscsit_stop_nopin_response_timer (conn);iscsit_stop_nopin_timer (conn); +if (conn->conn_transport->iscsit_wait_conn) + conn->conn_transport->iscsit_wait_conn (conn); +/* * During Connection recovery drop unacknowledged out of order * commands for this connection, and prepare the other commands
@@ -4233,11 +4232,6 @@ int iscsit_close_connection(* must wait until they have completed. */ iscsit_check_conn_usage_count (conn); -target_sess_cmd_list_set_waiting (sess->se_sess); -target_wait_for_sess_cmds (sess->se_sess); - -if (conn->conn_transport->iscsit_wait_conn) - conn->conn_transport->iscsit_wait_conn (conn);ahash_request_free (conn->conn_tx_hash);if (conn->conn_rx_hash) {
drivers/target/target_core_transport.c +28 -3
@@ -666,6 +666,11 @@ static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd)target_remove_from_state_list (cmd); +/* +* Clear struct se_cmd->se_lun before the handoff to FE. +*/ + cmd->se_lun =NULL ; +spin_lock_irqsave (&cmd->t_state_lock, flags);/* * Determine if frontend context caller is requesting the stopping of
@@ -693,6 +698,17 @@ static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd)return cmd->se_tfo->check_stop_free (cmd); } +static void transport_lun_remove_cmd (struct se_cmd *cmd) +{ +struct se_lun *lun = cmd->se_lun; + +if (!lun) +return ; + +if (cmpxchg (&cmd->lun_ref_active, true, false)) +percpu_ref_put (&lun->lun_ref); +} +static void target_complete_failure_work (struct work_struct *work) { struct se_cmd *cmd = container_of(work, struct se_cmd, work);
@@ -783,6 +799,8 @@ static void target_handle_abort(struct se_cmd *cmd)WARN_ON_ONCE (kref_read (&cmd->cmd_kref) ==0 ); +transport_lun_remove_cmd (cmd); +transport_cmd_check_stop_to_fabric (cmd); }
@@ -1695,6 +1713,7 @@ static void target_complete_tmr_failure(struct work_struct *work) se_cmd->se_tmr_req->response =TMR_LUN_DOES_NOT_EXIST ; se_cmd->se_tfo->queue_tm_rsp (se_cmd); +transport_lun_remove_cmd (se_cmd);transport_cmd_check_stop_to_fabric (se_cmd); }
@@ -1885,6 +1904,7 @@ void transport_generic_request_failure(struct se_cmd *cmd, goto queue_full; check_stop: +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd);return ;
@@ -2182,6 +2202,7 @@ static void transport_complete_qf(struct se_cmd *cmd)transport_handle_queue_full (cmd, cmd->se_dev, ret, false);return ; } +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd); }
@@ -2276,6 +2297,7 @@ static void target_complete_ok_work(struct work_struct *work)if (ret) goto queue_full; +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd);return ; }
@@ -2301,6 +2323,7 @@ static void target_complete_ok_work(struct work_struct *work)if (ret) goto queue_full; +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd);return ; }
@@ -2336,6 +2359,7 @@ static void target_complete_ok_work(struct work_struct *work)if (ret) goto queue_full; +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd);return ; }
@@ -2371,6 +2395,7 @@ static void target_complete_ok_work(struct work_struct *work)break ; } +transport_lun_remove_cmd (cmd);transport_cmd_check_stop_to_fabric (cmd);return ;
@@ -2697,6 +2722,9 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)*/ if (cmd->state_active)target_remove_from_state_list (cmd); + +if (cmd->se_lun) +transport_lun_remove_cmd (cmd); }if (aborted) cmd->free_compl = &compl;
@@ -2768,9 +2796,6 @@ static void target_release_cmd_kref(struct kref *kref)struct completion *abrt_compl = se_cmd->abrt_compl;unsigned long flags; -if (se_cmd->lun_ref_active) -percpu_ref_put (&se_cmd->se_lun->lun_ref); -if (se_sess) {spin_lock_irqsave (&se_sess->sess_cmd_lock, flags);list_del_init (&se_cmd->se_cmd_list);
drivers/thunderbolt/switch.c +7 -0
@@ -274,6 +274,12 @@ static int tb_switch_nvm_read(void *priv, unsigned int offset, void *val,return ret; } +static int tb_switch_nvm_no_read (void *priv,unsigned int offset,void *val, +size_t bytes) +{ +return -EPERM ; +} +static int tb_switch_nvm_write (void *priv,unsigned int offset,void *val,size_t bytes) {
@@ -319,6 +325,7 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id, config.read_only = true; }else { config.name ="nvm_non_active" ; + config.reg_read = tb_switch_nvm_no_read; config.reg_write = tb_switch_nvm_write; config.root_only = true; }
drivers/tty/serdev/serdev-ttyport.c +2 -4
@@ -265,7 +265,6 @@ struct device *serdev_tty_port_register(struct tty_port *port,struct device *parent, struct tty_driver *drv, int idx) { - const struct tty_port_client_operations *old_ops; struct serdev_controller *ctrl;struct serport *serport;int ret;
@@ -284,7 +283,6 @@ struct device *serdev_tty_port_register(struct tty_port *port, ctrl->ops = &ctrl_ops; - old_ops = port->client_ops; port->client_ops = &client_ops; port->client_data = ctrl;
@@ -297,7 +295,7 @@ struct device *serdev_tty_port_register(struct tty_port *port, err_reset_data: port->client_data =NULL ; - port->client_ops = old_ops; + port->client_ops = &tty_port_default_client_ops;serdev_controller_put (ctrl);return ERR_PTR (ret);
@@ -312,8 +310,8 @@ int serdev_tty_port_unregister(struct tty_port *port)return -ENODEV ;serdev_controller_remove (ctrl); - port->client_ops =NULL ; port->client_data =NULL ; + port->client_ops = &tty_port_default_client_ops;serdev_controller_put (ctrl);return 0 ;
drivers/tty/serial/8250/8250_aspeed_vuart.c +0 -1
@@ -379,7 +379,6 @@ static int aspeed_vuart_probe(struct platform_device *pdev) port.port.line = rc; port.port.irq =irq_of_parse_and_map (np,0 ); - port.port.irqflags =IRQF_SHARED ; port.port.handle_irq = aspeed_vuart_handle_irq; port.port.iotype =UPIO_MEM ; port.port.type =PORT_16550A ;
drivers/tty/serial/8250/8250_core.c +2 -3
@@ -174,7 +174,7 @@ static int serial_link_irq_chain(struct uart_8250_port *up)struct hlist_head *h;struct hlist_node *n;struct irq_info *i; -int ret, irq_flags = up->port.flags &UPF_SHARE_IRQ ?IRQF_SHARED :0 ; +int ret;mutex_lock (&hash_mutex);
@@ -209,9 +209,8 @@ static int serial_link_irq_chain(struct uart_8250_port *up)INIT_LIST_HEAD (&up->list); i->head = &up->list;spin_unlock_irq (&i->lock); - irq_flags |= up->port.irqflags; ret =request_irq (up->port.irq, serial8250_interrupt, - irq_flags, up->port.name, i); + up->port.irqflags, up->port.name, i);if (ret <0 )serial_do_unlink (i, up); }
drivers/tty/serial/8250/8250_of.c +0 -1
@@ -172,7 +172,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev, port->type = type; port->uartclk = clk; - port->irqflags |=IRQF_SHARED ;if (of_property_read_bool (np,"no-loopback-test" )) port->flags |=UPF_SKIP_TEST ;
drivers/tty/serial/8250/8250_port.c +4 -0
@@ -2192,6 +2192,10 @@ int serial8250_do_startup(struct uart_port *port) } } +/* Check if we need to have shared IRQs */ +if (port->irq && (up->port.flags &UPF_SHARE_IRQ )) + up->port.irqflags |=IRQF_SHARED ; +if (port->irq && !(up->port.flags &UPF_NO_THRE_TEST )) {unsigned char iir1;/*
drivers/tty/serial/atmel_serial.c +2 -1
@@ -574,7 +574,8 @@ static void atmel_stop_tx(struct uart_port *port)atmel_uart_writel (port,ATMEL_US_IDR , atmel_port->tx_done_mask);if (atmel_uart_is_half_duplex (port)) -atmel_start_rx (port); +if (!atomic_read (&atmel_port->tasklet_shutdown)) +atmel_start_rx (port); }
drivers/tty/serial/imx.c +1 -1
@@ -603,7 +603,7 @@ static void imx_uart_dma_tx(struct imx_port *sport) sport->tx_bytes =uart_circ_chars_pending (xmit); -if (xmit->tail < xmit->head) { +if (xmit->tail < xmit->head || xmit->head ==0 ) { sport->dma_tx_nents =1 ;sg_init_one (sgl, xmit->buf + xmit->tail, sport->tx_bytes); }else {
drivers/tty/serial/qcom_geni_serial.c +14 -4
@@ -125,6 +125,7 @@ static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop);static int handle_rx_uart (struct uart_port *uport,u32 bytes,bool drop);static unsigned int qcom_geni_serial_tx_empty (struct uart_port *port);static void qcom_geni_serial_stop_rx (struct uart_port *uport); +static void qcom_geni_serial_handle_rx (struct uart_port *uport,bool drop);static const unsigned long root_freq[] = {7372800 ,14745600 ,19200000 ,29491200 ,32000000 ,48000000 ,64000000 ,80000000 ,
@@ -615,7 +616,7 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport)u32 irq_en;u32 status;struct qcom_geni_serial_port *port =to_dev_port (uport, uport); -u32 irq_clear =S_CMD_DONE_EN ; +u32 s_irq_status; irq_en =readl (uport->membase +SE_GENI_S_IRQ_EN ); irq_en &= ~(S_RX_FIFO_WATERMARK_EN |S_RX_FIFO_LAST_EN );
@@ -631,10 +632,19 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport)return ;geni_se_cancel_s_cmd (&port->se); -qcom_geni_serial_poll_bit (uport,SE_GENI_S_CMD_CTRL_REG , -S_GENI_CMD_CANCEL , false); +qcom_geni_serial_poll_bit (uport,SE_GENI_S_IRQ_STATUS , +S_CMD_CANCEL_EN , true); +/* +* If timeout occurs secondary engine remains active +* and Abort sequence is executed. +*/ + s_irq_status =readl (uport->membase +SE_GENI_S_IRQ_STATUS ); +/* Flush the Rx buffer */ +if (s_irq_status &S_RX_FIFO_LAST_EN ) +qcom_geni_serial_handle_rx (uport, true); +writel (s_irq_status, uport->membase +SE_GENI_S_IRQ_CLEAR ); + status =readl (uport->membase +SE_GENI_STATUS ); -writel (irq_clear, uport->membase +SE_GENI_S_IRQ_CLEAR );if (status &S_GENI_CMD_ACTIVE )qcom_geni_serial_abort_rx (uport); }
drivers/tty/tty_port.c +3 -2
@@ -52,10 +52,11 @@ static void tty_port_default_wakeup(struct tty_port *port) } } -static const struct tty_port_client_operations default_client_ops = { +const struct tty_port_client_operations tty_port_default_client_ops = { .receive_buf = tty_port_default_receive_buf, .write_wakeup = tty_port_default_wakeup, }; +EXPORT_SYMBOL_GPL (tty_port_default_client_ops);void tty_port_init (struct tty_port *port) {
@@ -68,7 +69,7 @@ void tty_port_init(struct tty_port *port)spin_lock_init (&port->lock); port->close_delay = (50 *HZ ) /100 ; port->closing_wait = (3000 *HZ ) /100 ; - port->client_ops = &default_client_ops; + port->client_ops = &tty_port_default_client_ops;kref_init (&port->kref); }EXPORT_SYMBOL (tty_port_init);
drivers/tty/vt/selection.c +8 -1
@@ -29,6 +29,8 @@#include <linux/console.h> #include <linux/tty_flip.h> +#include <linux/sched/signal.h> +/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ #define isspace (c) ((c) == ' ')
@@ -350,6 +352,7 @@ int paste_selection(struct tty_struct *tty)unsigned int count;struct tty_ldisc *ld;DECLARE_WAITQUEUE (wait, current); +int ret =0 ;console_lock ();poke_blanked_console ();
@@ -363,6 +366,10 @@ int paste_selection(struct tty_struct *tty)add_wait_queue (&vc->paste_wait, &wait);while (sel_buffer && sel_buffer_lth > pasted) {set_current_state (TASK_INTERRUPTIBLE ); +if (signal_pending (current)) { + ret = -EINTR ; +break ; + }if (tty_throttled (tty)) {schedule ();continue ;
@@ -378,6 +385,6 @@ int paste_selection(struct tty_struct *tty)tty_buffer_unlock_exclusive (&vc->port);tty_ldisc_deref (ld); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (paste_selection);
drivers/tty/vt/vt.c +13 -2
@@ -936,10 +936,21 @@ static void flush_scrollback(struct vc_data *vc)WARN_CONSOLE_UNLOCKED ();set_origin (vc); -if (vc->vc_sw->con_flush_scrollback) +if (vc->vc_sw->con_flush_scrollback) { vc->vc_sw->con_flush_scrollback (vc); -else + }else if (con_is_visible (vc)) { +/* +* When no con_flush_scrollback method is provided then the +* legacy way for flushing the scrollback buffer is to use +* a side effect of the con_switch method. We do it only on +* the foreground console as background consoles have no +* scrollback buffers in that case and we obviously don't +* want to switch to them. +*/ +hide_cursor (vc); vc->vc_sw->con_switch (vc); +set_cursor (vc); + } }/*
drivers/tty/vt/vt_ioctl.c +11 -6
@@ -876,15 +876,20 @@ int vt_ioctl(struct tty_struct *tty,return -EINVAL ;for (i =0 ; i <MAX_NR_CONSOLES ; i++) { +struct vc_data *vcp; +if (!vc_cons[i].d)continue ;console_lock (); -if (v.v_vlin) - vc_cons[i].d->vc_scan_lines = v.v_vlin; -if (v.v_clin) - vc_cons[i].d->vc_font.height = v.v_clin; - vc_cons[i].d->vc_resize_user =1 ; -vc_resize (vc_cons[i].d, v.v_cols, v.v_rows); + vcp = vc_cons[i].d; +if (vcp) { +if (v.v_vlin) + vcp->vc_scan_lines = v.v_vlin; +if (v.v_clin) + vcp->vc_font.height = v.v_clin; + vcp->vc_resize_user =1 ; +vc_resize (vcp, v.v_cols, v.v_rows); + }console_unlock (); }break ;
drivers/usb/core/config.c +11 -0
@@ -256,6 +256,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, struct usb_host_interface *ifp, int num_ep, unsigned char *buffer, int size) { + struct usb_device *udev = to_usb_device(ddev);unsigned char *buffer0 = buffer;struct usb_endpoint_descriptor *d;struct usb_host_endpoint *endpoint;
@@ -297,6 +298,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, goto skip_to_next_endpoint_or_interface_descriptor; } +/* Ignore blacklisted endpoints */ +if (udev->quirks &USB_QUIRK_ENDPOINT_BLACKLIST ) { +if (usb_endpoint_is_blacklisted (udev, ifp, d)) { +dev_warn (ddev,"config %d interface %d altsetting %d has a blacklisted endpoint with address 0x%X, skipping\n" , + cfgno, inum, asnum, + d->bEndpointAddress); + goto skip_to_next_endpoint_or_interface_descriptor; + } + } + endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints]; ++ifp->desc.bNumEndpoints;
drivers/usb/core/hub.c +15 -5
@@ -37,7 +37,9 @@#include "otg_whitelist.h" #define USB_VENDOR_GENESYS_LOGIC 0x05e3 +#define USB_VENDOR_SMSC 0x0424#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01 +#define HUB_QUIRK_DISABLE_AUTOSUSPEND 0x02#define USB_TP_TRANSMISSION_DELAY 40/* ns */ #define USB_TP_TRANSMISSION_DELAY_MAX 65535/* ns */
@@ -1216,11 +1218,6 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)#ifdef CONFIG_PM udev->reset_resume =1 ;#endif -/* Don't set the change_bits when the device -* was powered off. -*/ -if (test_bit (port1, hub->power_bits)) -set_bit (port1, hub->change_bits); }else {/* The power session is gone; tell hub_wq */
@@ -1730,6 +1727,10 @@ static void hub_disconnect(struct usb_interface *intf)kfree (hub->buffer);pm_suspend_ignore_children (&intf->dev, false); + +if (hub->quirk_disable_autosuspend) +usb_autopm_put_interface (intf); +kref_put (&hub->kref, hub_release); }
@@ -1862,6 +1863,11 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)if (id->driver_info &HUB_QUIRK_CHECK_PORT_AUTOSUSPEND ) hub->quirk_check_port_auto_suspend =1 ; +if (id->driver_info &HUB_QUIRK_DISABLE_AUTOSUSPEND ) { + hub->quirk_disable_autosuspend =1 ; +usb_autopm_get_interface (intf); + } +if (hub_configure (hub, &desc->endpoint[0 ].desc) >=0 )return 0 ;
@@ -5484,6 +5490,10 @@ static void hub_event(struct work_struct *work) }static const struct usb_device_id hub_id_table[] = { + { .match_flags =USB_DEVICE_ID_MATCH_VENDOR |USB_DEVICE_ID_MATCH_INT_CLASS , + .idVendor =USB_VENDOR_SMSC , + .bInterfaceClass =USB_CLASS_HUB , + .driver_info =HUB_QUIRK_DISABLE_AUTOSUSPEND }, { .match_flags =USB_DEVICE_ID_MATCH_VENDOR |USB_DEVICE_ID_MATCH_INT_CLASS , .idVendor =USB_VENDOR_GENESYS_LOGIC ,
drivers/usb/core/hub.h +1 -0
@@ -61,6 +61,7 @@ struct usb_hub { unsigned quiescing:1; unsigned disconnected:1; unsigned in_reset:1; + unsigned quirk_disable_autosuspend:1; unsigned quirk_check_port_auto_suspend:1;
drivers/usb/core/quirks.c +40 -0
@@ -354,6 +354,10 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x0904, 0x6103), .driver_info = USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL }, + /* Sound Devices USBPre2 */ + { USB_DEVICE(0x0926, 0x0202), .driver_info = + USB_QUIRK_ENDPOINT_BLACKLIST }, + /* Keytouch QWERTY Panel keyboard */ { USB_DEVICE(0x0926, 0x3333), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS },
@@ -445,6 +449,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* INTEL VALUE SSD */ { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, + /* novation SoundControl XL */ + { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, + { }/* terminating entry must be last */ };
@@ -472,6 +479,39 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { { }/* terminating entry must be last */ }; +/* +* Entries for blacklisted endpoints that should be ignored when parsing +* configuration descriptors. +* +* Matched for devices with USB_QUIRK_ENDPOINT_BLACKLIST. +*/ +static const struct usb_device_id usb_endpoint_blacklist[] = { + {USB_DEVICE_INTERFACE_NUMBER (0x0926 ,0x0202 ,1 ), .driver_info =0x85 }, + { } +}; + +bool usb_endpoint_is_blacklisted (struct usb_device *udev, +struct usb_host_interface *intf, +struct usb_endpoint_descriptor *epd) +{ +const struct usb_device_id *id; +unsigned int address; + +for (id = usb_endpoint_blacklist; id->match_flags; ++id) { +if (!usb_match_device (udev, id)) +continue ; + +if (!usb_match_one_id_intf (udev, intf, id)) +continue ; + + address = id->driver_info; +if (address == epd->bEndpointAddress) +return true; + } + +return false; +} +static bool usb_match_any_interface (struct usb_device *udev,const struct usb_device_id *id) {
drivers/usb/core/usb.h +3 -0
@@ -37,6 +37,9 @@ extern void usb_authorize_interface(struct usb_interface *);extern void usb_detect_quirks (struct usb_device *udev);extern void usb_detect_interface_quirks (struct usb_device *udev);extern void usb_release_quirk_list (void ); +extern bool usb_endpoint_is_blacklisted (struct usb_device *udev, +struct usb_host_interface *intf, +struct usb_endpoint_descriptor *epd);extern int usb_remove_device (struct usb_device *udev); extern int usb_get_device_descriptor(struct usb_device *dev,
drivers/usb/dwc2/gadget.c +23 -17
@@ -1083,11 +1083,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,else packets =1 ;/* send one packet if length is zero. */ -if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) { -dev_err (hsotg->dev,"req length > maxpacket*mc\n" ); -return ; - } -if (dir_in && index !=0 )if (hs_ep->isochronous) epsize =DXEPTSIZ_MC (packets);
@@ -1391,6 +1386,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, req->actual =0 ; req->status = -EINPROGRESS ; +/* Don't queue ISOC request if length greater than mps*mc */ +if (hs_ep->isochronous && + req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) { +dev_err (hs->dev,"req length > maxpacket*mc\n" ); +return -EINVAL ; + } +/* In DDMA mode for ISOC's don't queue request if length greater * than descriptor limits. */
@@ -1632,6 +1634,7 @@ static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg,struct dwc2_hsotg_ep *ep0 = hsotg->eps_out[0 ];struct dwc2_hsotg_ep *ep;__le16 reply; +u16 status;int ret;dev_dbg (hsotg->dev,"%s: USB_REQ_GET_STATUS\n" , __func__);
@@ -1643,11 +1646,10 @@ static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg,switch (ctrl->bRequestType &USB_RECIP_MASK ) {case USB_RECIP_DEVICE : -/* -* bit 0 => self powered -* bit 1 => remote wakeup -*/ - reply =cpu_to_le16 (0 ); + status =1 <<USB_DEVICE_SELF_POWERED ; + status |= hsotg->remote_wakeup_allowed << +USB_DEVICE_REMOTE_WAKEUP ; + reply =cpu_to_le16 (status);break ;case USB_RECIP_INTERFACE :
@@ -1758,7 +1760,10 @@ static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,case USB_RECIP_DEVICE :switch (wValue) {case USB_DEVICE_REMOTE_WAKEUP : - hsotg->remote_wakeup_allowed =1 ; +if (set) + hsotg->remote_wakeup_allowed =1 ; +else + hsotg->remote_wakeup_allowed =0 ;break ;case USB_DEVICE_TEST_MODE :
@@ -1768,16 +1773,17 @@ static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,return -EINVAL ; hsotg->test_mode = wIndex >>8 ; - ret =dwc2_hsotg_send_reply (hsotg, ep0,NULL ,0 ); -if (ret) { -dev_err (hsotg->dev, -"%s: failed to send reply\n" , __func__); -return ret; - }break ;default :return -ENOENT ; } + + ret =dwc2_hsotg_send_reply (hsotg, ep0,NULL ,0 ); +if (ret) { +dev_err (hsotg->dev, +"%s: failed to send reply\n" , __func__); +return ret; + }break ;case USB_RECIP_ENDPOINT :
drivers/usb/dwc3/debug.h +15 -24
@@ -256,86 +256,77 @@ static inline const char *dwc3_ep_event_string(char *str, size_t size,u8 epnum = event->endpoint_number;size_t len;int status; -int ret; - ret =snprintf (str, size,"ep%d%s: " , epnum >>1 , + len =scnprintf (str, size,"ep%d%s: " , epnum >>1 , (epnum &1 ) ?"in" :"out" ); -if (ret <0 ) -return "UNKNOWN" ; status = event->status;switch (event->endpoint_event) {case DWC3_DEPEVT_XFERCOMPLETE : - len =strlen (str); -snprintf (str + len, size - len,"Transfer Complete (%c%c%c)" , + len +=scnprintf (str + len, size - len, +"Transfer Complete (%c%c%c)" , status &DEPEVT_STATUS_SHORT ?'S' :'s' , status &DEPEVT_STATUS_IOC ?'I' :'i' , status &DEPEVT_STATUS_LST ?'L' :'l' ); - len =strlen (str); -if (epnum <=1 ) -snprintf (str + len, size - len," [%s]" , +scnprintf (str + len, size - len," [%s]" ,dwc3_ep0_state_string (ep0state));break ;case DWC3_DEPEVT_XFERINPROGRESS : - len =strlen (str); - -snprintf (str + len, size - len,"Transfer In Progress [%d] (%c%c%c)" , +scnprintf (str + len, size - len, +"Transfer In Progress [%d] (%c%c%c)" , event->parameters, status &DEPEVT_STATUS_SHORT ?'S' :'s' , status &DEPEVT_STATUS_IOC ?'I' :'i' , status &DEPEVT_STATUS_LST ?'M' :'m' );break ;case DWC3_DEPEVT_XFERNOTREADY : - len =strlen (str); - -snprintf (str + len, size - len,"Transfer Not Ready [%d]%s" , + len +=scnprintf (str + len, size - len, +"Transfer Not Ready [%d]%s" , event->parameters, status &DEPEVT_STATUS_TRANSFER_ACTIVE ?" (Active)" :" (Not Active)" ); - len =strlen (str); -/* Control Endpoints */ if (epnum <=1 ) {int phase =DEPEVT_STATUS_CONTROL_PHASE (event->status);switch (phase) {case DEPEVT_STATUS_CONTROL_DATA : -snprintf (str + ret, size - ret, +scnprintf (str + len, size - len," [Data Phase]" );break ;case DEPEVT_STATUS_CONTROL_STATUS : -snprintf (str + ret, size - ret, +scnprintf (str + len, size - len," [Status Phase]" ); } }break ;case DWC3_DEPEVT_RXTXFIFOEVT : -snprintf (str + ret, size - ret,"FIFO" ); +scnprintf (str + len, size - len,"FIFO" );break ;case DWC3_DEPEVT_STREAMEVT : status = event->status;switch (status) {case DEPEVT_STREAMEVT_FOUND : -snprintf (str + ret, size - ret," Stream %d Found" , +scnprintf (str + len, size - len," Stream %d Found" , event->parameters);break ;case DEPEVT_STREAMEVT_NOTFOUND :default : -snprintf (str + ret, size - ret," Stream Not Found" ); +scnprintf (str + len, size - len," Stream Not Found" );break ; }break ;case DWC3_DEPEVT_EPCMDCMPLT : -snprintf (str + ret, size - ret,"Endpoint Command Complete" ); +scnprintf (str + len, size - len,"Endpoint Command Complete" );break ;default : -snprintf (str, size,"UNKNOWN" ); +scnprintf (str + len, size - len,"UNKNOWN" ); }return str;
drivers/usb/dwc3/gadget.c +2 -1
@@ -2426,7 +2426,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,if (event->status &DEPEVT_STATUS_SHORT && !chain)return 1 ; -if (event->status &DEPEVT_STATUS_IOC ) +if ((trb->ctrl &DWC3_TRB_CTRL_IOC ) || + (trb->ctrl &DWC3_TRB_CTRL_LST ))return 1 ;return 0 ;
drivers/usb/gadget/composite.c +3 -5
@@ -437,12 +437,10 @@ static u8 encode_bMaxPower(enum usb_device_speed speed, val =CONFIG_USB_GADGET_VBUS_DRAW ;if (!val)return 0 ; -switch (speed) { -case USB_SPEED_SUPER : -return DIV_ROUND_UP (val,8 ); -default : +if (speed <USB_SPEED_SUPER )return DIV_ROUND_UP (val,2 ); - } +else +return DIV_ROUND_UP (val,8 ); } static int config_buf(struct usb_configuration *config,
drivers/usb/host/xhci-hub.c +17 -8
@@ -55,6 +55,7 @@ static u8 usb_bos_descriptor [] = {static int xhci_create_usb3_bos_desc (struct xhci_hcd *xhci,char *buf,u16 wLength) { +struct xhci_port_cap *port_cap =NULL ;int i, ssa_count;u32 temp;u16 desc_size, ssp_cap_size, ssa_size =0 ;
@@ -64,16 +65,24 @@ static int xhci_create_usb3_bos_desc(struct xhci_hcd *xhci, char *buf, ssp_cap_size =sizeof (usb_bos_descriptor) - desc_size;/* does xhci support USB 3.1 Enhanced SuperSpeed */ -if (xhci->usb3_rhub.min_rev >=0x01 ) { +for (i =0 ; i < xhci->num_port_caps; i++) { +if (xhci->port_caps[i].maj_rev ==0x03 && + xhci->port_caps[i].min_rev >=0x01 ) { + usb3_1 = true; + port_cap = &xhci->port_caps[i]; +break ; + } + } + +if (usb3_1) {/* does xhci provide a PSI table for SSA speed attributes? */ -if (xhci->usb3_rhub.psi_count) { +if (port_cap->psi_count) {/* two SSA entries for each unique PSI ID, RX and TX */ - ssa_count = xhci->usb3_rhub.psi_uid_count *2 ; + ssa_count = port_cap->psi_uid_count *2 ; ssa_size = ssa_count *sizeof (u32); ssp_cap_size -=16 ;/* skip copying the default SSA */ } desc_size += ssp_cap_size; - usb3_1 = true; }memcpy (buf, &usb_bos_descriptor,min (desc_size, wLength));
@@ -99,7 +108,7 @@ static int xhci_create_usb3_bos_desc(struct xhci_hcd *xhci, char *buf, }/* If PSI table exists, add the custom speed attributes from it */ -if (usb3_1 && xhci->usb3_rhub.psi_count) { +if (usb3_1 && port_cap->psi_count) {u32 ssp_cap_base, bm_attrib, psi, psi_mant, psi_exp;int offset;
@@ -111,7 +120,7 @@ static int xhci_create_usb3_bos_desc(struct xhci_hcd *xhci, char *buf,/* attribute count SSAC bits 4:0 and ID count SSIC bits 8:5 */ bm_attrib = (ssa_count -1 ) &0x1f ; - bm_attrib |= (xhci->usb3_rhub.psi_uid_count -1 ) <<5 ; + bm_attrib |= (port_cap->psi_uid_count -1 ) <<5 ;put_unaligned_le32 (bm_attrib, &buf[ssp_cap_base +4 ]);if (wLength < desc_size + ssa_size)
@@ -124,8 +133,8 @@ static int xhci_create_usb3_bos_desc(struct xhci_hcd *xhci, char *buf,* USB 3.1 requires two SSA entries (RX and TX) for every link */ offset = desc_size; -for (i =0 ; i < xhci->usb3_rhub.psi_count; i++) { - psi = xhci->usb3_rhub.psi[i]; +for (i =0 ; i < port_cap->psi_count; i++) { + psi = port_cap->psi[i]; psi &= ~USB_SSP_SUBLINK_SPEED_RSVD ; psi_exp =XHCI_EXT_PORT_PSIE (psi); psi_mant =XHCI_EXT_PORT_PSIM (psi);
drivers/usb/host/xhci-mem.c +46 -25
121 lines not on this page · raw message
drivers/usb/host/xhci-pci.c +6 -4
@@ -49,6 +49,7 @@#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI 0x15ec#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI 0x15f0#define PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI 0x8a13 +#define PCI_DEVICE_ID_INTEL_CML_XHCI 0xa3af#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
@@ -187,7 +188,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device ==PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_APL_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI)) { + pdev->device ==PCI_DEVICE_ID_INTEL_DNV_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_CML_XHCI)) { xhci->quirks |= XHCI_PME_STUCK_QUIRK; } if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
@@ -302,6 +304,9 @@ static int xhci_pci_setup(struct usb_hcd *hcd)if (!usb_hcd_is_primary_hcd (hcd))return 0 ; +if (xhci->quirks &XHCI_PME_STUCK_QUIRK ) +xhci_pme_acpi_rtd3_enable (pdev); +xhci_dbg (xhci,"Got SBRN %u\n" , (unsigned int ) xhci->sbrn);/* Find any debug ports */
@@ -359,9 +364,6 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams =1 ; -if (xhci->quirks &XHCI_PME_STUCK_QUIRK ) -xhci_pme_acpi_rtd3_enable (dev); -/* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */ pm_runtime_put_noidle (&dev->dev);
drivers/usb/host/xhci-ring.c +43 -17
33 lines not on this page · raw message
fs/ext4/mballoc.c +41 -20
61 lines not on this page · raw message
fs/ext4/resize.c +49 -13
62 lines not on this page · raw message
fs/ext4/super.c +77 -36
113 lines not on this page · raw message
fs/io_uring.c +19 -28
47 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +5 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.