Linux 5.10.199
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.199 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.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/admin-guide/sysctl/net.rst | 18 Documentation/networking/ip-sysctl.rst | 8 Makefile | 2 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 1 arch/arm64/include/asm/cpufeature.h | 3 arch/arm64/include/asm/exception.h | 13 arch/arm64/include/asm/spectre.h | 2 arch/arm64/include/asm/system_misc.h | 2 arch/arm64/include/asm/traps.h | 19 arch/arm64/kernel/armv8_deprecated.c | 572 +++++++-------- arch/arm64/kernel/cpufeature.c | 23 arch/arm64/kernel/entry-common.c | 36 arch/arm64/kernel/proton-pack.c | 26 arch/arm64/kernel/traps.c | 125 +-- arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 arch/powerpc/include/asm/nohash/64/pgtable.h | 2 arch/powerpc/include/asm/nohash/pgtable.h | 2 arch/riscv/net/bpf_jit_comp64.c | 33 arch/s390/pci/pci_dma.c | 15 arch/x86/boot/compressed/sev-es.c | 10 arch/x86/include/asm/msr-index.h | 9 arch/x86/kernel/alternative.c | 13 arch/x86/kernel/cpu/amd.c | 8 arch/x86/kernel/sev-es-shared.c | 53 + arch/x86/kernel/sev-es.c | 30 arch/x86/kvm/lapic.c | 8 drivers/acpi/irq.c | 7 drivers/acpi/resource.c | 121 ++- drivers/ata/libata-eh.c | 2 drivers/base/regmap/regmap.c | 2 drivers/bluetooth/hci_vhci.c | 3 drivers/counter/microchip-tcb-capture.c | 2 drivers/dma/mediatek/mtk-uart-apdma.c | 3 drivers/dma/stm32-mdma.c | 4 drivers/gpio/gpio-timberdale.c | 5 drivers/gpio/gpio-vf610.c | 4 drivers/gpu/drm/amd/display/dc/core/dc.c | 9 drivers/gpu/drm/drm_connector.c | 79 ++ drivers/gpu/drm/drm_crtc_internal.h | 2 drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 drivers/gpu/drm/drm_sysfs.c | 87 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 12 drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 drivers/gpu/drm/msm/dsi/dsi_host.c | 12 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 drivers/hid/hid-holtek-kbd.c | 4 drivers/hid/hid-logitech-hidpp.c | 3 drivers/hid/hid-multitouch.c | 4 drivers/i2c/i2c-mux.c | 2 drivers/iio/pressure/bmp280-core.c | 2 drivers/iio/pressure/dps310.c | 8 drivers/iio/pressure/ms5611_core.c | 2 drivers/infiniband/hw/cxgb4/cm.c | 3 drivers/infiniband/ulp/srp/ib_srp.c | 172 +--- drivers/infiniband/ulp/srp/ib_srp.h | 2 drivers/input/joystick/xpad.c | 2 drivers/input/misc/powermate.c | 1 drivers/input/mouse/elantech.c | 1 drivers/input/mouse/synaptics.c | 1 drivers/input/serio/i8042-acpipnpio.h | 8 drivers/input/touchscreen/goodix.c | 19 drivers/mcb/mcb-core.c | 10 drivers/mcb/mcb-parse.c | 2 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1 drivers/mmc/core/mmc.c | 2 drivers/mmc/core/sdio.c | 8 drivers/mtd/maps/physmap-core.c | 11 drivers/mtd/nand/raw/arasan-nand-controller.c | 16 drivers/mtd/nand/raw/marvell_nand.c | 23 drivers/mtd/nand/raw/qcom_nandc.c | 2 drivers/mtd/nand/spi/micron.c | 2 drivers/net/dsa/bcm_sf2.c | 24 drivers/net/ethernet/intel/i40e/i40e_common.c | 4 drivers/net/ethernet/intel/ice/ice_lib.c | 3 drivers/net/ethernet/intel/ice/ice_main.c | 15 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 drivers/net/ethernet/marvell/sky2.h | 2 drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 4 drivers/net/ethernet/qlogic/qed/qed_ll2.c | 7 drivers/net/ethernet/renesas/ravb_main.c | 6 drivers/net/ieee802154/ca8210.c | 17 drivers/net/macsec.c | 2 drivers/net/phy/mscc/mscc_macsec.c | 6 drivers/net/tun.c | 7 drivers/net/usb/dm9601.c | 7 drivers/net/usb/smsc95xx.c | 2 drivers/net/xen-netback/interface.c | 3 drivers/nvme/host/pci.c | 3 drivers/nvme/host/rdma.c | 3 drivers/nvme/target/tcp.c | 7 drivers/perf/arm-cmn.c | 2 drivers/phy/motorola/phy-mapphone-mdm6600.c | 38 drivers/pinctrl/renesas/Kconfig | 1 drivers/platform/x86/asus-nb-wmi.c | 3 drivers/platform/x86/asus-wmi.h | 2 drivers/platform/x86/touchscreen_dmi.c | 23 drivers/regulator/core.c | 6 drivers/spi/spi-zynqmp-gqspi.c | 24 drivers/tee/amdtee/core.c | 10 drivers/thunderbolt/icm.c | 38 drivers/thunderbolt/switch.c | 7 drivers/tty/serial/8250/8250_omap.c | 93 +- drivers/usb/core/hcd.c | 6 drivers/usb/core/hub.c | 106 ++ drivers/usb/core/hub.h | 2 drivers/usb/dwc3/core.c | 39 - drivers/usb/gadget/function/f_ncm.c | 26 drivers/usb/gadget/udc/udc-xilinx.c | 20 drivers/usb/host/xhci-hub.c | 228 ++--- drivers/usb/host/xhci-mem.c | 10 drivers/usb/host/xhci-ring.c | 17 drivers/usb/host/xhci.h | 9 drivers/usb/musb/musb_debugfs.c | 2 drivers/usb/musb/musb_host.c | 9 drivers/usb/serial/option.c | 7 drivers/usb/typec/altmodes/Kconfig | 1 drivers/usb/typec/altmodes/displayport.c | 28 fs/btrfs/extent-tree.c | 6 fs/btrfs/ioctl.c | 4 fs/btrfs/tree-log.c | 2 fs/ceph/file.c | 2 fs/ceph/inode.c | 4 fs/nfs/pnfs.c | 33 fs/overlayfs/copy_up.c | 2 fs/quota/dquot.c | 66 + include/drm/drm_connector.h | 25 include/linux/ioport.h | 7 include/linux/ipv6.h | 1 include/linux/mcb.h | 1 include/linux/netdevice.h | 2 include/linux/perf_event.h | 1 include/linux/quota.h | 4 include/linux/quotaops.h | 2 include/linux/usb.h | 2 include/net/bluetooth/hci_core.h | 2 include/net/bluetooth/hci_mon.h | 2 include/net/ip_fib.h | 1 include/net/macsec.h | 1 include/net/netns/xfrm.h | 1 include/net/tcp.h | 3 include/trace/events/neigh.h | 4 include/uapi/linux/ipv6.h | 7 kernel/cgroup/cgroup-v1.c | 5 kernel/events/core.c | 39 - kernel/trace/trace_events.c | 1 kernel/workqueue.c | 8 lib/Kconfig.debug | 5 lib/test_meminit.c | 2 mm/memory_hotplug.c | 16 net/bluetooth/hci_conn.c | 72 + net/bluetooth/hci_core.c | 8 net/bluetooth/hci_event.c | 33 net/bluetooth/hci_sock.c | 3 net/ceph/messenger.c | 4 net/core/pktgen.c | 14 net/ipv4/esp4.c | 4 net/ipv4/fib_semantics.c | 15 net/ipv4/fib_trie.c | 4 net/ipv4/tcp_ipv4.c | 1 net/ipv4/tcp_output.c | 25 net/ipv4/tcp_recovery.c | 2 net/ipv6/addrconf.c | 13 net/ipv6/esp6.c | 4 net/ipv6/ndisc.c | 13 net/ipv6/xfrm6_policy.c | 4 net/mac80211/tx.c | 3 net/netfilter/ipvs/ip_vs_sync.c | 4 net/netfilter/nft_payload.c | 2 net/netfilter/nft_set_rbtree.c | 2 net/nfc/llcp_core.c | 30 net/nfc/nci/core.c | 5 net/nfc/nci/spi.c | 2 net/rds/tcp_connect.c | 2 net/rds/tcp_listen.c | 2 net/rfkill/rfkill-gpio.c | 4 net/sched/sch_hfsc.c | 18 net/socket.c | 6 net/wireless/nl80211.c | 2 net/wireless/scan.c | 4 net/xfrm/xfrm_interface_core.c | 22 net/xfrm/xfrm_policy.c | 6 sound/soc/pxa/pxa-ssp.c | 2 tools/testing/selftests/vm/charge_reserved_hugetlb.sh | 34 tools/testing/selftests/vm/hugetlb_reparenting_test.sh | 21 tools/testing/selftests/vm/write_hugetlb_memory.sh | 2 187 files changed, 2094 insertions(+), 1182 deletions(-)
Abhinav Kumar (2):
drm/msm/dsi: skip the wait for video mode done if not applicable drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow
Alexander Zangerl (1):
iio: pressure: ms5611: ms5611_prom_is_valid false negative bug
Amelie Delaunay (1):
dmaengine: stm32-mdma: abort resume if no ongoing transfer
Andy Shevchenko (1):
Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()"
Arkadiusz Bokowy (1):
Bluetooth: vhci: Fix race when opening vhci device
Arnd Bergmann (1):
Bluetooth: avoid memcmp() out of bounds warning
Artem Chernyshev (1):
RDMA/cxgb4: Check skb value for failure to allocate
Avri Altman (1):
mmc: core: Capture correct oemid-bits for eMMC cards
Bagas Sanjaya (1):
Documentation: sysctl: align cells in second content column
Bart Van Assche (3):
RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent RDMA/srp: Do not call scsi_done() from srp_abort() RDMA/srp: Fix srp_abort()
Benjamin Berg (1):
wifi: cfg80211: avoid leaking stack data into trace
Benoît Monin (1):
USB: serial: option: add entry for Sierra EM9191 with new firmware
Bibek Kumar Patro (1):
mtd: rawnand: qcom: Unmap the right resource upon probe failure
Björn Töpel (1):
riscv, bpf: Sign-extend return values
Borislav Petkov (AMD) (2):
x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs x86/sev: Disable MMIO emulation from user mode
Chengfeng Ye (1):
gpio: timberdale: Fix potential deadlock on &tgpio->lock
Christophe Leroy (2):
powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE powerpc/64e: Fix wrong test in __ptep_test_and_clear_young()
Clément Léger (1):
tracing: relax trace_event_eval_update() execution with cond_resched()
Damien Le Moal (1):
ata: libata-eh: Fix compilation warning in ata_eh_link_report()
Dan Carpenter (5):
mlxsw: fix mlxsw_sp2_nve_vxlan_learning_set() return type
ixgbe: fix crash with empty VF macvlan list
ceph: fix type promotion bug on 32bit systems
net: usb: smsc95xx: Fix an error code in smsc95xx_reset()
ASoC: pxa: fix a memory leak in probe()
Daniel Miess (1):
drm/amd/display: Don't set dpms_off for seamless boot
Dharma Balasubiramani (1):
counter: microchip-tcb-capture: Fix the use of internal GCLK logic
Dinghao Liu (1):
ieee802154: ca8210: Fix a potential UAF in ca8210_probe
Dmitry Torokhov (1):
pinctrl: avoid unsafe code pattern in find_pinctrl()
Duoming Zhou (1):
dmaengine: mediatek: Fix deadlock caused by synchronize_irq()
Edward AD (1):
Bluetooth: hci_sock: fix slab oob read in create_monitor_event
Eric Dumazet (6):
net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn()
xfrm: fix a data-race in xfrm_gen_index()
xfrm: interface: use DEV_STATS_INC()
tcp: tsq: relax tcp_small_queue_check() when rtx queue contains a single skb
tun: prevent negative ifindex
ipv4: fib: annotate races around nh->nh_saddr_genid and nh->nh_saddr
Fabio Porcedda (1):
USB: serial: option: add Telit LE910C4-WWX 0x1035 composition
Filipe Manana (1):
btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1
Florian Westphal (1):
netfilter: nft_payload: fix wrong mac header matching
Gavrilov Ilia (1):
net: pktgen: Fix interface flags printing
Geert Uytterhoeven (2):
neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section
mtd: physmap-core: Restore map_rom fallback
Greg Kroah-Hartman (2):
lib/test_meminit: fix off-by-one error in test_pages() Linux 5.10.199
Haibo Chen (2):
mmc: core: sdio: hold retuning if sdio in 1-bit mode
gpio: vf610: set value before the direction to avoid a glitch
Hangbin Liu (1):
ipv4/fib: send notify when delete source address routes
Hans de Goede (11):
HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect
Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case
ACPI: resource: Add Asus ExpertBook B2502 to Asus quirks
ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA drm/connector: Give connector sysfs devices there own device_type drm/connector: Add a fwnode pointer to drm_connector and register with ACPI (v2) drm/connector: Add drm_connector_find_by_fwnode() function (v3) drm/connector: Add support for out-of-band hotplug notification (v3)
usb: typec: altmodes/displayport: Notify drm subsys of hotplug events platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events
Heiner Kallweit (1):
i2c: mux: Avoid potential false error message in i2c_mux_add_adapter
Hui Wang (1):
ACPI: resources: Add DMI-based legacy IRQ override quirk
Hyeonggon Yoo (1):
lib/Kconfig.debug: do not enable DEBUG_PREEMPT by default
Ilan Peer (1):
wifi: cfg80211: Fix 6GHz scan configuration
Jan Kara (1):
quota: Fix slow quotaoff
Javier Carrasco (2):
net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read
Input: powermate - fix use-after-free in powermate_config_complete
Jeff Layton (1):
overlayfs: set ctime when setting mtime and atime
Jeffery Miller (1):
Input: psmouse - fix fast_reconnect function for PS/2 mode
Jeremy Cline (1):
nfc: nci: assert requested protocol is valid
Jesse Brandeburg (2):
ice: fix over-shifted variable
ice: reset first in crash dump kernels
Jim Mattson (1):
KVM: x86: Mask LVTPC when handling a PMI
Jing Zhang (1):
perf/arm-cmn: Fix the unhandled overflow status of counter 4 to 7
Jinjie Ruan (1):
net: dsa: bcm_sf2: Fix possible memory leak in bcm_sf2_mdio_register()
Joerg Roedel (2):
x86/sev: Check IOBM for IOIO exceptions from user-space x86/sev: Check for user-space IOIO pointing to kernel space
Johan Hovold (1):
regmap: fix NULL deref on lookup
John Garry (2):
resource: Add irqresource_disabled()
ACPI: Drop acpi_dev_irqresource_disabled()
Jordan Rife (2):
net: prevent address rewrite in kernel_bind()
libceph: use kernel_connect()
Jorge Sanjuan Garcia (1):
mcb: remove is_added flag from mcb_device struct
Josef Bacik (2):
btrfs: initialize start_slot in btrfs_log_prealloc_extents
btrfs: fix some -Wmaybe-uninitialized warnings in ioctl.c
Josua Mayer (1):
net: rfkill: gpio: prevent value glitch during probe
Juntong Deng (1):
selftests/mm: fix awk usage in charge_reserved_hugetlb.sh and hugetlb_reparenting_test.sh that may cause error
Kai Uwe Broulik (1):
drm: panel-orientation-quirks: Add quirk for One Mix 2S
Kees Cook (2):
sky2: Make sure there is at least one frag_addr available
Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name
Keith Busch (1):
nvme-pci: add BOGUS_NID for Intel 0a54 device
Kellen Renshaw (1):
ACPI: resource: Add ASUS model S5402ZA to quirks
Kirill A. Shutemov (1):
x86/alternatives: Disable KASAN in apply_alternatives()
Konstantin Meskhidze (1):
drm/vmwgfx: fix typo of sizeof argument
Krishna Kurapati (1):
usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call
Krzysztof Kozlowski (1):
nfc: nci: fix possible NULL pointer dereference in send_acknowledge()
Kuogee Hsieh (1):
drm/msm/dp: do not reinitialize phy unless retry during link training
Lakshmi Yadlapati (1):
iio: pressure: dps310: Adjust Timeout Settings
Lee, Chun-Yi (2):
Bluetooth: hci_event: Ignore NULL link key
Bluetooth: Reject connection with the device which has same BD_ADDR
Liam Mark (1):
mm/memory_hotplug: rate limit page migration warnings
Luiz Augusto von Dentz (3):
Bluetooth: hci_event: Fix coding style
Bluetooth: hci_core: Fix build warnings
Bluetooth: hci_event: Fix using memcmp when comparing keys
Ma Ke (3):
net: ipv4: fix return value check in esp_remove_trailer
net: ipv6: fix return value check in esp_remove_trailer
HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event
Maher Sanalla (1):
net/mlx5: Handle fw tracer change ownership event based on MTRC
Manish Chopra (1):
qed: fix LL2 RX buffer allocation
Mark Rutland (14):
arm64: report EL1 UNDEFs better
arm64: die(): pass 'err' as long
arm64: consistently pass ESR_ELx to die()
arm64: rework FPAC exception handling
arm64: rework BTI exception handling
arm64: allow kprobes on EL0 handlers
arm64: split EL0/EL1 UNDEF handlers
arm64: factor out EL1 SSBS emulation hook
arm64: factor insn read out of call_undef_hook()
arm64: rework EL0 MRS emulation
arm64: armv8_deprecated: fold ops into insn_emulation
arm64: armv8_deprecated move emulation functions
arm64: armv8_deprecated: move aarch32 helper earlier
arm64: armv8_deprecated: rework deprected instruction handling
Martin Kurbanov (1):
mtd: spinand: micron: correct bitmask for ecc status
Mathias Nyman (6):
xhci: cleanup xhci_hub_control port references
xhci: move port specific items such as state completions to port structure
xhci: rename resume_done to resume_timestamp
xhci: clear usb2 resume related variables in one place.
xhci: decouple usb2 port resume and get_port_status request handling
xhci: track port suspend state correctly in unsuccessful resume cases
Matthias Berndt (1):
Input: xpad - add PXN V900 support
Maurizio Lombardi (1):
nvme-rdma: do not try to stop unallocated queues
Michal Koutný (1):
cgroup: Remove duplicates in cgroup v1 tasks file
Michal Schmidt (1):
i40e: prevent crash on probe if hw registers have invalid values
Michał Mirosław (1):
regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()"
Mika Westerberg (2):
thunderbolt: Check that lane 1 is in CL0 before enabling lane bonding
thunderbolt: Workaround an IOMMU fault on certain systems with Intel Maple Ridge
Miquel Raynal (2):
mtd: rawnand: marvell: Ensure program page operations are successful
mtd: rawnand: arasan: Ensure program page operations are successful
Neal Cardwell (1):
tcp: fix excessive TLP and RACK timeouts from HZ rounding
Nicolas Dichtel (1):
dev_forward_skb: do not scrub skb mark within the same name space
Niklas Schnelle (1):
s390/pci: fix iommu bitmap allocation
Pablo Neira Ayuso (1):
netfilter: nft_set_rbtree: .deactivate fails if element has expired
Paolo Abeni (1):
tcp: check mptcp-level constraints for backlog coalescing
Patrick Rohr (3):
net: add sysctl accept_ra_min_rtr_lft
net: change accept_ra_min_rtr_lft to affect all RA lifetimes
net: release reference to inet6_dev pointer
Paul Menzel (1):
ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA
Pedro Tammela (1):
net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve
Peter Zijlstra (1):
perf: Disallow mis-matched inherited group reads
Phil Elwell (1):
iio: pressure: bmp280: Fix NULL pointer exception
Piyush Mehta (1):
usb: gadget: udc-xilinx: replace memcpy with memcpy_toio
Pu Lehui (1):
riscv, bpf: Factor out emit_call for kernel and bpf context
Puliang Lu (1):
USB: serial: option: add Fibocom to DELL custom modem FM101R-GL
RD Babiera (1):
usb: typec: altmodes/displayport: Signal hpd low when exiting mode
Radu Pirea (NXP OSS) (2):
net: macsec: indicate next pn update when offloading
net: phy: mscc: macsec: reject PN update requests
Rahul Rameshbabu (1):
HID: multitouch: Add required quirk for Synaptics 0xcd7e device
Ralph Siemsen (1):
pinctrl: renesas: rzn1: Enable missing PINMUX
Ren Zhijie (1):
arm64: armv8_deprecated: fix unused-function error
Renan Guilherme Lebre Ramos (1):
platform/x86: touchscreen_dmi: Add info for the Positivo C4128B
Ricardo Cañuelo (1):
usb: hub: Guard against accesses to uninitialized BOS descriptors
Rijo Thomas (1):
tee: amdtee: fix use-after-free vulnerability in amdtee_close_session
Roger Pau Monne (1):
xen-netback: use default TX queue size for vifs
Sagi Grimberg (1):
nvmet-tcp: Fix a possible UAF in queue intialization setup
Sasha Levin (2):
Revert "spi: zynqmp-gqspi: fix clock imbalance on probe failure" Revert "spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe"
Sunil V L (1):
ACPI: irq: Fix incorrect return value in acpi_register_gsi()
Szilard Fabian (1):
Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table
Tamim Khan (3):
ACPI: resource: Skip IRQ override on Asus Vivobook K3402ZA/K3502ZA
ACPI: resource: Skip IRQ override on Asus Vivobook S5602ZA
ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA
Thinh Nguyen (2):
usb: dwc3: Soft reset phy on probe for host
usb: core: Track SuperSpeed Plus GenXxY
Tony Lindgren (6):
serial: 8250: omap: Fix imprecise external abort for omap_8250_pm()
serial: 8250_omap: Fix errors with no_console_suspend
ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone
phy: mapphone-mdm6600: Fix runtime disable on probe
phy: mapphone-mdm6600: Fix runtime PM for remove
phy: mapphone-mdm6600: Fix pinctrl_pm handling for sleep pins
Trond Myklebust (1):
pNFS: Fix a hang in nfs4_evict_inode()
Ville Syrjälä (1):
drm/i915: Retry gtt fault when out of fence registers
Waiman Long (2):
workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask() selftests/vm: make charge_reserved_hugetlb.sh work with existing cgroup setting
Wen Gong (1):
wifi: mac80211: allow transmitting EAPOL frames with tainted key
Wesley Cheng (1):
usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer
Xingxing Luo (2):
usb: musb: Get the musb_qh poniter after musb_giveback
usb: musb: Modify the "HWVers" register address
Xiubo Li (1):
ceph: fix incorrect revoked caps assert in ceph_fill_file_size()
Ying Hsu (1):
Bluetooth: Avoid redundant authentication
Yongqiang Sun (1):
drm/amd/display: only check available pipe to disable vbios mode.
Yoshihiro Shimoda (2):
ravb: Fix up dma_free_coherent() call in ravb_remove()
ravb: Fix use-after-free issue in ravb_tx_timeout_work()
Zhang Changzhong (1):
xfrm6: fix inet6_dev refcount underflow problem
Zheng Wang (1):
media: mtk-jpeg: Fix use after free bug due to uncanceled work
Ziyang Xuan (1):
Bluetooth: Fix a refcnt underflow problem for hci_conn
[email protected] (1):
RDMA/srp: Set scmnd->result only when scmnd is not NULL
Greg Kroah-Hartman
maintainerDocumentation/admin-guide/sysctl/net.rst +9 -9
@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration. Table : Subdirectories in /proc/sys/net - ========= =================== = ========== ================== + ========= =================== = ========== =================== Directory Content Directory Content - ========= =================== = ========== ================== - 802 E802 protocol mptcp Multipath TCP - appletalk Appletalk protocol netfilter Network Filter + ========= =================== = ========== =================== + 802 E802 protocol mptcp Multipath TCP + appletalk Appletalk protocol netfilter Network Filter ax25 AX25 netrom NET/ROM - bridge Bridging rose X.25 PLP layer - core General parameter tipc TIPC - ethernet Ethernet protocol unix Unix domain sockets - ipv4 IP version 4 x25 X.25 protocol + bridge Bridging rose X.25 PLP layer + core General parameter tipc TIPC + ethernet Ethernet protocol unix Unix domain sockets + ipv4 IP version 4 x25 X.25 protocol ipv6 IP version 6 - ========= =================== = ========== ================== + ========= =================== = ========== =================== 1. /proc/sys/net/core - Network core options ============================================
Documentation/networking/ip-sysctl.rst +8 -0
@@ -1916,6 +1916,14 @@ accept_ra_min_hop_limit - INTEGER Default: 1 +accept_ra_min_lft - INTEGER + Minimum acceptable lifetime value in Router Advertisement. + + RA sections with a lifetime less than this value shall be + ignored. Zero lifetimes stay unaffected. + + Default: 0 + accept_ra_pinfo - BOOLEAN Learn Prefix Information in Router Advertisement.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 198 +SUBLEVEL = 199 EXTRAVERSION = NAME = Dare mighty things
arch/arm/boot/dts/motorola-mapphone-common.dtsi +1 -0
@@ -765,6 +765,7 @@ &uart1 { &uart3 { interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH &omap4_pmx_core 0x17c>; + overrun-throttle-ms = <500>; }; &uart4 {
arch/arm64/include/asm/cpufeature.h +2 -1
@@ -759,7 +759,8 @@ static inline bool system_supports_tlb_range(void)cpus_have_const_cap (ARM64_HAS_TLB_RANGE ); } -extern int do_emulate_mrs (struct pt_regs *regs,u32 sys_reg,u32 rt); +int do_emulate_mrs (struct pt_regs *regs,u32 sys_reg,u32 rt); +bool try_emulate_mrs (struct pt_regs *regs,u32 isn);static inline u32 id_aa64mmfr0_parange_to_phys_shift (int parange) {
arch/arm64/include/asm/exception.h +8 -5
@@ -33,19 +33,22 @@ asmlinkage void exit_to_user_mode(void);void arm64_enter_nmi (struct pt_regs *regs);void arm64_exit_nmi (struct pt_regs *regs);void do_mem_abort (unsigned long addr,unsigned int esr,struct pt_regs *regs); -void do_undefinstr (struct pt_regs *regs); -void do_bti (struct pt_regs *regs); +void do_el0_undef (struct pt_regs *regs,unsigned long esr); +void do_el1_undef (struct pt_regs *regs,unsigned long esr); +void do_el0_bti (struct pt_regs *regs); +void do_el1_bti (struct pt_regs *regs,unsigned long esr); asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);void do_debug_exception (unsigned long addr_if_watchpoint,unsigned int esr,struct pt_regs *regs);void do_fpsimd_acc (unsigned int esr,struct pt_regs *regs);void do_sve_acc (unsigned int esr,struct pt_regs *regs);void do_fpsimd_exc (unsigned int esr,struct pt_regs *regs); -void do_sysinstr (unsigned int esr,struct pt_regs *regs); +void do_el0_sys (unsigned long esr,struct pt_regs *regs);void do_sp_pc_abort (unsigned long addr,unsigned int esr,struct pt_regs *regs);void bad_el0_sync (struct pt_regs *regs,int reason,unsigned int esr); -void do_cp15instr (unsigned int esr,struct pt_regs *regs); +void do_el0_cp15 (unsigned long esr,struct pt_regs *regs);void do_el0_svc (struct pt_regs *regs);void do_el0_svc_compat (struct pt_regs *regs); -void do_ptrauth_fault (struct pt_regs *regs,unsigned int esr); +void do_el0_fpac (struct pt_regs *regs,unsigned long esr); +void do_el1_fpac (struct pt_regs *regs,unsigned long esr);#endif /* __ASM_EXCEPTION_H */
arch/arm64/include/asm/spectre.h +2 -0
@@ -18,6 +18,7 @@ enum mitigation_state { SPECTRE_VULNERABLE, }; +struct pt_regs ;struct task_struct ;enum mitigation_state arm64_get_spectre_v2_state (void );
@@ -33,4 +34,5 @@ enum mitigation_state arm64_get_spectre_bhb_state(void);bool is_spectre_bhb_affected (const struct arm64_cpu_capabilities *entry,int scope);u8 spectre_bhb_loop_affected (int scope);void spectre_bhb_enable_mitigation (const struct arm64_cpu_capabilities *__unused); +bool try_emulate_el1_ssbs (struct pt_regs *regs,u32 instr);#endif /* __ASM_SPECTRE_H */
arch/arm64/include/asm/system_misc.h +1 -1
@@ -18,7 +18,7 @@struct pt_regs ; -void die (const char *msg,struct pt_regs *regs,int err); +void die (const char *msg,struct pt_regs *regs,long err);struct siginfo ; void arm64_notify_die(const char *str, struct pt_regs *regs,
arch/arm64/include/asm/traps.h +9 -10
@@ -13,17 +13,16 @@struct pt_regs ; -struct undef_hook { -struct list_head node; -u32 instr_mask; -u32 instr_val; -u64 pstate_mask; -u64 pstate_val; -int (*fn)(struct pt_regs *regs,u32 instr); -}; +#ifdef CONFIG_ARMV8_DEPRECATED +bool try_emulate_armv8_deprecated (struct pt_regs *regs,u32 insn); +#else +static inline bool +try_emulate_armv8_deprecated (struct pt_regs *regs,u32 insn) +{ +return false; +} +#endif /* CONFIG_ARMV8_DEPRECATED */ -void register_undef_hook (struct undef_hook *hook); -void unregister_undef_hook (struct undef_hook *hook);void force_signal_inject (int signal,int code,unsigned long address,unsigned int err);void arm64_notify_segfault (unsigned long addr);void arm64_force_sig_fault (int signo,int code,void __user *addr,const char *str);
arch/arm64/kernel/armv8_deprecated.c +281 -291
653 lines not on this page · raw message
arch/arm64/kernel/cpufeature.c +5 -18
@@ -2852,35 +2852,22 @@ int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt)return rc; } -static int emulate_mrs (struct pt_regs *regs,u32 insn) +bool try_emulate_mrs (struct pt_regs *regs,u32 insn) {u32 sys_reg, rt; +if (compat_user_mode (regs) || !aarch64_insn_is_mrs (insn)) +return false; +/* * sys_reg values are defined as used in mrs/msr instruction. * shift the imm value to get the encoding. */ sys_reg = (u32 )aarch64_insn_decode_immediate (AARCH64_INSN_IMM_16 , insn) <<5 ; rt =aarch64_insn_decode_register (AARCH64_INSN_REGTYPE_RT , insn); -return do_emulate_mrs (regs, sys_reg, rt); +return do_emulate_mrs (regs, sys_reg, rt) ==0 ; } -static struct undef_hook mrs_hook = { - .instr_mask =0xfff00000 , - .instr_val =0xd5300000 , - .pstate_mask =PSR_AA32_MODE_MASK , - .pstate_val = PSR_MODE_EL0t, - .fn = emulate_mrs, -}; - -static int __init enable_mrs_emulation (void ) -{ -register_undef_hook (&mrs_hook); -return 0 ; -} - -core_initcall (enable_mrs_emulation); -ssize_t cpu_show_meltdown (struct device *dev,struct device_attribute *attr,char *buf) {
arch/arm64/kernel/entry-common.c +24 -12
@@ -132,11 +132,20 @@ static void noinstr el1_pc(struct pt_regs *regs, unsigned long esr)exit_to_kernel_mode (regs); } -static void noinstr el1_undef(struct pt_regs *regs) +static void noinstr el1_undef(struct pt_regs *regs, unsigned long esr) {enter_from_kernel_mode (regs);local_daif_inherit (regs); -do_undefinstr (regs); +do_el1_undef (regs, esr); +local_daif_mask (); +exit_to_kernel_mode (regs); +} + +static void noinstr el1_bti(struct pt_regs *regs, unsigned long esr) +{ +enter_from_kernel_mode (regs); +local_daif_inherit (regs); +do_el1_bti (regs, esr);local_daif_mask ();exit_to_kernel_mode (regs); }
@@ -187,7 +196,7 @@ static void noinstr el1_fpac(struct pt_regs *regs, unsigned long esr) {enter_from_kernel_mode (regs);local_daif_inherit (regs); -do_ptrauth_fault (regs, esr); +do_el1_fpac (regs, esr);local_daif_mask ();exit_to_kernel_mode (regs); }
@@ -210,7 +219,10 @@ asmlinkage void noinstr el1_sync_handler(struct pt_regs *regs)break ;case ESR_ELx_EC_SYS64:case ESR_ELx_EC_UNKNOWN: -el1_undef (regs); +el1_undef (regs, esr); +break ; +case ESR_ELx_EC_BTI: +el1_bti (regs, esr);break ;case ESR_ELx_EC_BREAKPT_CUR:case ESR_ELx_EC_SOFTSTP_CUR:
@@ -294,7 +306,7 @@ static void noinstr el0_sys(struct pt_regs *regs, unsigned long esr) {enter_from_user_mode ();local_daif_restore (DAIF_PROCCTX ); -do_sysinstr (esr, regs); +do_el0_sys (esr, regs); } static void noinstr el0_pc(struct pt_regs *regs, unsigned long esr)
@@ -316,18 +328,18 @@ static void noinstr el0_sp(struct pt_regs *regs, unsigned long esr)do_sp_pc_abort (regs->sp, esr, regs); } -static void noinstr el0_undef(struct pt_regs *regs) +static void noinstr el0_undef(struct pt_regs *regs, unsigned long esr) {enter_from_user_mode ();local_daif_restore (DAIF_PROCCTX ); -do_undefinstr (regs); +do_el0_undef (regs, esr); } static void noinstr el0_bti(struct pt_regs *regs) {enter_from_user_mode ();local_daif_restore (DAIF_PROCCTX ); -do_bti (regs); +do_el0_bti (regs); } static void noinstr el0_inv(struct pt_regs *regs, unsigned long esr)
@@ -357,7 +369,7 @@ static void noinstr el0_fpac(struct pt_regs *regs, unsigned long esr) {enter_from_user_mode ();local_daif_restore (DAIF_PROCCTX ); -do_ptrauth_fault (regs, esr); +do_el0_fpac (regs, esr); } asmlinkage void noinstr el0_sync_handler(struct pt_regs *regs)
@@ -394,7 +406,7 @@ asmlinkage void noinstr el0_sync_handler(struct pt_regs *regs)el0_pc (regs, esr);break ;case ESR_ELx_EC_UNKNOWN: -el0_undef (regs); +el0_undef (regs, esr);break ;case ESR_ELx_EC_BTI:el0_bti (regs);
@@ -418,7 +430,7 @@ static void noinstr el0_cp15(struct pt_regs *regs, unsigned long esr) {enter_from_user_mode ();local_daif_restore (DAIF_PROCCTX ); -do_cp15instr (esr, regs); +do_el0_cp15 (esr, regs); } static void noinstr el0_svc_compat(struct pt_regs *regs)
@@ -454,7 +466,7 @@ asmlinkage void noinstr el0_sync_compat_handler(struct pt_regs *regs)case ESR_ELx_EC_CP14_MR:case ESR_ELx_EC_CP14_LS:case ESR_ELx_EC_CP14_64: -el0_undef (regs); +el0_undef (regs, esr);break ;case ESR_ELx_EC_CP15_32:case ESR_ELx_EC_CP15_64:
arch/arm64/kernel/proton-pack.c +7 -19
@@ -537,10 +537,13 @@ bool has_spectre_v4(const struct arm64_cpu_capabilities *cap, int scope)return state !=SPECTRE_UNAFFECTED ; } -static int ssbs_emulation_handler (struct pt_regs *regs,u32 instr) +bool try_emulate_el1_ssbs (struct pt_regs *regs,u32 instr) { -if (user_mode (regs)) -return 1 ; +const u32 instr_mask = ~(1U << PSTATE_Imm_shift); +const u32 instr_val =0xd500401f |PSTATE_SSBS ; + +if ((instr & instr_mask) != instr_val) +return false;if (instr &BIT (PSTATE_Imm_shift)) regs->pstate |=PSR_SSBS_BIT ;
@@ -548,19 +551,11 @@ static int ssbs_emulation_handler(struct pt_regs *regs, u32 instr) regs->pstate &= ~PSR_SSBS_BIT ;arm64_skip_faulting_instruction (regs,4 ); -return 0 ; +return true; } -static struct undef_hook ssbs_emulation_hook = { - .instr_mask = ~(1U << PSTATE_Imm_shift), - .instr_val =0xd500401f |PSTATE_SSBS , - .fn = ssbs_emulation_handler, -}; -static enum mitigation_state spectre_v4_enable_hw_mitigation (void ) { -static bool undef_hook_registered = false; -static DEFINE_RAW_SPINLOCK (hook_lock);enum mitigation_state state;/*
@@ -571,13 +566,6 @@ static enum mitigation_state spectre_v4_enable_hw_mitigation(void)if (state !=SPECTRE_MITIGATED || !this_cpu_has_cap (ARM64_SSBS ))return state; -raw_spin_lock (&hook_lock); -if (!undef_hook_registered) { -register_undef_hook (&ssbs_emulation_hook); - undef_hook_registered = true; - } -raw_spin_unlock (&hook_lock); -if (spectre_v4_mitigations_off ()) {sysreg_clear_set (sctlr_el1,0 , SCTLR_ELx_DSSBS); asm volatile(SET_PSTATE_SSBS(1));
arch/arm64/kernel/traps.c +57 -68
232 lines not on this page · raw message
arch/powerpc/include/asm/nohash/32/pte-8xx.h +7 -0
@@ -94,6 +94,13 @@ static inline pte_t pte_wrprotect(pte_t pte)#define pte_wrprotect pte_wrprotect +static inline int pte_read (pte_t pte) +{ +return (pte_val (pte) & _PAGE_RO) != _PAGE_NA; +} + +#define pte_read pte_read +static inline int pte_write (pte_t pte) {return !(pte_val (pte) & _PAGE_RO);
arch/powerpc/include/asm/nohash/64/pgtable.h +1 -1
@@ -216,7 +216,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, {unsigned long old; -if (pte_young (*ptep)) +if (!pte_young (*ptep))return 0 ; old =pte_update (mm, addr, ptep, _PAGE_ACCESSED,0 ,0 );return (old & _PAGE_ACCESSED) !=0 ;
arch/powerpc/include/asm/nohash/pgtable.h +2 -0
@@ -45,7 +45,9 @@ static inline int pte_write(pte_t pte) return pte_val(pte) & _PAGE_RW; }#endif +#ifndef pte_readstatic inline int pte_read (pte_t pte) {return 1 ; } +#endif static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_special (pte_t pte) {return pte_val (pte) & _PAGE_SPECIAL; }static inline int pte_none (pte_t pte) {return (pte_val (pte) & ~_PTE_NONE_MASK) ==0 ; }
arch/riscv/net/bpf_jit_comp64.c +15 -18
@@ -201,7 +201,7 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)emit_addi (RV_REG_SP ,RV_REG_SP , stack_adjust, ctx);/* Set return value. */ if (!is_tail_call) -emit_mv (RV_REG_A0 ,RV_REG_A5 , ctx); +emit_addiw (RV_REG_A0 ,RV_REG_A5 ,0 , ctx);emit_jalr (RV_REG_ZERO , is_tail_call ?RV_REG_T3 :RV_REG_RA , is_tail_call ?4 :0 ,/* skip TCC init */ ctx);
@@ -394,12 +394,12 @@ static void emit_sext_32_rd(u8 *rd, struct rv_jit_context *ctx) *rd =RV_REG_T2 ; } -static int emit_jump_and_link (u8 rd,s64 rvoff,bool force_jalr, +static int emit_jump_and_link (u8 rd,s64 rvoff,bool fixed_addr,struct rv_jit_context *ctx) {s64 upper, lower; -if (rvoff &&is_21b_int (rvoff) && !force_jalr) { +if (rvoff && fixed_addr &&is_21b_int (rvoff)) {emit (rv_jal (rd, rvoff >>1 ), ctx);return 0 ; }else if (in_auipc_jalr_range (rvoff)) {
@@ -420,24 +420,17 @@ static bool is_signed_bpf_cond(u8 cond) cond ==BPF_JSGE || cond ==BPF_JSLE ; } -static int emit_call (bool fixed,u64 addr,struct rv_jit_context *ctx) +static int emit_call (u64 addr,bool fixed_addr,struct rv_jit_context *ctx) {s64 off =0 ;u64 ip; -u8 rd; -int ret;if (addr && ctx->insns) { ip = (u64)(long)(ctx->insns + ctx->ninsns); off = addr - ip; } - ret =emit_jump_and_link (RV_REG_RA , off, !fixed, ctx); -if (ret) -return ret; - rd =bpf_to_rv_reg (BPF_REG_0 , ctx); -emit_mv (rd,RV_REG_A0 , ctx); -return 0 ; +return emit_jump_and_link (RV_REG_RA , off, fixed_addr, ctx); } int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
@@ -731,7 +724,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,/* JUMP off */ case BPF_JMP |BPF_JA : rvoff =rv_offset (i, off, ctx); - ret =emit_jump_and_link (RV_REG_ZERO , rvoff, false, ctx); + ret =emit_jump_and_link (RV_REG_ZERO , rvoff, true, ctx);if (ret)return ret;break ;
@@ -850,17 +843,21 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,/* function call */ case BPF_JMP |BPF_CALL : { -bool fixed; +bool fixed_addr;u64 addr;mark_call (ctx); - ret =bpf_jit_get_func_addr (ctx->prog, insn, extra_pass, &addr, - &fixed); + ret =bpf_jit_get_func_addr (ctx->prog, insn, extra_pass, + &addr, &fixed_addr);if (ret <0 )return ret; - ret =emit_call (fixed, addr, ctx); + + ret =emit_call (addr, fixed_addr, ctx);if (ret)return ret; + +if (insn->src_reg !=BPF_PSEUDO_CALL ) +emit_mv (bpf_to_rv_reg (BPF_REG_0 , ctx),RV_REG_A0 , ctx);break ; }/* tail call */
@@ -875,7 +872,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,break ; rvoff =epilogue_offset (ctx); - ret =emit_jump_and_link (RV_REG_ZERO , rvoff, false, ctx); + ret =emit_jump_and_link (RV_REG_ZERO , rvoff, true, ctx);if (ret)return ret;break ;
arch/s390/pci/pci_dma.c +13 -2
@@ -541,6 +541,17 @@ static void s390_dma_unmap_sg(struct device *dev, struct scatterlist *sg, s->dma_length =0 ; } } + +static unsigned long *bitmap_vzalloc (size_t bits,gfp_t flags) +{ +size_t n =BITS_TO_LONGS (bits); +size_t bytes; + +if (unlikely (check_mul_overflow (n,sizeof (unsigned long ), &bytes))) +return NULL ; + +return vzalloc (bytes); +}int zpci_dma_init_device (struct zpci_dev *zdev) {
@@ -577,13 +588,13 @@ int zpci_dma_init_device(struct zpci_dev *zdev) zdev->end_dma - zdev->start_dma + 1); zdev->end_dma = zdev->start_dma + zdev->iommu_size -1 ; zdev->iommu_pages = zdev->iommu_size >>PAGE_SHIFT ; - zdev->iommu_bitmap =vzalloc (zdev->iommu_pages /8 ); + zdev->iommu_bitmap =bitmap_vzalloc (zdev->iommu_pages,GFP_KERNEL );if (!zdev->iommu_bitmap) { rc = -ENOMEM ; goto free_dma_table; }if (!s390_iommu_strict) { - zdev->lazy_bitmap =vzalloc (zdev->iommu_pages /8 ); + zdev->lazy_bitmap =bitmap_vzalloc (zdev->iommu_pages,GFP_KERNEL );if (!zdev->lazy_bitmap) { rc = -ENOMEM ; goto free_bitmap;
arch/x86/boot/compressed/sev-es.c +10 -0
@@ -106,6 +106,16 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,return ES_OK ; } +static enum es_result vc_ioio_check (struct es_em_ctxt *ctxt,u16 port,size_t size) +{ +return ES_OK ; +} + +static bool fault_in_kernel_space (unsigned long address) +{ +return false; +} +#undef __init#undef __pa#define __init
arch/x86/include/asm/msr-index.h +7 -2
@@ -541,12 +541,17 @@#define MSR_AMD64_VIRT_SPEC_CTRL 0xc001011f -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 +/* Zen4 */ +#define MSR_ZEN4_BP_CFG 0xc001102e +#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 +/* Zen 2 */ #define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 +/* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230#define MSR_F16H_L2I_PERF_CTR 0xc0010231
arch/x86/kernel/alternative.c +13 -0
@@ -424,6 +424,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,u8 insn_buff[MAX_PATCH_LEN ];DPRINTK ("alt table %px, -> %px" , start, end); + +/* +* In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using +* cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here. +* During the process, KASAN becomes confused seeing partial LA57 +* conversion and triggers a false-positive out-of-bound report. +* +* Disable KASAN until the patching is complete. +*/ +kasan_disable_current (); +/* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code.
@@ -491,6 +502,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, next:optimize_nops (instr, a->instrlen); } + +kasan_enable_current (); }#if defined(CONFIG_RETPOLINE ) && defined(CONFIG_STACK_VALIDATION )
arch/x86/kernel/cpu/amd.c +8 -0
@@ -81,6 +81,10 @@ static const int amd_div0[] =AMD_LEGACY_ERRATUM (AMD_MODEL_RANGE (0x17 ,0x00 ,0x0 ,0x2f ,0xf ),AMD_MODEL_RANGE (0x17 ,0x50 ,0x0 ,0x5f ,0xf )); +static const int amd_erratum_1485[] = +AMD_LEGACY_ERRATUM (AMD_MODEL_RANGE (0x19 ,0x10 ,0x0 ,0x1f ,0xf ), +AMD_MODEL_RANGE (0x19 ,0x60 ,0x0 ,0xaf ,0xf )); +static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum) {int osvw_id = *erratum++;
@@ -1178,6 +1182,10 @@ static void init_amd(struct cpuinfo_x86 *c)pr_notice_once ("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n" );setup_force_cpu_bug (X86_BUG_DIV0 ); } + +if (!cpu_has (c,X86_FEATURE_HYPERVISOR ) && +cpu_has_amd_erratum (c, amd_erratum_1485)) +msr_set_bit (MSR_ZEN4_BP_CFG ,MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT ); }#ifdef CONFIG_X86_32
arch/x86/kernel/sev-es-shared.c +44 -9
137 lines not on this page · raw message
arch/x86/kernel/sev-es.c +30 -0
@@ -448,6 +448,33 @@ static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxtreturn ES_OK ; } +static enum es_result vc_ioio_check (struct es_em_ctxt *ctxt,u16 port,size_t size) +{ +BUG_ON (size >4 ); + +if (user_mode (ctxt->regs)) { +struct thread_struct *t = ¤t->thread; +struct io_bitmap *iobm = t->io_bitmap; +size_t idx; + +if (!iobm) + goto fault; + +for (idx = port; idx < port + size; ++idx) { +if (test_bit (idx, iobm->bitmap)) + goto fault; + } + } + +return ES_OK ; + +fault: + ctxt->fi.vector =X86_TRAP_GP ; + ctxt->fi.error_code =0 ; + +return ES_EXCEPTION ; +} +/* Include code shared with pre-decompression boot stage */ #include "sev-es-shared.c"
@@ -970,6 +997,9 @@ static enum es_result vc_handle_mmio(struct ghcb *ghcb,enum es_result ret;long *reg_data; +if (user_mode (ctxt->regs)) +return ES_UNSUPPORTED ; +switch (insn->opcode.bytes[0 ]) {/* MMIO Write */ case 0x88 :
arch/x86/kvm/lapic.c +6 -2
@@ -2397,13 +2397,17 @@ int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type) {u32 reg =kvm_lapic_get_reg (apic, lvt_type);int vector, mode, trig_mode; +int r;if (kvm_apic_hw_enabled (apic) && !(reg &APIC_LVT_MASKED )) { vector = reg &APIC_VECTOR_MASK ; mode = reg &APIC_MODE_MASK ; trig_mode = reg &APIC_LVT_LEVEL_TRIGGER ; -return __apic_accept_irq (apic, mode, vector,1 , trig_mode, -NULL ); + + r =__apic_accept_irq (apic, mode, vector,1 , trig_mode,NULL ); +if (r && lvt_type ==APIC_LVTPC ) +kvm_lapic_set_reg (apic,APIC_LVTPC , reg |APIC_LVT_MASKED ); +return r; }return 0 ; }
drivers/acpi/irq.c +6 -1
@@ -52,6 +52,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +unsigned int irq;if (WARN_ON (!acpi_gsi_domain_id)) {pr_warn ("GSI: No registered irqchip, giving up\n" );
@@ -63,7 +64,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, fwspec.param[1 ] =acpi_dev_get_irq_type (trigger, polarity); fwspec.param_count =2 ; -return irq_create_fwspec_mapping (&fwspec); + irq =irq_create_fwspec_mapping (&fwspec); +if (!irq) +return -EINVAL ; + +return irq; }EXPORT_SYMBOL_GPL (acpi_register_gsi);
drivers/acpi/resource.c +110 -11
172 lines not on this page · raw message
drivers/ata/libata-eh.c +1 -1
@@ -2224,7 +2224,7 @@ static void ata_eh_link_report(struct ata_link *link)struct ata_eh_context *ehc = &link->eh_context;struct ata_queued_cmd *qc;const char *frozen, *desc; -char tries_buf[6 ] ="" ; +char tries_buf[16 ] ="" ;int tag, nr_failed =0 ;if (ehc->i.flags &ATA_EHI_QUIET )
drivers/base/regmap/regmap.c +1 -1
@@ -1511,7 +1511,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data)/* If the user didn't specify a name match any */ if (data) -return !strcmp ((*r)->name, data); +return (*r)->name && !strcmp ((*r)->name, data);else return 1 ; }
drivers/bluetooth/hci_vhci.c +3 -0
@@ -67,7 +67,10 @@ static int vhci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)struct vhci_data *data =hci_get_drvdata (hdev);memcpy (skb_push (skb,1 ), &hci_skb_pkt_type (skb),1 ); + +mutex_lock (&data->open_mutex);skb_queue_tail (&data->readq, skb); +mutex_unlock (&data->open_mutex);wake_up_interruptible (&data->read_wait);return 0 ;
drivers/counter/microchip-tcb-capture.c +1 -1
@@ -111,7 +111,7 @@ static int mchp_tc_count_function_set(struct counter_device *counter, priv->qdec_mode =0 ;/* Set highest rate based on whether soc has gclk or not */ bmr &= ~(ATMEL_TC_QDEN |ATMEL_TC_POSEN ); -if (priv->tc_cfg->has_gclk) +if (!priv->tc_cfg->has_gclk) cmr |=ATMEL_TC_TIMER_CLOCK2 ;else cmr |=ATMEL_TC_TIMER_CLOCK1 ;
drivers/dma/mediatek/mtk-uart-apdma.c +1 -2
@@ -451,9 +451,8 @@ static int mtk_uart_apdma_device_pause(struct dma_chan *chan)mtk_uart_apdma_write (c,VFF_EN ,VFF_EN_CLR_B );mtk_uart_apdma_write (c,VFF_INT_EN ,VFF_INT_EN_CLR_B ); -synchronize_irq (c->irq); -spin_unlock_irqrestore (&c->vc.lock, flags); +synchronize_irq (c->irq);return 0 ; }
drivers/dma/stm32-mdma.c +4 -0
@@ -1206,6 +1206,10 @@ static int stm32_mdma_resume(struct dma_chan *c)unsigned long flags;u32 status, reg; +/* Transfer can be terminated */ +if (!chan->desc || (stm32_mdma_read (dmadev,STM32_MDMA_CCR (chan->id)) &STM32_MDMA_CCR_EN )) +return -EPERM ; + hwdesc = chan->desc->node[chan->curr_hwdesc].hwdesc;spin_lock_irqsave (&chan->vchan.lock, flags);
drivers/gpio/gpio-timberdale.c +3 -2
@@ -43,9 +43,10 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, unsigned offset, bool enabled) {struct timbgpio *tgpio =gpiochip_get_data (gpio); +unsigned long flags;u32 reg; -spin_lock (&tgpio->lock); +spin_lock_irqsave (&tgpio->lock, flags); reg =ioread32 (tgpio->membase + offset);if (enabled)
@@ -54,7 +55,7 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, reg &= ~(1 << index);iowrite32 (reg, tgpio->membase + offset); -spin_unlock (&tgpio->lock); +spin_unlock_irqrestore (&tgpio->lock, flags);return 0 ; }
drivers/gpio/gpio-vf610.c +2 -2
@@ -127,14 +127,14 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,unsigned long mask =BIT (gpio);u32 val; +vf610_gpio_set (chip, gpio, value); +if (port->sdata && port->sdata->have_paddr) { val =vf610_gpio_readl (port->gpio_base +GPIO_PDDR ); val |= mask;vf610_gpio_writel (val, port->gpio_base +GPIO_PDDR ); } -vf610_gpio_set (chip, gpio, value); -return pinctrl_gpio_direction_output (chip->base + gpio); }
drivers/gpu/drm/amd/display/dc/core/dc.c +8 -1
@@ -862,12 +862,19 @@ static void disable_vbios_mode_if_required(if (stream ==NULL )continue ; +if (stream->apply_seamless_boot_optimization) +continue ; + +// only looking for first odm pipe +if (pipe->prev_odm_pipe) +continue ; +if (stream->link->local_sink && stream->link->local_sink->sink_signal ==SIGNAL_TYPE_EDP ) { link = stream->link; } -if (link !=NULL ) { +if (link !=NULL && link->link_enc->funcs->is_dig_enabled (link->link_enc)) {unsigned int enc_inst, tg_inst =0 ;unsigned int pix_clk_100hz;
drivers/gpu/drm/drm_connector.c +79 -0
115 lines not on this page · raw message
drivers/gpu/drm/drm_crtc_internal.h +2 -0
@@ -57,6 +57,7 @@ struct drm_property;struct edid ;struct kref ;struct work_struct ; +struct fwnode_handle ;/* drm_crtc.c */ int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
@@ -182,6 +183,7 @@ int drm_connector_set_obj_prop(struct drm_mode_object *obj,int drm_connector_create_standard_properties (struct drm_device *dev);const char *drm_get_connector_force_name (enum drm_connector_force force);void drm_connector_free_work_fn (struct work_struct *work); +struct drm_connector *drm_connector_find_by_fwnode (struct fwnode_handle *fwnode);/* IOCTL */ int drm_connector_property_set_ioctl(struct drm_device *dev,
drivers/gpu/drm/drm_panel_orientation_quirks.c +16 -0
@@ -44,6 +44,14 @@ static const struct drm_dmi_panel_orientation_data gpd_micropc = { .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +static const struct drm_dmi_panel_orientation_data gpd_onemix2s = { + .width =1200 , + .height =1920 , + .bios_dates = (const char *const []){"05/21/2018" ,"10/26/2018" , +"03/04/2019" ,NULL }, + .orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP , +}; +static const struct drm_dmi_panel_orientation_data gpd_pocket = { .width =1200 , .height =1920 ,
@@ -329,6 +337,14 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LTH17"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* One Mix 2S (generic strings, also match on bios date) */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"), + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), + }, + .driver_data = (void *)&gpd_onemix2s, }, {} };
drivers/gpu/drm/drm_sysfs.c +74 -13
143 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -0
@@ -222,6 +222,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)case 0 :case -EAGAIN :case -ENOSPC :/* transient failure to evict? */ +case -ENOBUFS :/* temporarily out of fences? */ case -ERESTARTSYS :case -EINTR :case -EBUSY :
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +6 -6
@@ -147,6 +147,7 @@ static void _dpu_plane_calc_bw(struct drm_plane *plane,const struct dpu_format *fmt =NULL ;struct dpu_kms *dpu_kms =_dpu_plane_get_kms (plane);int src_width, src_height, dst_height, fps; +u64 plane_pixel_rate, plane_bit_rate;u64 plane_prefill_bw;u64 plane_bw;u32 hw_latency_lines;
@@ -168,13 +169,12 @@ static void _dpu_plane_calc_bw(struct drm_plane *plane, scale_factor = src_height > dst_height ?mult_frac (src_height,1 , dst_height) :1 ; - plane_bw = - src_width * mode->vtotal * fps * fmt->bpp * - scale_factor; + plane_pixel_rate = src_width * mode->vtotal * fps; + plane_bit_rate = plane_pixel_rate * fmt->bpp; - plane_prefill_bw = - src_width * hw_latency_lines * fps * fmt->bpp * - scale_factor * mode->vtotal; + plane_bw = plane_bit_rate * scale_factor; + + plane_prefill_bw = plane_bw * hw_latency_lines;do_div (plane_prefill_bw, (vbp+vpw));
drivers/gpu/drm/msm/dp/dp_ctrl.c +6 -7
@@ -1665,13 +1665,6 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl)return rc;while (--link_train_max_retries) { - rc =dp_ctrl_reinitialize_mainlink (ctrl); -if (rc) { -DRM_ERROR ("Failed to reinitialize mainlink. rc=%d\n" , - rc); -break ; - } - training_step =DP_TRAINING_NONE ; rc =dp_ctrl_setup_main_link (ctrl, &cr, &training_step);if (rc ==0 ) {
@@ -1712,6 +1705,12 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl)break ;/* lane == 1 already */ } } + + rc =dp_ctrl_reinitialize_mainlink (ctrl); +if (rc) { +DRM_ERROR ("Failed to reinitialize mainlink. rc=%d\n" , rc); +break ; + } }if (ctrl->link->sink_request &DP_TEST_LINK_PHY_TEST_PATTERN )
drivers/gpu/drm/msm/dsi/dsi_host.c +12 -0
@@ -1075,9 +1075,21 @@ static void dsi_wait4video_done(struct msm_dsi_host *msm_host)static void dsi_wait4video_eng_busy (struct msm_dsi_host *msm_host) { +u32 data; +if (!(msm_host->mode_flags &MIPI_DSI_MODE_VIDEO ))return ; + data =dsi_read (msm_host,REG_DSI_STATUS0 ); + +/* if video mode engine is not busy, its because +* either timing engine was not turned on or the +* DSI controller has finished transmitting the video +* data already, so no need to wait in those cases +*/ +if (!(data &DSI_STATUS0_VIDEO_MODE_ENGINE_BUSY )) +return ; +if (msm_host->power_on && msm_host->enabled) {dsi_wait4video_done (msm_host);/* delay 4 ms to skip BLLP */
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +1 -1
@@ -1627,7 +1627,7 @@ static int vmw_cmd_tex_state(struct vmw_private *dev_priv, {VMW_DECLARE_CMD_VAR (*cmd, SVGA3dCmdSetTextureState);SVGA3dTextureState *last_state = (SVGA3dTextureState *) - ((unsigned long ) header + header->size +sizeof (header)); + ((unsigned long ) header + header->size +sizeof (*header));SVGA3dTextureState *cur_state = (SVGA3dTextureState *) ((unsigned long ) header +sizeof (*cmd));struct vmw_resource *ctx;
drivers/hid/hid-holtek-kbd.c +4 -0
@@ -130,6 +130,10 @@ static int holtek_kbd_input_event(struct input_dev *dev, unsigned int type,return -ENODEV ; boot_hid =usb_get_intfdata (boot_interface); +if (list_empty (&boot_hid->inputs)) { +hid_err (hid,"no inputs found\n" ); +return -ENODEV ; + } boot_hid_input =list_first_entry (&boot_hid->inputs, struct hid_input, list);
drivers/hid/hid-logitech-hidpp.c +2 -1
@@ -3936,7 +3936,8 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) goto hid_hw_init_fail; } -hidpp_connect_event (hidpp); +schedule_work (&hidpp->work); +flush_work (&hidpp->work);if (will_restart) {/* Reset the HID node state */
drivers/hid/hid-multitouch.c +4 -0
@@ -2058,6 +2058,10 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_MTP_STM)},/* Synaptics devices */ + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, +HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , + USB_VENDOR_ID_SYNAPTICS, 0xcd7e) }, + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , USB_VENDOR_ID_SYNAPTICS, 0xce08) },
drivers/i2c/i2c-mux.c +1 -1
@@ -340,7 +340,7 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, priv->adap.lock_ops = &i2c_parent_lock_ops;/* Sanity check on class */ -if (i2c_mux_parent_classes (parent) & class) +if (i2c_mux_parent_classes (parent) & class & ~I2C_CLASS_DEPRECATED )dev_err (&parent->dev,"Segment %d behind mux can't share classes with ancestors\n" , chan_id);
drivers/iio/pressure/bmp280-core.c +1 -1
@@ -1112,7 +1112,7 @@ int bmp280_common_probe(struct device *dev,* however as it happens, the BMP085 shares the chip ID of BMP180 * so we look for an IRQ if we have that. */ -if (irq >0 || (chip_id ==BMP180_CHIP_ID )) { +if (irq >0 && (chip_id ==BMP180_CHIP_ID )) { ret =bmp085_fetch_eoc_irq (dev, name, irq, data);if (ret)return ret;
drivers/iio/pressure/dps310.c +4 -4
@@ -57,8 +57,8 @@#define DPS310_RESET_MAGIC 0x09#define DPS310_COEF_BASE 0x10 -/* Make sure sleep time is <= 20ms for usleep_range */ -#define DPS310_POLL_SLEEP_US (t) min(20000, (t) / 8) +/* Make sure sleep time is <= 30ms for usleep_range */ +#define DPS310_POLL_SLEEP_US (t) min(30000, (t) / 8)/* Silently handle error in rate value here */ #define DPS310_POLL_TIMEOUT_US (rc) ((rc) <= 0 ? 1000000 : 1000000 / (rc))
@@ -402,8 +402,8 @@ static int dps310_reset_wait(struct dps310_data *data)if (rc)return rc; -/* Wait for device chip access: 2.5ms in specification */ -usleep_range (2500 ,12000 ); +/* Wait for device chip access: 15ms in specification */ +usleep_range (15000 ,55000 );return 0 ; }
drivers/iio/pressure/ms5611_core.c +1 -1
@@ -76,7 +76,7 @@ static bool ms5611_prom_is_valid(u16 *prom, size_t len) crc = (crc >>12 ) &0x000F ; -return crc_orig !=0x0000 && crc == crc_orig; +return crc == crc_orig; }static int ms5611_read_prom (struct iio_dev *indio_dev)
drivers/infiniband/hw/cxgb4/cm.c +3 -0
@@ -1965,6 +1965,9 @@ static int send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid)int win; skb =get_skb (NULL ,sizeof (*req),GFP_KERNEL ); +if (!skb) +return -ENOMEM ; + req =__skb_put_zero (skb,sizeof (*req)); req->op_compl =htonl (WR_OP_V (FW_OFLD_CONNECTION_WR )); req->len16_pkd =htonl (FW_WR_LEN16_V (DIV_ROUND_UP (sizeof (*req),16 )));
drivers/infiniband/ulp/srp/ib_srp.c +69 -103
314 lines not on this page · raw message
drivers/infiniband/ulp/srp/ib_srp.h +0 -2
@@ -176,7 +176,6 @@ struct srp_rdma_ch {struct srp_iu **tx_ring;struct srp_iu **rx_ring; -struct srp_request *req_ring;int comp_vector;u64 tsk_mgmt_tag;
@@ -222,7 +221,6 @@ struct srp_target_port {int mr_pool_size;int mr_per_cmd;int queue_size; -int req_ring_size;int comp_vector;int tl_retry_count;
drivers/input/joystick/xpad.c +2 -0
@@ -252,6 +252,7 @@ static const struct xpad_device { { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 }, + { 0x11ff, 0x0511, "PXN V900", 0, XTYPE_XBOX360 }, { 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 }, { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },
@@ -446,6 +447,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOXONE_VENDOR (0x0f0d ),/* Hori Controllers */ XPAD_XBOX360_VENDOR (0x1038 ),/* SteelSeries Controllers */ XPAD_XBOX360_VENDOR (0x11c9 ),/* Nacon GC100XF */ +XPAD_XBOX360_VENDOR (0x11ff ),/* PXN V900 */ XPAD_XBOX360_VENDOR (0x1209 ),/* Ardwiino Controllers */ XPAD_XBOX360_VENDOR (0x12ab ),/* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
drivers/input/misc/powermate.c +1 -0
@@ -425,6 +425,7 @@ static void powermate_disconnect(struct usb_interface *intf) pm->requires_update =0 ;usb_kill_urb (pm->irq);input_unregister_device (pm->input); +usb_kill_urb (pm->config);usb_free_urb (pm->irq);usb_free_urb (pm->config);powermate_free_buffers (interface_to_usbdev (intf), pm);
drivers/input/mouse/elantech.c +1 -0
@@ -2112,6 +2112,7 @@ static int elantech_setup_ps2(struct psmouse *psmouse, psmouse->protocol_handler = elantech_process_byte; psmouse->disconnect = elantech_disconnect; psmouse->reconnect = elantech_reconnect; + psmouse->fast_reconnect =NULL ; psmouse->pktsize = info->hw_version >1 ?6 :4 ;return 0 ;
drivers/input/mouse/synaptics.c +1 -0
@@ -1619,6 +1619,7 @@ static int synaptics_init_ps2(struct psmouse *psmouse, psmouse->set_rate = synaptics_set_rate; psmouse->disconnect = synaptics_disconnect; psmouse->reconnect = synaptics_reconnect; + psmouse->fast_reconnect =NULL ; psmouse->cleanup = synaptics_reset;/* Synaptics can usually stay in sync without extra help */ psmouse->resync_time =0 ;
drivers/input/serio/i8042-acpipnpio.h +8 -0
@@ -609,6 +609,14 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { }, .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, + { +/* Fujitsu Lifebook E5411 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU CLIENT COMPUTING LIMITED" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E5411"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOAUX ) + }, {/* Gigabyte M912 */ .matches = {
drivers/input/touchscreen/goodix.c +19 -0
@@ -820,6 +820,25 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts)dev_info (dev,"No ACPI GpioInt resource, assuming that the GPIO order is reset, int\n" ); ts->irq_pin_access_method =IRQ_PIN_ACCESS_ACPI_GPIO ; gpio_mapping = acpi_goodix_int_last_gpios; + }else if (ts->gpio_count ==1 && ts->gpio_int_idx ==0 ) { +/* +* On newer devices there is only 1 GpioInt resource and _PS0 +* does the whole reset sequence for us. +*/ +acpi_device_fix_up_power (ACPI_COMPANION (dev)); + +/* +* Before the _PS0 call the int GPIO may have been in output +* mode and the call should have put the int GPIO in input mode, +* but the GPIO subsys cached state may still think it is +* in output mode, causing gpiochip_lock_as_irq() failure. +* +* Add a mapping for the int GPIO to make the +* gpiod_int = gpiod_get(..., GPIOD_IN) call succeed, +* which will explicitly set the direction to input. +*/ + ts->irq_pin_access_method =IRQ_PIN_ACCESS_NONE ; + gpio_mapping = acpi_goodix_int_first_gpios; }else {dev_warn (dev,"Unexpected ACPI resources: gpio_count %d, gpio_int_idx %d\n" , ts->gpio_count, ts->gpio_int_idx);
drivers/mcb/mcb-core.c +3 -7
@@ -389,17 +389,13 @@ EXPORT_SYMBOL_NS_GPL(mcb_free_dev, MCB);static int __mcb_bus_add_devices (struct device *dev,void *data) { -struct mcb_device *mdev =to_mcb_device (dev);int retval; -if (mdev->is_added) -return 0 ; - retval =device_attach (dev); -if (retval <0 ) +if (retval <0 ) {dev_err (dev,"Error adding device (%d)\n" , retval); - - mdev->is_added = true; +return retval; + }return 0 ; }
drivers/mcb/mcb-parse.c +0 -2
@@ -99,8 +99,6 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, mdev->mem.end = mdev->mem.start + size -1 ; mdev->mem.flags =IORESOURCE_MEM ; - mdev->is_added = false; - ret =mcb_device_register (bus, mdev);if (ret <0 ) goto err;
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +1 -0
@@ -1455,6 +1455,7 @@ static int mtk_jpeg_remove(struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg =platform_get_drvdata (pdev); +cancel_delayed_work_sync (&jpeg->job_timeout_work);pm_runtime_disable (&pdev->dev);video_unregister_device (jpeg->vdev);video_device_release (jpeg->vdev);
drivers/mmc/core/mmc.c +1 -1
@@ -95,7 +95,7 @@ static int mmc_decode_cid(struct mmc_card *card)case 3 :/* MMC v3.1 - v3.3 */ case 4 :/* MMC v4 */ card->cid.manfid =UNSTUFF_BITS (resp,120 ,8 ); - card->cid.oemid =UNSTUFF_BITS (resp,104 ,16 ); + card->cid.oemid =UNSTUFF_BITS (resp,104 ,8 ); card->cid.prod_name[0 ] =UNSTUFF_BITS (resp,96 ,8 ); card->cid.prod_name[1 ] =UNSTUFF_BITS (resp,88 ,8 ); card->cid.prod_name[2 ] =UNSTUFF_BITS (resp,80 ,8 );
drivers/mmc/core/sdio.c +7 -1
@@ -1075,8 +1075,14 @@ static int mmc_sdio_resume(struct mmc_host *host) } err =mmc_sdio_reinit_card (host); }else if (mmc_card_wake_sdio_irq (host)) { -/* We may have switched to 1-bit mode during suspend */ +/* +* We may have switched to 1-bit mode during suspend, +* need to hold retuning, because tuning only supprt +* 4-bit mode or 8 bit mode. +*/ +mmc_retune_hold_now (host); err =sdio_enable_4bit_bus (host->card); +mmc_retune_release (host); }if (err)
drivers/mtd/maps/physmap-core.c +11 -0
@@ -556,6 +556,17 @@ static int physmap_flash_probe(struct platform_device *dev)if (info->probe_type) { info->mtds[i] =do_map_probe (info->probe_type, &info->maps[i]); + +/* Fall back to mapping region as ROM */ +if (!info->mtds[i] &&IS_ENABLED (CONFIG_MTD_ROM ) && +strcmp (info->probe_type,"map_rom" )) { +dev_warn (&dev->dev, +"map_probe() failed for type %s\n" , + info->probe_type); + + info->mtds[i] =do_map_probe ("map_rom" , + &info->maps[i]); + } }else {int j;
drivers/mtd/nand/raw/arasan-nand-controller.c +14 -2
@@ -451,6 +451,7 @@ static int anfc_write_page_hw_ecc(struct nand_chip *chip, const u8 *buf,struct mtd_info *mtd =nand_to_mtd (chip);unsigned int len = mtd->writesize + (oob_required ? mtd->oobsize :0 );dma_addr_t dma_addr; +u8 status;int ret; struct anfc_op nfc_op = { .pkt_reg =
@@ -497,10 +498,21 @@ static int anfc_write_page_hw_ecc(struct nand_chip *chip, const u8 *buf, }/* Spare data is not protected */ -if (oob_required) +if (oob_required) { ret =nand_write_oob_std (chip, page); +if (ret) +return ret; + } -return ret; +/* Check write status on the chip side */ + ret =nand_status_op (chip, &status); +if (ret) +return ret; + +if (status &NAND_STATUS_FAIL ) +return -EIO ; + +return 0 ; } static int anfc_sel_write_page_hw_ecc(struct nand_chip *chip, const u8 *buf,
drivers/mtd/nand/raw/marvell_nand.c +22 -1
@@ -1148,6 +1148,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, .ndcb[2] = NDCB2_ADDR5_PAGE(page), };unsigned int oob_bytes = lt->spare_bytes + (raw ? lt->ecc_bytes :0 ); +u8 status;int ret;/* NFCv2 needs more information about the operation being executed */
@@ -1181,7 +1182,18 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, ret =marvell_nfc_wait_op (chip,PSEC_TO_MSEC (sdr->tPROG_max)); -return ret; +if (ret) +return ret; + +/* Check write status on the chip side */ + ret =nand_status_op (chip, &status); +if (ret) +return ret; + +if (status &NAND_STATUS_FAIL ) +return -EIO ; + +return 0 ; } static int marvell_nfc_hw_ecc_hmg_write_page_raw(struct nand_chip *chip,
@@ -1610,6 +1622,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip,int data_len = lt->data_bytes;int spare_len = lt->spare_bytes;int chunk, ret; +u8 status;marvell_nfc_select_target (chip, chip->cur_cs);
@@ -1646,6 +1659,14 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip,if (ret)return ret; +/* Check write status on the chip side */ + ret =nand_status_op (chip, &status); +if (ret) +return ret; + +if (status &NAND_STATUS_FAIL ) +return -EIO ; +return 0 ; }
drivers/mtd/nand/raw/qcom_nandc.c +1 -1
@@ -2996,7 +2996,7 @@ static int qcom_nandc_probe(struct platform_device *pdev) err_aon_clk:clk_disable_unprepare (nandc->core_clk); err_core_clk: -dma_unmap_resource (dev, res->start,resource_size (res), +dma_unmap_resource (dev, nandc->base_dma,resource_size (res),DMA_BIDIRECTIONAL ,0 );return ret; }
drivers/mtd/nand/spi/micron.c +1 -1
@@ -12,7 +12,7 @@#define SPINAND_MFR_MICRON 0x2c -#define MICRON_STATUS_ECC_MASK GENMASK(7, 4) +#define MICRON_STATUS_ECC_MASK GENMASK(6, 4)#define MICRON_STATUS_ECC_NO_BITFLIPS (0 << 4)#define MICRON_STATUS_ECC_1TO3_BITFLIPS (1 << 4)#define MICRON_STATUS_ECC_4TO6_BITFLIPS (3 << 4)
drivers/net/dsa/bcm_sf2.c +15 -9
@@ -497,17 +497,16 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) dn =of_find_compatible_node (NULL ,NULL ,"brcm,unimac-mdio" ); priv->master_mii_bus =of_mdio_find_bus (dn);if (!priv->master_mii_bus) { -of_node_put (dn); -return -EPROBE_DEFER ; + err = -EPROBE_DEFER ; + goto err_of_node_put; } -get_device (&priv->master_mii_bus->dev); priv->master_mii_dn = dn; priv->slave_mii_bus =mdiobus_alloc ();if (!priv->slave_mii_bus) { -of_node_put (dn); -return -ENOMEM ; + err = -ENOMEM ; + goto err_put_master_mii_bus_dev; }
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_common.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_lib.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_main.c +15 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_ll2.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/renesas/ravb_main.c +4 -2
Lines of this file are not shown. View the raw message.
drivers/phy/motorola/phy-mapphone-mdm6600.c +18 -20
Lines of this file are not shown. View the raw message.
drivers/platform/x86/touchscreen_dmi.c +23 -0
Lines of this file are not shown. View the raw message.
drivers/tty/serial/8250/8250_omap.c +47 -46
93 lines not on this page · raw message
drivers/usb/core/hub.c +102 -4
106 lines not on this page · raw message
drivers/usb/host/xhci-hub.c +114 -114
228 lines not on this page · raw message
drivers/usb/typec/altmodes/displayport.c +28 -0
Lines of this file are not shown. View the raw message.
fs/quota/dquot.c +39 -27
66 lines not on this page · raw message
net/bluetooth/hci_conn.c +44 -28
72 lines not on this page · raw message
tools/testing/selftests/vm/charge_reserved_hugetlb.sh +20 -14
Lines of this file are not shown. View the raw message.
tools/testing/selftests/vm/hugetlb_reparenting_test.sh +13 -8
Lines of this file are not shown. View the raw message.
tools/testing/selftests/vm/write_hugetlb_memory.sh +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.