Skip to contentSkip to conversation

Linux 6.1.46

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Aug 16, 2023 Stable branch

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 6.1.46 kernel.

All users of the 6.1 kernel series must upgrade.

The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.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

------------

 Makefile                                                          |    2 
 arch/alpha/kernel/setup.c                                         |    3 
 arch/loongarch/Kconfig                                            |    1 
 arch/loongarch/kernel/setup.c                                     |    6 
 arch/riscv/include/asm/mmio.h                                     |   16 
 arch/riscv/kernel/elf_kexec.c                                     |    3 
 arch/x86/boot/compressed/idt_64.c                                 |    9 
 arch/x86/boot/compressed/sev.c                                    |   37 +
 arch/x86/entry/vdso/vma.c                                         |    4 
 arch/x86/include/asm/processor.h                                  |    2 
 arch/x86/kernel/cpu/amd.c                                         |    1 
 arch/x86/kernel/vmlinux.lds.S                                     |   12 
 arch/x86/kvm/svm/sev.c                                            |   94 ++--
 arch/x86/kvm/svm/svm.h                                            |   26 +
 arch/x86/kvm/x86.c                                                |    2 
 drivers/acpi/scan.c                                               |    1 
 drivers/android/binder.c                                          |    1 
 drivers/android/binder_alloc.c                                    |    6 
 drivers/android/binder_alloc.h                                    |    1 
 drivers/char/tpm/tpm-chip.c                                       |   83 ---
 drivers/char/tpm/tpm_crb.c                                        |   30 +
 drivers/cpuidle/dt_idle_genpd.c                                   |   24 +
 drivers/cpuidle/dt_idle_genpd.h                                   |    7 
 drivers/dma/mcf-edma.c                                            |   13 
 drivers/dma/owl-dma.c                                             |    2 
 drivers/dma/pl330.c                                               |   18 
 drivers/gpio/gpio-sim.c                                           |    1 
 drivers/gpio/gpio-ws16c48.c                                       |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                               |    5 
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c                            |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c                        |   26 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c                           |   11 
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c                 |    2 
 drivers/gpu/drm/amd/display/dc/core/dc.c                          |   74 ++-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c                     |    5 
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c                 |  234 +++++++++-
 drivers/gpu/drm/amd/display/dc/dc.h                               |    6 
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c         |    6 
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c                  |    7 
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c                 |    8 
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c             |   22 
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h             |    3 
 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c           |    1 
 drivers/gpu/drm/amd/display/dc/inc/core_types.h                   |    1 
 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h          |    1 
 drivers/gpu/drm/amd/include/kgd_pp_interface.h                    |    2 
 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h                           |    2 
 drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c                  |   58 ++
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/hardwaremanager.c          |    4 
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c              |   16 
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c               |   80 ++-
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c               |   16 
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c               |   27 -
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c             |   41 +
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c             |   26 +
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c             |   24 -
 drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h                      |    4 
 drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h                |    1 
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c                         |   42 +
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h                     |    2 
 drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c                    |    9 
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c                    |    9 
 drivers/gpu/drm/drm_gem_shmem_helper.c                            |    6 
 drivers/gpu/drm/nouveau/nouveau_connector.c                       |    2 
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c                     |   48 ++
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h                 |    1 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c                 |    4 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c                 |   10 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c                |    1 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c                 |    1 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c                 |    1 
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c                       |   17 
 drivers/hwmon/pmbus/bel-pfe.c                                     |   16 
 drivers/iio/adc/ad7192.c                                          |   16 
 drivers/iio/adc/ina2xx-adc.c                                      |    9 
 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c         |    2 
 drivers/iio/frequency/admv1013.c                                  |    5 
 drivers/iio/industrialio-core.c                                   |    5 
 drivers/infiniband/core/umem.c                                    |    3 
 drivers/infiniband/hw/hfi1/chip.c                                 |    1 
 drivers/interconnect/qcom/bcm-voter.c                             |    5 
 drivers/interconnect/qcom/icc-rpmh.h                              |    2 
 drivers/interconnect/qcom/sm8450.c                                |    9 
 drivers/isdn/mISDN/dsp.h                                          |    2 
 drivers/isdn/mISDN/dsp_cmx.c                                      |    2 
 drivers/isdn/mISDN/dsp_core.c                                     |    2 
 drivers/misc/cardreader/rts5227.c                                 |    2 
 drivers/misc/cardreader/rts5228.c                                 |   18 
 drivers/misc/cardreader/rts5249.c                                 |    3 
 drivers/misc/cardreader/rts5260.c                                 |   18 
 drivers/misc/cardreader/rts5261.c                                 |   18 
 drivers/misc/cardreader/rtsx_pcr.c                                |    5 
 drivers/mmc/host/moxart-mmc.c                                     |    8 
 drivers/net/bonding/bond_main.c                                   |    4 
 drivers/net/dsa/ocelot/felix.c                                    |    2 
 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c                |    4 
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c                   |   14 
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c        |    4 
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c           |   24 -
 drivers/net/ethernet/ibm/ibmvnic.c                                |  112 ++++
 drivers/net/ethernet/intel/iavf/iavf_ethtool.c                    |    5 
 drivers/net/ethernet/intel/iavf/iavf_fdir.c                       |   11 
 drivers/net/ethernet/marvell/prestera/prestera_router.c           |   14 
 drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c            |    2 
 drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c               |    5 
 drivers/net/ethernet/mellanox/mlx5/core/main.c                    |    2 
 drivers/net/ethernet/mellanox/mlx5/core/sriov.c                   |    3 
 drivers/net/ethernet/microsoft/mana/mana_en.c                     |   37 +
 drivers/net/macsec.c                                              |   28 -
 drivers/net/phy/at803x.c                                          |    2 
 drivers/net/tun.c                                                 |    2 
 drivers/net/vxlan/vxlan_vnifilter.c                               |   11 
 drivers/net/wireguard/allowedips.c                                |    8 
 drivers/net/wireguard/selftest/allowedips.c                       |   16 
 drivers/net/wireless/realtek/rtw89/mac.c                          |    2 
 drivers/nvme/host/pci.c                                           |    3 
 drivers/nvme/host/rdma.c                                          |    3 
 drivers/nvme/host/tcp.c                                           |    3 
 drivers/platform/x86/serial-multi-instantiate.c                   |   35 +
 drivers/scsi/53c700.c                                             |    2 
 drivers/scsi/fnic/fnic.h                                          |    2 
 drivers/scsi/fnic/fnic_scsi.c                                     |    6 
 drivers/scsi/qedf/qedf_main.c                                     |   18 
 drivers/scsi/qedi/qedi_main.c                                     |   18 
 drivers/scsi/raid_class.c                                         |    1 
 drivers/scsi/scsi_proc.c                                          |   30 -
 drivers/scsi/snic/snic_disc.c                                     |    1 
 drivers/scsi/storvsc_drv.c                                        |    4 
 drivers/ufs/host/ufs-renesas.c                                    |    2 
 drivers/usb/common/usb-conn-gpio.c                                |    6 
 drivers/usb/dwc3/gadget.c                                         |    9 
 drivers/usb/gadget/udc/core.c                                     |    9 
 drivers/usb/storage/alauda.c                                      |   12 
 drivers/usb/typec/altmodes/displayport.c                          |   18 
 drivers/usb/typec/tcpm/tcpm.c                                     |    7 
 fs/btrfs/block-group.c                                            |   17 
 fs/btrfs/block-group.h                                            |    2 
 fs/btrfs/disk-io.c                                                |    3 
 fs/btrfs/extent-tree.c                                            |    5 
 fs/btrfs/extent_io.c                                              |    7 
 fs/btrfs/inode.c                                                  |   10 
 fs/btrfs/relocation.c                                             |   45 +
 fs/btrfs/tree-checker.c                                           |   14 
 fs/nilfs2/inode.c                                                 |    8 
 fs/nilfs2/segment.c                                               |    2 
 fs/nilfs2/the_nilfs.h                                             |    2 
 fs/smb/server/smb2misc.c                                          |   10 
 fs/smb/server/smb2pdu.c                                           |    9 
 include/linux/cpu.h                                               |    2 
 include/linux/skmsg.h                                             |    1 
 include/linux/tpm.h                                               |    1 
 include/net/cfg80211.h                                            |    3 
 include/net/netfilter/nf_tables.h                                 |   31 +
 include/trace/events/tcp.h                                        |    5 
 io_uring/openclose.c                                              |    6 
 net/core/filter.c                                                 |    6 
 net/core/skmsg.c                                                  |   10 
 net/core/sock_map.c                                               |   10 
 net/dccp/output.c                                                 |    2 
 net/dccp/proto.c                                                  |   10 
 net/ipv4/ip_tunnel_core.c                                         |    2 
 net/ipv4/nexthop.c                                                |   28 -
 net/ipv6/ndisc.c                                                  |    3 
 net/mptcp/protocol.c                                              |    4 
 net/mptcp/protocol.h                                              |    1 
 net/mptcp/subflow.c                                               |   58 +-
 net/netfilter/nf_tables_api.c                                     |  163 ++++--
 net/netfilter/nft_flow_offload.c                                  |    6 
 net/netfilter/nft_immediate.c                                     |    8 
 net/netfilter/nft_objref.c                                        |    8 
 net/packet/af_packet.c                                            |   16 
 net/sched/sch_netem.c                                             |   59 +-
 net/smc/af_smc.c                                                  |   73 ++-
 net/tls/tls_device.c                                              |   64 +-
 net/wireless/nl80211.c                                            |    5 
 net/xdp/xsk.c                                                     |    1 
 scripts/gcc-plugins/gcc-common.h                                  |    4 
 tools/testing/radix-tree/regression1.c                            |    2 
 tools/testing/selftests/net/fib_nexthops.sh                       |   10 
 tools/testing/selftests/net/forwarding/ethtool.sh                 |    2 
 tools/testing/selftests/net/forwarding/ethtool_extended_state.sh  |    2 
 tools/testing/selftests/net/forwarding/hw_stats_l3_gre.sh         |    2 
 tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh |    2 
 tools/testing/selftests/net/forwarding/lib.sh                     |   17 
 tools/testing/selftests/net/forwarding/settings                   |    1 
 tools/testing/selftests/net/forwarding/tc_flower.sh               |    8 
 tools/testing/selftests/net/mptcp/mptcp_join.sh                   |    6 
 tools/testing/selftests/rseq/Makefile                             |    4 
 tools/testing/selftests/rseq/rseq.c                               |    2 
 189 files changed, 1975 insertions(+), 734 deletions(-)

Alan Stern (2):
usb-storage: alauda: Fix uninit-value in alauda_check_media()
USB: Gadget: core: Help prevent panic during UVC unconfigure

Aleksa Sarai (1):
io_uring: correct check for O_TMPFILE

Alex Deucher (4):
drm/amdgpu: fix possible UAF in amdgpu_cs_pass1() drm/amdgpu: add S/G display parameter drm/amd/display: fix the build when DRM_AMD_DC_DCN is not set drm/amd/pm/smu7: move variables to where they are used

Alexandra Diupina (1):
scsi: 53c700: Check that command slot is not NULL

Alisa Roman (1):
iio: adc: ad7192: Fix ac excitation feature

Alvin Lee (2):
drm/amd/display: Disable phantom OTG after enable for plane disable drm/amd/display: Retain phantom plane/stream if validation fails

Alvin Šipraga (1):
iio: adc: ina2xx: avoid NULL pointer dereference on OF device match

Andrea Claudi (2):
selftests: mptcp: join: fix 'delete and re-add' test
selftests: mptcp: join: fix 'implicit EP' test

Andrea Parri (1):
riscv,mmio: Fix readX()-to-delay() ordering

Andrew Kanner (2):
net: core: remove unnecessary frame_sz check in bpf_xdp_adjust_tail()
drivers: net: prevent tun_build_skb() to exceed the packet size limit

Arnd Bergmann (2):
x86/speculation: Add cpu_show_gds() prototype
x86: Move gds_ucode_mitigated() declaration to header

August Wikerfors (1):
nvme-pci: add NVME_QUIRK_BOGUS_NID for Samsung PM9B1 256G and 512G

Aurabindo Pillai (1):
drm/amd/display: trigger timing sync only if TG is running

Badhri Jagan Sridharan (1):
usb: typec: tcpm: Fix response to vsafe0V event

Bartosz Golaszewski (1):
gpio: sim: mark the GPIO chip as a one that can sleep

Boris Brezillon (1):

      drm/shmem-helper: Reset vma->vm_ops before calling dma_buf_mmap()

Borislav Petkov (AMD) (1):
x86/sev: Do not try to parse for the CC blob on non-AMD hardware

Christoph Hellwig (2):
btrfs: don't stop integrity writeback too early
btrfs: properly clear end of the unreserved range in cow_file_range

Christophe JAILLET (1):
dmaengine: mcf-edma: Fix a potential un-allocated memory access

Colin Ian King (1):
radix tree test suite: fix incorrect allocation size for pthreads

Cristian Ciocaltea (1):
x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405

Dan Carpenter (1):
iio: frequency: admv1013: propagate errors from regulator_get_voltage()

Daniel Jurgens (1):
net/mlx5: Allow 0 for total host VFs

Daniel Stone (1):
drm/rockchip: Don't spam logs in atomic check

David Xu (1):
platform/x86: serial-multi-instantiate: Auto detect IRQ resource for CSC3551

Douglas Miller (1):
IB/hfi1: Fix possible panic during hotplug remove

Elson Roy Serrao (1):
usb: dwc3: Properly handle processing of pending events

Eric Dumazet (5):
macsec: use DEV_STATS_INC()
net/packet: annotate data-races around tp->status
tcp: add missing family to tcp_set_ca_state() tracepoint
dccp: fix data-race around dp->dccps_mss_cache
sch_netem: fix issues in netem_change() vs get_dist_table()

Evan Quan (4):
drm/amd/pm: fulfill swsmu peak profiling mode shader/memory clock settings drm/amd/pm: expose swctf threshold setting for legacy powerplay drm/amd/pm: fulfill powerplay peak profiling mode shader/memory clock settings drm/amd/pm: avoid unintentional shutdown due to temperature momentary fluctuation

Fedor Pchelkin (1):
drivers: vxlan: vnifilter: free percpu vni stats on error path

Felix Fietkau (1):
wifi: cfg80211: fix sband iftype data lookup for AP_VLAN

Florian Westphal (1):
tunnels: fix kasan splat when generating ipv4 pmtu error

Gerd Bayer (1):
net/smc: Use correct buffer sizes when switching between TCP and SMC

Greg Kroah-Hartman (2):
Revert "loongarch/cpu: Switch to arch_cpu_finalize_init()" Linux 6.1.46

Hao Chen (1):
net: hns3: fix strscpy causing content truncation issue

Ido Schimmel (11):
selftests: forwarding: Set default IPv6 traceroute utility
selftests: forwarding: Add a helper to skip test when using veth pairs
selftests: forwarding: ethtool: Skip when using veth pairs
selftests: forwarding: ethtool_extended_state: Skip when using veth pairs
selftests: forwarding: hw_stats_l3_gre: Skip when using veth pairs
selftests: forwarding: Skip test when no interfaces are specified
selftests: forwarding: Switch off timeout
selftests: forwarding: tc_flower: Relax success criterion
nexthop: Fix infinite nexthop dump when using maximum nexthop ID
nexthop: Make nexthop bucket dump more efficient
nexthop: Fix infinite nexthop bucket dump when using maximum nexthop ID

Ilpo Järvinen (1):
dmaengine: pl330: Return DMA_PAUSED when transaction is paused

Jakub Kicinski (1):
net: tls: avoid discarding data on record close

Jason A. Donenfeld (1):
wireguard: allowedips: expand maximum node depth

Jie Wang (2):
net: hns3: refactor hclge_mac_link_status_wait for interface reuse
net: hns3: add wait until mac link down

Jonas Gorski (1):
net: marvell: prestera: fix handling IPv4 routes with nhid

Josef Bacik (2):
btrfs: wait for actual caching progress during allocation
btrfs: set cache_block_group_error if we find an error

Karan Tilak Kumar (1):
scsi: fnic: Replace return codes in fnic_clean_pending_aborts()

Karol Herbst (2):
drm/nouveau/gr: enable memory loads on helper invocation on all channels drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes

Kees Cook (1):
gcc-plugins: Reorganize gimple includes for GCC 13

Keith Yeo (1):

      wifi: nl80211: fix integer overflow in nl80211_parse_mbssid_elems()

Kirill A. Shutemov (1):
x86/mm: Fix VDSO and VVAR placement on 5-level paging machines

Li Yang (1):
net: phy: at803x: remove set/get wol callbacks for AR8032

Long Li (1):
ksmbd: validate command request size

Lyude Paul (1):
drm/nouveau/nvkm/dp: Add workaround to fix DP 1.3+ DPCD issues

Maciej Żenczykowski (1):
ipv6: adjust ndisc_is_useropt() to also return true for PIO

Magnus Karlsson (1):
xsk: fix refcount underflow in error path

Mario Limonciello (3):
tpm: Disable RNG for all AMD fTPMs
tpm: Add a helper for checking hwrng enabled drm/amd: Disable S/G for APUs when 64GB or more host memory

Mark Brown (1):
selftests/rseq: Fix build with undefined __weak

Masahiro Yamada (1):
alpha: remove __init annotation from exported page_is_ram()

Maulik Shah (1):
cpuidle: dt_idle_genpd: Add helper function to remove genpd topology

Melissa Wen (1):
drm/amd/display: check attr flag before set cursor degamma on DCN3+

Michael Guralnik (1):
RDMA/umem: Set iova in ODP flow

Michael Kelley (1):
scsi: storvsc: Fix handling of virtual Fibre Channel timeouts

Mike Tipton (1):
interconnect: qcom: Add support for mask-based BCMs

Milan Zamazal (1):
iio: core: Prevent invalid memory access when there is no parent

Ming Lei (2):
nvme-tcp: fix potential unbalanced freeze & unfreeze
nvme-rdma: fix potential unbalanced freeze & unfreeze

Moshe Shemesh (2):
net/mlx5: Skip clock update work when device is in error state net/mlx5: Reload auxiliary devices in pci error handlers

Namjae Jeon (1):
ksmbd: fix wrong next length validation of ea buffer in smb2_set_ea()

Nathan Chancellor (1):
mISDN: Update parameter type of dsp_cmx_send()

Neil Armstrong (1):
interconnect: qcom: sm8450: add enable_mask for bcm nodes

Nick Child (5):
ibmvnic: Enforce stronger sanity checks on login response
ibmvnic: Unmap DMA login rsp buffer on send login fail
ibmvnic: Handle DMA unmapping of login buffs in release functions
ibmvnic: Do partial reset on login failure
ibmvnic: Ensure login failure recovery is safe from other resets

Nick Desaulniers (1):
x86/srso: Fix build breakage with the LLVM linker

Nilesh Javali (2):
scsi: qedi: Fix firmware halt over suspend and resume
scsi: qedf: Fix firmware halt over suspend and resume

Pablo Neira Ayuso (1):
netfilter: nf_tables: report use refcount overflow

Paolo Abeni (2):
mptcp: avoid bogus reset on fallback close
mptcp: fix disconnect vs accept race

Paolo Bonzini (2):
KVM: SEV: snapshot the GHCB before accessing it
KVM: SEV: only access GHCB fields once

Peichen Huang (1):
drm/amd/display: limit DPIA link rate to HBR3

Ping-Ke Shih (1):
wifi: rtw89: fix 8852AE disconnection caused by RX full flags

Piotr Gardocki (1):
iavf: fix potential races for FDIR filters

Prashanth K (1):
usb: common: usb-conn-gpio: Prevent bailing out if initial role is none

Qi Zheng (1):
binder: fix memory leak in binder_init()

Qu Wenruo (2):
btrfs: exit gracefully if reloc roots don't match
btrfs: reject invalid reloc tree root keys with stack dump

RD Babiera (1):
usb: typec: altmodes/displayport: Signal hpd when configuring pin assignment

Ricky WU (1):
misc: rtsx: judge ASPM Mode to set PETXCFG Reg

Rodrigo Siqueira (6):
drm/amd/display: Handle virtual hardware detect drm/amd/display: Add function for validate and update new stream drm/amd/display: Handle seamless boot stream drm/amd/display: Update OTG instance in the commit stream drm/amd/display: Avoid ABM when ODM combine is enabled for eDP drm/amd/display: Use update plane and stream routine for DCN32x

Ryusuke Konishi (1):
nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput

Sergei Antonov (1):
mmc: moxart: read scr register without changing byte order

Shay Drory (1):
net/mlx5: LAG, Check correct bucket when modifying LAG

Simon Trimmer (1):
ACPI: scan: Create platform device for CS35L56

Souradeep Chakrabarti (1):
net: mana: Fix MANA VF unload when hardware is unresponsive

Tao Ren (1):
hwmon: (pmbus/bel-pfe) Enable PMBUS_SKIP_STATUS_CHECK for pfe1100

Tony Battersby (1):
scsi: core: Fix legacy /proc parsing buffer overflow

Torsten Duwe (2):
riscv/kexec: load initrd high in available memory riscv/kexec: handle R_RISCV_CALL_PLT relocation type

Vladimir Oltean (1):
net: dsa: ocelot: call dsa_tag_8021q_unregister() under rtnl_lock() on driver remove

William Breathitt Gray (1):
gpio: ws16c48: Fix off-by-one error in WS16C48 resource region extent

Xiang Yang (1):

      mptcp: fix the incorrect judgment for msk->cb_flags

Xu Kuohai (2):
bpf, sockmap: Fix map type error in sock_map_del_link bpf, sockmap: Fix bug that strp_done cannot be called

Yiyuan Guo (1):
iio: cros_ec: Fix the allocation size for cros_ec_command

Yonglong Liu (1):
net: hns3: fix deadlock issue when externel_lb and reset are executed together

Yoshihiro Shimoda (1):
scsi: ufs: renesas: Fix private allocation

Zhang Jianhua (1):
dmaengine: owl-dma: Modify mismatched function name

Zhu Wang (2):
scsi: snic: Fix possible memory leak if device_add() fails
scsi: core: Fix possible memory leak if device_add() fails

Ziyang Xuan (1):
bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves

author maintainer
#1 lore raw
Makefile +1 -1
index 82c958299e98..bdb965177db5 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 45
+SUBLEVEL = 46
 EXTRAVERSION =
 NAME = Curry Ramen
 
arch/alpha/kernel/setup.c +1 -2
index 33bf3a627002..45a920ba4921 100644
@@ -385,8 +385,7 @@ setup_memory(void *kernel_end)
 #endif /* CONFIG_BLK_DEV_INITRD */
 }
 
-int __init
-page_is_ram(unsigned long pfn)
+int page_is_ram(unsigned long pfn)
 {
 	struct memclust_struct * cluster;
 	struct memdesc_struct * memdesc;
arch/loongarch/Kconfig +0 -1
index 270742cc3ca4..e737dc8cd660 100644
@@ -10,7 +10,6 @@ config LOONGARCH
 	select ARCH_ENABLE_MEMORY_HOTPLUG
 	select ARCH_ENABLE_MEMORY_HOTREMOVE
 	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI
-	select ARCH_HAS_CPU_FINALIZE_INIT
 	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
 	select ARCH_HAS_PTE_SPECIAL
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
arch/loongarch/kernel/setup.c +0 -6
index 29725b37b35c..ae436def7ee9 100644
@@ -12,7 +12,6 @@
  */
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <linux/cpu.h>
 #include <linux/dmi.h>
 #include <linux/efi.h>
 #include <linux/export.h>
@@ -81,11 +80,6 @@ const char *get_system_type(void)
 	return "generic-loongson-machine";
 }
 
-void __init arch_cpu_finalize_init(void)
-{
-	alternative_instructions();
-}
-
 static const char *dmi_string_parse(const struct dmi_header *dm, u8 s)
 {
 	const u8 *bp = ((u8 *) dm) + dm->length;
arch/riscv/include/asm/mmio.h +8 -8
index aff6c33ab0c0..4c58ee7f95ec 100644
@@ -101,9 +101,9 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)
  * Relaxed I/O memory access primitives. These follow the Device memory
  * ordering rules but do not guarantee any ordering relative to Normal memory
  * accesses.  These are defined to order the indicated access (either a read or
- * write) with all other I/O memory accesses. Since the platform specification
- * defines that all I/O regions are strongly ordered on channel 2, no explicit
- * fences are required to enforce this ordering.
+ * write) with all other I/O memory accesses to the same peripheral. Since the
+ * platform specification defines that all I/O regions are strongly ordered on
+ * channel 0, no explicit fences are required to enforce this ordering.
  */
 /* FIXME: These are now the same as asm-generic */
 #define __io_rbr()		do {} while (0)
@@ -125,14 +125,14 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)
 #endif
 
 /*
- * I/O memory access primitives. Reads are ordered relative to any
- * following Normal memory access. Writes are ordered relative to any prior
- * Normal memory access.  The memory barriers here are necessary as RISC-V
+ * I/O memory access primitives.  Reads are ordered relative to any following
+ * Normal memory read and delay() loop.  Writes are ordered relative to any
+ * prior Normal memory write.  The memory barriers here are necessary as RISC-V
  * doesn't define any ordering between the memory space and the I/O space.
  */
 #define __io_br()	do {} while (0)
-#define __io_ar(v)	__asm__ __volatile__ ("fence i,r" : : : "memory")
-#define __io_bw()	__asm__ __volatile__ ("fence w,o" : : : "memory")
+#define __io_ar(v)	({ __asm__ __volatile__ ("fence i,ir" : : : "memory"); })
+#define __io_bw()	({ __asm__ __volatile__ ("fence w,o" : : : "memory"); })
 #define __io_aw()	mmiowb_set_pending()
 
 #define readb(c)	({ u8  __v; __io_br(); __v = readb_cpu(c); __io_ar(__v); __v; })
arch/riscv/kernel/elf_kexec.c +2 -1
index 5372b708fae2..c08bb5c3b385 100644
@@ -281,7 +281,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,
 		kbuf.buffer = initrd;
 		kbuf.bufsz = kbuf.memsz = initrd_len;
 		kbuf.buf_align = PAGE_SIZE;
-		kbuf.top_down = false;
+		kbuf.top_down = true;
 		kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
 		ret = kexec_add_buffer(&kbuf);
 		if (ret)
@@ -425,6 +425,7 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
 		 * sym, instead of searching the whole relsec.
 		 */
 		case R_RISCV_PCREL_HI20:
+		case R_RISCV_CALL_PLT:
 		case R_RISCV_CALL:
 			*(u64 *)loc = CLEAN_IMM(UITYPE, *(u64 *)loc) |
 				 ENCODE_UJTYPE_IMM(val - addr);
arch/x86/boot/compressed/idt_64.c +8 -1
index 6debb816e83d..3cdf94b41456 100644
@@ -63,7 +63,14 @@ void load_stage2_idt(void)
 	set_idt_entry(X86_TRAP_PF, boot_page_fault);
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT
-	set_idt_entry(X86_TRAP_VC, boot_stage2_vc);
+	/*
+	 * Clear the second stage #VC handler in case guest types
+	 * needing #VC have not been detected.
+	 */
+	if (sev_status & BIT(1))
+		set_idt_entry(X86_TRAP_VC, boot_stage2_vc);
+	else
+		set_idt_entry(X86_TRAP_VC, NULL);
 #endif
 
 	load_boot_idt(&boot_idt_desc);
arch/x86/boot/compressed/sev.c +35 -2
index d63ad8f99f83..e65f0968e0d9 100644
@@ -354,13 +354,46 @@ void sev_enable(struct boot_params *bp)
 	if (bp)
 		bp->cc_blob_address = 0;
 
+	/*
+	 * Do an initial SEV capability check before snp_init() which
+	 * loads the CPUID page and the same checks afterwards are done
+	 * without the hypervisor and are trustworthy.
+	 *
+	 * If the HV fakes SEV support, the guest will crash'n'burn
+	 * which is good enough.
+	 */
+
+	/* Check for the SME/SEV support leaf */
+	eax = 0x80000000;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (eax < 0x8000001f)
+		return;
+
+	/*
+	 * Check for the SME/SEV feature:
+	 *   CPUID Fn8000_001F[EAX]
+	 *   - Bit 0 - Secure Memory Encryption support
+	 *   - Bit 1 - Secure Encrypted Virtualization support
+	 *   CPUID Fn8000_001F[EBX]
+	 *   - Bits 5:0 - Pagetable bit position used to indicate encryption
+	 */
+	eax = 0x8000001f;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	/* Check whether SEV is supported */
+	if (!(eax & BIT(1)))
+		return;
+
 	/*
 	 * Setup/preliminary detection of SNP. This will be sanity-checked
 	 * against CPUID/MSR values later.
 	 */
 	snp = snp_init(bp);
 
-	/* Check for the SME/SEV support leaf */
+	/* Now repeat the checks with the SNP CPUID table. */
+
+	/* Recheck the SME/SEV support leaf */
 	eax = 0x80000000;
 	ecx = 0;
 	native_cpuid(&eax, &ebx, &ecx, &edx);
@@ -368,7 +401,7 @@ void sev_enable(struct boot_params *bp)
 		return;
 
 	/*
-	 * Check for the SME/SEV feature:
+	 * Recheck for the SME/SEV feature:
 	 *   CPUID Fn8000_001F[EAX]
 	 *   - Bit 0 - Secure Memory Encryption support
 	 *   - Bit 1 - Secure Encrypted Virtualization support
arch/x86/entry/vdso/vma.c +2 -2
index 311eae30e089..1288661397f0 100644
@@ -322,8 +322,8 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
 
 	/* Round the lowest possible end address up to a PMD boundary. */
 	end = (start + len + PMD_SIZE - 1) & PMD_MASK;
-	if (end >= TASK_SIZE_MAX)
-		end = TASK_SIZE_MAX;
+	if (end >= DEFAULT_MAP_WINDOW)
+		end = DEFAULT_MAP_WINDOW;
 	end -= len;
 
 	if (end > start) {
arch/x86/include/asm/processor.h +2 -0
index 45bf26862b99..94ea13adb724 100644
@@ -867,4 +867,6 @@ bool arch_is_platform_page(u64 paddr);
 #define arch_is_platform_page arch_is_platform_page
 #endif
 
+extern bool gds_ucode_mitigated(void);
+
 #endif /* _ASM_X86_PROCESSOR_H */
arch/x86/kernel/cpu/amd.c +1 -0
index 43910eb55b2e..239b302973d7 100644
@@ -73,6 +73,7 @@ static const int amd_erratum_1054[] =
 static const int amd_zenbleed[] =
 	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf),
 			   AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf),
+			   AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf),
 			   AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf));
 
 static const int amd_div0[] =
arch/x86/kernel/vmlinux.lds.S +9 -3
index fd03f5a1f0ef..e6939ebb606a 100644
@@ -514,11 +514,17 @@ INIT_PER_CPU(irq_stack_backing_store);
 
 #ifdef CONFIG_CPU_SRSO
 /*
- * GNU ld cannot do XOR so do: (A | B) - (A & B) in order to compute the XOR
+ * GNU ld cannot do XOR until 2.41.
+ * https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f6f78318fca803c4907fb8d7f6ded8295f1947b1
+ *
+ * LLVM lld cannot do XOR until lld-17.
+ * https://github.com/llvm/llvm-project/commit/fae96104d4378166cbe5c875ef8ed808a356f3fb
+ *
+ * Instead do: (A | B) - (A & B) in order to compute the XOR
  * of the two function addresses:
  */
-. = ASSERT(((srso_untrain_ret_alias | srso_safe_ret_alias) -
-		(srso_untrain_ret_alias & srso_safe_ret_alias)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
+. = ASSERT(((ABSOLUTE(srso_untrain_ret_alias) | srso_safe_ret_alias) -
+		(ABSOLUTE(srso_untrain_ret_alias) & srso_safe_ret_alias)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
 		"SRSO function pair won't alias");
 #endif
 
arch/x86/kvm/svm/sev.c +49 -45

207 lines not on this page · raw message

arch/x86/kvm/svm/svm.h +26 -0
index d0ed3f595229..62f87492763e 100644
@@ -196,10 +196,12 @@ struct vcpu_sev_es_state {
 	/* SEV-ES support */
 	struct sev_es_save_area *vmsa;
 	struct ghcb *ghcb;
+	u8 valid_bitmap[16];
 	struct kvm_host_map ghcb_map;
 	bool received_first_sipi;
 
 	/* SEV-ES scratch area support */
+	u64 sw_scratch;
 	void *ghcb_sa;
 	u32 ghcb_sa_len;
 	bool ghcb_sa_sync;
@@ -688,4 +690,28 @@ void sev_es_unmap_ghcb(struct vcpu_svm *svm);
 void __svm_sev_es_vcpu_run(struct vcpu_svm *svm, bool spec_ctrl_intercepted);
 void __svm_vcpu_run(struct vcpu_svm *svm, bool spec_ctrl_intercepted);
 
+#define DEFINE_KVM_GHCB_ACCESSORS(field)						\
+	static __always_inline bool kvm_ghcb_##field##_is_valid(const struct vcpu_svm *svm) \
+	{									\
+		return test_bit(GHCB_BITMAP_IDX(field),				\
+				(unsigned long *)&svm->sev_es.valid_bitmap);	\
+	}									\
+										\
+	static __always_inline u64 kvm_ghcb_get_##field##_if_valid(struct vcpu_svm *svm, struct ghcb *ghcb) \
+	{									\
+		return kvm_ghcb_##field##_is_valid(svm) ? ghcb->save.field : 0;	\
+	}									\
+
+DEFINE_KVM_GHCB_ACCESSORS(cpl)
+DEFINE_KVM_GHCB_ACCESSORS(rax)
+DEFINE_KVM_GHCB_ACCESSORS(rcx)
+DEFINE_KVM_GHCB_ACCESSORS(rdx)
+DEFINE_KVM_GHCB_ACCESSORS(rbx)
+DEFINE_KVM_GHCB_ACCESSORS(rsi)
+DEFINE_KVM_GHCB_ACCESSORS(sw_exit_code)
+DEFINE_KVM_GHCB_ACCESSORS(sw_exit_info_1)
+DEFINE_KVM_GHCB_ACCESSORS(sw_exit_info_2)
+DEFINE_KVM_GHCB_ACCESSORS(sw_scratch)
+DEFINE_KVM_GHCB_ACCESSORS(xcr0)
+
 #endif
arch/x86/kvm/x86.c +0 -2
index f4b12c3c30a0..1931d3fcbbe0 100644
@@ -311,8 +311,6 @@ u64 __read_mostly host_xcr0;
 
 static struct kmem_cache *x86_emulator_cache;
 
-extern bool gds_ucode_mitigated(void);
-
 /*
  * When called, it means the previous get/set msr reached an invalid msr.
  * Return true if we want to ignore/silent this failed msr access.
drivers/acpi/scan.c +1 -0
index dbfa58e799e2..a0e347f6f97e 100644
@@ -1712,6 +1712,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
 		{"BSG1160", },
 		{"BSG2150", },
 		{"CSC3551", },
+		{"CSC3556", },
 		{"INT33FE", },
 		{"INT3515", },
 		/* Non-conforming _HID for Cirrus Logic already released */
drivers/android/binder.c +1 -0
index e374a8a2da46..e4a6da81cd4b 100644
@@ -6602,6 +6602,7 @@ static int __init binder_init(void)
 
 err_alloc_device_names_failed:
 	debugfs_remove_recursive(binder_debugfs_dir_entry_root);
+	binder_alloc_shrinker_exit();
 
 	return ret;
 }
drivers/android/binder_alloc.c +6 -0
index 4fb89ef067d5..cd87f12733f2 100644
@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void)
 	return ret;
 }
 
+void binder_alloc_shrinker_exit(void)
+{
+	unregister_shrinker(&binder_shrinker);
+	list_lru_destroy(&binder_alloc_lru);
+}
+
 /**
  * check_buffer() - verify that buffer/offset is safe to access
  * @alloc: binder_alloc for this proc
drivers/android/binder_alloc.h +1 -0
index 138d1d5af9ce..dc1e2b01dd64 100644
@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
 						  int pid);
 extern void binder_alloc_init(struct binder_alloc *alloc);
 extern int binder_alloc_shrinker_init(void);
+extern void binder_alloc_shrinker_exit(void);
 extern void binder_alloc_vma_close(struct binder_alloc *alloc);
 extern struct binder_buffer *
 binder_alloc_prepare_to_free(struct binder_alloc *alloc,
drivers/char/tpm/tpm-chip.c +14 -69

109 lines not on this page · raw message

drivers/char/tpm/tpm_crb.c +30 -0
index cbbedf52607c..7f7f3bded453 100644
@@ -463,6 +463,28 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status)
 	return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE;
 }
 
+static int crb_check_flags(struct tpm_chip *chip)
+{
+	u32 val;
+	int ret;
+
+	ret = crb_request_locality(chip, 0);
+	if (ret)
+		return ret;
+
+	ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL);
+	if (ret)
+		goto release;
+
+	if (val == 0x414D4400U /* AMD */)
+		chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED;
+
+release:
+	crb_relinquish_locality(chip, 0);
+
+	return ret;
+}
+
 static const struct tpm_class_ops tpm_crb = {
 	.flags = TPM_OPS_AUTO_STARTUP,
 	.status = crb_status,
@@ -800,6 +822,14 @@ static int crb_acpi_add(struct acpi_device *device)
 	chip->acpi_dev_handle = device->handle;
 	chip->flags = TPM_CHIP_FLAG_TPM2;
 
+	rc = tpm_chip_bootstrap(chip);
+	if (rc)
+		goto out;
+
+	rc = crb_check_flags(chip);
+	if (rc)
+		goto out;
+
 	rc = tpm_chip_register(chip);
 
 out:
drivers/cpuidle/dt_idle_genpd.c +24 -0
index b37165514d4e..1af63c189039 100644
@@ -152,6 +152,30 @@ int dt_idle_pd_init_topology(struct device_node *np)
 	return 0;
 }
 
+int dt_idle_pd_remove_topology(struct device_node *np)
+{
+	struct device_node *node;
+	struct of_phandle_args child, parent;
+	int ret;
+
+	for_each_child_of_node(np, node) {
+		if (of_parse_phandle_with_args(node, "power-domains",
+					"#power-domain-cells", 0, &parent))
+			continue;
+
+		child.np = node;
+		child.args_count = 0;
+		ret = of_genpd_remove_subdomain(&parent, &child);
+		of_node_put(parent.np);
+		if (ret) {
+			of_node_put(node);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
 struct device *dt_idle_attach_cpu(int cpu, const char *name)
 {
 	struct device *dev;
drivers/cpuidle/dt_idle_genpd.h +7 -0
index a95483d08a02..3be1f70f55b5 100644
@@ -14,6 +14,8 @@ struct generic_pm_domain *dt_idle_pd_alloc(struct device_node *np,
 
 int dt_idle_pd_init_topology(struct device_node *np);
 
+int dt_idle_pd_remove_topology(struct device_node *np);
+
 struct device *dt_idle_attach_cpu(int cpu, const char *name);
 
 void dt_idle_detach_cpu(struct device *dev);
@@ -36,6 +38,11 @@ static inline int dt_idle_pd_init_topology(struct device_node *np)
 	return 0;
 }
 
+static inline int dt_idle_pd_remove_topology(struct device_node *np)
+{
+	return 0;
+}
+
 static inline struct device *dt_idle_attach_cpu(int cpu, const char *name)
 {
 	return NULL;
drivers/dma/mcf-edma.c +7 -6
index e12b754e6398..60d3c5f09ad6 100644
@@ -191,7 +191,13 @@ static int mcf_edma_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	chans = pdata->dma_channels;
+	if (!pdata->dma_channels) {
+		dev_info(&pdev->dev, "setting default channel number to 64");
+		chans = 64;
+	} else {
+		chans = pdata->dma_channels;
+	}
+
 	len = sizeof(*mcf_edma) + sizeof(*mcf_chan) * chans;
 	mcf_edma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
 	if (!mcf_edma)
@@ -203,11 +209,6 @@ static int mcf_edma_probe(struct platform_device *pdev)
 	mcf_edma->drvdata = &mcf_data;
 	mcf_edma->big_endian = 1;
 
-	if (!mcf_edma->n_chans) {
-		dev_info(&pdev->dev, "setting default channel number to 64");
-		mcf_edma->n_chans = 64;
-	}
-
 	mutex_init(&mcf_edma->fsl_edma_mutex);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
drivers/dma/owl-dma.c +1 -1
index 95a462a1f511..b6e0ac8314e5 100644
@@ -192,7 +192,7 @@ struct owl_dma_pchan {
 };
 
 /**
- * struct owl_dma_pchan - Wrapper for DMA ENGINE channel
+ * struct owl_dma_vchan - Wrapper for DMA ENGINE channel
  * @vc: wrapped virtual channel
  * @pchan: the physical channel utilized by this channel
  * @txd: active transaction on this channel
drivers/dma/pl330.c +16 -2
index b4731fe6bbc1..3cf0b38387ae 100644
@@ -403,6 +403,12 @@ enum desc_status {
 	 * of a channel can be BUSY at any time.
 	 */
 	BUSY,
+	/*
+	 * Pause was called while descriptor was BUSY. Due to hardware
+	 * limitations, only termination is possible for descriptors
+	 * that have been paused.
+	 */
+	PAUSED,
 	/*
 	 * Sitting on the channel work_list but xfer done
 	 * by PL330 core
@@ -2041,7 +2047,7 @@ static inline void fill_queue(struct dma_pl330_chan *pch)
 	list_for_each_entry(desc, &pch->work_list, node) {
 
 		/* If already submitted */
-		if (desc->status == BUSY)
+		if (desc->status == BUSY || desc->status == PAUSED)
 			continue;
 
 		ret = pl330_submit_req(pch->thread, desc);
@@ -2326,6 +2332,7 @@ static int pl330_pause(struct dma_chan *chan)
 {
 	struct dma_pl330_chan *pch = to_pchan(chan);
 	struct pl330_dmac *pl330 = pch->dmac;
+	struct dma_pl330_desc *desc;
 	unsigned long flags;
 
 	pm_runtime_get_sync(pl330->ddma.dev);
@@ -2335,6 +2342,10 @@ static int pl330_pause(struct dma_chan *chan)
 	_stop(pch->thread);
 	spin_unlock(&pl330->lock);
 
+	list_for_each_entry(desc, &pch->work_list, node) {
+		if (desc->status == BUSY)
+			desc->status = PAUSED;
+	}
 	spin_unlock_irqrestore(&pch->lock, flags);
 	pm_runtime_mark_last_busy(pl330->ddma.dev);
 	pm_runtime_put_autosuspend(pl330->ddma.dev);
@@ -2425,7 +2436,7 @@ pl330_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 		else if (running && desc == running)
 			transferred =
 				pl330_get_current_xferred_count(pch, desc);
-		else if (desc->status == BUSY)
+		else if (desc->status == BUSY || desc->status == PAUSED)
 			/*
 			 * Busy but not running means either just enqueued,
 			 * or finished and not yet marked done
@@ -2442,6 +2453,9 @@ pl330_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 			case DONE:
 				ret = DMA_COMPLETE;
 				break;
+			case PAUSED:
+				ret = DMA_PAUSED;
+				break;
 			case PREP:
 			case BUSY:
 				ret = DMA_IN_PROGRESS;
drivers/gpio/gpio-sim.c +1 -0
index 803676e307d7..fef12e57b1f1 100644
@@ -425,6 +425,7 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev)
 	gc->set_config = gpio_sim_set_config;
 	gc->to_irq = gpio_sim_to_irq;
 	gc->free = gpio_sim_free;
+	gc->can_sleep = true;
 
 	ret = devm_gpiochip_add_data(dev, gc, chip);
 	if (ret)
drivers/gpio/gpio-ws16c48.c +1 -1
index e73885a4dc32..afb42a8e916f 100644
@@ -18,7 +18,7 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
-#define WS16C48_EXTENT 10
+#define WS16C48_EXTENT 11
 #define MAX_NUM_WS16C48 max_num_isa_dev(WS16C48_EXTENT)
 
 static unsigned int base[MAX_NUM_WS16C48];
drivers/gpu/drm/amd/amdgpu/amdgpu.h +5 -0
index c0e782a95e72..0c962f996aff 100644
@@ -242,6 +242,7 @@ extern int amdgpu_num_kcq;
 
 #define AMDGPU_VCNFW_LOG_SIZE (32 * 1024)
 extern int amdgpu_vcnfw_log;
+extern int amdgpu_sg_display;
 
 #define AMDGPU_VM_MAX_NUM_CTX			4096
 #define AMDGPU_SG_THRESHOLD			(256*1024*1024)
@@ -283,6 +284,9 @@ extern int amdgpu_vcnfw_log;
 #define AMDGPU_SMARTSHIFT_MAX_BIAS (100)
 #define AMDGPU_SMARTSHIFT_MIN_BIAS (-100)
 
+/* Extra time delay(in ms) to eliminate the influence of temperature momentary fluctuation */
+#define AMDGPU_SWCTF_EXTRA_DELAY		50
+
 struct amdgpu_device;
 struct amdgpu_irq_src;
 struct amdgpu_fpriv;
@@ -1262,6 +1266,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
 int amdgpu_device_pci_reset(struct amdgpu_device *adev);
 bool amdgpu_device_need_post(struct amdgpu_device *adev);
+bool amdgpu_sg_display_supported(struct amdgpu_device *adev);
 bool amdgpu_device_pcie_dynamic_switching_supported(void);
 bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);
 bool amdgpu_device_aspm_support_quirk(void);
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
index b60b6e6149bf..fdb53d4394f3 100644
@@ -287,7 +287,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
 
 	if (!p->gang_size) {
 		ret = -EINVAL;
-		goto free_partial_kdata;
+		goto free_all_kdata;
 	}
 
 	for (i = 0; i < p->gang_size; ++i) {
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +26 -0
index 30c97ee37563..773383e660e8 100644
@@ -1333,6 +1333,32 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev)
 	return true;
 }
 
+/*
+ * On APUs with >= 64GB white flickering has been observed w/ SG enabled.
+ * Disable S/G on such systems until we have a proper fix.
+ * https://gitlab.freedesktop.org/drm/amd/-/issues/2354
+ * https://gitlab.freedesktop.org/drm/amd/-/issues/2735
+ */
+bool amdgpu_sg_display_supported(struct amdgpu_device *adev)
+{
+	switch (amdgpu_sg_display) {
+	case -1:
+		break;
+	case 0:
+		return false;
+	case 1:
+		return true;
+	default:
+		return false;
+	}
+	if ((totalram_pages() << (PAGE_SHIFT - 10)) +
+	    (adev->gmc.real_vram_size / 1024) >= 64000000) {
+		DRM_WARN("Disabling S/G due to >=64GB RAM\n");
+		return false;
+	}
+	return true;
+}
+
 /*
  * Intel hosts such as Raptor Lake and Sapphire Rapids don't support dynamic
  * speed switching. Until we have confirmation from Intel that a specific host
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +11 -0
index 49a023f59b2f..6e5bc7484695 100644
@@ -185,6 +185,7 @@ int amdgpu_num_kcq = -1;
 int amdgpu_smartshift_bias;
 int amdgpu_use_xgmi_p2p = 1;
 int amdgpu_vcnfw_log;
+int amdgpu_sg_display = -1; /* auto */
 
 static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
 
@@ -929,6 +930,16 @@ module_param_named(num_kcq, amdgpu_num_kcq, int, 0444);
 MODULE_PARM_DESC(vcnfw_log, "Enable vcnfw log(0 = disable (default value), 1 = enable)");
 module_param_named(vcnfw_log, amdgpu_vcnfw_log, int, 0444);
 
+/**
+ * DOC: sg_display (int)
+ * Disable S/G (scatter/gather) display (i.e., display from system memory).
+ * This option is only relevant on APUs.  Set this option to 0 to disable
+ * S/G display if you experience flickering or other issues under memory
+ * pressure and report the issue.
+ */
+MODULE_PARM_DESC(sg_display, "S/G Display (-1 = auto (default), 0 = disable)");
+module_param_named(sg_display, amdgpu_sg_display, int, 0444);
+
 /**
  * DOC: smu_pptable_id (int)
  * Used to override pptable id. id = 0 use VBIOS pptable.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
index 86e07cc1d3dc..9f718b98da1f 100644
@@ -1634,6 +1634,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 		}
 		break;
 	}
+	if (init_data.flags.gpu_vm_support)
+		init_data.flags.gpu_vm_support = amdgpu_sg_display_supported(adev);
 
 	if (init_data.flags.gpu_vm_support)
 		adev->mode_info.gpu_vm_support = true;
drivers/gpu/drm/amd/display/dc/core/dc.c +63 -11

127 lines not on this page · raw message

drivers/gpu/drm/amd/display/dc/core/dc_link.c +5 -0
index c2c6c4587a5c..bbaeb6c567d0 100644
@@ -1141,6 +1141,11 @@ static bool detect_link_and_local_sink(struct dc_link *link,
 					(link->dpcd_caps.dongle_type !=
 							DISPLAY_DONGLE_DP_HDMI_CONVERTER))
 				converter_disable_audio = true;
+
+			/* limited link rate to HBR3 for DPIA until we implement USB4 V2 */
+			if (link->ep_type == DISPLAY_ENDPOINT_USB4_DPIA &&
+					link->reported_link_cap.link_rate > LINK_RATE_HIGH3)
+				link->reported_link_cap.link_rate = LINK_RATE_HIGH3;
 			break;
 		}
 
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +230 -4

250 lines not on this page · raw message

drivers/gpu/drm/amd/display/dc/dc.h +6 -0
index 6409b8d8ff71..a4540f83aae5 100644
@@ -1298,6 +1298,12 @@ enum dc_status dc_validate_plane(struct dc *dc, const struct dc_plane_state *pla
 
 void get_clock_requirements_for_state(struct dc_state *state, struct AsicStateEx *info);
 
+enum dc_status dc_validate_with_context(struct dc *dc,
+					const struct dc_validation_set set[],
+					int set_count,
+					struct dc_state *context,
+					bool fast_validate);
+
 bool dc_set_generic_gpio_for_stereo(bool enable,
 		struct gpio_service *gpio_service);
 
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +6 -0
index a6fde27d1347..394027118963 100644
@@ -2284,6 +2284,12 @@ void dcn10_enable_timing_synchronization(
 		opp = grouped_pipes[i]->stream_res.opp;
 		tg = grouped_pipes[i]->stream_res.tg;
 		tg->funcs->get_otg_active_size(tg, &width, &height);
+
+		if (!tg->funcs->is_tg_enabled(tg)) {
+			DC_SYNC_INFO("Skipping timing sync on disabled OTG\n");
+			return;
+		}
+
 		if (opp->funcs->opp_program_dpg_dimensions)
 			opp->funcs->opp_program_dpg_dimensions(opp, width, 2*(height) + 1);
 	}
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c +5 -2
index e5b7ef7422b8..50dc83404644 100644
@@ -357,8 +357,11 @@ void dpp3_set_cursor_attributes(
 	int cur_rom_en = 0;
 
 	if (color_format == CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA ||
-		color_format == CURSOR_MODE_COLOR_UN_PRE_MULTIPLIED_ALPHA)
-		cur_rom_en = 1;
+		color_format == CURSOR_MODE_COLOR_UN_PRE_MULTIPLIED_ALPHA) {
+		if (cursor_attributes->attribute_flags.bits.ENABLE_CURSOR_DEGAMMA) {
+			cur_rom_en = 1;
+		}
+	}
 
 	REG_UPDATE_3(CURSOR0_CONTROL,
 			CUR0_MODE, color_format,
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c +8 -0
index fe941b103de8..a974f86e718a 100644
@@ -167,6 +167,13 @@ static void optc32_phantom_crtc_post_enable(struct timing_generator *optc)
 	REG_WAIT(OTG_CLOCK_CONTROL, OTG_BUSY, 0, 1, 100000);
 }
 
+static void optc32_disable_phantom_otg(struct timing_generator *optc)
+{
+	struct optc *optc1 = DCN10TG_FROM_TG(optc);
+
+	REG_UPDATE(OTG_CONTROL, OTG_MASTER_EN, 0);
+}
+
 static void optc32_set_odm_bypass(struct timing_generator *optc,
 		const struct dc_crtc_timing *dc_crtc_timing)
 {
@@ -260,6 +267,7 @@ static struct timing_generator_funcs dcn32_tg_funcs = {
 		.enable_crtc = optc32_enable_crtc,
 		.disable_crtc = optc32_disable_crtc,
 		.phantom_crtc_post_enable = optc32_phantom_crtc_post_enable,
+		.disable_phantom_crtc = optc32_disable_phantom_otg,
 		/* used by enable_timing_synchronization. Not need for FPGA */
 		.is_counter_moving = optc1_is_counter_moving,
 		.get_position = optc1_get_position,
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +22 -0
index 814620e6638f..2b8700b291a4 100644
@@ -1719,6 +1719,27 @@ static struct dc_stream_state *dcn32_enable_phantom_stream(struct dc *dc,
 	return phantom_stream;
 }
 
+void dcn32_retain_phantom_pipes(struct dc *dc, struct dc_state *context)
+{
+	int i;
+	struct dc_plane_state *phantom_plane = NULL;
+	struct dc_stream_state *phantom_stream = NULL;
+
+	for (i = 0; i < dc->res_pool->pipe_count; i++) {
+		struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
+
+		if (!pipe->top_pipe && !pipe->prev_odm_pipe &&
+				pipe->plane_state && pipe->stream &&
+				pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) {
+			phantom_plane = pipe->plane_state;
+			phantom_stream = pipe->stream;
+
+			dc_plane_state_retain(phantom_plane);
+			dc_stream_retain(phantom_stream);
+		}
+	}
+}
+
 // return true if removed piped from ctx, false otherwise
 bool dcn32_remove_phantom_pipes(struct dc *dc, struct dc_state *context)
 {
@@ -2035,6 +2056,7 @@ static struct resource_funcs dcn32_res_pool_funcs = {
 	.update_soc_for_wm_a = dcn30_update_soc_for_wm_a,
 	.add_phantom_pipes = dcn32_add_phantom_pipes,
 	.remove_phantom_pipes = dcn32_remove_phantom_pipes,
+	.retain_phantom_pipes = dcn32_retain_phantom_pipes,
 };
 
 static uint32_t read_pipe_fuses(struct dc_context *ctx)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +3 -0
index 615244a1f95d..026cf13d203f 100644
@@ -83,6 +83,9 @@ bool dcn32_release_post_bldn_3dlut(
 bool dcn32_remove_phantom_pipes(struct dc *dc,
 		struct dc_state *context);
 
+void dcn32_retain_phantom_pipes(struct dc *dc,
+		struct dc_state *context);
+
 void dcn32_add_phantom_pipes(struct dc *dc,
 		struct dc_state *context,
 		display_e2e_pipe_params_st *pipes,
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +1 -0
index 213ff3672bd5..aed92ced7b76 100644
@@ -1619,6 +1619,7 @@ static struct resource_funcs dcn321_res_pool_funcs = {
 	.update_soc_for_wm_a = dcn30_update_soc_for_wm_a,
 	.add_phantom_pipes = dcn32_add_phantom_pipes,
 	.remove_phantom_pipes = dcn32_remove_phantom_pipes,
+	.retain_phantom_pipes = dcn32_retain_phantom_pipes,
 };
 
 static uint32_t read_pipe_fuses(struct dc_context *ctx)
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -0
index 9498105c98ab..5fa7c4772af4 100644
@@ -234,6 +234,7 @@ struct resource_funcs {
             unsigned int index);
 
 	bool (*remove_phantom_pipes)(struct dc *dc, struct dc_state *context);
+	void (*retain_phantom_pipes)(struct dc *dc, struct dc_state *context);
 	void (*get_panel_config_defaults)(struct dc_panel_config *panel_config);
 };
 
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +1 -0
index f96fb425345e..789cf9406ca5 100644
@@ -185,6 +185,7 @@ struct timing_generator_funcs {
 #ifdef CONFIG_DRM_AMD_DC_DCN
 	void (*phantom_crtc_post_enable)(struct timing_generator *tg);
 #endif
+	void (*disable_phantom_crtc)(struct timing_generator *tg);
 	bool (*immediate_disable_crtc)(struct timing_generator *tg);
 	bool (*is_counter_moving)(struct timing_generator *tg);
 	void (*get_position)(struct timing_generator *tg,
drivers/gpu/drm/amd/include/kgd_pp_interface.h +2 -0
index d18162e9ed1d..f3d64c78feaa 100644
@@ -139,6 +139,8 @@ enum amd_pp_sensors {
 	AMDGPU_PP_SENSOR_MIN_FAN_RPM,
 	AMDGPU_PP_SENSOR_MAX_FAN_RPM,
 	AMDGPU_PP_SENSOR_VCN_POWER_STATE,
+	AMDGPU_PP_SENSOR_PEAK_PSTATE_SCLK,
+	AMDGPU_PP_SENSOR_PEAK_PSTATE_MCLK,
 };
 
 enum amd_pp_task {
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +2 -0
index cb5b9df78b4d..338fce249f5a 100644
@@ -89,6 +89,8 @@ struct amdgpu_dpm_thermal {
 	int                max_mem_crit_temp;
 	/* memory max emergency(shutdown) temp */
 	int                max_mem_emergency_temp;
+	/* SWCTF threshold */
+	int                sw_ctf_threshold;
 	/* was last interrupt low to high or high to low */
 	bool               high_to_low;
 	/* interrupt source */
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +56 -2

96 lines not on this page · raw message

drivers/gpu/drm/amd/pm/powerplay/hwmgr/hardwaremanager.c +3 -1
index 981dc8c7112d..90452b66e107 100644
@@ -241,7 +241,8 @@ int phm_start_thermal_controller(struct pp_hwmgr *hwmgr)
 		TEMP_RANGE_MAX,
 		TEMP_RANGE_MIN,
 		TEMP_RANGE_MAX,
-		TEMP_RANGE_MAX};
+		TEMP_RANGE_MAX,
+		0};
 	struct amdgpu_device *adev = hwmgr->adev;
 
 	if (!hwmgr->not_vf)
@@ -265,6 +266,7 @@ int phm_start_thermal_controller(struct pp_hwmgr *hwmgr)
 	adev->pm.dpm.thermal.min_mem_temp = range.mem_min;
 	adev->pm.dpm.thermal.max_mem_crit_temp = range.mem_crit_max;
 	adev->pm.dpm.thermal.max_mem_emergency_temp = range.mem_emergency_max;
+	adev->pm.dpm.thermal.sw_ctf_threshold = range.sw_ctf_threshold;
 
 	return ret;
 }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +13 -3
index ede71de2343d..86d6e88c7386 100644
@@ -375,6 +375,17 @@ static int smu10_enable_gfx_off(struct pp_hwmgr *hwmgr)
 	return 0;
 }
 
+static void smu10_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
+{
+	hwmgr->pstate_sclk = SMU10_UMD_PSTATE_GFXCLK;
+	hwmgr->pstate_mclk = SMU10_UMD_PSTATE_FCLK;
+
+	smum_send_msg_to_smc(hwmgr,
+			     PPSMC_MSG_GetMaxGfxclkFrequency,
+			     &hwmgr->pstate_sclk_peak);
+	hwmgr->pstate_mclk_peak = SMU10_UMD_PSTATE_PEAK_FCLK;
+}
+
 static int smu10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
 	struct amdgpu_device *adev = hwmgr->adev;
@@ -398,6 +409,8 @@ static int smu10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 			return ret;
 	}
 
+	smu10_populate_umdpstate_clocks(hwmgr);
+
 	return 0;
 }
 
@@ -574,9 +587,6 @@ static int smu10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
 
 	hwmgr->platform_descriptor.minimumClocksReductionPercentage = 50;
 
-	hwmgr->pstate_sclk = SMU10_UMD_PSTATE_GFXCLK * 100;
-	hwmgr->pstate_mclk = SMU10_UMD_PSTATE_FCLK * 100;
-
 	/* enable the pp_od_clk_voltage sysfs file */
 	hwmgr->od_enabled = 1;
 	/* disabled fine grain tuning function by default */
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +67 -13

132 lines not on this page · raw message

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c +14 -2
index b50fd4a4a3d1..b015a601b385 100644
@@ -1016,6 +1016,18 @@ static void smu8_reset_acp_boot_level(struct pp_hwmgr *hwmgr)
 	data->acp_boot_level = 0xff;
 }
 
+static void smu8_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
+{
+	struct phm_clock_voltage_dependency_table *table =
+				hwmgr->dyn_state.vddc_dependency_on_sclk;
+
+	hwmgr->pstate_sclk = table->entries[0].clk / 100;
+	hwmgr->pstate_mclk = 0;
+
+	hwmgr->pstate_sclk_peak = table->entries[table->count - 1].clk / 100;
+	hwmgr->pstate_mclk_peak = 0;
+}
+
 static int smu8_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
 	smu8_program_voting_clients(hwmgr);
@@ -1024,6 +1036,8 @@ static int smu8_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 	smu8_program_bootup_state(hwmgr);
 	smu8_reset_acp_boot_level(hwmgr);
 
+	smu8_populate_umdpstate_clocks(hwmgr);
+
 	return 0;
 }
 
@@ -1167,8 +1181,6 @@ static int smu8_phm_unforce_dpm_levels(struct pp_hwmgr *hwmgr)
 
 	data->sclk_dpm.soft_min_clk = table->entries[0].clk;
 	data->sclk_dpm.hard_min_clk = table->entries[0].clk;
-	hwmgr->pstate_sclk = table->entries[0].clk;
-	hwmgr->pstate_mclk = 0;
 
 	level = smu8_get_max_sclk_level(hwmgr) - 1;
 
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c +9 -18
index bfe80ac0ad8c..d0b1ab6c4523 100644
@@ -603,21 +603,17 @@ int phm_irq_process(struct amdgpu_device *adev,
 			   struct amdgpu_irq_src *source,
 			   struct amdgpu_iv_entry *entry)
 {
+	struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
 	uint32_t client_id = entry->client_id;
 	uint32_t src_id = entry->src_id;
 
 	if (client_id == AMDGPU_IRQ_CLIENTID_LEGACY) {
 		if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_LOW_TO_HIGH) {
-			dev_emerg(adev->dev, "ERROR: GPU over temperature range(SW CTF) detected!\n");
-			/*
-			 * SW CTF just occurred.
-			 * Try to do a graceful shutdown to prevent further damage.
-			 */
-			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
-			orderly_poweroff(true);
-		} else if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_HIGH_TO_LOW)
+			schedule_delayed_work(&hwmgr->swctf_delayed_work,
+					      msecs_to_jiffies(AMDGPU_SWCTF_EXTRA_DELAY));
+		} else if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_HIGH_TO_LOW) {
 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
-		else if (src_id == VISLANDS30_IV_SRCID_GPIO_19) {
+		} else if (src_id == VISLANDS30_IV_SRCID_GPIO_19) {
 			dev_emerg(adev->dev, "ERROR: GPU HW Critical Temperature Fault(aka CTF) detected!\n");
 			/*
 			 * HW CTF just occurred. Shutdown to prevent further damage.
@@ -626,15 +622,10 @@ int phm_irq_process(struct amdgpu_device *adev,
 			orderly_poweroff(true);
 		}
 	} else if (client_id == SOC15_IH_CLIENTID_THM) {
-		if (src_id == 0) {
-			dev_emerg(adev->dev, "ERROR: GPU over temperature range(SW CTF) detected!\n");
-			/*
-			 * SW CTF just occurred.
-			 * Try to do a graceful shutdown to prevent further damage.
-			 */
-			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
-			orderly_poweroff(true);
-		} else
+		if (src_id == 0)
+			schedule_delayed_work(&hwmgr->swctf_delayed_work,
+					      msecs_to_jiffies(AMDGPU_SWCTF_EXTRA_DELAY));
+		else
 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
 	} else if (client_id == SOC15_IH_CLIENTID_ROM_SMUIO) {
 		dev_emerg(adev->dev, "ERROR: GPU HW Critical Temperature Fault(aka CTF) detected!\n");
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +36 -5

77 lines not on this page · raw message

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +26 -0
index a2f4d6773d45..1069eaaae2f8 100644
@@ -1026,6 +1026,25 @@ static int vega12_get_all_clock_ranges(struct pp_hwmgr *hwmgr)
 	return 0;
 }
 
+static void vega12_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
+{
+	struct vega12_hwmgr *data = (struct vega12_hwmgr *)(hwmgr->backend);
+	struct vega12_single_dpm_table *gfx_dpm_table = &(data->dpm_table.gfx_table);
+	struct vega12_single_dpm_table *mem_dpm_table = &(data->dpm_table.mem_table);
+
+	if (gfx_dpm_table->count > VEGA12_UMD_PSTATE_GFXCLK_LEVEL &&
+	    mem_dpm_table->count > VEGA12_UMD_PSTATE_MCLK_LEVEL) {
+		hwmgr->pstate_sclk = gfx_dpm_table->dpm_levels[VEGA12_UMD_PSTATE_GFXCLK_LEVEL].value;
+		hwmgr->pstate_mclk = mem_dpm_table->dpm_levels[VEGA12_UMD_PSTATE_MCLK_LEVEL].value;
+	} else {
+		hwmgr->pstate_sclk = gfx_dpm_table->dpm_levels[0].value;
+		hwmgr->pstate_mclk = mem_dpm_table->dpm_levels[0].value;
+	}
+
+	hwmgr->pstate_sclk_peak = gfx_dpm_table->dpm_levels[gfx_dpm_table->count].value;
+	hwmgr->pstate_mclk_peak = mem_dpm_table->dpm_levels[mem_dpm_table->count].value;
+}
+
 static int vega12_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
 	int tmp_result, result = 0;
@@ -1077,6 +1096,9 @@ static int vega12_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 	PP_ASSERT_WITH_CODE(!result,
 			"Failed to setup default DPM tables!",
 			return result);
+
+	vega12_populate_umdpstate_clocks(hwmgr);
+
 	return result;
 }
 
@@ -2742,6 +2764,8 @@ static int vega12_notify_cac_buffer_info(struct pp_hwmgr *hwmgr,
 static int vega12_get_thermal_temperature_range(struct pp_hwmgr *hwmgr,
 		struct PP_TemperatureRange *thermal_data)
 {
+	struct phm_ppt_v3_information *pptable_information =
+		(struct phm_ppt_v3_information *)hwmgr->pptable;
 	struct vega12_hwmgr *data =
 			(struct vega12_hwmgr *)(hwmgr->backend);
 	PPTable_t *pp_table = &(data->smc_state_table.pp_table);
@@ -2760,6 +2784,8 @@ static int vega12_get_thermal_temperature_range(struct pp_hwmgr *hwmgr,
 		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
 	thermal_data->mem_emergency_max = (pp_table->ThbmLimit + CTF_OFFSET_HBM)*
 		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
+	thermal_data->sw_ctf_threshold = pptable_information->us_software_shutdown_temp *
+		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
 
 	return 0;
 }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +11 -13
index b30684c84e20..ff77a3683efd 100644
@@ -1555,26 +1555,23 @@ static int vega20_set_mclk_od(
 	return 0;
 }
 
-static int vega20_populate_umdpstate_clocks(
-		struct pp_hwmgr *hwmgr)
+static void vega20_populate_umdpstate_clocks(struct pp_hwmgr *hwmgr)
 {
 	struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend);
 	struct vega20_single_dpm_table *gfx_table = &(data->dpm_table.gfx_table);
 	struct vega20_single_dpm_table *mem_table = &(data->dpm_table.mem_table);
 
-	hwmgr->pstate_sclk = gfx_table->dpm_levels[0].value;
-	hwmgr->pstate_mclk = mem_table->dpm_levels[0].value;
-
 	if (gfx_table->count > VEGA20_UMD_PSTATE_GFXCLK_LEVEL &&
 	    mem_table->count > VEGA20_UMD_PSTATE_MCLK_LEVEL) {
 		hwmgr->pstate_sclk = gfx_table->dpm_levels[VEGA20_UMD_PSTATE_GFXCLK_LEVEL].value;
 		hwmgr->pstate_mclk = mem_table->dpm_levels[VEGA20_UMD_PSTATE_MCLK_LEVEL].value;
+	} else {
+		hwmgr->pstate_sclk = gfx_table->dpm_levels[0].value;
+		hwmgr->pstate_mclk = mem_table->dpm_levels[0].value;
 	}
 
-	hwmgr->pstate_sclk = hwmgr->pstate_sclk * 100;
-	hwmgr->pstate_mclk = hwmgr->pstate_mclk * 100;
-
-	return 0;
+	hwmgr->pstate_sclk_peak = gfx_table->dpm_levels[gfx_table->count - 1].value;
+	hwmgr->pstate_mclk_peak = mem_table->dpm_levels[mem_table->count - 1].value;
 }
 
 static int vega20_get_max_sustainable_clock(struct pp_hwmgr *hwmgr,
@@ -1753,10 +1750,7 @@ static int vega20_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 			"[EnableDPMTasks] Failed to initialize odn settings!",
 			return result);
 
-	result = vega20_populate_umdpstate_clocks(hwmgr);
-	PP_ASSERT_WITH_CODE(!result,
-			"[EnableDPMTasks] Failed to populate umdpstate clocks!",
-			return result);
+	vega20_populate_umdpstate_clocks(hwmgr);
 
 	result = smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetPptLimit,
 			POWER_SOURCE_AC << 16, &hwmgr->default_power_limit);
@@ -4213,6 +4207,8 @@ static int vega20_notify_cac_buffer_info(struct pp_hwmgr *hwmgr,
 static int vega20_get_thermal_temperature_range(struct pp_hwmgr *hwmgr,
 		struct PP_TemperatureRange *thermal_data)
 {
+	struct phm_ppt_v3_information *pptable_information =
+		(struct phm_ppt_v3_information *)hwmgr->pptable;
 	struct vega20_hwmgr *data =
 			(struct vega20_hwmgr *)(hwmgr->backend);
 	PPTable_t *pp_table = &(data->smc_state_table.pp_table);
@@ -4231,6 +4227,8 @@ static int vega20_get_thermal_temperature_range(struct pp_hwmgr *hwmgr,
 		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
 	thermal_data->mem_emergency_max = (pp_table->ThbmLimit + CTF_OFFSET_HBM)*
 		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
+	thermal_data->sw_ctf_threshold = pptable_information->us_software_shutdown_temp *
+		PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
 
 	return 0;
 }
drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h +4 -0
index 27f8d0e0e6a8..ec10643edea3 100644
@@ -809,6 +809,10 @@ struct pp_hwmgr {
 	uint32_t workload_prority[Workload_Policy_Max];
 	uint32_t workload_setting[Workload_Policy_Max];
 	bool gfxoff_state_changed_by_workload;
+	uint32_t pstate_sclk_peak;
+	uint32_t pstate_mclk_peak;
+
+	struct delayed_work swctf_delayed_work;
 };
 
 int hwmgr_early_init(struct pp_hwmgr *hwmgr);
drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h +1 -0
index a5f2227a3971..0ffc2347829d 100644
@@ -131,6 +131,7 @@ struct PP_TemperatureRange {
 	int mem_min;
 	int mem_crit_max;
 	int mem_emergency_max;
+	int sw_ctf_threshold;
 };
 
 struct PP_StateValidationBlock {
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +42 -0

72 lines not on this page · raw message

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +2 -0
index 3bc4128a22ac..1ab77a6cdb65 100644
@@ -573,6 +573,8 @@ struct smu_context
 	u32 debug_param_reg;
 	u32 debug_msg_reg;
 	u32 debug_resp_reg;
+
+	struct delayed_work		swctf_delayed_work;
 };
 
 struct i2c_adapter;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -7
index ad5f6a15a1d7..d490b571c8ff 100644
@@ -1438,13 +1438,8 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
 	if (client_id == SOC15_IH_CLIENTID_THM) {
 		switch (src_id) {
 		case THM_11_0__SRCID__THM_DIG_THERM_L2H:
-			dev_emerg(adev->dev, "ERROR: GPU over temperature range(SW CTF) detected!\n");
-			/*
-			 * SW CTF just occurred.
-			 * Try to do a graceful shutdown to prevent further damage.
-			 */
-			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
-			orderly_poweroff(true);
+			schedule_delayed_work(&smu->swctf_delayed_work,
+					      msecs_to_jiffies(AMDGPU_SWCTF_EXTRA_DELAY));
 		break;
 		case THM_11_0__SRCID__THM_DIG_THERM_H2L:
 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -7
index 47fafb1fa608..3104d4937909 100644
@@ -1386,13 +1386,8 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
 	if (client_id == SOC15_IH_CLIENTID_THM) {
 		switch (src_id) {
 		case THM_11_0__SRCID__THM_DIG_THERM_L2H:
-			dev_emerg(adev->dev, "ERROR: GPU over temperature range(SW CTF) detected!\n");
-			/*
-			 * SW CTF just occurred.
-			 * Try to do a graceful shutdown to prevent further damage.
-			 */
-			dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
-			orderly_poweroff(true);
+			schedule_delayed_work(&smu->swctf_delayed_work,
+					      msecs_to_jiffies(AMDGPU_SWCTF_EXTRA_DELAY));
 			break;
 		case THM_11_0__SRCID__THM_DIG_THERM_H2L:
 			dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");
drivers/gpu/drm/drm_gem_shmem_helper.c +6 -0
index 5fdc608043e7..e33f06bb66eb 100644
@@ -622,7 +622,13 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
 	int ret;
 
 	if (obj->import_attach) {
+		/* Reset both vm_ops and vm_private_data, so we don't end up with
+		 * vm_ops pointing to our implementation if the dma-buf backend
+		 * doesn't set those fields.
+		 */
 		vma->vm_private_data = NULL;
+		vma->vm_ops = NULL;
+
 		ret = dma_buf_mmap(obj->dma_buf, vma, 0);
 
 		/* Drop the reference drm_gem_mmap_obj() acquired.*/
drivers/gpu/drm/nouveau/nouveau_connector.c +1 -1
index f40310559d13..49c5451cdfb1 100644
@@ -967,7 +967,7 @@ nouveau_connector_get_modes(struct drm_connector *connector)
 	/* Determine display colour depth for everything except LVDS now,
 	 * DP requires this before mode_valid() is called.
 	 */
-	if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS && nv_connector->native_mode)
+	if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS)
 		nouveau_connector_detect_depth(connector);
 
 	/* Find the native mode if this is a digital panel, if we didn't
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +47 -1

66 lines not on this page · raw message

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h +1 -0
index 32bbddc0993e..679aff79f4d6 100644
@@ -123,6 +123,7 @@ void gk104_grctx_generate_r418800(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gk110_grctx;
 void gk110_grctx_generate_r419eb0(struct gf100_gr *);
+void gk110_grctx_generate_r419f78(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gk110b_grctx;
 extern const struct gf100_grctx_func gk208_grctx;
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c +3 -1
index 304e9d268bad..f894f8254824 100644
@@ -916,7 +916,9 @@ static void
 gk104_grctx_generate_r419f78(struct gf100_gr *gr)
 {
 	struct nvkm_device *device = gr->base.engine.subdev.device;
-	nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);
+
+	/* bit 3 set disables loads in fp helper invocations, we need it enabled */
+	nvkm_mask(device, 0x419f78, 0x00000009, 0x00000000);
 }
 
 void
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c +10 -0
index 86547cfc38dc..e88740d4e54d 100644
@@ -820,6 +820,15 @@ gk110_grctx_generate_r419eb0(struct gf100_gr *gr)
 	nvkm_mask(device, 0x419eb0, 0x00001000, 0x00001000);
 }
 
+void
+gk110_grctx_generate_r419f78(struct gf100_gr *gr)
+{
+	struct nvkm_device *device = gr->base.engine.subdev.device;
+
+	/* bit 3 set disables loads in fp helper invocations, we need it enabled */
+	nvkm_mask(device, 0x419f78, 0x00000008, 0x00000000);
+}
+
 const struct gf100_grctx_func
 gk110_grctx = {
 	.main  = gf100_grctx_generate_main,
@@ -852,4 +861,5 @@ gk110_grctx = {
 	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
 	.r418800 = gk104_grctx_generate_r418800,
 	.r419eb0 = gk110_grctx_generate_r419eb0,
+	.r419f78 = gk110_grctx_generate_r419f78,
 };
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c +1 -0
index ebb947bd1446..086e4d49e112 100644
@@ -101,4 +101,5 @@ gk110b_grctx = {
 	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
 	.r418800 = gk104_grctx_generate_r418800,
 	.r419eb0 = gk110_grctx_generate_r419eb0,
+	.r419f78 = gk110_grctx_generate_r419f78,
 };
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c +1 -0
index 4d40512b5c99..0bf438c3f7cb 100644
@@ -566,4 +566,5 @@ gk208_grctx = {
 	.dist_skip_table = gf117_grctx_generate_dist_skip_table,
 	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
 	.r418800 = gk104_grctx_generate_r418800,
+	.r419f78 = gk110_grctx_generate_r419f78,
 };
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c +1 -0
index 0b3964e6b36e..acdf0932a99e 100644
@@ -991,4 +991,5 @@ gm107_grctx = {
 	.r406500 = gm107_grctx_generate_r406500,
 	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
 	.r419e00 = gm107_grctx_generate_r419e00,
+	.r419f78 = gk110_grctx_generate_r419f78,
 };
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +9 -8
index 9fea03121247..2e2e08f4359a 100644
@@ -836,12 +836,12 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 	 * need align with 2 pixel.
 	 */
 	if (fb->format->is_yuv && ((new_plane_state->src.x1 >> 16) % 2)) {
-		DRM_ERROR("Invalid Source: Yuv format not support odd xpos\n");
+		DRM_DEBUG_KMS("Invalid Source: Yuv format not support odd xpos\n");
 		return -EINVAL;
 	}
 
 	if (fb->format->is_yuv && new_plane_state->rotation & DRM_MODE_REFLECT_Y) {
-		DRM_ERROR("Invalid Source: Yuv format does not support this rotation\n");
+		DRM_DEBUG_KMS("Invalid Source: Yuv format does not support this rotation\n");
 		return -EINVAL;
 	}
 
@@ -849,7 +849,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 		struct vop *vop = to_vop(crtc);
 
 		if (!vop->data->afbc) {
-			DRM_ERROR("vop does not support AFBC\n");
+			DRM_DEBUG_KMS("vop does not support AFBC\n");
 			return -EINVAL;
 		}
 
@@ -858,15 +858,16 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 			return ret;
 
 		if (new_plane_state->src.x1 || new_plane_state->src.y1) {
-			DRM_ERROR("AFBC does not support offset display, xpos=%d, ypos=%d, offset=%d\n",
-				  new_plane_state->src.x1,
-				  new_plane_state->src.y1, fb->offsets[0]);
+			DRM_DEBUG_KMS("AFBC does not support offset display, " \
+				      "xpos=%d, ypos=%d, offset=%d\n",
+				      new_plane_state->src.x1, new_plane_state->src.y1,
+				      fb->offsets[0]);
 			return -EINVAL;
 		}
 
 		if (new_plane_state->rotation && new_plane_state->rotation != DRM_MODE_ROTATE_0) {
-			DRM_ERROR("No rotation support in AFBC, rotation=%d\n",
-				  new_plane_state->rotation);
+			DRM_DEBUG_KMS("No rotation support in AFBC, rotation=%d\n",
+				      new_plane_state->rotation);
 			return -EINVAL;
 		}
 	}
drivers/hwmon/pmbus/bel-pfe.c +8 -8
index 4100eefb7ac3..61c195f8fd3b 100644
@@ -17,12 +17,13 @@
 enum chips {pfe1100, pfe3000};
 
 /*
- * Disable status check for pfe3000 devices, because some devices report
- * communication error (invalid command) for VOUT_MODE command (0x20)
- * although correct VOUT_MODE (0x16) is returned: it leads to incorrect
- * exponent in linear mode.
+ * Disable status check because some devices report communication error
+ * (invalid command) for VOUT_MODE command (0x20) although the correct
+ * VOUT_MODE (0x16) is returned: it leads to incorrect exponent in linear
+ * mode.
+ * This affects both pfe3000 and pfe1100.
  */
-static struct pmbus_platform_data pfe3000_plat_data = {
+static struct pmbus_platform_data pfe_plat_data = {
 	.flags = PMBUS_SKIP_STATUS_CHECK,
 };
 
@@ -94,16 +95,15 @@ static int pfe_pmbus_probe(struct i2c_client *client)
 	int model;
 
 	model = (int)i2c_match_id(pfe_device_id, client)->driver_data;
+	client->dev.platform_data = &pfe_plat_data;
 
 	/*
 	 * PFE3000-12-069RA devices may not stay in page 0 during device
 	 * probe which leads to probe failure (read status word failed).
 	 * So let's set the device to page 0 at the beginning.
 	 */
-	if (model == pfe3000) {
-		client->dev.platform_data = &pfe3000_plat_data;
+	if (model == pfe3000)
 		i2c_smbus_write_byte_data(client, PMBUS_PAGE, 0);
-	}
 
 	return pmbus_do_probe(client, &pfe_driver_info[model]);
 }
drivers/iio/adc/ad7192.c +8 -8
index 8720ac43a4a4..80eff7090f14 100644
@@ -62,7 +62,6 @@
 #define AD7192_MODE_STA_MASK	BIT(20) /* Status Register transmission Mask */
 #define AD7192_MODE_CLKSRC(x)	(((x) & 0x3) << 18) /* Clock Source Select */
 #define AD7192_MODE_SINC3	BIT(15) /* SINC3 Filter Select */
-#define AD7192_MODE_ACX		BIT(14) /* AC excitation enable(AD7195 only)*/
 #define AD7192_MODE_ENPAR	BIT(13) /* Parity Enable */
 #define AD7192_MODE_CLKDIV	BIT(12) /* Clock divide by 2 (AD7190/2 only)*/
 #define AD7192_MODE_SCYCLE	BIT(11) /* Single cycle conversion */
@@ -91,6 +90,7 @@
 /* Configuration Register Bit Designations (AD7192_REG_CONF) */
 
 #define AD7192_CONF_CHOP	BIT(23) /* CHOP enable */
+#define AD7192_CONF_ACX		BIT(22) /* AC excitation enable(AD7195 only) */
 #define AD7192_CONF_REFSEL	BIT(20) /* REFIN1/REFIN2 Reference Select */
 #define AD7192_CONF_CHAN(x)	((x) << 8) /* Channel select */
 #define AD7192_CONF_CHAN_MASK	(0x7FF << 8) /* Channel select mask */
@@ -473,7 +473,7 @@ static ssize_t ad7192_show_ac_excitation(struct device *dev,
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ad7192_state *st = iio_priv(indio_dev);
 
-	return sysfs_emit(buf, "%d\n", !!(st->mode & AD7192_MODE_ACX));
+	return sysfs_emit(buf, "%d\n", !!(st->conf & AD7192_CONF_ACX));
 }
 
 static ssize_t ad7192_show_bridge_switch(struct device *dev,
@@ -514,13 +514,13 @@ static ssize_t ad7192_set(struct device *dev,
 
 		ad_sd_write_reg(&st->sd, AD7192_REG_GPOCON, 1, st->gpocon);
 		break;
-	case AD7192_REG_MODE:
+	case AD7192_REG_CONF:
 		if (val)
-			st->mode |= AD7192_MODE_ACX;
+			st->conf |= AD7192_CONF_ACX;
 		else
-			st->mode &= ~AD7192_MODE_ACX;
+			st->conf &= ~AD7192_CONF_ACX;
 
-		ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode);
+		ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, st->conf);
 		break;
 	default:
 		ret = -EINVAL;
@@ -580,12 +580,11 @@ static IIO_DEVICE_ATTR(bridge_switch_en, 0644,
 
 static IIO_DEVICE_ATTR(ac_excitation_en, 0644,
 		       ad7192_show_ac_excitation, ad7192_set,
-		       AD7192_REG_MODE);
+		       AD7192_REG_CONF);
 
 static struct attribute *ad7192_attributes[] = {
 	&iio_dev_attr_filter_low_pass_3db_frequency_available.dev_attr.attr,
 	&iio_dev_attr_bridge_switch_en.dev_attr.attr,
-	&iio_dev_attr_ac_excitation_en.dev_attr.attr,
 	NULL
 };
 
@@ -596,6 +595,7 @@ static const struct attribute_group ad7192_attribute_group = {
 static struct attribute *ad7195_attributes[] = {
 	&iio_dev_attr_filter_low_pass_3db_frequency_available.dev_attr.attr,
 	&iio_dev_attr_bridge_switch_en.dev_attr.attr,
+	&iio_dev_attr_ac_excitation_en.dev_attr.attr,
 	NULL
 };
 
drivers/iio/adc/ina2xx-adc.c +6 -3
index 910e7e965fc4..74092f3836b8 100644
@@ -124,6 +124,7 @@ static const struct regmap_config ina2xx_regmap_config = {
 enum ina2xx_ids { ina219, ina226 };
 
 struct ina2xx_config {
+	const char *name;
 	u16 config_default;
 	int calibration_value;
 	int shunt_voltage_lsb;	/* nV */
@@ -155,6 +156,7 @@ struct ina2xx_chip_info {
 
 static const struct ina2xx_config ina2xx_config[] = {
 	[ina219] = {
+		.name = "ina219",
 		.config_default = INA219_CONFIG_DEFAULT,
 		.calibration_value = 4096,
 		.shunt_voltage_lsb = 10000,
@@ -164,6 +166,7 @@ static const struct ina2xx_config ina2xx_config[] = {
 		.chip_id = ina219,
 	},
 	[ina226] = {
+		.name = "ina226",
 		.config_default = INA226_CONFIG_DEFAULT,
 		.calibration_value = 2048,
 		.shunt_voltage_lsb = 2500,
@@ -996,7 +999,7 @@ static int ina2xx_probe(struct i2c_client *client,
 	/* Patch the current config register with default. */
 	val = chip->config->config_default;
 
-	if (id->driver_data == ina226) {
+	if (type == ina226) {
 		ina226_set_average(chip, INA226_DEFAULT_AVG, &val);
 		ina226_set_int_time_vbus(chip, INA226_DEFAULT_IT, &val);
 		ina226_set_int_time_vshunt(chip, INA226_DEFAULT_IT, &val);
@@ -1015,7 +1018,7 @@ static int ina2xx_probe(struct i2c_client *client,
 	}
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
-	if (id->driver_data == ina226) {
+	if (type == ina226) {
 		indio_dev->channels = ina226_channels;
 		indio_dev->num_channels = ARRAY_SIZE(ina226_channels);
 		indio_dev->info = &ina226_info;
@@ -1024,7 +1027,7 @@ static int ina2xx_probe(struct i2c_client *client,
 		indio_dev->num_channels = ARRAY_SIZE(ina219_channels);
 		indio_dev->info = &ina219_info;
 	}
-	indio_dev->name = id->name;
+	indio_dev->name = id ? id->name : chip->config->name;
 
 	ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev,
 					  &ina2xx_setup_ops);
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +1 -1
index 05a28d353e34..d98f7e4d202c 100644
@@ -253,7 +253,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
 	platform_set_drvdata(pdev, indio_dev);
 
 	state->ec = ec->ec_dev;
-	state->msg = devm_kzalloc(&pdev->dev,
+	state->msg = devm_kzalloc(&pdev->dev, sizeof(*state->msg) +
 				max((u16)sizeof(struct ec_params_motion_sense),
 				state->ec->max_response), GFP_KERNEL);
 	if (!state->msg)
drivers/iio/frequency/admv1013.c +4 -1
index ed8167271358..e6311213f3e8 100644
@@ -344,9 +344,12 @@ static int admv1013_update_quad_filters(struct admv1013_state *st)
 
 static int admv1013_update_mixer_vgate(struct admv1013_state *st)
 {
-	unsigned int vcm, mixer_vgate;
+	unsigned int mixer_vgate;
+	int vcm;
 
 	vcm = regulator_get_voltage(st->reg);
+	if (vcm < 0)
+		return vcm;
 
 	if (vcm < 1800000)
 		mixer_vgate = (2389 * vcm / 1000000 + 8100) / 100;
drivers/iio/industrialio-core.c +3 -2
index 151ff3993354..f3f8392623a4 100644
@@ -1916,7 +1916,7 @@ static const struct iio_buffer_setup_ops noop_ring_setup_ops;
 int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
 {
 	struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev);
-	struct fwnode_handle *fwnode;
+	struct fwnode_handle *fwnode = NULL;
 	int ret;
 
 	if (!indio_dev->info)
@@ -1927,7 +1927,8 @@ int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
 	/* If the calling driver did not initialize firmware node, do it here */
 	if (dev_fwnode(&indio_dev->dev))
 		fwnode = dev_fwnode(&indio_dev->dev);
-	else
+	/* The default dummy IIO device has no parent */
+	else if (indio_dev->dev.parent)
 		fwnode = dev_fwnode(indio_dev->dev.parent);
 	device_set_node(&indio_dev->dev, fwnode);
 
drivers/infiniband/core/umem.c +2 -1
index 86d479772fbc..957634eceba8 100644
@@ -85,6 +85,8 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
 	dma_addr_t mask;
 	int i;
 
+	umem->iova = va = virt;
+
 	if (umem->is_odp) {
 		unsigned int page_size = BIT(to_ib_umem_odp(umem)->page_shift);
 
@@ -100,7 +102,6 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
 	 */
 	pgsz_bitmap &= GENMASK(BITS_PER_LONG - 1, PAGE_SHIFT);
 
-	umem->iova = va = virt;
 	/* The best result is the smallest page size that results in the minimum
 	 * number of required pages. Compute the largest page size that could
 	 * work based on VA address bits that don't change.
drivers/infiniband/hw/hfi1/chip.c +1 -0
index 90b672feed83..194cac40da65 100644
@@ -12307,6 +12307,7 @@ static void free_cntrs(struct hfi1_devdata *dd)
 
 	if (dd->synth_stats_timer.function)
 		del_timer_sync(&dd->synth_stats_timer);
+	cancel_work_sync(&dd->update_cntr_work);
 	ppd = (struct hfi1_pportdata *)(dd + 1);
 	for (i = 0; i < dd->num_pports; i++, ppd++) {
 		kfree(ppd->cntrs);
drivers/interconnect/qcom/bcm-voter.c +5 -0
index 8f385f9c2dd3..d5f2a6b5376b 100644
@@ -83,6 +83,11 @@ static void bcm_aggregate(struct qcom_icc_bcm *bcm)
 
 		temp = agg_peak[bucket] * bcm->vote_scale;
 		bcm->vote_y[bucket] = bcm_div(temp, bcm->aux_data.unit);
+
+		if (bcm->enable_mask && (bcm->vote_x[bucket] || bcm->vote_y[bucket])) {
+			bcm->vote_x[bucket] = 0;
+			bcm->vote_y[bucket] = bcm->enable_mask;
+		}
 	}
 
 	if (bcm->keepalive && bcm->vote_x[QCOM_ICC_BUCKET_AMC] == 0 &&
drivers/interconnect/qcom/icc-rpmh.h +2 -0
index 04391c1ba465..7843d8864d6b 100644
@@ -81,6 +81,7 @@ struct qcom_icc_node {
  * @vote_x: aggregated threshold values, represents sum_bw when @type is bw bcm
  * @vote_y: aggregated threshold values, represents peak_bw when @type is bw bcm
  * @vote_scale: scaling factor for vote_x and vote_y
+ * @enable_mask: optional mask to send as vote instead of vote_x/vote_y
  * @dirty: flag used to indicate whether the bcm needs to be committed
  * @keepalive: flag used to indicate whether a keepalive is required
  * @aux_data: auxiliary data used when calculating threshold values and
@@ -97,6 +98,7 @@ struct qcom_icc_bcm {
 	u64 vote_x[QCOM_ICC_NUM_BUCKETS];
 	u64 vote_y[QCOM_ICC_NUM_BUCKETS];
 	u64 vote_scale;
+	u32 enable_mask;
 	bool dirty;
 	bool keepalive;
 	struct bcm_db aux_data;
drivers/interconnect/qcom/sm8450.c +9 -0
index 2d7a8e7b85ec..e64c214b4020 100644
@@ -1337,6 +1337,7 @@ static struct qcom_icc_node qns_mem_noc_sf_disp = {
 
 static struct qcom_icc_bcm bcm_acv = {
 	.name = "ACV",
+	.enable_mask = 0x8,
 	.num_nodes = 1,
 	.nodes = { &ebi },
 };
@@ -1349,6 +1350,7 @@ static struct qcom_icc_bcm bcm_ce0 = {
 
 static struct qcom_icc_bcm bcm_cn0 = {
 	.name = "CN0",
+	.enable_mask = 0x1,
 	.keepalive = true,
 	.num_nodes = 55,
 	.nodes = { &qnm_gemnoc_cnoc, &qnm_gemnoc_pcie,
@@ -1383,6 +1385,7 @@ static struct qcom_icc_bcm bcm_cn0 = {
 
 static struct qcom_icc_bcm bcm_co0 = {
 	.name = "CO0",
+	.enable_mask = 0x1,
 	.num_nodes = 2,
 	.nodes = { &qxm_nsp, &qns_nsp_gemnoc },
 };
@@ -1403,6 +1406,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
 
 static struct qcom_icc_bcm bcm_mm1 = {
 	.name = "MM1",
+	.enable_mask = 0x1,
 	.num_nodes = 12,
 	.nodes = { &qnm_camnoc_hf, &qnm_camnoc_icp,
 		   &qnm_camnoc_sf, &qnm_mdp,
@@ -1445,6 +1449,7 @@ static struct qcom_icc_bcm bcm_sh0 = {
 
 static struct qcom_icc_bcm bcm_sh1 = {
 	.name = "SH1",
+	.enable_mask = 0x1,
 	.num_nodes = 7,
 	.nodes = { &alm_gpu_tcu, &alm_sys_tcu,
 		   &qnm_nsp_gemnoc, &qnm_pcie,
@@ -1461,6 +1466,7 @@ static struct qcom_icc_bcm bcm_sn0 = {
 
 static struct qcom_icc_bcm bcm_sn1 = {
 	.name = "SN1",
+	.enable_mask = 0x1,
 	.num_nodes = 4,
 	.nodes = { &qhm_gic, &qxm_pimem,
 		   &xm_gic, &qns_gemnoc_gc },
@@ -1492,6 +1498,7 @@ static struct qcom_icc_bcm bcm_sn7 = {
 
 static struct qcom_icc_bcm bcm_acv_disp = {
 	.name = "ACV",
+	.enable_mask = 0x1,
 	.num_nodes = 1,
 	.nodes = { &ebi_disp },
 };
@@ -1510,6 +1517,7 @@ static struct qcom_icc_bcm bcm_mm0_disp = {
 
 static struct qcom_icc_bcm bcm_mm1_disp = {
 	.name = "MM1",
+	.enable_mask = 0x1,
 	.num_nodes = 3,
 	.nodes = { &qnm_mdp_disp, &qnm_rot_disp,
 		   &qns_mem_noc_sf_disp },
@@ -1523,6 +1531,7 @@ static struct qcom_icc_bcm bcm_sh0_disp = {
 
 static struct qcom_icc_bcm bcm_sh1_disp = {
 	.name = "SH1",
+	.enable_mask = 0x1,
 	.num_nodes = 1,
 	.nodes = { &qnm_pcie_disp },
 };
drivers/isdn/mISDN/dsp.h +1 -1
index fa09d511a8ed..baf31258f5c9 100644
@@ -247,7 +247,7 @@ extern void dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp);
 extern int dsp_cmx_conf(struct dsp *dsp, u32 conf_id);
 extern void dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb);
 extern void dsp_cmx_hdlc(struct dsp *dsp, struct sk_buff *skb);
-extern void dsp_cmx_send(void *arg);
+extern void dsp_cmx_send(struct timer_list *arg);
 extern void dsp_cmx_transmit(struct dsp *dsp, struct sk_buff *skb);
 extern int dsp_cmx_del_conf_member(struct dsp *dsp);
 extern int dsp_cmx_del_conf(struct dsp_conf *conf);
drivers/isdn/mISDN/dsp_cmx.c +1 -1
index 6d2088fbaf69..1b73af501397 100644
@@ -1625,7 +1625,7 @@ static u16	dsp_count; /* last sample count */
 static int	dsp_count_valid; /* if we have last sample count */
 
 void
-dsp_cmx_send(void *arg)
+dsp_cmx_send(struct timer_list *arg)
 {
 	struct dsp_conf *conf;
 	struct dsp_conf_member *member;
drivers/isdn/mISDN/dsp_core.c +1 -1
index 386084530c2f..fae95f166688 100644
@@ -1195,7 +1195,7 @@ static int __init dsp_init(void)
 	}
 
 	/* set sample timer */
-	timer_setup(&dsp_spl_tl, (void *)dsp_cmx_send, 0);
+	timer_setup(&dsp_spl_tl, dsp_cmx_send, 0);
 	dsp_spl_tl.expires = jiffies + dsp_tics;
 	dsp_spl_jiffies = dsp_spl_tl.expires;
 	add_timer(&dsp_spl_tl);
drivers/misc/cardreader/rts5227.c +1 -1
index d676cf63a966..3dae5e3a1697 100644
@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
 		}
 	}
 
-	if (option->force_clkreq_0)
+	if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
 		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,
 				FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
 	else
drivers/misc/cardreader/rts5228.c +0 -18
index cfebad51d1d8..f4ab09439da7 100644
@@ -435,17 +435,10 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
 			option->ltr_enabled = false;
 		}
 	}
-
-	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-				| PM_L1_1_EN | PM_L1_2_EN))
-		option->force_clkreq_0 = false;
-	else
-		option->force_clkreq_0 = true;
 }
 
 static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
 {
-	struct rtsx_cr_option *option = &pcr->option;
 
 	rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1,
 			CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);
@@ -476,17 +469,6 @@ static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
 	else
 		rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
 
-	/*
-	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-	 * to drive low, and we forcibly request clock.
-	 */
-	if (option->force_clkreq_0)
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-	else
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-
 	rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
 
 	if (pcr->rtd3_en) {
drivers/misc/cardreader/rts5249.c +1 -2
index 91d240dd68fa..47ab72a43256 100644
@@ -327,12 +327,11 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr)
 		}
 	}
 
-
 	/*
 	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
 	 * to drive low, and we forcibly request clock.
 	 */
-	if (option->force_clkreq_0)
+	if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
 		rtsx_pci_write_register(pcr, PETXCFG,
 			FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
 	else
drivers/misc/cardreader/rts5260.c +0 -18
index 9b42b20a3e5a..79b18f6f73a8 100644
@@ -517,17 +517,10 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
 			option->ltr_enabled = false;
 		}
 	}
-
-	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-				| PM_L1_1_EN | PM_L1_2_EN))
-		option->force_clkreq_0 = false;
-	else
-		option->force_clkreq_0 = true;
 }
 
 static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
 {
-	struct rtsx_cr_option *option = &pcr->option;
 
 	/* Set mcu_cnt to 7 to ensure data can be sampled properly */
 	rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07);
@@ -546,17 +539,6 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
 
 	rts5260_init_hw(pcr);
 
-	/*
-	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-	 * to drive low, and we forcibly request clock.
-	 */
-	if (option->force_clkreq_0)
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-	else
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-
 	rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
 
 	return 0;
drivers/misc/cardreader/rts5261.c +0 -18
index b1e76030cafd..94af6bf8a25a 100644
@@ -498,17 +498,10 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
 			option->ltr_enabled = false;
 		}
 	}
-
-	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-				| PM_L1_1_EN | PM_L1_2_EN))
-		option->force_clkreq_0 = false;
-	else
-		option->force_clkreq_0 = true;
 }
 
 static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
 {
-	struct rtsx_cr_option *option = &pcr->option;
 	u32 val;
 
 	rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1,
@@ -554,17 +547,6 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
 	else
 		rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
 
-	/*
-	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-	 * to drive low, and we forcibly request clock.
-	 */
-	if (option->force_clkreq_0)
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-	else
-		rtsx_pci_write_register(pcr, PETXCFG,
-				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-
 	rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
 
 	if (pcr->rtd3_en) {
drivers/misc/cardreader/rtsx_pcr.c +4 -1
index 32b7783e9d4f..a3f4b52bb159 100644
@@ -1326,8 +1326,11 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
 			return err;
 	}
 
-	if (pcr->aspm_mode == ASPM_MODE_REG)
+	if (pcr->aspm_mode == ASPM_MODE_REG) {
 		rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
+		rtsx_pci_write_register(pcr, PETXCFG,
+				FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
+	}
 
 	/* No CD interrupt if probing driver with card inserted.
 	 * So we need to initialize pcr->card_exist here.
drivers/mmc/host/moxart-mmc.c +1 -7
index 52ed30f2d9f4..94e9a08bc90e 100644
@@ -338,13 +338,7 @@ static void moxart_transfer_pio(struct moxart_host *host)
 				return;
 			}
 			for (len = 0; len < remain && len < host->fifo_width;) {
-				/* SCR data must be read in big endian. */
-				if (data->mrq->cmd->opcode == SD_APP_SEND_SCR)
-					*sgp = ioread32be(host->base +
-							  REG_DATA_WINDOW);
-				else
-					*sgp = ioread32(host->base +
-							REG_DATA_WINDOW);
+				*sgp = ioread32(host->base + REG_DATA_WINDOW);
 				sgp++;
 				len += 4;
 			}
drivers/net/bonding/bond_main.c +3 -1
index 576370f89c75..7a3c7a74af04 100644
@@ -5839,7 +5839,9 @@ void bond_setup(struct net_device *bond_dev)
 
 	bond_dev->hw_features = BOND_VLAN_FEATURES |
 				NETIF_F_HW_VLAN_CTAG_RX |
-				NETIF_F_HW_VLAN_CTAG_FILTER;
+				NETIF_F_HW_VLAN_CTAG_FILTER |
+				NETIF_F_HW_VLAN_STAG_RX |
+				NETIF_F_HW_VLAN_STAG_FILTER;
 
 	bond_dev->hw_features |= NETIF_F_GSO_ENCAP_ALL;
 	bond_dev->features |= bond_dev->hw_features;
drivers/net/dsa/ocelot/felix.c +2 -0
index 4faabc4364aa..2d2c6f941272 100644
@@ -1606,8 +1606,10 @@ static void felix_teardown(struct dsa_switch *ds)
 	struct felix *felix = ocelot_to_felix(ocelot);
 	struct dsa_port *dp;
 
+	rtnl_lock();
 	if (felix->tag_proto_ops)
 		felix->tag_proto_ops->teardown(ds);
+	rtnl_unlock();
 
 	dsa_switch_for_each_available_port(dp, ds)
 		ocelot_deinit_port(ocelot, dp->index);
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +2 -2
index f6ededec5a4f..69d1549e63a9 100644
@@ -458,9 +458,9 @@ static void hns3_dbg_fill_content(char *content, u16 len,
 		if (result) {
 			if (item_len < strlen(result[i]))
 				break;
-			strscpy(pos, result[i], strlen(result[i]));
+			memcpy(pos, result[i], strlen(result[i]));
 		} else {
-			strscpy(pos, items[i].name, strlen(items[i].name));
+			memcpy(pos, items[i].name, strlen(items[i].name));
 		}
 		pos += item_len;
 		len -= item_len;
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +13 -1
index 248f15dac86b..61f833d61f58 100644
@@ -5854,6 +5854,9 @@ void hns3_external_lb_prepare(struct net_device *ndev, bool if_running)
 	if (!if_running)
 		return;
 
+	if (test_and_set_bit(HNS3_NIC_STATE_DOWN, &priv->state))
+		return;
+
 	netif_carrier_off(ndev);
 	netif_tx_disable(ndev);
 
@@ -5882,7 +5885,16 @@ void hns3_external_lb_restore(struct net_device *ndev, bool if_running)
 	if (!if_running)
 		return;
 
-	hns3_nic_reset_all_ring(priv->ae_handle);
+	if (hns3_nic_resetting(ndev))
+		return;
+
+	if (!test_bit(HNS3_NIC_STATE_DOWN, &priv->state))
+		return;
+
+	if (hns3_nic_reset_all_ring(priv->ae_handle))
+		return;
+
+	clear_bit(HNS3_NIC_STATE_DOWN, &priv->state);
 
 	for (i = 0; i < priv->vector_num; i++)
 		hns3_vector_enable(&priv->tqp_vector[i]);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +2 -2
index 726062e51293..5cb8f1818e51 100644
@@ -110,9 +110,9 @@ static void hclge_dbg_fill_content(char *content, u16 len,
 		if (result) {
 			if (item_len < strlen(result[i]))
 				break;
-			strscpy(pos, result[i], strlen(result[i]));
+			memcpy(pos, result[i], strlen(result[i]));
 		} else {
-			strscpy(pos, items[i].name, strlen(items[i].name));
+			memcpy(pos, items[i].name, strlen(items[i].name));
 		}
 		pos += item_len;
 		len -= item_len;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +18 -6
index 50e956d6c3b2..6af2273f227c 100644
@@ -72,6 +72,8 @@ static void hclge_restore_hw_table(struct hclge_dev *hdev);
 static void hclge_sync_promisc_mode(struct hclge_dev *hdev);
 static void hclge_sync_fd_table(struct hclge_dev *hdev);
 static void hclge_update_fec_stats(struct hclge_dev *hdev);
+static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,
+				      int wait_cnt);
 
 static struct hnae3_ae_algo ae_algo;
 
@@ -7567,6 +7569,8 @@ static void hclge_enable_fd(struct hnae3_handle *handle, bool enable)
 
 static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
 {
+#define HCLGE_LINK_STATUS_WAIT_CNT  3
+
 	struct hclge_desc desc;
 	struct hclge_config_mac_mode_cmd *req =
 		(struct hclge_config_mac_mode_cmd *)desc.data;
@@ -7591,9 +7595,15 @@ static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
 	req->txrx_pad_fcs_loop_en = cpu_to_le32(loop_en);
 
 	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
-	if (ret)
+	if (ret) {
 		dev_err(&hdev->pdev->dev,
 			"mac enable fail, ret =%d.\n", ret);
+		return;
+	}
+
+	if (!enable)
+		hclge_mac_link_status_wait(hdev, HCLGE_LINK_STATUS_DOWN,
+					   HCLGE_LINK_STATUS_WAIT_CNT);
 }
 
 static int hclge_config_switch_param(struct hclge_dev *hdev, int vfid,
@@ -7656,10 +7666,9 @@ static void hclge_phy_link_status_wait(struct hclge_dev *hdev,
 	} while (++i < HCLGE_PHY_LINK_STATUS_NUM);
 }
 
-static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret)
+static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,
+				      int wait_cnt)
 {
-#define HCLGE_MAC_LINK_STATUS_NUM  100
-
 	int link_status;
 	int i = 0;
 	int ret;
@@ -7672,13 +7681,15 @@ static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret)
 			return 0;
 
 		msleep(HCLGE_LINK_STATUS_MS);
-	} while (++i < HCLGE_MAC_LINK_STATUS_NUM);
+	} while (++i < wait_cnt);
 	return -EBUSY;
 }
 
 static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,
 					  bool is_phy)
 {
+#define HCLGE_MAC_LINK_STATUS_NUM  100
+
 	int link_ret;
 
 	link_ret = en ? HCLGE_LINK_STATUS_UP : HCLGE_LINK_STATUS_DOWN;
@@ -7686,7 +7697,8 @@ static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,
 	if (is_phy)
 		hclge_phy_link_status_wait(hdev, link_ret);
 
-	return hclge_mac_link_status_wait(hdev, link_ret);
+	return hclge_mac_link_status_wait(hdev, link_ret,
+					  HCLGE_MAC_LINK_STATUS_NUM);
 }
 
 static int hclge_set_app_loopback(struct hclge_dev *hdev, bool en)
drivers/net/ethernet/ibm/ibmvnic.c +99 -13

140 lines not on this page · raw message

drivers/net/ethernet/intel/iavf/iavf_ethtool.c +4 -1
index fd6d6f6263f6..f544d2b0abdb 100644

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

drivers/net/ethernet/intel/iavf/iavf_fdir.c +8 -3
index 6146203efd84..505e82ebafe4 100644

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

drivers/net/ethernet/marvell/prestera/prestera_router.c +7 -7
index a9a1028cb17b..de317179a7dc 100644

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

drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c +1 -1
index d3a3fe4ce670..7d9bbb494d95 100644

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

drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +5 -0
index d7ddfc489536..2ac255bb918b 100644

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

drivers/net/ethernet/mellanox/mlx5/core/main.c +1 -1
index 077204929fe4..6ab0642e9de7 100644

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

drivers/net/ethernet/mellanox/mlx5/core/sriov.c +1 -2
index 20d7662c10fb..5f2195e65dd6 100644

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

drivers/net/ethernet/microsoft/mana/mana_en.c +33 -4
index 27a0f3af8aab..4f4204432aaa 100644

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

drivers/net/macsec.c +14 -14
index 983cabf9a0f6..6a7965ed6300 100644

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

drivers/net/phy/at803x.c +0 -2
index d49965907561..61824a463df8 100644

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

drivers/net/tun.c +1 -1
index 228f5f9ef1dd..7544df1ff50e 100644

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

drivers/net/vxlan/vxlan_vnifilter.c +8 -3
index 3e04af4c5daa..c5cf55030158 100644

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

drivers/net/wireguard/allowedips.c +4 -4
index 5bf7822c53f1..0ba714ca5185 100644

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

drivers/net/wireguard/selftest/allowedips.c +10 -6
index 19eac00b2381..c51c794e70a0 100644

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

drivers/net/wireless/realtek/rtw89/mac.c +1 -1
index 077fddc5fa1e..4a1c9e18c530 100644

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

drivers/nvme/host/pci.c +2 -1
index ce2e628f94a0..b30269f5e68f 100644

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

drivers/nvme/host/rdma.c +2 -1
index 80383213b882..c478480f54aa 100644

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

drivers/nvme/host/tcp.c +2 -1
index 8f17cbec5a0e..f2fedd25915f 100644

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

drivers/platform/x86/serial-multi-instantiate.c +31 -4
index 5362f1a7b77c..7a9c758e9547 100644

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

drivers/scsi/53c700.c +1 -1
index e1e4f9d10887..857be0f3ae5b 100644

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

drivers/scsi/fnic/fnic.h +1 -1
index d82de34f6fd7..e51e92f932fa 100644

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

drivers/scsi/fnic/fnic_scsi.c +4 -2
index 26dbd347156e..be89ce96df46 100644

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

drivers/scsi/qedf/qedf_main.c +18 -0
index ecff2ec83a00..c4f293d39f22 100644

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

drivers/scsi/qedi/qedi_main.c +18 -0
index f530bb036493..9fd68d362698 100644

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

drivers/scsi/raid_class.c +1 -0
index 898a0bdf8df6..711252e52d8e 100644

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

drivers/scsi/scsi_proc.c +17 -13
index 95aee1ad1383..7184e169a4a5 100644

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

drivers/scsi/snic/snic_disc.c +1 -0
index 8fbf3c1b1311..cd27562ec922 100644

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

drivers/scsi/storvsc_drv.c +0 -4
index 54a1b8514f04..83d09c200928 100644

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

drivers/ufs/host/ufs-renesas.c +1 -1
index f8a5e79ed3b4..ab0652d8705a 100644

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

drivers/usb/common/usb-conn-gpio.c +5 -1
index e20874caba36..3f5180d64931 100644

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

drivers/usb/dwc3/gadget.c +8 -1
index c3590a0c4203..137602d9076f 100644

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

drivers/usb/gadget/udc/core.c +9 -0
index 139f471894fb..316e9cc3987b 100644

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

drivers/usb/storage/alauda.c +9 -3
index 5e912dd29b4c..115f05a6201a 100644

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

drivers/usb/typec/altmodes/displayport.c +17 -1
index 7cdf83f4c811..7a3caf556dae 100644

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

drivers/usb/typec/tcpm/tcpm.c +7 -0
index 524099634a1d..d5950ef9d1f3 100644

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

fs/btrfs/block-group.c +15 -2
index d7aad5e8ee37..3495bc775afa 100644

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

fs/btrfs/block-group.h +2 -0
index 0a3d38682358..debd42aeae0f 100644

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

fs/btrfs/disk-io.c +2 -1
index f22e00dfec6c..96369c44863a 100644

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

fs/btrfs/extent-tree.c +4 -1
index 571fcc5ae4dc..f2ee70c03f0d 100644

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

fs/btrfs/extent_io.c +4 -3
index 58785dc7080a..0ad69041954f 100644

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

fs/btrfs/inode.c +5 -5
index 3c48273cd7a5..28bcba2e0590 100644

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

fs/btrfs/relocation.c +37 -8

45 lines not on this page · raw message

fs/btrfs/tree-checker.c +14 -0
index 43f905ab0a18..2b39c7f9226f 100644

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

fs/nilfs2/inode.c +8 -0
index f6e44efb58e1..d4c0895a8811 100644

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

fs/nilfs2/segment.c +2 -0
index 6cf64023be31..21e8260112c8 100644

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

fs/nilfs2/the_nilfs.h +2 -0
index 47c7dfbb7ea5..cd4ae1b8ae16 100644

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

fs/smb/server/smb2misc.c +5 -5
index 33b7e6c4ceff..e881df1d10cb 100644

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

fs/smb/server/smb2pdu.c +8 -1
index 26cf73d664f9..f8ca44622d90 100644

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

include/linux/cpu.h +2 -0
index f98cfe9f188f..008bfa68cfab 100644

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

include/linux/skmsg.h +1 -0
index 054d7911bfc9..c1637515a8a4 100644

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

include/linux/tpm.h +1 -0
index 4e22e4f4cec8..df5cd4245f29 100644

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

include/net/cfg80211.h +3 -0
index e09ff87146c1..5976545aa26b 100644

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

include/net/netfilter/nf_tables.h +27 -4
index f3a37cacb32c..c752b6f50979 100644

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

include/trace/events/tcp.h +4 -1
index 901b440238d5..0a14c474c6f9 100644

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

io_uring/openclose.c +4 -2
index 67178e4bb282..008990e58180 100644

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

net/core/filter.c +0 -6
index da71e6812ab5..419ce7c61bd6 100644

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

net/core/skmsg.c +8 -2
index 65fb6f5b21b2..296e45b6c3c0 100644

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

net/core/sock_map.c +5 -5
index c84e5073c0b6..96db7409baa1 100644

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

net/dccp/output.c +1 -1
index b8a24734385e..fd2eb148d24d 100644

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

net/dccp/proto.c +8 -2
index a06b5641287a..abc02d25edc1 100644

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

net/ipv4/ip_tunnel_core.c +1 -1
index 92c02c886fe7..586b1b3e35b8 100644

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

net/ipv4/nexthop.c +7 -21
index d8ef05347fd9..9cc287902454 100644

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

net/ipv6/ndisc.c +2 -1
index 3a553494ff16..a4d43eb45a9d 100644

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

net/mptcp/protocol.c +2 -2
index f6f2e6417dcb..61fefa1a82db 100644

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

net/mptcp/protocol.h +0 -1
index fc00dd587a29..d77b25636125 100644

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

net/mptcp/subflow.c +29 -29

58 lines not on this page · raw message

net/netfilter/nf_tables_api.c +101 -62

163 lines not on this page · raw message

net/netfilter/nft_flow_offload.c +4 -2
index a25c88bc8b75..8a43f6f9c90b 100644

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

net/netfilter/nft_immediate.c +4 -4
index 391c18e4b3eb..5f59dbab3e93 100644

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

net/netfilter/nft_objref.c +5 -3
index 7f8e480b6be5..0017bd341872 100644

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

net/packet/af_packet.c +10 -6
index 168106840073..451bd8bfafd2 100644

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

net/sched/sch_netem.c +25 -34

59 lines not on this page · raw message

net/smc/af_smc.c +51 -22

73 lines not on this page · raw message

net/tls/tls_device.c +33 -31

64 lines not on this page · raw message

net/wireless/nl80211.c +4 -1
index 087c0c442e23..c2363d44a1ff 100644

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

net/xdp/xsk.c +1 -0
index 22bf10ffbf2d..f7592638e61d 100644

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

scripts/gcc-plugins/gcc-common.h +2 -2
index 9a1895747b15..84c730da36dd 100644

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

tools/testing/radix-tree/regression1.c +1 -1
index a61c7bcbc72d..63f468bf8245 100644

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

tools/testing/selftests/net/fib_nexthops.sh +10 -0
index 0f5e88c8f4ff..df8d90b51867 100755

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

tools/testing/selftests/net/forwarding/ethtool.sh +2 -0
index dbb9fcf759e0..aa2eafb7b243 100755

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

tools/testing/selftests/net/forwarding/ethtool_extended_state.sh +2 -0
index 072faa77f53b..17f89c3b7c02 100755

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

tools/testing/selftests/net/forwarding/hw_stats_l3_gre.sh +2 -0
index eb9ec4a68f84..7594bbb49029 100755

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

tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh +2 -0
index 9f5b3e2e5e95..49fa94b53a1c 100755

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

tools/testing/selftests/net/forwarding/lib.sh +17 -0
index f4721f1b2886..06027772cf79 100755

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

tools/testing/selftests/net/forwarding/settings new file +1 -0
new file mode 100644
index 000000000000..e7b9417537fb

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

tools/testing/selftests/net/forwarding/tc_flower.sh +4 -4
index 683711f41aa9..b1daad19b01e 100755

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

tools/testing/selftests/net/mptcp/mptcp_join.sh +4 -2
index a3108c3cff47..7b20878a1af5 100755

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

tools/testing/selftests/rseq/Makefile +3 -1
index 3a173e184566..cb5a9fc629fe 100644

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

tools/testing/selftests/rseq/rseq.c +2 -0
index b736a5169aad..e20191fb40d4 100644

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

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

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