January 2023 - Linux-stable-mirror

[regression] Bug 216932 - io_uring with libvirt cause kernel NULL pointer dereference since 6.1.5

by Linux kernel regression tracking (Thorsten Leemhuis)

Hi, this is your Linux kernel regression tracker. I noticed a regression report in bugzilla.kernel.org. As many (most?) kernel developer don't keep an eye on it, I decided to forward it by mail. Quoting from https://bugzilla.kernel.org/show_bug.cgi?id=216932 : > Sergey V. 2023-01-15 06:41:03 UTC > > Created attachment 303605 [details] > My dmesg > > After 6.1.5 kernel update my vm locks up at boot, and dmesg says "BUG: kernel NULL pointer dereference, address: 0000000000000005" (more details in attachment) > > I have few drives attached to vm with io_uring > > <driver name="qemu" type="raw" cache="none" io="io_uring" discard="unmap" detect_zeroes="off"/> > > [reply] [−] Comment 1 Sergey V. 2023-01-15 06:51:54 UTC > > After update from 6.1.4 to 6.1.5, rollback to 6.1.4 solve the problem > From the attached dmesg: > [ 70.298276] vfio-pci 0000:04:00.0: vfio_ecap_init: hiding ecap 0x25@0x3a0 > [ 90.429090] BUG: kernel NULL pointer dereference, address: 0000000000000005 > [ 90.429097] #PF: supervisor write access in kernel mode > [ 90.429099] #PF: error_code(0x0002) - not-present page > [ 90.429101] PGD 0 P4D 0 > [ 90.429104] Oops: 0002 [#1] PREEMPT SMP NOPTI > [ 90.429106] CPU: 23 PID: 4674 Comm: qemu-system-x86 Tainted: P OE 6.1.6-arch1-1 #1 7a22e7c094ebed7938b5cf37e842437a2188b39a > [ 90.429111] Hardware name: System manufacturer System Product Name/ROG STRIX X570-E GAMING, BIOS 4403 04/27/2022 > [ 90.429113] RIP: 0010:__bio_split_to_limits+0x2a4/0x480 > [ 90.429119] Code: 48 8b 5c 24 10 4c 8b 74 24 08 44 8b 7c 24 30 45 89 3e e9 29 ff ff ff c6 43 18 0c 48 89 df 49 c7 c4 f5 ff ff ff e8 4c 30 ff ff <41> 81 4c 24 10 00 40 00 00 45 8b 6c 24 28 49 be 00 00 00 00 00 00 > [ 90.429122] RSP: 0018:ffffad8501857a30 EFLAGS: 00010202 > [ 90.429124] RAX: ffff8e475e9a2001 RBX: ffff8e475e9a11c0 RCX: 0000000000002817 > [ 90.429126] RDX: 0000000000002617 RSI: 2f0bdc6175ca72c6 RDI: 000000000003bae0 > [ 90.429127] RBP: ffffad8501857ab8 R08: ffff8e4616989000 R09: 0000000000001000 > [ 90.429128] R10: 0000000000001000 R11: 0000000000001000 R12: fffffffffffffff5 > [ 90.429130] R13: 0000000000200000 R14: ffffad8501857acc R15: ffff8e4616989a80 > [ 90.429132] FS: 00007fa9099b3e40(0000) GS:ffff8e64aefc0000(0000) knlGS:0000000000000000 > [ 90.429134] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 90.429135] CR2: 0000000000000005 CR3: 0000000104526000 CR4: 0000000000750ee0 > [ 90.429137] PKRU: 55555554 > [ 90.429138] Call Trace: > [ 90.429139] <TASK> > [ 90.429142] blk_mq_submit_bio+0x9d/0x5e0 > [ 90.429145] ? bio_associate_blkg_from_css+0xcd/0x340 > [ 90.429148] __submit_bio+0xf5/0x180 > [ 90.429150] submit_bio_noacct_nocheck+0x20e/0x2c0 > [ 90.429152] __blkdev_direct_IO_async+0x104/0x1b0 > [ 90.429155] blkdev_read_iter+0x127/0x1e0 > [ 90.429158] io_read+0xe6/0x4e0 > [ 90.429162] io_issue_sqe+0x66/0x3c0 > [ 90.429165] ? io_prep_rw+0x5e/0x1c0 > [ 90.429167] io_submit_sqes+0x201/0x610 > [ 90.429170] __do_sys_io_uring_enter+0x3d0/0xa50 > [ 90.429173] do_syscall_64+0x5c/0x90 > [ 90.429176] ? syscall_exit_to_user_mode+0x1b/0x40 > [ 90.429179] ? do_syscall_64+0x6b/0x90 > [ 90.429180] ? exit_to_user_mode_prepare+0x16f/0x1d0 > [ 90.429184] ? syscall_exit_to_user_mode+0x1b/0x40 > [ 90.429186] ? do_syscall_64+0x6b/0x90 > [ 90.429187] ? do_syscall_64+0x6b/0x90 > [ 90.429188] entry_SYSCALL_64_after_hwframe+0x63/0xcd > [ 90.429192] RIP: 0033:0x7fa90ac10865 > [ 90.429220] Code: 00 00 00 44 89 d0 41 b9 08 00 00 00 83 c8 10 f6 87 d0 00 00 00 01 8b bf cc 00 00 00 44 0f 45 d0 45 31 c0 b8 aa 01 00 00 0f 05 <c3> 66 2e 0f 1f 84 00 00 00 00 00 41 83 e2 02 74 c2 f0 48 83 0c 24 > [ 90.429223] RSP: 002b:00007ffd7b86b0d8 EFLAGS: 00000246 ORIG_RAX: 00000000000001aa > [ 90.429226] RAX: ffffffffffffffda RBX: 00005572c9a6a800 RCX: 00007fa90ac10865 > [ 90.429227] RDX: 0000000000000000 RSI: 0000000000000001 RDI: 000000000000000d > [ 90.429229] RBP: 00005572c9a6a808 R08: 0000000000000000 R09: 0000000000000008 > [ 90.429230] R10: 0000000000000000 R11: 0000000000000246 R12: 00005572c9a6a8f0 > [ 90.429231] R13: 00007ffd7b86b160 R14: 0000000000000001 R15: 0000000000000000 > [ 90.429235] </TASK> > [ 90.429236] Modules linked in: ip_vs_rr xt_ipvs ip_vs overlay > rfcomm vhost_net vhost vhost_iotlb tap tun snd_seq_dummy snd_hrtimer > snd_seq xt_nat vxlan ip6_udp_tunnel udp_tunnel xt_policy xt_mark xt_u32 > xt_CHECKSUM ipt_REJECT nf_reject_ipv4 xt_tcpudp xt_conntrack > ip6table_mangle ip6table_nat ip6table_filter xt_MASQUERADE ip6_tables > nf_conntrack_netlink nfnetlink iptable_mangle xt_addrtype iptable_filter > iptable_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 > br_netfilter cmac algif_hash veth algif_skcipher af_alg nct6775 bnep > nct6775_core hwmon_vid scsi_transport_iscsi f2fs snd_usb_audio > snd_usbmidi_lib crc32_generic lz4hc_compress snd_rawmidi hid_sony > snd_seq_device ff_memless mc xfs intel_rapl_msr intel_rapl_common > edac_mce_amd snd_hda_codec_realtek kvm_amd btusb btrtl > snd_hda_codec_generic snd_hda_codec_hdmi btbcm snd_hda_intel kvm btintel > snd_intel_dspcfg btmtk snd_intel_sdw_acpi joydev mousedev > crct10dif_pclmul snd_hda_codec bluetooth crc32_pclmul dm_thin_pool > polyval_clmulni > [ 90.429270] polyval_generic dm_persistent_data gf128mul > hid_apple > ecdh_generic snd_hda_core dm_bio_prison crc16 asus_ec_sensors > ghash_clmulni_intel dm_bufio bridge snd_hwdep eeepc_wmi sha512_ssse3 > snd_pcm asus_wmi aesni_intel stp llc snd_timer crypto_simd ledtrig_audio > sp5100_tco sparse_keymap snd cryptd apple_mfi_fastcharge rapl usbhid > platform_profile pcspkr igb ccp wmi_bmof k10temp i2c_piix4 soundcore > vfat cfg80211 dca fat rfkill acpi_cpufreq mac_hid dm_multipath dm_mod sg > crypto_user fuse bpf_preload ip_tables x_tables btrfs blake2b_generic > libcrc32c crc32c_generic xor raid6_pq nvme crc32c_intel nvme_core > xhci_pci xhci_pci_renesas nvme_common mxm_wmi video wmi vfio_pci > vfio_pci_core irqbypass vfio_virqfd vfio_iommu_type1 vfio > [ 90.429308] Unloaded tainted modules: nvidia(POE):1 nvidia_uvm(POE):1 nvidia_modeset(POE):1 nvidia_drm(POE):1 [last unloaded: nvidia(POE)] > [ 90.429320] CR2: 0000000000000005 > [ 90.429321] ---[ end trace 0000000000000000 ]--- > [ 90.429323] RIP: 0010:__bio_split_to_limits+0x2a4/0x480 > [ 90.429325] Code: 48 8b 5c 24 10 4c 8b 74 24 08 44 8b 7c 24 30 45 89 3e e9 29 ff ff ff c6 43 18 0c 48 89 df 49 c7 c4 f5 ff ff ff e8 4c 30 ff ff <41> 81 4c 24 10 00 40 00 00 45 8b 6c 24 28 49 be 00 00 00 00 00 00 > [ 90.429328] RSP: 0018:ffffad8501857a30 EFLAGS: 00010202 > [ 90.429329] RAX: ffff8e475e9a2001 RBX: ffff8e475e9a11c0 RCX: 0000000000002817 > [ 90.429331] RDX: 0000000000002617 RSI: 2f0bdc6175ca72c6 RDI: 000000000003bae0 > [ 90.429332] RBP: ffffad8501857ab8 R08: ffff8e4616989000 R09: 0000000000001000 > [ 90.429334] R10: 0000000000001000 R11: 0000000000001000 R12: fffffffffffffff5 > [ 90.429335] R13: 0000000000200000 R14: ffffad8501857acc R15: ffff8e4616989a80 > [ 90.429337] FS: 00007fa9099b3e40(0000) GS:ffff8e64aefc0000(0000) knlGS:0000000000000000 > [ 90.429338] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 90.429340] CR2: 0000000000000005 CR3: 0000000104526000 CR4: 0000000000750ee0 > [ 90.429341] PKRU: 55555554 See the ticket for more details. [TLDR for the rest of this mail: I'm adding this report to the list of tracked Linux kernel regressions; the text you find below is based on a few templates paragraphs you might have encountered already in similar form.] BTW, let me use this mail to also add the report to the list of tracked regressions to ensure it's doesn't fall through the cracks: #regzbot introduced: v6.1.4..v6.1.5 https://bugzilla.kernel.org/show_bug.cgi?id=216932 #regzbot title: io_uring: NULL pointer dereference #regzbot ignore-activity This isn't a regression? This issue or a fix for it are already discussed somewhere else? It was fixed already? You want to clarify when the regression started to happen? Or point out I got the title or something else totally wrong? Then just reply and tell me -- ideally while also telling regzbot about it, as explained by the page listed in the footer of this mail. Developers: When fixing the issue, remember to add 'Link:' tags pointing to the report (e.g. the buzgzilla ticket and maybe this mail as well, if this thread sees some discussion). See page linked in footer for details. Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) -- Everything you wanna know about Linux kernel regression tracking: https://linux-regtracking.leemhuis.info/about/#tldr If I did something stupid, please tell me, as explained on that page.

1 year, 3 months

4
8
0 0

crypto-rockchip patches queued for 6.1

by Diederik de Haas

Hi, I couldn't find an existing mail with "[PATCH AUTOSEL 6.1 N/M] XYZ" to reply to, so I'm just sending an email like this. Hope that's ok. In https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/ tree/queue-6.1 there are a number of patches which start with: crypto-rockchip- like crypto-rockchip-add-fallback-for-ahash.patch I guess they were (auto) selected as they contain a "Fixes: <commitid>" line. Those 7 patches are actually part of a larger patch set, see here: https://lore.kernel.org/all/20220927075511.3147847-1-clabbe@baylibre.com/ All those patches have been merged into Linus' tree for 6.2 and there's a hotfix planned to be submitted for 6.2 here: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/ commit/?h=v6.2-armsoc/dtsfixes&id=53e8e1e6e9c1653095211a8edf17912f2374bb03 Wouldn't it make more sense to queue the whole patch set for 6.1? Or (at least) the whole crypto rockchip part as mentioned here: https://lore.kernel.org/all/Y5mGGrBJaDL6mnQJ@gondor.apana.org.au/ under the "Corentin Labbe (32):" label? Cheers, Diederik

1 year, 3 months

2
6
0 0

[PATCH 5.4 000/658] 5.4.229-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.229 release. There are 658 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 18 Jan 2023 15:47:28 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.229-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.229-rc1 Xin Long <lucien.xin(a)gmail.com> tipc: call tipc_lxc_xmit without holding node_read_lock Heming Zhao <ocfs2-devel(a)oss.oracle.com> ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown Mahesh Salgaonkar <mahesh(a)linux.ibm.com> pseries/eeh: Fix the kdump kernel crash during eeh_pseries_init Hoang Le <hoang.h.le(a)dektech.com.au> tipc: Add a missing case of TIPC_DIRECT_MSG type Dmitry Osipenko <digetx(a)gmail.com> tty: serial: tegra: Handle RX transfer in PIO mode if DMA wasn't started Tuong Lien <tuong.t.lien(a)dektech.com.au> tipc: fix use-after-free in tipc_disc_rcv() Ferry Toth <ftoth(a)exalondelft.nl> Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" Aaron Thompson <dev(a)aaront.org> mm: Always release pages to the buddy allocator in memblock_free_late(). Johan Hovold <johan+linaro(a)kernel.org> efi: fix NULL-deref in init error path Mark Rutland <mark.rutland(a)arm.com> arm64: cmpxchg_double*: hazard against entire exchange variable Mark Rutland <mark.rutland(a)arm.com> arm64: atomics: remove LL/SC trampolines Mark Rutland <mark.rutland(a)arm.com> arm64: atomics: format whitespace consistently Rob Clark <robdclark(a)chromium.org> drm/virtio: Fix GEM handle creation UAF Peter Newman <peternewman(a)google.com> x86/resctrl: Fix task CLOSID/RMID update race Reinette Chatre <reinette.chatre(a)intel.com> x86/resctrl: Use task_curr() instead of task_struct->on_cpu to prevent unnecessary IPI Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe() Yong Wu <yong.wu(a)mediatek.com> iommu/mediatek-v1: Add error handle for mtk_iommu_probe Rahul Rameshbabu <rrameshbabu(a)nvidia.com> net/mlx5: Fix ptp max frequency adjustment range Eran Ben Elisha <eranbe(a)mellanox.com> net/mlx5: Rename ptp clock info Ido Schimmel <idosch(a)nvidia.com> net/sched: act_mpls: Fix warning during failed attribute validation Minsuk Kang <linuxlovemin(a)yonsei.ac.kr> nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() Roger Pau Monne <roger.pau(a)citrix.com> hvc/xen: lock console list traversal Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix unexpected link reset due to discovery messages Hoang Le <hoang.h.le(a)dektech.com.au> tipc: eliminate checking netns if node established Hoang Le <hoang.h.le(a)dektech.com.au> tipc: improve throughput between nodes in netns Ricardo Ribalda <ribalda(a)chromium.org> regulator: da9211: Use irq handler when ready Eliav Farber <farbere(a)amazon.com> EDAC/device: Fix period calculation in edac_device_reset_delay_period() Peter Zijlstra <peterz(a)infradead.org> x86/boot: Avoid using Intel mnemonics in AT&T syntax asm Kajol Jain <kjain(a)linux.ibm.com> powerpc/imc-pmu: Fix use of mutex in IRQs disabled section Gavrilov Ilia <Ilia.Gavrilov(a)infotecs.ru> netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. Ye Bin <yebin10(a)huawei.com> ext4: fix uninititialized value in 'ext4_evict_inode' Baokun Li <libaokun1(a)huawei.com> ext4: fix use-after-free in ext4_orphan_cleanup zhengliang <zhengliang6(a)huawei.com> ext4: lost matching-pair of trace in ext4_truncate Baokun Li <libaokun1(a)huawei.com> ext4: fix bug_on in __es_tree_search caused by bad quota inode Jan Kara <jack(a)suse.cz> quota: Factor out setup of quota inode Bixuan Cui <cuibixuan(a)linux.alibaba.com> jbd2: use the correct print format Jan Kara <jack(a)suse.cz> jbd2: Factor out common parts of stopping and restarting a handle Jan Kara <jack(a)suse.cz> jbd2: Drop pointless wakeup from jbd2_journal_stop() Jan Kara <jack(a)suse.cz> jbd2: Reorganize jbd2_journal_stop() Jan Kara <jack(a)suse.cz> ocfs2: Use accessor function for h_buffer_credits Jan Kara <jack(a)suse.cz> ext4, jbd2: Provide accessor function for handle credits Jan Kara <jack(a)suse.cz> ext4: Provide function to handle transaction restarts Ferry Toth <ftoth(a)exalondelft.nl> usb: ulpi: defer ulpi_register on ulpi_read_id timeout Michael Walle <michael(a)walle.cc> wifi: wilc1000: sdio: fix module autoloading Herbert Xu <herbert(a)gondor.apana.org.au> ipv6: raw: Deduct extension header length in rawv6_push_pending_frames Yang Yingliang <yangyingliang(a)huawei.com> ixgbe: fix pci device refcount leak Hans de Goede <hdegoede(a)redhat.com> platform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe Konrad Dybcio <konrad.dybcio(a)linaro.org> drm/msm/adreno: Make adreno quirks not overwrite each other Volker Lendecke <vl(a)samba.org> cifs: Fix uninitialized memory read for smb311 posix symlink create Adrian Chan <adchan(a)google.com> ALSA: hda/hdmi: Add a HP device 0x8715 to force connect list Clement Lecigne <clecigne(a)google.com> ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF Paolo Abeni <pabeni(a)redhat.com> net/ulp: prevent ULP without clone op from entering the LISTEN status Heiko Carstens <hca(a)linux.ibm.com> s390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple() Alexander Egorenkov <egorenar(a)linux.ibm.com> s390/kexec: fix ipl report address for kdump Adrian Hunter <adrian.hunter(a)intel.com> perf auxtrace: Fix address filter duplicate symbol selection Jonathan Corbet <corbet(a)lwn.net> docs: Fix the docs build with Sphinx 6.0 Ard Biesheuvel <ardb(a)kernel.org> efi: tpm: Avoid READ_ONCE() for accessing the event log Marc Zyngier <maz(a)kernel.org> KVM: arm64: Fix S1PTW handling on RO memslots Frederick Lawler <fred(a)cloudflare.com> net: sched: disallow noqueue for qdisc classes Isaac J. Manjarres <isaacmanjarres(a)google.com> driver core: Fix bus_type.match() error handling in __driver_attach() Muhammad Usama Anjum <usama.anjum(a)collabora.com> selftests: set the BUILD variable to absolute path Shuah Khan <skhan(a)linuxfoundation.org> selftests: Fix kselftest O=objdir build from cluttering top level objdir Helge Deller <deller(a)gmx.de> parisc: Align parisc MADV_XXX constants with all other architectures Jan Kara <jack(a)suse.cz> mbcache: Avoid nesting of cache->c_list_lock under bit locks Linus Torvalds <torvalds(a)linux-foundation.org> hfs/hfsplus: avoid WARN_ON() for sanity check, use proper error handling Arnd Bergmann <arnd(a)arndb.de> hfs/hfsplus: use WARN_ON for sanity check Eric Biggers <ebiggers(a)google.com> ext4: don't allow journal inode to have encrypt flag Ben Dooks <ben-linux(a)fluff.org> riscv: uaccess: fix type of 0 variable on error in get_user() Jeff Layton <jlayton(a)kernel.org> nfsd: fix handling of readdir in v4root vs. mount upcall timeout Rodrigo Branco <bsdaemon(a)google.com> x86/bugs: Flush IBP in ib_prctl_set() Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet Jan Kara <jack(a)suse.cz> udf: Fix extension of the last extent in the file Zhengchao Shao <shaozhengchao(a)huawei.com> caif: fix memory leak in cfctrl_linkup_request() Dan Carpenter <error27(a)gmail.com> drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() Szymon Heidrich <szymon.heidrich(a)gmail.com> usb: rndis_host: Secure rndis_query check against int overflow Daniil Tatianin <d-tatianin(a)yandex-team.ru> drivers/net/bonding/bond_3ad: return when there's no aggregator Miaoqian Lin <linmq006(a)gmail.com> perf tools: Fix resources leak in perf_data__open_dir() Jamal Hadi Salim <jhs(a)mojatatu.com> net: sched: cbq: dont intepret cls results when asked to drop Jamal Hadi Salim <jhs(a)mojatatu.com> net: sched: atm: dont intepret cls results when asked to drop Maor Gottlieb <maorg(a)nvidia.com> RDMA/mlx5: Fix validation of max_rd_atomic caps for DC Leon Romanovsky <leon(a)kernel.org> RDMA/uverbs: Silence shiftTooManyBitsSigned warning Miaoqian Lin <linmq006(a)gmail.com> net: phy: xgmiitorgmii: Fix refcount leak in xgmiitorgmii_probe Jiguang Xiao <jiguang.xiao(a)windriver.com> net: amd-xgbe: add missed tasklet_kill Stefano Garzarella <sgarzare(a)redhat.com> vhost: fix range used in translate_desc() Miaoqian Lin <linmq006(a)gmail.com> nfc: Fix potential resource leaks Daniil Tatianin <d-tatianin(a)yandex-team.ru> qlcnic: prevent ->dcb use-after-free on qlcnic_dcb_enable() failure Hawkins Jiawei <yin31149(a)gmail.com> net: sched: fix memory leak in tcindex_set_parms Jie Wang <wangjie125(a)huawei.com> net: hns3: add interrupts re-initialization while doing VF FLR Jeff Layton <jlayton(a)kernel.org> nfsd: shut down the NFSv4 state objects before the filecache Jakub Kicinski <kuba(a)kernel.org> bpf: pull before calling skb_postpull_rcsum() minoura makoto <minoura(a)valinux.co.jp> SUNRPC: ensure the matching upcall is in-flight upon downcall Jan Kara <jack(a)suse.cz> ext4: fix deadlock due to mbcache entry corruption Jan Kara <jack(a)suse.cz> mbcache: automatically delete entries from cache on freeing Jan Kara <jack(a)suse.cz> ext4: fix race when reusing xattr blocks Jan Kara <jack(a)suse.cz> ext4: unindent codeblock in ext4_xattr_block_set() Jan Kara <jack(a)suse.cz> ext4: remove EA inode entry from mbcache on inode eviction Jan Kara <jack(a)suse.cz> mbcache: add functions to delete entry if unused Jan Kara <jack(a)suse.cz> mbcache: don't reclaim used entries Shuqi Zhang <zhangshuqi3(a)huawei.com> ext4: use kmemdup() to replace kmalloc + memcpy Alexander Potapenko <glider(a)google.com> fs: ext4: initialize fsdata in pagecache_write() Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> ext4: use memcpy_to_page() in pagecache_write() Ira Weiny <ira.weiny(a)intel.com> mm/highmem: Lift memcpy_[to|from]_page to core Baokun Li <libaokun1(a)huawei.com> ext4: correct inconsistent error msg in nojournal mode Jason Yan <yanaijie(a)huawei.com> ext4: goto right label 'failed_mount3a' Guo Ren <guoren(a)linux.alibaba.com> riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument Chen Huang <chenhuang5(a)huawei.com> riscv/stacktrace: Fix stack output without ra on the stack top Biju Das <biju.das.jz(a)bp.renesas.com> ravb: Fix "failed to switch device to config mode" message during unbind Sean Christopherson <seanjc(a)google.com> KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1 Xiaoyao Li <xiaoyao.li(a)intel.com> KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING Xiaoyao Li <xiaoyao.li(a)intel.com> KVM: VMX: Rename NMI_PENDING to NMI_WINDOW Xiaoyao Li <xiaoyao.li(a)intel.com> KVM: VMX: Rename INTERRUPT_PENDING to INTERRUPT_WINDOW Andrea Arcangeli <aarcange(a)redhat.com> KVM: retpolines: x86: eliminate retpoline from vmx.c exit handlers Andrea Arcangeli <aarcange(a)redhat.com> KVM: x86: optimize more exit handlers in vmx.c Masami Hiramatsu (Google) <mhiramat(a)kernel.org> perf probe: Fix to get the DW_AT_decl_file and DW_AT_call_file as unsinged data Masami Hiramatsu (Google) <mhiramat(a)kernel.org> perf probe: Use dwarf_attr_integrate as generic DWARF attr accessor Luo Meng <luomeng12(a)huawei.com> dm thin: resume even if in FAIL mode Smitha T Murthy <smitha.t(a)samsung.com> media: s5p-mfc: Fix in register read and write for H264 Smitha T Murthy <smitha.t(a)samsung.com> media: s5p-mfc: Clear workbit to handle error condition Smitha T Murthy <smitha.t(a)samsung.com> media: s5p-mfc: Fix to handle reference queue during finishing Kant Fan <kant(a)allwinnertech.com> PM/devfreq: governor: Add a private governor_data for governor Sasha Levin <sashal(a)kernel.org> btrfs: replace strncpy() with strscpy() Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: make display pinning more flexible (v2) Ye Bin <yebin10(a)huawei.com> ext4: allocate extended attribute value in vmalloc area Jan Kara <jack(a)suse.cz> ext4: avoid unaccounted block allocation when expanding inode Jan Kara <jack(a)suse.cz> ext4: initialize quota before expanding inode in setproject ioctl Ye Bin <yebin10(a)huawei.com> ext4: fix inode leak in ext4_xattr_inode_create() on an error path Jan Kara <jack(a)suse.cz> ext4: avoid BUG_ON when creating xattrs Luís Henriques <lhenriques(a)suse.de> ext4: fix error code return to user-space in ext4_get_branch() Baokun Li <libaokun1(a)huawei.com> ext4: fix corruption when online resizing a 1K bigalloc fs Eric Whitney <enwlinux(a)gmail.com> ext4: fix delayed allocation bug in ext4_clu_mapped for bigalloc + inline Ye Bin <yebin10(a)huawei.com> ext4: init quota for 'old.inode' in 'ext4_rename' Baokun Li <libaokun1(a)huawei.com> ext4: fix bug_on in __es_tree_search caused by bad boot loader inode Ye Bin <yebin10(a)huawei.com> ext4: fix reserved cluster accounting in __es_remove_extent() Baokun Li <libaokun1(a)huawei.com> ext4: add helper to check quota inums Baokun Li <libaokun1(a)huawei.com> ext4: add EXT4_IGET_BAD flag to prevent unexpected bad inode Gaosheng Cui <cuigaosheng1(a)huawei.com> ext4: fix undefined behavior in bit shift for ext4_check_flag_values Baokun Li <libaokun1(a)huawei.com> ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop Zack Rusin <zackr(a)vmware.com> drm/vmwgfx: Validate the box size for the snooped cursor Simon Ser <contact(a)emersion.fr> drm/connector: send hotplug uevent on connector cleanup Wang Weiyang <wangweiyang2(a)huawei.com> device_cgroup: Roll back to original exceptions after copy failure Shang XiaoJing <shangxiaojing(a)huawei.com> parisc: led: Fix potential null-ptr-deref in start_task() Kim Phillips <kim.phillips(a)amd.com> iommu/amd: Fix ivrs_acpihid cmdline parsing code Corentin Labbe <clabbe(a)baylibre.com> crypto: n2 - add missing hash statesize Sascha Hauer <s.hauer(a)pengutronix.de> PCI/sysfs: Fix double free in error path Michael S. Tsirkin <mst(a)redhat.com> PCI: Fix pci_device_is_present() for VFs by checking PF Dan Carpenter <error27(a)gmail.com> ipmi: fix use after free in _ipmi_destroy_user() Huaxin Lu <luhuaxin1(a)huawei.com> ima: Fix a potential NULL pointer access in ima_restore_measurement_list Alexander Sverdlin <alexander.sverdlin(a)nokia.com> mtd: spi-nor: Check for zero erase size in spi_nor_find_best_erase_type() Zhang Yuchen <zhangyuchen.lcr(a)bytedance.com> ipmi: fix long wait in unload when IPMI disconnect Aditya Garg <gargaditya08(a)live.com> efi: Add iMac Pro 2017 to uefi skip cert quirk Florian-Ewald Mueller <florian-ewald.mueller(a)ionos.com> md/bitmap: Fix bitmap chunk size overflow issues Steve French <stfrench(a)microsoft.com> cifs: fix missing display of three mount options Paulo Alcantara <pc(a)cjr.nz> cifs: fix confusing debug message Takashi Iwai <tiwai(a)suse.de> media: dvb-core: Fix UAF due to refcount races at releasing Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> media: dvb-core: Fix double free in dvb_register_device() Nick Desaulniers <ndesaulniers(a)google.com> ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod Yang Jihong <yangjihong1(a)huawei.com> tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line Zheng Yejian <zhengyejian1(a)huawei.com> tracing/hist: Fix wrong return value in parse_action_params() Ashok Raj <ashok.raj(a)intel.com> x86/microcode/intel: Do not retry microcode reloading on the APs Zheng Yejian <zhengyejian1(a)huawei.com> tracing/hist: Fix out-of-bound write on 'action_data.var_ref_idx' Mike Snitzer <snitzer(a)kernel.org> dm cache: set needs_check flag after aborting metadata Luo Meng <luomeng12(a)huawei.com> dm cache: Fix UAF in destroy() Luo Meng <luomeng12(a)huawei.com> dm clone: Fix UAF in clone_dtr() Luo Meng <luomeng12(a)huawei.com> dm integrity: Fix UAF in dm_integrity_dtr() Luo Meng <luomeng12(a)huawei.com> dm thin: Fix UAF in run_timer_softirq() Zhihao Cheng <chengzhihao1(a)huawei.com> dm thin: Use last transaction's pmd->root when commit failed Zhihao Cheng <chengzhihao1(a)huawei.com> dm thin: Fix ABBA deadlock between shrink_slab and dm_pool_abort_metadata Mike Snitzer <snitzer(a)kernel.org> dm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort Wang Yufen <wangyufen(a)huawei.com> binfmt: Fix error return code in load_elf_fdpic_binary() Eric W. Biederman <ebiederm(a)xmission.com> binfmt: Move install_exec_creds after setup_new_exec to match binfmt_elf Yongqiang Liu <liuyongqiang13(a)huawei.com> cpufreq: Init completion before kobject_init_and_add() Mickaël Salaün <mic(a)digikod.net> selftests: Use optional USERCFLAGS and USERLDFLAGS Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sdm850-lenovo-yoga-c630: correct I2C12 pins drive strength Jason A. Donenfeld <Jason(a)zx2c4.com> ARM: ux500: do not directly dereference __iomem Boris Burkov <boris(a)bur.io> btrfs: fix resolving backrefs for inline extent followed by prealloc Wenchao Chen <wenchao.chen(a)unisoc.com> mmc: sdhci-sprd: Disable CLK_AUTO when the clock is less than 400K Steven Rostedt <rostedt(a)goodmis.org> ktest.pl minconfig: Unset configs instead of just removing them Steven Rostedt <rostedt(a)goodmis.org> kest.pl: Fix grub2 menu handling for rebooting Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> soc: qcom: Select REMAP_MMIO for LLCC driver Jason A. Donenfeld <Jason(a)zx2c4.com> media: stv0288: use explicitly signed char Eric Dumazet <edumazet(a)google.com> net/af_packet: make sure to pull mac header Hangbin Liu <liuhangbin(a)gmail.com> net/af_packet: add VLAN support for AF_PACKET SOCK_RAW GSO Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Don't leak netobj memory when gss_read_proxy_verf() fails Hanjun Guo <guohanjun(a)huawei.com> tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak Hanjun Guo <guohanjun(a)huawei.com> tpm: tpm_crb: Add the missed acpi_put_table() to fix memory leak Deren Wu <deren.wu(a)mediatek.com> mmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNING Pavel Machek <pavel(a)denx.de> f2fs: should put a page when checking the summary info NARIBAYASHI Akira <a.naribayashi(a)fujitsu.com> mm, compaction: fix fast_isolate_around() to stay within boundaries Mikulas Patocka <mpatocka(a)redhat.com> md: fix a crash in mempool_free Christian Brauner <brauner(a)kernel.org> pnode: terminate at peers of source Artem Egorkine <arteme(a)gmail.com> ALSA: line6: fix stack overflow in line6_midi_transmit Artem Egorkine <arteme(a)gmail.com> ALSA: line6: correct midi status byte when receiving data from podxt Zhang Tianci <zhangtianci.1997(a)bytedance.com> ovl: Use ovl mounter's fsuid and fsgid in ovl_link() Aditya Garg <gargaditya08(a)live.com> hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount Terry Junge <linuxhid(a)cosmicgizmosystems.com> HID: plantronics: Additional PIDs for double volume key presses quirk José Expósito <jose.exposito89(a)gmail.com> HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/rtas: avoid scheduling in rtas_os_term() Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/rtas: avoid device tree lookups in rtas_os_term() Christophe Leroy <christophe.leroy(a)csgroup.eu> objtool: Fix SEGFAULT Christoph Hellwig <hch(a)lst.de> nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition Revanth Rajashekar <revanth.rajashekar(a)intel.com> nvme: resync include/linux/nvme.h with nvmecli Adam Vodopjan <grozzly(a)protonmail.com> ata: ahci: Fix PCS quirk application for suspend Baolin Wang <baolin.wang(a)linux.alibaba.com> nvme-pci: use the consistent return type of nvme_pci_iod_alloc_size() Baolin Wang <baolin.wang(a)linux.alibaba.com> nvme-pci: add a blank line after declarations Klaus Jensen <k.jensen(a)samsung.com> nvme-pci: fix doorbell buffer value endianness Paulo Alcantara <pc(a)cjr.nz> cifs: fix oops during encryption Lin Ma <linma(a)zju.edu.cn> media: dvbdev: fix refcnt bug Lin Ma <linma(a)zju.edu.cn> media: dvbdev: fix build warning due to comments Rickard x Andersson <rickaran(a)axis.com> gcov: add support for checksum field Johan Hovold <johan+linaro(a)kernel.org> regulator: core: fix deadlock on regulator enable Rasmus Villemoes <linux(a)rasmusvillemoes.dk> iio: adc128s052: add proper .data members in adc128_of_match table Nuno Sá <nuno.sa(a)analog.com> iio: adc: ad_sigma_delta: do not use internal iio_dev lock Roberto Sassu <roberto.sassu(a)huawei.com> reiserfs: Add missing calls to reiserfs_security_free() Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Ensure bootloader PID is usable in hidraw mode Ferry Toth <ftoth(a)exalondelft.nl> usb: dwc3: core: defer probe on ulpi_read_id timeout Jiao Zhou <jiaozhou(a)google.com> ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list Edward Pacman <edward(a)edward-p.xyz> ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB John Stultz <jstultz(a)google.com> pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXES Yang Jihong <yangjihong1(a)huawei.com> perf debug: Set debug_peo_args and redirect_to_stderr variable to correct values in perf_quiet_option() John Stultz <jstultz(a)google.com> pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Remove unbalanced pm_runtime_put() Wang Jingjin <wangjingjin1(a)huawei.com> ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() Marek Szyprowski <m.szyprowski(a)samsung.com> ASoC: wm8994: Fix potential deadlock Wang Jingjin <wangjingjin1(a)huawei.com> ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume() Wang Yufen <wangyufen(a)huawei.com> ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() Wang Yufen <wangyufen(a)huawei.com> ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: Intel: Skylake: Fix driver hang during shutdown Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ALSA: hda: add snd_hdac_stop_streams() helper Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ALSA/ASoC: hda: move/rename snd_hdac_ext_stop_streams to hdac_stream.c Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init() Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() Nathan Chancellor <nathan(a)kernel.org> drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid() Nathan Chancellor <nathan(a)kernel.org> drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() Hawkins Jiawei <yin31149(a)gmail.com> hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param() Xiu Jianfeng <xiujianfeng(a)huawei.com> clk: st: Fix memory leak in st_of_quadfs_setup() Shigeru Yoshida <syoshida(a)redhat.com> media: si470x: Fix use-after-free in si470x_int_in_callback() Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> mmc: f-sdh30: Add quirks for broken timeout clock capability Rui Zhang <zr.zhang(a)vivo.com> regulator: core: fix use_count leakage when handling boot-on Ye Bin <yebin10(a)huawei.com> blk-mq: fix possible memleak when register 'hctx' failed Mazin Al Haddad <mazinalhaddad05(a)gmail.com> media: dvb-usb: fix memory leak in dvb_usb_adapter_init() Lin Ma <linma(a)zju.edu.cn> media: dvbdev: adopts refcnt to avoid UAF Yan Lei <yan_lei(a)dahuatech.com> media: dvb-frontends: fix leak of memory fw Stanislav Fomichev <sdf(a)google.com> bpf: Prevent decl_tag from being referenced in func_proto arg Stanislav Fomichev <sdf(a)google.com> ppp: associate skb with a device at tx Schspa Shi <schspa(a)gmail.com> mrp: introduce active flags to prevent UAF when applicant uninit Eric Dumazet <edumazet(a)google.com> net: add atomic_long_t to net_device_stats fields Jiang Li <jiang.li(a)ugreen.com> md/raid1: stop mdx_raid1 thread when raid1 array run failed Li Zhong <floridsleeves(a)gmail.com> drivers/md/md-bitmap: check the return value of md_bitmap_get_counter() Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/sti: Use drm_mode_copy() Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/rockchip: Use drm_mode_copy() Nathan Chancellor <nathan(a)kernel.org> s390/lcs: Fix return type of lcs_start_xmit() Nathan Chancellor <nathan(a)kernel.org> s390/netiucv: Fix return type of netiucv_tx() Nathan Chancellor <nathan(a)kernel.org> s390/ctcm: Fix return type of ctc{mp,}m_tx() Kees Cook <keescook(a)chromium.org> igb: Do not free q_vector unless new one was allocated Minsuk Kang <linuxlovemin(a)yonsei.ac.kr> wifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request() Nathan Chancellor <nathan(a)kernel.org> hamradio: baycom_epp: Fix return type of baycom_send_packet() Nathan Chancellor <nathan(a)kernel.org> net: ethernet: ti: Fix return type of netcp_ndo_start_xmit() Stanislav Fomichev <sdf(a)google.com> bpf: make sure skb->len != 0 when redirecting to a tunneling device Zhang Yuchen <zhangyuchen.lcr(a)bytedance.com> ipmi: fix memleak when unload ipmi driver Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> ASoC: codecs: rt298: Add quirk for KBL-R RVP platform Shigeru Yoshida <syoshida(a)redhat.com> wifi: ar5523: Fix use-after-free on ar5523_cmd() timed out Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: verify the expected usb_endpoints are present Wright Feng <wright.feng(a)cypress.com> brcmfmac: return error when getting invalid max_flowrings from dongle Doug Brown <doug(a)schmorgal.com> drm/etnaviv: add missing quirks for GC300 ZhangPeng <zhangpeng362(a)huawei.com> hfs: fix OOB Read in __hfs_brec_find Zheng Yejian <zhengyejian1(a)huawei.com> acct: fix potential integer overflow in encode_comp_t() Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset() Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPICA: Fix error code path in acpi_ds_call_control_method() Hoi Pok Wu <wuhoipok(a)gmail.com> fs: jfs: fix shift-out-of-bounds in dbDiscardAG Shigeru Yoshida <syoshida(a)redhat.com> udf: Avoid double brelse() in udf_rename() Dongliang Mu <mudongliangabcd(a)gmail.com> fs: jfs: fix shift-out-of-bounds in dbAllocAG Liu Shixin <liushixin2(a)huawei.com> binfmt_misc: fix shift-out-of-bounds in check_special_flags Zqiang <qiang1.zhang(a)intel.com> rcu: Fix __this_cpu_read() lockdep warning in rcu_force_quiescent_state() Eric Dumazet <edumazet(a)google.com> net: stream: purge sk_error_queue in sk_stream_kill_queues() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> myri10ge: Fix an error handling path in myri10ge_probe() David Howells <dhowells(a)redhat.com> rxrpc: Fix missing unlock in rxrpc_do_sendmsg() Cong Wang <cong.wang(a)bytedance.com> net_sched: reject TCF_EM_SIMPLE case for complex ematch module Yang Yingliang <yangyingliang(a)huawei.com> mailbox: zynq-ipi: fix error handling while device_register() fails Subash Abhinov Kasiviswanathan <quic_subashab(a)quicinc.com> skbuff: Account for tail adjustment during pull operations Eelco Chaudron <echaudro(a)redhat.com> openvswitch: Fix flow lookup to use unmasked key GUO Zihua <guozihua(a)huawei.com> rtc: mxc_v2: Add missing clk_disable_unprepare() Li Zetao <lizetao1(a)huawei.com> r6040: Fix kmemleak in probe and remove Minsuk Kang <linuxlovemin(a)yonsei.ac.kr> nfc: pn533: Clear nfc_target before being used Yang Yingliang <yangyingliang(a)huawei.com> mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> mISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() Dan Aloni <dan.aloni(a)vastdata.com> nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure Chuck Lever <chuck.lever(a)oracle.com> NFSD: Add tracepoints to NFSD's duplicate reply cache Trond Myklebust <trondmy(a)gmail.com> nfsd: Define the file access mode enum for tracing Gaosheng Cui <cuigaosheng1(a)huawei.com> rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe() Gaosheng Cui <cuigaosheng1(a)huawei.com> rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/eeh: use correct API for error log size Haowen Bai <baihaowen(a)meizu.com> powerpc/eeh: Drop redundant spinlock initialization Oliver O'Halloran <oohall(a)gmail.com> powerpc/pseries: Stop using eeh_ops->init() Wen Xiong <wenxiong(a)linux.vnet.ibm.com> powerpc/pseries: PCIE PHB reset Sam Bobroff <sbobroff(a)linux.ibm.com> powerpc/eeh: Fix pseries_eeh_configure_bridge() Yuan Can <yuancan(a)huawei.com> remoteproc: qcom_q6v5_pas: Fix missing of_node_put() in adsp_alloc_memory_region() Gaosheng Cui <cuigaosheng1(a)huawei.com> remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev() Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: sifive: Call pwm_sifive_update_clock() while mutex is held Miaoqian Lin <linmq006(a)gmail.com> selftests/powerpc: Fix resource leaks Kajol Jain <kjain(a)linux.ibm.com> powerpc/hv-gpci: Fix hv_gpci event list Yang Yingliang <yangyingliang(a)huawei.com> powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe() Nicholas Piggin <npiggin(a)gmail.com> powerpc/perf: callchain validate kernel stack pointer bounds Yang Yingliang <yangyingliang(a)huawei.com> powerpc/xive: add missing iounmap() in error path in xive_spapr_populate_irq_data() Miaoqian Lin <linmq006(a)gmail.com> cxl: Fix refcount leak in cxl_calc_capp_routing Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> powerpc/52xx: Fix a resource leak in an error handling path Xie Shaowen <studentxswpy(a)163.com> macintosh/macio-adb: check the return value of ioremap() Yang Yingliang <yangyingliang(a)huawei.com> macintosh: fix possible memory leak in macio_add_one_device() Yuan Can <yuancan(a)huawei.com> iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe() Yang Yingliang <yangyingliang(a)huawei.com> iommu/amd: Fix pci device refcount leak in ppr_notifier() Alexander Stein <alexander.stein(a)ew.tq-group.com> rtc: pcf85063: Fix reading alarm Stefan Eichenberger <stefan.eichenberger(a)toradex.com> rtc: snvs: Allow a time difference on clock register read Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Disable ACPI RTC event on removal Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Rename ACPI-related functions Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Eliminate forward declarations of some functions Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Call rtc_wake_setup() from cmos_do_probe() Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Call cmos_wake_setup() from cmos_do_probe() Alexandre Belloni <alexandre.belloni(a)bootlin.com> rtc: cmos: fix build on non-ACPI platforms Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Fix wake alarm breakage Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: cmos: Fix event handler registration ordering issue Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0 Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> rtc: cmos: Refactor code by using the new dmi_get_bios_year() helper Matt Redfearn <matt.redfearn(a)mips.com> include/uapi/linux/swab: Fix potentially missing __always_inline Arnd Bergmann <arnd(a)arndb.de> RDMA/siw: Fix pointer cast warning ruanjinjie <ruanjinjie(a)huawei.com> power: supply: fix null pointer dereferencing in power_supply_get_battery_info Yuan Can <yuancan(a)huawei.com> HSI: omap_ssi_core: Fix error handling in ssi_init() Ajay Kaher <akaher(a)vmware.com> perf symbol: correction while adjusting symbol Leo Yan <leo.yan(a)linaro.org> perf trace: Handle failure when trace point folder is missed Leo Yan <leo.yan(a)linaro.org> perf trace: Use macro RAW_SYSCALL_ARGS_NUM to replace number Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Add a strtoul() method to 'struct syscall_arg_fmt' Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Allow associating scnprintf routines with well known arg names Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Add the syscall_arg_fmt pointer to syscall_arg Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Factor out the initialization of syscal_arg_fmt->scnprintf Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Separate 'struct syscall_fmt' definition from syscall_fmts variable Leo Yan <leo.yan(a)linaro.org> perf trace: Return error if a system call doesn't exist Zeng Heng <zengheng4(a)huawei.com> power: supply: fix residue sysfs file in error handle route of __power_supply_register() Yang Yingliang <yangyingliang(a)huawei.com> HSI: omap_ssi_core: fix possible memory leak in ssi_probe() Yang Yingliang <yangyingliang(a)huawei.com> HSI: omap_ssi_core: fix unbalanced pm_runtime_disable() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() Xiongfeng Wang <wangxiongfeng2(a)huawei.com> fbdev: vermilion: decrease reference count in error path Shang XiaoJing <shangxiaojing(a)huawei.com> fbdev: via: Fix error in via_core_init() Yang Yingliang <yangyingliang(a)huawei.com> fbdev: pm2fb: fix missing pci_disable_device() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> fbdev: ssd1307fb: Drop optional dependency Shang XiaoJing <shangxiaojing(a)huawei.com> samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe() Zheng Yejian <zhengyejian1(a)huawei.com> tracing/hist: Fix issue of losting command info in error_log Jiasheng Jiang <jiasheng(a)iscas.ac.cn> usb: storage: Add check for kcalloc Zheyu Ma <zheyuma97(a)gmail.com> i2c: ismt: Fix an out-of-bounds bug in ismt_access() Yang Yingliang <yangyingliang(a)huawei.com> i2c: mux: reg: check return value after calling platform_get_resource() Dejin Zheng <zhengdejin5(a)gmail.com> drivers: provide devm_platform_get_and_ioremap_resource() Chen Zhongjin <chenzhongjin(a)huawei.com> vme: Fix error not catched in fake_init() YueHaibing <yuehaibing(a)huawei.com> staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor() Dan Carpenter <error27(a)gmail.com> staging: rtl8192u: Fix use after free in ieee80211_rx() Hui Tang <tanghui20(a)huawei.com> i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe Yang Yingliang <yangyingliang(a)huawei.com> chardev: fix error handling in cdev_device_add() Yang Yingliang <yangyingliang(a)huawei.com> mcb: mcb-parse: fix error handing in chameleon_parse_gdd() Zhengchao Shao <shaozhengchao(a)huawei.com> drivers: mcb: fix resource leak in mcb_probe() John Keeping <john(a)metanate.com> usb: gadget: f_hid: fix refcount leak on error path John Keeping <john(a)metanate.com> usb: gadget: f_hid: fix f_hidg lifetime vs cdev Maxim Devaev <mdevaev(a)gmail.com> usb: gadget: f_hid: optional SETUP/SET_REPORT mode Yang Yingliang <yangyingliang(a)huawei.com> usb: roles: fix of node refcount leak in usb_role_switch_is_parent() Fabrice Gasnier <fabrice.gasnier(a)foss.st.com> counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update Yang Yingliang <yangyingliang(a)huawei.com> cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter() Yang Yingliang <yangyingliang(a)huawei.com> cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter() Zheng Wang <zyytlz.wz(a)163.com> misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os ruanjinjie <ruanjinjie(a)huawei.com> misc: tifm: fix possible memory leak in tifm_7xx1_switch_media() Yang Yingliang <yangyingliang(a)huawei.com> misc: ocxl: fix possible name leak in ocxl_file_register_afu() Zhengchao Shao <shaozhengchao(a)huawei.com> test_firmware: fix memory leak in test_firmware_init() Yuan Can <yuancan(a)huawei.com> serial: sunsab: Fix error handling in sunsab_init() Gabriel Somlo <gsomlo(a)gmail.com> serial: altera_uart: fix locking in polling mode Jiri Slaby <jslaby(a)suse.cz> tty: serial: altera_uart_{r,t}x_chars() need only uart_port Jiri Slaby <jslaby(a)suse.cz> tty: serial: clean up stop-tx part in altera_uart_tx_chars() Xiongfeng Wang <wangxiongfeng2(a)huawei.com> serial: pch: Fix PCI device refcount leak in pch_request_dma() delisun <delisun(a)pateo.com.cn> serial: pl011: Do not clear RX FIFO & RX interrupt in unthrottle. Jiamei Xie <jiamei.xie(a)arm.com> serial: amba-pl011: avoid SBSA UART accessing DMACR register Yang Yingliang <yangyingliang(a)huawei.com> usb: typec: tcpci: fix of node refcount leak in tcpci_register_port() Sven Peter <sven(a)svenpeter.dev> usb: typec: Check for ops->exit instead of ops->enter in altmode_exit Gaosheng Cui <cuigaosheng1(a)huawei.com> staging: vme_user: Fix possible UAF in tsi148_dma_list_add Linus Walleij <linus.walleij(a)linaro.org> usb: fotg210-udc: Fix ages old endianness issues Rafael Mendonca <rafaelmendsr(a)gmail.com> uio: uio_dmem_genirq: Fix deadlock between irq config and handling Rafael Mendonca <rafaelmendsr(a)gmail.com> uio: uio_dmem_genirq: Fix missing unlock in irq configuration Rafael Mendonca <rafaelmendsr(a)gmail.com> vfio: platform: Do not pass return buffer to ACPI _RST method Yang Yingliang <yangyingliang(a)huawei.com> class: fix possible memory leak in __class_register() Kartik <kkartik(a)nvidia.com> serial: tegra: Read DMA status before terminating Dmitry Osipenko <digetx(a)gmail.com> tty: serial: tegra: Activate RX DMA transfer by request Yang Yingliang <yangyingliang(a)huawei.com> drivers: dio: fix possible memory leak in dio_init() Dragos Tatulea <dtatulea(a)nvidia.com> IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces Xiongfeng Wang <wangxiongfeng2(a)huawei.com> hwrng: geode - Fix PCI device refcount leak Xiongfeng Wang <wangxiongfeng2(a)huawei.com> hwrng: amd - Fix PCI device refcount leak Gaosheng Cui <cuigaosheng1(a)huawei.com> crypto: img-hash - Fix variable dereferenced before check 'hdev->req' Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> orangefs: Fix sysfs not cleanup when dev init failed Wang Yufen <wangyufen(a)huawei.com> RDMA/hfi1: Fix error return code in parse_platform_config() Shang XiaoJing <shangxiaojing(a)huawei.com> crypto: omap-sham - Use pm_runtime_resume_and_get() in omap_sham_probe() Yonggil Song <yonggil.song(a)samsung.com> f2fs: avoid victim selection from previous victim section Yuan Can <yuancan(a)huawei.com> RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps() Gaosheng Cui <cuigaosheng1(a)huawei.com> scsi: snic: Fix possible UAF in snic_tgt_create() Chen Zhongjin <chenzhongjin(a)huawei.com> scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails Shang XiaoJing <shangxiaojing(a)huawei.com> scsi: ipr: Fix WARNING in ipr_init() Yang Yingliang <yangyingliang(a)huawei.com> scsi: fcoe: Fix possible name leak when device_register() fails Yang Yingliang <yangyingliang(a)huawei.com> scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device() Yang Yingliang <yangyingliang(a)huawei.com> scsi: hpsa: Fix error handling in hpsa_add_sas_host() Yang Yingliang <yangyingliang(a)huawei.com> scsi: mpt3sas: Fix possible resource leaks in mpt3sas_transport_port_add() Zhang Yiqun <zhangyiqun(a)phytium.com.cn> crypto: tcrypt - Fix multibuffer skcipher speed test mem leak Yuan Can <yuancan(a)huawei.com> scsi: hpsa: Fix possible memory leak in hpsa_init_one() Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> RDMA/rxe: Fix NULL-ptr-deref in rxe_qp_do_cleanup() when socket create failed Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> crypto: ccree - Make cc_debugfs_global_fini() available for module init function Xiongfeng Wang <wangxiongfeng2(a)huawei.com> RDMA/hfi: Decrease PCI device reference count in error path Zeng Heng <zengheng4(a)huawei.com> PCI: Check for alloc failure in pci_request_irq() Gaosheng Cui <cuigaosheng1(a)huawei.com> crypto: ccree - Remove debugfs when platform_driver_register failed Geert Uytterhoeven <geert+renesas(a)glider.be> crypto: ccree - swap SHA384 and SHA512 larval hashes at build time Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> scsi: scsi_debug: Fix a warning in resp_write_scat() Bernard Metzler <bmt(a)zurich.ibm.com> RDMA/siw: Set defined status for work completion with undefined status Mark Zhang <markzhang(a)nvidia.com> RDMA/nldev: Return "-EAGAIN" if the cm_id isn't from expected port Bernard Metzler <bmt(a)zurich.ibm.com> RDMA/siw: Fix immediate work request flush to completion queue Dongdong Zhang <zhangdongdong1(a)oppo.com> f2fs: fix normal discard process Leon Romanovsky <leonro(a)nvidia.com> RDMA/core: Fix order of nldev_exit call Xiu Jianfeng <xiujianfeng(a)huawei.com> apparmor: Use pointer to struct aa_label for lbs_cred John Johansen <john.johansen(a)canonical.com> apparmor: Fix abi check to include v8 abi John Johansen <john.johansen(a)canonical.com> apparmor: fix lockdep warning when removing a namespace Gaosheng Cui <cuigaosheng1(a)huawei.com> apparmor: fix a memleak in multi_transaction_new() Piergiorgio Beruto <piergiorgio.beruto(a)gmail.com> stmmac: fix potential division by 0 Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: RFCOMM: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: hci_ll: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() Eric Pilmore <epilmore(a)gigaio.com> ntb_netdev: Use dev_kfree_skb_any() in interrupt context Jerry Ray <jerry.ray(a)microchip.com> net: lan9303: Fix read error execution path Markus Schneider-Pargmann <msp(a)baylibre.com> can: tcan4x5x: Remove invalid write in clear_interrupts Tom Lendacky <thomas.lendacky(a)amd.com> net: amd-xgbe: Check only the minimum speed for active/passive cables Tom Lendacky <thomas.lendacky(a)amd.com> net: amd-xgbe: Fix logic around active and passive cables Yang Yingliang <yangyingliang(a)huawei.com> net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> hamradio: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang <yangyingliang(a)huawei.com> net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave() Hangbin Liu <liuhangbin(a)gmail.com> net/tunnel: wait until all sk_user_data reader finish before releasing the sock Li Zetao <lizetao1(a)huawei.com> net: farsync: Fix kmemleak when rmmods farsync Yang Yingliang <yangyingliang(a)huawei.com> ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() ruanjinjie <ruanjinjie(a)huawei.com> of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop() Yuan Can <yuancan(a)huawei.com> drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init() Zhang Changzhong <zhangchangzhong(a)huawei.com> net: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload() Yongqiang Liu <liuyongqiang13(a)huawei.com> net: defxx: Fix missing err handling in dfx_init() Artem Chernyshev <artem.chernyshev(a)red-soft.ru> net: vmw_vsock: vmci: Check memcpy_from_msg() Xiu Jianfeng <xiujianfeng(a)huawei.com> clk: socfpga: Fix memory leak in socfpga_gate_init() Dinh Nguyen <dinguyen(a)kernel.org> clk: socfpga: use clk_hw_register for a5/c5 Lee Jones <lee.jones(a)linaro.org> clk: socfpga: clk-pll: Remove unused variable 'rc' Yang Jihong <yangjihong1(a)huawei.com> blktrace: Fix output non-blktrace event when blk_classic option enabled Wang Yufen <wangyufen(a)huawei.com> wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware() Bitterblue Smith <rtl8821cerfe2(a)gmail.com> wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h Kris Bahnsen <kris(a)embeddedTS.com> spi: spi-gpio: Don't set MOSI as an input if not 3WIRE mode Xiu Jianfeng <xiujianfeng(a)huawei.com> clk: samsung: Fix memory leak in _samsung_clk_register_pll() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> media: coda: Add check for kmalloc Jiasheng Jiang <jiasheng(a)iscas.ac.cn> media: coda: Add check for dcoda_iram_alloc Liang He <windhl(a)126.com> media: c8sectpfe: Add of_node_put() when breaking out of loop Yang Yingliang <yangyingliang(a)huawei.com> mmc: mmci: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: wbsd: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: via-sdmmc: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: meson-gx: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: omap_hsmmc: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: atmel-mci: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: wmt-sdmmc: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: vub300: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: toshsd: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: pxamci: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: mxcmmc: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: moxart: fix return value check of mmc_add_host() Yang Yingliang <yangyingliang(a)huawei.com> mmc: alcor: fix return value check of mmc_add_host() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.x: Fail client initialisation if state manager thread can't run Wang ShaoBo <bobo.shaobowang(a)huawei.com> SUNRPC: Fix missing release socket in rpc_sockname() Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> xprtrdma: Fix regbuf data not freed in rpcrdma_req_create() Gaosheng Cui <cuigaosheng1(a)huawei.com> ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt Liu Shixin <liushixin2(a)huawei.com> media: saa7164: fix missing pci_disable_device() Eric Dumazet <edumazet(a)google.com> bpf, sockmap: fix race in sock_map_free() Yang Yingliang <yangyingliang(a)huawei.com> regulator: core: fix resource leak in regulator_register() Chen Zhongjin <chenzhongjin(a)huawei.com> configfs: fix possible memory leak in configfs_create_dir() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> hsr: Avoid double remove of a node. Christian Marangi <ansuelsmth(a)gmail.com> clk: qcom: clk-krait: fix wrong div2 functions Yang Yingliang <yangyingliang(a)huawei.com> regulator: core: fix module refcount leak in set_supply() Chen Zhongjin <chenzhongjin(a)huawei.com> wifi: cfg80211: Fix not unregister reg_pdev when load_builtin_regdb_keys() fails Zhengchao Shao <shaozhengchao(a)huawei.com> wifi: mac80211: fix memory leak in ieee80211_if_add() Alexander Sverdlin <alexander.sverdlin(a)siemens.com> spi: spidev: mask SPI_CS_HIGH in SPI_IOC_RD_MODE Dan Carpenter <error27(a)gmail.com> bonding: uninitialized variable in bond_miimon_inspect() Pengcheng Yang <yangpc(a)wangsu.com> bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect Pengcheng Yang <yangpc(a)wangsu.com> bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data Florian Westphal <fw(a)strlen.de> netfilter: conntrack: set icmpv6 redirects as RELATED Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe Xiongfeng Wang <wangxiongfeng2(a)huawei.com> drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios() Xiongfeng Wang <wangxiongfeng2(a)huawei.com> drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios() Ricardo Ribalda <ribalda(a)chromium.org> ASoC: mediatek: mt8173: Enable IRQ when pdata is ready Ben Greear <greearb(a)candelatech.com> wifi: iwlwifi: mvm: fix double free on tx path. Liu Shixin <liushixin2(a)huawei.com> ALSA: asihpi: fix missing pci_disable_device() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.2: Fix initialisation of struct nfs4_label Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.2: Fix a memory stomp in decode_attr_security_label Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding Jiasheng Jiang <jiasheng(a)iscas.ac.cn> ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd Dmitry Torokhov <dmitry.torokhov(a)gmail.com> ASoC: dt-bindings: wcd9335: fix reset line polarity in example Zhang Zekun <zhangzekun11(a)huawei.com> drm/tegra: Add missing clk_disable_unprepare() in tegra_dc_probe() Aakarsh Jain <aakarsh.jain(a)samsung.com> media: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC Baisong Zhong <zhongbaisong(a)huawei.com> media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer() Chen Zhongjin <chenzhongjin(a)huawei.com> media: dvb-core: Fix ignored return value in dvb_register_frontend() ZhangPeng <zhangpeng362(a)huawei.com> pinctrl: pinconf-generic: add missing of_node_put() Dario Binacchi <dario.binacchi(a)amarulasolutions.com> clk: imx: replace osc_hdmi with dummy Li Jun <jun.li(a)nxp.com> clk: imx8mn: correct the usb1_ctrl parent to be usb_bus Gautam Menghani <gautammenghani201(a)gmail.com> media: imon: fix a race condition in send_packet() Zheng Yongjun <zhengyongjun3(a)huawei.com> mtd: maps: pxa2xx-flash: fix memory leak in probe Jonathan Toppins <jtoppins(a)redhat.com> bonding: fix link recovery in mode 2 when updelay is nonzero Maor Gottlieb <maorg(a)mellanox.com> bonding: Rename slave_arr to usable_slaves Maor Gottlieb <maorg(a)mellanox.com> bonding: Export skip slave logic to function Xiu Jianfeng <xiujianfeng(a)huawei.com> clk: rockchip: Fix memory leak in rockchip_clk_register_pll() Wang ShaoBo <bobo.shaobowang(a)huawei.com> regulator: core: use kfree_const() to free space conditionally Baisong Zhong <zhongbaisong(a)huawei.com> ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT Baisong Zhong <zhongbaisong(a)huawei.com> ALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOT Marcus Folkesson <marcus.folkesson(a)gmail.com> HID: hid-sensor-custom: set fixed size for custom attributes Stanislav Fomichev <sdf(a)google.com> bpf: Move skb->len == 0 checks into __bpf_redirect Christoph Hellwig <hch(a)lst.de> media: videobuf-dma-contig: use dma_mmap_coherent Yuan Can <yuancan(a)huawei.com> media: platform: exynos4-is: Fix error handling in fimc_md_init() Yang Yingliang <yangyingliang(a)huawei.com> media: solo6x10: fix possible memory leak in solo_sysfs_init() Douglas Anderson <dianders(a)chromium.org> Input: elants_i2c - properly handle the reset GPIO when power is off Hui Tang <tanghui20(a)huawei.com> mtd: lpddr2_nvm: Fix possible null-ptr-deref Xiu Jianfeng <xiujianfeng(a)huawei.com> wifi: ath10k: Fix return value in ath10k_pci_init() Xiu Jianfeng <xiujianfeng(a)huawei.com> ima: Fix misuse of dereference of pointer in template_desc_init_fields() GUO Zihua <guozihua(a)huawei.com> integrity: Fix memory leakage in keyring allocation error path Dan Carpenter <error27(a)gmail.com> amdgpu/pm: prevent array underflow in vega20_odn_edit_dpm_table() Yang Yingliang <yangyingliang(a)huawei.com> regulator: core: fix unbalanced of node refcount in regulator_dev_lookup() Zeng Heng <zengheng4(a)huawei.com> ASoC: pxa: fix null-pointer dereference in filter() Xinlei Lee <xinlei.lee(a)mediatek.com> drm/mediatek: Modify dpi power on/off sequence. Hanjun Guo <guohanjun(a)huawei.com> drm/radeon: Add the missed acpi_put_table() to fix memory leak David Howells <dhowells(a)redhat.com> rxrpc: Fix ack.bufferSize to be 0 when generating an ack David Howells <dhowells(a)redhat.com> net, proc: Provide PROC_FS=n fallback for proc_create_net_single_write() Vladimir Zapolskiy <vladimir.zapolskiy(a)linaro.org> media: camss: Clean up received buffers on failed start of streaming Marek Vasut <marex(a)denx.de> wifi: rsi: Fix handling of 802.3 EAPOL frames sent via control port Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> mtd: Fix device name leak when register device failed in add_mtd_device() Andrii Nakryiko <andrii(a)kernel.org> bpf: propagate precision in ALU/ALU64 operations Liu Shixin <liushixin2(a)huawei.com> media: vivid: fix compose size exceed boundary GUO Zihua <guozihua(a)huawei.com> ima: Handle -ESTALE returned by ima_filter_rule_match() Gustavo A. R. Silva <gustavoars(a)kernel.org> ima: Fix fall-through warnings for Clang Tyler Hicks <tyhicks(a)linux.microsoft.com> ima: Rename internal filter rule functions Marek Vasut <marex(a)denx.de> drm/panel/panel-sitronix-st7701: Remove panel on DSI attach failure Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> spi: Update reference to struct spi_controller Marek Vasut <marex(a)denx.de> clk: renesas: r9a06g032: Repair grave increment error Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: Add struct kvaser_usb_busparams Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix bogus restart events Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix wrong CAN state after stopping Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix improved state not being reported Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Set Warning state even without bus errors Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: kvaser_usb_leaf: Handle CMD_ERROR_EVENT Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: kvaser_usb_leaf: Get capabilities from device Vincent Mailhol <mailhol.vincent(a)wanadoo.fr> can: kvaser_usb: do not increase tx statistics when sending error message frames Ricardo Ribalda <ribalda(a)chromium.org> media: i2c: ad5820: Fix error path Junlin Yang <yangjunlin(a)yulong.com> pata_ipx4xx_cf: Fix unsigned comparison with less than zero Bitterblue Smith <rtl8821cerfe2(a)gmail.com> wifi: rtl8xxxu: Fix reading the vendor of combo chips Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb() Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs() Cai Xinchen <caixinchen1(a)huawei.com> rapidio: devices: fix missing put_device in mport_cdev_open ZhangPeng <zhangpeng362(a)huawei.com> hfs: Fix OOB Write in hfs_asc2mac Gavrilov Ilia <Ilia.Gavrilov(a)infotecs.ru> relay: fix type mismatch when allocating memory in relay_create_buf() Zhang Qilong <zhangqilong3(a)huawei.com> eventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD Wang Weiyang <wangweiyang2(a)huawei.com> rapidio: fix possible UAF when kfifo_alloc() fails Chen Zhongjin <chenzhongjin(a)huawei.com> fs: sysv: Fix sysv_nblocks() returns wrong value Ladislav Michl <ladis(a)linux-mips.org> MIPS: OCTEON: warn only once if deprecated link status is being used Anastasia Belova <abelova(a)astralinux.ru> MIPS: BCM63xx: Add check for NULL for clk in clk_enable Yu Liao <liaoyu15(a)huawei.com> platform/x86: mxm-wmi: fix memleak in mxm_wmi_call_mx[ds|mx]() Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: runtime: Do not call __rpm_callback() from rpm_idle() Ulf Hansson <ulf.hansson(a)linaro.org> PM: runtime: Improve path in rpm_idle() when no callback Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> xen/privcmd: Fix a possible warning in privcmd_ioctl_mmap_resource() Xiu Jianfeng <xiujianfeng(a)huawei.com> x86/xen: Fix memory leak in xen_init_lock_cpu() Xiu Jianfeng <xiujianfeng(a)huawei.com> x86/xen: Fix memory leak in xen_smp_intr_init{_pv}() Juergen Gross <jgross(a)suse.com> xen/events: only register debug interrupt for 2-level events Oleg Nesterov <oleg(a)redhat.com> uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix Li Zetao <lizetao1(a)huawei.com> ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() Geert Uytterhoeven <geert+renesas(a)glider.be> clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled Yang Yingliang <yangyingliang(a)huawei.com> rapidio: rio: fix possible name leak in rio_register_mport() Yang Yingliang <yangyingliang(a)huawei.com> rapidio: fix possible name leaks when rio_add_device() fails Li Zetao <ocfs2-devel(a)oss.oracle.com> ocfs2: fix memory leak in ocfs2_mount_volume() Heming Zhao via Ocfs2-devel <ocfs2-devel(a)oss.oracle.com> ocfs2: rewrite error handling of ocfs2_fill_super Heming Zhao via Ocfs2-devel <ocfs2-devel(a)oss.oracle.com> ocfs2: ocfs2_mount_volume does cleanup job before return error Akinobu Mita <akinobu.mita(a)gmail.com> debugfs: fix error when writing negative value to atomic_t debugfs file Wolfram Sang <wsa+renesas(a)sang-engineering.com> docs: fault-injection: fix non-working usage of negative values Akinobu Mita <akinobu.mita(a)gmail.com> lib/notifier-error-inject: fix error when writing -errno to debugfs file Akinobu Mita <akinobu.mita(a)gmail.com> libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value Xiongfeng Wang <wangxiongfeng2(a)huawei.com> cpufreq: amd_freq_sensitivity: Add missing pci_dev_put() Yang Yingliang <yangyingliang(a)huawei.com> genirq/irqdesc: Don't try to remove non-existing sysfs files Jeff Layton <jlayton(a)kernel.org> nfsd: don't call nfsd_file_put from client states seqfile display Yang Yingliang <yangyingliang(a)huawei.com> EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper() Shang XiaoJing <shangxiaojing(a)huawei.com> irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe() Xiongfeng Wang <wangxiongfeng2(a)huawei.com> perf/x86/intel/uncore: Fix reference count leak in hswep_has_limit_sbox() Yang Yingliang <yangyingliang(a)huawei.com> PNP: fix name memory leak in pnp_alloc_dev() Zhao Gongyi <zhaogongyi(a)huawei.com> selftests/efivarfs: Add checking of the test return value Yang Yingliang <yangyingliang(a)huawei.com> MIPS: vpe-cmp: fix possible memory leak while module exiting Yang Yingliang <yangyingliang(a)huawei.com> MIPS: vpe-mt: fix possible memory leak while module exiting Shang XiaoJing <shangxiaojing(a)huawei.com> ocfs2: fix memory leak in ocfs2_stack_glue_init() Gaosheng Cui <cuigaosheng1(a)huawei.com> lib/fonts: fix undefined behavior in bit shift for get_default_font Alexey Dobriyan <adobriyan(a)gmail.com> proc: fixup uptime selftest Barnabás Pőcze <pobrn(a)protonmail.com> timerqueue: Use rb_entry_safe() in timerqueue_getnext() wuchi <wuchi.zero(a)gmail.com> lib/debugobjects: fix stat count and optimize debug_objects_mem_init Zqiang <qiang.zhang(a)windriver.com> debugobjects: Free per CPU pool after CPU unplug Chen Zhongjin <chenzhongjin(a)huawei.com> perf: Fix possible memleak in pmu_dev_alloc() Yipeng Zou <zouyipeng(a)huawei.com> selftests/ftrace: event_triggers: wait longer for test_event_enable Ondrej Mosnacek <omosnace(a)redhat.com> fs: don't audit the capability check in simple_xattr_list() xiongxin <xiongxin(a)kylinos.cn> PM: hibernate: Fix mistake in kerneldoc comment Al Viro <viro(a)zeniv.linux.org.uk> alpha: fix syscall entry in !AUDUT_SYSCALL case Ulf Hansson <ulf.hansson(a)linaro.org> cpuidle: dt: Return the correct numbers of parsed idle states Michael Kelley <mikelley(a)microsoft.com> tpm/tpm_crb: Fix error message in __crb_relinquish_locality() Stephen Boyd <swboyd(a)chromium.org> pstore: Avoid kcore oops by vmap()ing with VM_IOREMAP Doug Brown <doug(a)schmorgal.com> ARM: mmp: fix timer_read delay Wang Yufen <wangyufen(a)huawei.com> pstore/ram: Fix error return code in ramoops_probe() Pali Rohár <pali(a)kernel.org> arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC Pali Rohár <pali(a)kernel.org> ARM: dts: turris-omnia: Add switch port 6 node Pali Rohár <pali(a)kernel.org> ARM: dts: turris-omnia: Add ethernet aliases Pali Rohár <pali(a)kernel.org> ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port Pali Rohár <pali(a)kernel.org> ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port Pali Rohár <pali(a)kernel.org> ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port Pali Rohár <pali(a)kernel.org> ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port Pali Rohár <pali(a)kernel.org> ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port Pali Rohár <pali(a)kernel.org> ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> arm64: dts: mediatek: mt6797: Fix 26M oscillator unit name AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> arm64: dts: mt2712-evb: Fix usb vbus regulators unit names AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> arm64: dts: mt2712-evb: Fix vproc fixed regulators unit names AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> arm64: dts: mt2712e: Fix unit address for pinctrl node AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> arm64: dts: mt2712e: Fix unit_address_vs_reg warning for oscillators Shang XiaoJing <shangxiaojing(a)huawei.com> perf/smmuv3: Fix hotplug callback leak in arm_smmu_pmu_init() Yuan Can <yuancan(a)huawei.com> perf: arm_dsu: Fix hotplug callback leak in dsu_pmu_init() Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: knav_qmss_queue: Fix PM disable depth imbalance in knav_queue_probe Minghao Chi <chi.minghao(a)zte.com.cn> soc: ti: knav_qmss_queue: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync Kory Maincent <kory.maincent(a)bootlin.com> arm: dts: spear600: Fix clcd interrupt Luca Weiss <luca.weiss(a)fairphone.com> soc: qcom: llcc: make irq truly optional Vivek Gautam <vivek.gautam(a)codeaurora.org> soc: qcom: Rename llcc-slice to llcc-qcom Vivek Gautam <vivek.gautam(a)codeaurora.org> soc: qcom: llcc cleanup to get rid of sdm845 specific driver file Chen Jiahao <chenjiahao16(a)huawei.com> drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sdm845-cheza: fix AP suspend pin bias Luca Weiss <luca(a)z3ntu.xyz> ARM: dts: qcom: apq8064: fix coresight compatible Ivaylo Dimitrov <ivo.g.dimitrov.75(a)gmail.com> usb: musb: remove extra check in musb_gadget_vbus_draw Rasmus Villemoes <linux(a)rasmusvillemoes.dk> net: loopback: use NET_NAME_PREDICTABLE for name_assign_type Sungwoo Kim <iam(a)sung-woo.kim> Bluetooth: L2CAP: Fix u8 overflow José Expósito <jose.exposito89(a)gmail.com> HID: uclogic: Add HID_QUIRK_HIDINPUT_FORCE quirk Hans de Goede <hdegoede(a)redhat.com> HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch V 10 Hans de Goede <hdegoede(a)redhat.com> HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E Hans de Goede <hdegoede(a)redhat.com> HID: ite: Add support for Acer S1002 keyboard-dock Pratyush Yadav <ptyadav(a)amazon.de> xen-netback: move removal of "hotplug-status" to the right place Tony Nguyen <anthony.l.nguyen(a)intel.com> igb: Initialize mailbox message for VF reset Johan Hovold <johan(a)kernel.org> USB: serial: f81534: fix division by zero on line-speed change Johan Hovold <johan(a)kernel.org> USB: serial: f81232: fix division by zero on line-speed change Bruno Thomsen <bruno.thomsen(a)gmail.com> USB: serial: cp210x: add Kamstrup RF sniffer PIDs Duke Xin <duke_xinanwen(a)163.com> USB: serial: option: add Quectel EM05-G modem Szymon Heidrich <szymon.heidrich(a)gmail.com> usb: gadget: uvc: Prevent buffer overflow in setup handler Jan Kara <jack(a)suse.cz> udf: Fix extending file within last block Jan Kara <jack(a)suse.cz> udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size Jan Kara <jack(a)suse.cz> udf: Fix preallocation discarding at indirect extent boundary Jan Kara <jack(a)suse.cz> udf: Discard preallocation before extending file with a hole Pratyush Yadav <ptyadav(a)amazon.de> tracing/ring-buffer: Only do full wait when cpu != RING_BUFFER_ALL_CPUS ------------- Diffstat: .../devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- Documentation/driver-api/spi.rst | 4 +- Documentation/fault-injection/fault-injection.rst | 16 +- Documentation/sphinx/load_config.py | 6 +- Makefile | 4 +- arch/alpha/kernel/entry.S | 4 +- arch/arm/boot/dts/armada-370.dtsi | 2 +- arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/armada-380.dtsi | 4 +- arch/arm/boot/dts/armada-385-turris-omnia.dts | 18 +- arch/arm/boot/dts/armada-385.dtsi | 6 +- arch/arm/boot/dts/armada-39x.dtsi | 6 +- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 8 +- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 16 +- arch/arm/boot/dts/dove.dtsi | 2 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- arch/arm/boot/dts/spear600.dtsi | 2 +- arch/arm/mach-mmp/time.c | 11 +- arch/arm/nwfpe/Makefile | 6 + .../boot/dts/marvell/armada-3720-turris-mox.dts | 3 + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 12 +- arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 22 +- arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 +- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 6 +- arch/arm64/include/asm/atomic_ll_sc.h | 114 +++--- arch/arm64/include/asm/atomic_lse.h | 16 +- arch/arm64/include/asm/kvm_emulate.h | 22 +- arch/mips/bcm63xx/clk.c | 2 + .../cavium-octeon/executive/cvmx-helper-board.c | 2 +- arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +- arch/mips/kernel/vpe-cmp.c | 4 +- arch/mips/kernel/vpe-mt.c | 4 +- arch/parisc/include/uapi/asm/mman.h | 23 +- arch/parisc/kernel/sys_parisc.c | 27 ++ arch/parisc/kernel/syscalls/syscall.tbl | 2 +- arch/powerpc/include/asm/imc-pmu.h | 2 +- arch/powerpc/kernel/rtas.c | 20 +- arch/powerpc/perf/callchain.c | 1 + arch/powerpc/perf/hv-gpci-requests.h | 4 + arch/powerpc/perf/hv-gpci.c | 33 +- arch/powerpc/perf/hv-gpci.h | 1 + arch/powerpc/perf/imc-pmu.c | 136 ++++--- arch/powerpc/perf/req-gen/perf.h | 20 + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- arch/powerpc/platforms/pseries/eeh_pseries.c | 323 +++++++++------ arch/powerpc/sysdev/xive/spapr.c | 1 + arch/riscv/include/asm/uaccess.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +- arch/s390/include/asm/percpu.h | 2 +- arch/s390/kernel/machine_kexec_file.c | 5 +- arch/x86/boot/bioscall.S | 4 +- arch/x86/events/intel/uncore_snbep.c | 1 + arch/x86/ia32/ia32_aout.c | 3 +- arch/x86/include/asm/vmx.h | 6 +- arch/x86/include/uapi/asm/vmx.h | 4 +- arch/x86/kernel/cpu/bugs.c | 2 + arch/x86/kernel/cpu/microcode/intel.c | 8 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 26 +- arch/x86/kernel/uprobes.c | 4 +- arch/x86/kvm/vmx/nested.c | 31 +- arch/x86/kvm/vmx/vmx.c | 66 ++-- arch/x86/xen/smp.c | 41 +- arch/x86/xen/smp_pv.c | 12 +- arch/x86/xen/spinlock.c | 6 +- arch/x86/xen/xen-ops.h | 2 + block/blk-mq-sysfs.c | 11 +- crypto/tcrypt.c | 9 - drivers/acpi/acpica/dsmethod.c | 10 +- drivers/acpi/acpica/utcopy.c | 7 - drivers/ata/ahci.c | 32 +- drivers/ata/pata_ixp4xx_cf.c | 2 +- drivers/base/class.c | 5 + drivers/base/dd.c | 8 +- drivers/base/platform.c | 22 ++ drivers/base/power/runtime.c | 18 +- drivers/bluetooth/btusb.c | 6 +- drivers/bluetooth/hci_bcsp.c | 2 +- drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_ll.c | 2 +- drivers/bluetooth/hci_qca.c | 2 +- drivers/char/hw_random/amd-rng.c | 18 +- drivers/char/hw_random/geode-rng.c | 36 +- drivers/char/ipmi/ipmi_msghandler.c | 12 +- drivers/char/ipmi/ipmi_si_intf.c | 27 +- drivers/char/tpm/tpm_crb.c | 31 +- drivers/char/tpm/tpm_tis.c | 9 +- drivers/clk/imx/clk-imx8mn.c | 14 +- drivers/clk/qcom/clk-krait.c | 2 + drivers/clk/renesas/r9a06g032-clocks.c | 3 +- drivers/clk/rockchip/clk-pll.c | 1 + drivers/clk/samsung/clk-pll.c | 1 + drivers/clk/socfpga/clk-gate.c | 16 +- drivers/clk/socfpga/clk-periph.c | 8 +- drivers/clk/socfpga/clk-pll.c | 17 +- drivers/clk/st/clkgen-fsyn.c | 5 +- drivers/clocksource/sh_cmt.c | 16 +- drivers/counter/stm32-lptimer-cnt.c | 2 +- drivers/cpufreq/amd_freq_sensitivity.c | 2 + drivers/cpufreq/cpufreq.c | 2 +- drivers/cpuidle/dt_idle_states.c | 2 +- drivers/crypto/ccree/cc_debugfs.c | 2 +- drivers/crypto/ccree/cc_driver.c | 11 +- drivers/crypto/ccree/cc_hash.c | 49 +-- drivers/crypto/ccree/cc_hash.h | 2 - drivers/crypto/img-hash.c | 8 +- drivers/crypto/n2_core.c | 6 + drivers/crypto/omap-sham.c | 2 +- drivers/devfreq/devfreq.c | 6 +- drivers/devfreq/governor_userspace.c | 12 +- drivers/dio/dio.c | 8 + drivers/edac/edac_device.c | 17 +- drivers/edac/edac_module.h | 2 +- drivers/edac/i10nm_base.c | 3 +- drivers/firmware/efi/efi.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 +- drivers/gpu/drm/drm_connector.c | 3 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- drivers/gpu/drm/i915/gvt/scheduler.c | 1 + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 10 +- drivers/gpu/drm/radeon/radeon_bios.c | 19 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 7 +- drivers/gpu/drm/sti/sti_hda.c | 7 +- drivers/gpu/drm/sti/sti_hdmi.c | 7 +- drivers/gpu/drm/tegra/dc.c | 4 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- drivers/hid/hid-ids.h | 5 + drivers/hid/hid-ite.c | 26 +- drivers/hid/hid-multitouch.c | 4 + drivers/hid/hid-plantronics.c | 9 + drivers/hid/hid-sensor-custom.c | 2 +- drivers/hid/hid-uclogic-core.c | 1 + drivers/hid/wacom_sys.c | 8 + drivers/hid/wacom_wac.c | 4 + drivers/hid/wacom_wac.h | 1 + drivers/hsi/controllers/omap_ssi_core.c | 14 +- drivers/i2c/busses/i2c-ismt.c | 3 + drivers/i2c/busses/i2c-pxa-pci.c | 10 +- drivers/i2c/muxes/i2c-mux-reg.c | 5 +- drivers/iio/adc/ad_sigma_delta.c | 8 +- drivers/iio/adc/ti-adc128s052.c | 14 +- drivers/infiniband/core/device.c | 2 +- drivers/infiniband/core/nldev.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/hfi1/affinity.c | 2 + drivers/infiniband/hw/hfi1/firmware.c | 6 + drivers/infiniband/hw/mlx5/qp.c | 49 ++- drivers/infiniband/sw/rxe/rxe_qp.c | 6 +- drivers/infiniband/sw/siw/siw_cq.c | 24 +- drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- drivers/infiniband/sw/siw/siw_verbs.c | 40 +- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 7 + drivers/input/touchscreen/elants_i2c.c | 9 +- drivers/iommu/amd_iommu_init.c | 7 + drivers/iommu/amd_iommu_v2.c | 1 + drivers/iommu/fsl_pamu.c | 2 +- drivers/iommu/mtk_iommu_v1.c | 26 +- drivers/irqchip/irq-gic-pm.c | 2 +- drivers/isdn/hardware/mISDN/hfcmulti.c | 19 +- drivers/isdn/hardware/mISDN/hfcpci.c | 13 +- drivers/isdn/hardware/mISDN/hfcsusb.c | 12 +- drivers/macintosh/macio-adb.c | 4 + drivers/macintosh/macio_asic.c | 2 +- drivers/mailbox/zynqmp-ipi-mailbox.c | 4 +- drivers/mcb/mcb-core.c | 4 +- drivers/mcb/mcb-parse.c | 2 +- drivers/md/dm-cache-metadata.c | 54 ++- drivers/md/dm-cache-target.c | 11 +- drivers/md/dm-clone-target.c | 1 + drivers/md/dm-integrity.c | 2 + drivers/md/dm-thin-metadata.c | 60 ++- drivers/md/dm-thin.c | 18 +- drivers/md/md-bitmap.c | 47 ++- drivers/md/md.c | 9 +- drivers/md/raid1.c | 1 + drivers/media/dvb-core/dmxdev.c | 8 + drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- drivers/media/dvb-core/dvb_frontend.c | 10 +- drivers/media/dvb-core/dvbdev.c | 33 +- drivers/media/dvb-frontends/bcm3510.c | 1 + drivers/media/dvb-frontends/stv0288.c | 5 +- drivers/media/i2c/ad5820.c | 10 +- drivers/media/pci/saa7164/saa7164-core.c | 4 +- drivers/media/pci/solo6x10/solo6x10-core.c | 1 + drivers/media/platform/coda/coda-bit.c | 14 +- drivers/media/platform/exynos4-is/fimc-core.c | 2 +- drivers/media/platform/exynos4-is/media-dev.c | 6 +- drivers/media/platform/qcom/camss/camss-video.c | 3 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 +- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 +- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 14 +- .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 + drivers/media/platform/vivid/vivid-vid-cap.c | 1 + drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- drivers/media/rc/imon.c | 6 +- drivers/media/usb/dvb-usb/az6027.c | 4 + drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 +- drivers/media/v4l2-core/videobuf-dma-contig.c | 22 +- drivers/misc/cxl/guest.c | 24 +- drivers/misc/cxl/pci.c | 21 +- drivers/misc/ocxl/file.c | 7 +- drivers/misc/sgi-gru/grufault.c | 13 +- drivers/misc/sgi-gru/grumain.c | 22 +- drivers/misc/sgi-gru/grutables.h | 2 +- drivers/misc/tifm_7xx1.c | 2 +- drivers/mmc/host/alcor.c | 5 +- drivers/mmc/host/atmel-mci.c | 9 +- drivers/mmc/host/meson-gx-mmc.c | 4 +- drivers/mmc/host/mmci.c | 4 +- drivers/mmc/host/moxart-mmc.c | 4 +- drivers/mmc/host/mxcmmc.c | 4 +- drivers/mmc/host/omap_hsmmc.c | 4 +- drivers/mmc/host/pxamci.c | 7 +- drivers/mmc/host/rtsx_usb_sdmmc.c | 11 +- drivers/mmc/host/sdhci-sprd.c | 16 +- drivers/mmc/host/sdhci_f_sdh30.c | 3 + drivers/mmc/host/toshsd.c | 6 +- drivers/mmc/host/via-sdmmc.c | 4 +- drivers/mmc/host/vub300.c | 13 +- drivers/mmc/host/wbsd.c | 12 +- drivers/mmc/host/wmt-sdmmc.c | 6 +- drivers/mtd/lpddr/lpddr2_nvm.c | 2 + drivers/mtd/maps/pxa2xx-flash.c | 2 + drivers/mtd/mtdcore.c | 4 +- drivers/mtd/spi-nor/spi-nor.c | 2 + drivers/net/bonding/bond_3ad.c | 1 + drivers/net/bonding/bond_alb.c | 4 +- drivers/net/bonding/bond_main.c | 98 +++-- drivers/net/can/m_can/tcan4x5x.c | 5 - drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 30 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 115 +++++- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 167 ++++++-- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 437 ++++++++++++++++++--- drivers/net/dsa/lan9303-core.c | 4 +- drivers/net/ethernet/amd/atarilance.c | 2 +- drivers/net/ethernet/amd/lance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 3 + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 4 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 +- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 23 +- drivers/net/ethernet/apple/bmac.c | 2 +- drivers/net/ethernet/apple/mace.c | 2 +- drivers/net/ethernet/dnet.c | 4 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +- drivers/net/ethernet/intel/igb/igb_main.c | 10 +- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 4 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 + drivers/net/ethernet/neterion/s2io.c | 2 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 8 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 8 +- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 + drivers/net/ethernet/rdc/r6040.c | 5 +- drivers/net/ethernet/renesas/ravb_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 3 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/fddi/defxx.c | 22 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/scc.c | 6 +- drivers/net/loopback.c | 2 +- drivers/net/ntb_netdev.c | 4 +- drivers/net/phy/xilinx_gmii2rgmii.c | 1 + drivers/net/ppp/ppp_generic.c | 2 + drivers/net/usb/rndis_host.c | 3 +- drivers/net/wan/farsync.c | 2 + drivers/net/wireless/ath/ar5523/ar5523.c | 6 + drivers/net/wireless/ath/ath10k/pci.c | 20 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 46 ++- .../broadcom/brcm80211/brcmfmac/firmware.c | 5 + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 6 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 16 +- drivers/net/wireless/rsi/rsi_91x_core.c | 4 +- drivers/net/wireless/rsi/rsi_91x_hal.c | 6 +- drivers/net/xen-netback/xenbus.c | 3 +- drivers/nfc/pn533/pn533.c | 4 + drivers/nfc/pn533/usb.c | 44 ++- drivers/nvme/host/pci.c | 31 +- drivers/of/overlay.c | 4 +- drivers/parisc/led.c | 3 + drivers/pci/irq.c | 2 + drivers/pci/pci-sysfs.c | 13 +- drivers/pci/pci.c | 2 + drivers/perf/arm_dsu_pmu.c | 6 +- drivers/perf/arm_smmuv3_pmu.c | 8 +- drivers/pinctrl/pinconf-generic.c | 4 +- drivers/platform/x86/mxm-wmi.c | 8 +- drivers/platform/x86/sony-laptop.c | 21 +- drivers/pnp/core.c | 4 +- drivers/power/avs/smartreflex.c | 1 + drivers/power/supply/power_supply_core.c | 7 +- drivers/pwm/pwm-sifive.c | 5 +- drivers/rapidio/devices/rio_mport_cdev.c | 15 +- drivers/rapidio/rio-scan.c | 8 +- drivers/rapidio/rio.c | 9 +- drivers/regulator/core.c | 15 +- drivers/regulator/da9211-regulator.c | 11 +- drivers/remoteproc/qcom_q6v5_pas.c | 1 + drivers/remoteproc/qcom_sysmon.c | 5 +- drivers/rtc/rtc-cmos.c | 366 ++++++++--------- drivers/rtc/rtc-mxc_v2.c | 4 +- drivers/rtc/rtc-pcf85063.c | 8 +- drivers/rtc/rtc-pic32.c | 8 +- drivers/rtc/rtc-snvs.c | 16 +- drivers/rtc/rtc-st-lpc.c | 1 + drivers/s390/net/ctcm_main.c | 11 +- drivers/s390/net/lcs.c | 8 +- drivers/s390/net/netiucv.c | 9 +- drivers/scsi/fcoe/fcoe.c | 1 + drivers/scsi/fcoe/fcoe_sysfs.c | 19 +- drivers/scsi/hpsa.c | 9 +- drivers/scsi/ipr.c | 10 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 2 + drivers/scsi/scsi_debug.c | 2 +- drivers/scsi/snic/snic_disc.c | 3 + drivers/soc/qcom/Kconfig | 15 +- drivers/soc/qcom/Makefile | 3 +- drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} | 62 ++- drivers/soc/qcom/llcc-sdm845.c | 100 ----- drivers/soc/ti/knav_qmss_queue.c | 6 +- drivers/soc/ux500/ux500-soc-id.c | 10 +- drivers/spi/spi-gpio.c | 16 +- drivers/spi/spidev.c | 21 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- drivers/staging/wilc1000/wilc_sdio.c | 1 + drivers/tty/hvc/hvc_xen.c | 46 ++- drivers/tty/serial/altera_uart.c | 21 +- drivers/tty/serial/amba-pl011.c | 14 +- drivers/tty/serial/pch_uart.c | 4 + drivers/tty/serial/serial-tegra.c | 115 +++--- drivers/tty/serial/sunsab.c | 8 +- drivers/uio/uio_dmem_genirq.c | 13 +- drivers/usb/dwc3/core.c | 7 +- drivers/usb/gadget/function/f_hid.c | 271 ++++++++++--- drivers/usb/gadget/function/f_uvc.c | 5 +- drivers/usb/gadget/function/u_hid.h | 1 + drivers/usb/gadget/udc/fotg210-udc.c | 12 +- drivers/usb/musb/musb_gadget.c | 2 - drivers/usb/roles/class.c | 5 +- drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/f81232.c | 12 +- drivers/usb/serial/f81534.c | 12 +- drivers/usb/serial/option.c | 3 + drivers/usb/storage/alauda.c | 2 + drivers/usb/typec/bus.c | 2 +- drivers/usb/typec/tcpm/tcpci.c | 5 +- drivers/vfio/platform/vfio_platform_common.c | 3 +- drivers/vhost/vhost.c | 4 +- drivers/video/fbdev/Kconfig | 1 - drivers/video/fbdev/pm2fb.c | 9 +- drivers/video/fbdev/uvesafb.c | 1 + drivers/video/fbdev/vermilion/vermilion.c | 4 +- drivers/video/fbdev/via/via-core.c | 9 +- drivers/vme/bridges/vme_fake.c | 2 + drivers/vme/bridges/vme_tsi148.c | 1 + drivers/xen/events/events_base.c | 10 +- drivers/xen/privcmd.c | 2 +- fs/binfmt_aout.c | 2 +- fs/binfmt_elf_fdpic.c | 7 +- fs/binfmt_flat.c | 3 +- fs/binfmt_misc.c | 8 +- fs/btrfs/backref.c | 4 + fs/btrfs/ioctl.c | 9 +- fs/btrfs/rcu-string.h | 6 +- fs/char_dev.c | 2 +- fs/cifs/cifsfs.c | 8 +- fs/cifs/cifsglob.h | 70 ++++ fs/cifs/cifsproto.h | 4 +- fs/cifs/connect.c | 4 +- fs/cifs/link.c | 1 + fs/cifs/misc.c | 4 +- fs/cifs/smb2ops.c | 143 ++++--- fs/configfs/dir.c | 2 + fs/debugfs/file.c | 28 +- fs/ext4/ext4.h | 9 +- fs/ext4/ext4_jbd2.c | 20 +- fs/ext4/ext4_jbd2.h | 55 ++- fs/ext4/extents.c | 76 ++-- fs/ext4/extents_status.c | 3 +- fs/ext4/indirect.c | 102 +++-- fs/ext4/inode.c | 74 ++-- fs/ext4/ioctl.c | 13 +- fs/ext4/migrate.c | 95 ++--- fs/ext4/namei.c | 3 + fs/ext4/resize.c | 52 +-- fs/ext4/super.c | 50 ++- fs/ext4/verity.c | 7 +- fs/ext4/xattr.c | 274 ++++++------- fs/ext4/xattr.h | 1 + fs/f2fs/gc.c | 6 +- fs/f2fs/segment.c | 2 +- fs/hfs/inode.c | 13 +- fs/hfs/trans.c | 2 +- fs/hfsplus/hfsplus_fs.h | 2 + fs/hfsplus/inode.c | 16 +- fs/hfsplus/options.c | 4 + fs/hugetlbfs/inode.c | 6 +- fs/jbd2/transaction.c | 135 +++---- fs/jfs/jfs_dmap.c | 27 +- fs/libfs.c | 22 +- fs/mbcache.c | 121 ++++-- fs/nfs/nfs4proc.c | 34 +- fs/nfs/nfs4state.c | 2 + fs/nfs/nfs4xdr.c | 12 +- fs/nfsd/nfs4callback.c | 4 +- fs/nfsd/nfs4state.c | 51 ++- fs/nfsd/nfs4xdr.c | 11 + fs/nfsd/nfscache.c | 57 +-- fs/nfsd/nfssvc.c | 2 +- fs/nfsd/trace.h | 65 +++ fs/nilfs2/the_nilfs.c | 31 +- fs/ocfs2/alloc.c | 32 +- fs/ocfs2/dlmglue.c | 8 +- fs/ocfs2/journal.c | 6 +- fs/ocfs2/journal.h | 1 + fs/ocfs2/stackglue.c | 8 +- fs/ocfs2/super.c | 108 ++--- fs/orangefs/orangefs-debugfs.c | 29 +- fs/orangefs/orangefs-mod.c | 8 +- fs/overlayfs/dir.c | 46 ++- fs/pnode.c | 2 +- fs/pstore/Kconfig | 1 + fs/pstore/pmsg.c | 7 +- fs/pstore/ram.c | 2 + fs/pstore/ram_core.c | 6 +- fs/quota/dquot.c | 110 ++++-- fs/reiserfs/namei.c | 4 + fs/reiserfs/xattr_security.c | 2 +- fs/sysv/itree.c | 2 +- fs/udf/inode.c | 76 ++-- fs/udf/namei.c | 8 +- fs/udf/truncate.c | 48 +-- fs/xattr.c | 2 +- include/linux/cpuhotplug.h | 1 + include/linux/debugfs.h | 19 +- include/linux/devfreq.h | 11 +- include/linux/eventfd.h | 2 +- include/linux/fs.h | 12 +- include/linux/highmem.h | 18 + include/linux/jbd2.h | 6 + include/linux/mbcache.h | 41 +- include/linux/netdevice.h | 58 +-- include/linux/nvme.h | 56 ++- include/linux/platform_device.h | 3 + include/linux/proc_fs.h | 2 + include/linux/quotaops.h | 2 + include/linux/soc/qcom/llcc-qcom.h | 57 +-- include/linux/sunrpc/rpc_pipe_fs.h | 5 + include/linux/timerqueue.h | 2 +- include/linux/tpm_eventlog.h | 4 +- include/media/dvbdev.h | 32 +- include/net/bonding.h | 2 +- include/net/dst.h | 5 +- include/net/mrp.h | 1 + include/sound/hdaudio.h | 2 + include/sound/hdaudio_ext.h | 1 - include/sound/pcm.h | 36 +- include/trace/events/jbd2.h | 40 +- include/uapi/linux/swab.h | 2 +- include/uapi/sound/asequencer.h | 8 +- kernel/acct.c | 2 + kernel/bpf/btf.c | 5 + kernel/bpf/verifier.c | 5 + kernel/events/core.c | 8 +- kernel/gcov/gcc_4_7.c | 5 + kernel/irq/internals.h | 2 + kernel/irq/irqdesc.c | 15 +- kernel/power/snapshot.c | 4 +- kernel/rcu/tree.c | 2 +- kernel/relay.c | 4 +- kernel/trace/blktrace.c | 3 +- kernel/trace/ring_buffer.c | 1 + kernel/trace/trace.c | 15 +- kernel/trace/trace_events_hist.c | 13 +- lib/debugobjects.c | 35 ++ lib/fonts/fonts.c | 4 +- lib/iov_iter.c | 14 - lib/notifier-error-inject.c | 2 +- lib/test_firmware.c | 1 + mm/compaction.c | 18 +- mm/memblock.c | 8 +- net/802/mrp.c | 18 +- net/bluetooth/hci_core.c | 2 +- net/bluetooth/l2cap_core.c | 3 +- net/bluetooth/rfcomm/core.c | 2 +- net/bpf/test_run.c | 3 - net/caif/cfctrl.c | 6 +- net/core/dev.c | 14 +- net/core/filter.c | 18 +- net/core/skbuff.c | 3 + net/core/sock_map.c | 2 + net/core/stream.c | 6 + net/hsr/hsr_framereg.c | 16 +- net/hsr/hsr_framereg.h | 1 + net/ipv4/inet_connection_sock.c | 16 +- net/ipv4/tcp_bpf.c | 8 +- net/ipv4/udp_tunnel.c | 1 + net/ipv6/raw.c | 4 + net/mac80211/iface.c | 1 + net/netfilter/ipset/ip_set_bitmap_ip.c | 4 +- net/netfilter/nf_conntrack_proto_icmpv6.c | 53 +++ net/nfc/netlink.c | 52 ++- net/openvswitch/datapath.c | 25 +- net/packet/af_packet.c | 20 +- net/rxrpc/output.c | 2 +- net/rxrpc/sendmsg.c | 2 +- net/sched/act_mpls.c | 8 +- net/sched/cls_tcindex.c | 12 +- net/sched/ematch.c | 2 + net/sched/sch_api.c | 5 + net/sched/sch_atm.c | 5 +- net/sched/sch_cbq.c | 5 +- net/sunrpc/auth_gss/auth_gss.c | 19 +- net/sunrpc/auth_gss/svcauth_gss.c | 9 +- net/sunrpc/clnt.c | 2 +- net/sunrpc/xprtrdma/verbs.c | 1 + net/tipc/core.c | 16 + net/tipc/core.h | 6 + net/tipc/discover.c | 4 +- net/tipc/msg.h | 19 + net/tipc/name_distr.c | 2 +- net/tipc/node.c | 172 +++++++- net/tipc/node.h | 5 +- net/tipc/socket.c | 6 +- net/vmw_vsock/vmci_transport.c | 6 +- net/wireless/reg.c | 4 +- samples/vfio-mdev/mdpy-fb.c | 8 +- security/apparmor/apparmorfs.c | 4 +- security/apparmor/lsm.c | 4 +- security/apparmor/policy.c | 2 +- security/apparmor/policy_unpack.c | 2 +- security/device_cgroup.c | 33 +- security/integrity/digsig.c | 6 +- security/integrity/ima/ima.h | 16 +- security/integrity/ima/ima_main.c | 1 + security/integrity/ima/ima_policy.c | 65 +-- security/integrity/ima/ima_template.c | 9 +- security/integrity/platform_certs/load_uefi.c | 1 + sound/core/control_compat.c | 4 + sound/drivers/mts64.c | 3 + sound/hda/ext/hdac_ext_stream.c | 17 - sound/hda/hdac_stream.c | 27 ++ sound/pci/asihpi/hpioctl.c | 2 +- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_hdmi.c | 2 + sound/pci/hda/patch_realtek.c | 27 ++ sound/soc/codecs/pcm512x.c | 8 +- sound/soc/codecs/rt298.c | 7 + sound/soc/codecs/rt5670.c | 2 - sound/soc/codecs/wm8994.c | 5 + sound/soc/generic/audio-graph-card.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 15 + sound/soc/intel/skylake/skl.c | 7 +- sound/soc/mediatek/common/mtk-btcvsd.c | 6 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/rockchip/rockchip_pdm.c | 1 + sound/soc/rockchip/rockchip_spdif.c | 1 + sound/usb/line6/driver.c | 3 +- sound/usb/line6/midi.c | 6 +- sound/usb/line6/midibuf.c | 25 +- sound/usb/line6/midibuf.h | 5 +- sound/usb/line6/pod.c | 3 +- tools/arch/parisc/include/uapi/asm/mman.h | 12 +- tools/arch/x86/include/uapi/asm/vmx.h | 4 +- tools/objtool/check.c | 2 +- tools/perf/bench/bench.h | 12 - tools/perf/builtin-trace.c | 135 +++++-- tools/perf/trace/beauty/beauty.h | 3 + tools/perf/util/auxtrace.c | 2 +- tools/perf/util/data.c | 2 + tools/perf/util/debug.c | 4 + tools/perf/util/dwarf-aux.c | 23 +- tools/perf/util/symbol-elf.c | 2 +- tools/testing/ktest/ktest.pl | 23 +- tools/testing/selftests/Makefile | 28 +- tools/testing/selftests/efivarfs/efivarfs.sh | 5 + .../ftrace/test.d/ftrace/func_event_triggers.tc | 15 +- tools/testing/selftests/kvm/include/x86_64/vmx.h | 8 +- .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- tools/testing/selftests/lib.mk | 5 + .../selftests/netfilter/conntrack_icmp_related.sh | 36 +- .../selftests/powerpc/dscr/dscr_sysfs_test.c | 5 +- tools/testing/selftests/proc/proc-uptime-002.c | 3 +- 603 files changed, 6390 insertions(+), 3248 deletions(-)

1 year, 3 months

7
669
0 0

[PATCH stable 4.14 0/1] Fix ext4 xfstests failure

by Rishabh Bhatnagar

While running xfstests on 4.14.304 version we see a warning being generated in one of ext4 tests with the following stack trace. WARNING: CPU: 4 PID: 15332 at mm/util.c:414 kvmalloc_node+0x67/0x70 ext4_expand_extra_isize_ea+0x2b4/0x870 [ext4] __ext4_expand_extra_isize+0xcb/0x120 [ext4] ext4_mark_inode_dirty+0x1a5/0x1d0 [ext4] ext4_ext_truncate+0x1f/0x90 [ext4] ext4_truncate+0x363/0x400 [ext4] ext4_setattr+0x392/0xa00 [ext4] notify_change+0x300/0x420 ? ext4_xattr_security_set+0x20/0x20 [ext4] do_truncate+0x75/0xc0 ? ext4_release_file+0xa0/0xa0 [ext4] path_openat+0x737/0x16f0 do_filp_open+0x9b/0x110 ? __check_object_size+0xb4/0x190 ? do_sys_open+0x1bd/0x250 do_sys_open+0x1bd/0x250 do_syscall_64+0x67/0x110 entry_SYSCALL_64_after_hwframe+0x59/0xbe It seems rebase to 4.14.304 brings a bunch of ext4 changes. Commit ext4: allocate extended attribute value in vmalloc area (73c44f61dab180b5f2dee9f15397aba36a75a882) tries to allocate buffer using kvmalloc with improper flags that generates this warning. To fix backport an upstream commit mm: kvmalloc does not fallback to vmalloc for incompatible gfp flags (170f26afa0481c72af93aa61b7398b5663451651). This removes the WARN_ON and fallsback to kmalloc if correct flags are not passed. Michal Hocko (1): mm: kvmalloc does not fallback to vmalloc for incompatible gfp flags mm/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.38.1

1 year, 3 months

2
2
0 0

[PATCH] fscrypt: Copy the memcg information to the ciphertext page

by Matthew Wilcox (Oracle)

Both f2fs and ext4 end up passing the ciphertext page to wbc_account_cgroup_owner(). At the moment, the ciphertext page appears to belong to no cgroup, so it is accounted to the root_mem_cgroup instead of whatever cgroup the original page was in. It's hard to say how far back this is a bug. The crypto code shared between ext4 & f2fs was created in May 2015 with commit 0b81d0779072, but neither filesystem did anything with memcg_data before then. memcg writeback accounting was added to ext4 in July 2015 in commit 001e4a8775f6 and it wasn't added to f2fs until January 2018 (commit 578c647879f7). I'm going with the ext4 commit since this is the first commit where there was a difference in behaviour between encrypted and unencrypted filesystems. Fixes: 001e4a8775f6 ("ext4: implement cgroup writeback support") Cc: stable(a)vger.kernel.org Signed-off-by: Matthew Wilcox (Oracle) <willy(a)infradead.org> --- fs/crypto/crypto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index e78be66bbf01..a4e76f96f291 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -205,6 +205,9 @@ struct page *fscrypt_encrypt_pagecache_blocks(struct page *page, } SetPagePrivate(ciphertext_page); set_page_private(ciphertext_page, (unsigned long)page); +#ifdef CONFIG_MEMCG + ciphertext_page->memcg_data = page->memcg_data; +#endif return ciphertext_page; } EXPORT_SYMBOL(fscrypt_encrypt_pagecache_blocks); -- 2.35.1

1 year, 3 months

5
7
0 0

[PATCH 5.15.y v2 0/5] phy: qcom-qmp-combo: Backport some stable fixes

by Stephen Boyd

After the qmp phy driver was split it looks like 5.15.y stable kernels aren't getting fixes like commit 7a7d86d14d07 ("phy: qcom-qmp-combo: fix broken power on") which is tagged for stable 5.10. Trogdor boards use the qmp phy on 5.15.y kernels, so I backported the fixes I could find that looked like we may possibly trip over at some point. USB and DP work on my Trogdor.Lazor board with this set. Changes from v1 (https://lore.kernel.org/r/20230113005405.3992011-1-swboyd@chromium.org): * New patch for memleak on probe deferal to avoid compat issues * Update "fix broken power on" patch for pcie/ufs phy Johan Hovold (5): phy: qcom-qmp-combo: disable runtime PM on unbind phy: qcom-qmp-combo: fix memleak on probe deferral phy: qcom-qmp-usb: fix memleak on probe deferral phy: qcom-qmp-combo: fix broken power on phy: qcom-qmp-combo: fix runtime suspend drivers/phy/qualcomm/phy-qcom-qmp.c | 97 ++++++++++++++++++----------- 1 file changed, 61 insertions(+), 36 deletions(-) Cc: Johan Hovold <johan+linaro(a)kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> Cc: Vinod Koul <vkoul(a)kernel.org> base-commit: d57287729e229188e7d07ef0117fe927664e08cb -- https://chromeos.dev

1 year, 3 months

3
9
0 0

[PATCH net 1/1] hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()

by Michael Kelley

netvsc_dma_map() and netvsc_dma_unmap() currently check the cp_partial flag and adjust the page_count so that pagebuf entries for the RNDIS portion of the message are skipped when it has already been copied into a send buffer. But this adjustment has already been made by code in netvsc_send(). The duplicate adjustment causes some pagebuf entries to not be mapped. In a normal VM, this doesn't break anything because the mapping doesn’t change the PFN. But in a Confidential VM, dma_map_single() does bounce buffering and provides a different PFN. Failing to do the mapping causes the wrong PFN to be passed to Hyper-V, and various errors ensue. Fix this by removing the duplicate adjustment in netvsc_dma_map() and netvsc_dma_unmap(). Fixes: 846da38de0e8 ("net: netvsc: Add Isolation VM support for netvsc driver") Cc: stable(a)vger.kernel.org Signed-off-by: Michael Kelley <mikelley(a)microsoft.com> --- drivers/net/hyperv/netvsc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 661bbe6..8acfa40 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -949,9 +949,6 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, void netvsc_dma_unmap(struct hv_device *hv_dev, struct hv_netvsc_packet *packet) { - u32 page_count = packet->cp_partial ? - packet->page_buf_cnt - packet->rmsg_pgcnt : - packet->page_buf_cnt; int i; if (!hv_is_isolation_supported()) @@ -960,7 +957,7 @@ void netvsc_dma_unmap(struct hv_device *hv_dev, if (!packet->dma_range) return; - for (i = 0; i < page_count; i++) + for (i = 0; i < packet->page_buf_cnt; i++) dma_unmap_single(&hv_dev->device, packet->dma_range[i].dma, packet->dma_range[i].mapping_size, DMA_TO_DEVICE); @@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev, struct hv_netvsc_packet *packet, struct hv_page_buffer *pb) { - u32 page_count = packet->cp_partial ? - packet->page_buf_cnt - packet->rmsg_pgcnt : - packet->page_buf_cnt; + u32 page_count = packet->page_buf_cnt; dma_addr_t dma; int i; -- 1.8.3.1

1 year, 3 months

6
6
0 0

[PATCH 5.15 v2 0/1] ext4: backport online resize fix

by Oleksandr Tymoshenko

The following patch is required to fix the ext4 online resize in 5.15. Baokun Li (1): ext4: fix bad checksum after online resize fs/ext4/resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.39.1.456.gfc5497dd1b-goog

1 year, 3 months

2
2
0 0

[PATCH] Revert "drm/display/dp_mst: Move all payload info into the atomic state"

by Wayne Lin

This reverts commit 4d07b0bc403403438d9cf88450506240c5faf92f. [Why] Changes cause regression on amdgpu mst. E.g. In fill_dc_mst_payload_table_from_drm(), amdgpu expects to add/remove payload one by one and call fill_dc_mst_payload_table_from_drm() to update the HW maintained payload table. But previous change tries to go through all the payloads in mst_state and update amdpug hw maintained table in once everytime driver only tries to add/remove a specific payload stream only. The newly design idea conflicts with the implementation in amdgpu nowadays. [How] Revert this patch first. After addressing all regression problems caused by this previous patch, will add it back and adjust it. Signed-off-by: Wayne Lin <Wayne.Lin(a)amd.com> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2171 Cc: stable(a)vger.kernel.org # 6.1 Cc: Lyude Paul <lyude(a)redhat.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Mario Limonciello <mario.limonciello(a)amd.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Stanislav Lisovskiy <stanislav.lisovskiy(a)intel.com> Cc: Fangzhi Zuo <Jerry.Zuo(a)amd.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 53 +- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 106 ++- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 87 ++- .../amd/display/include/link_service_types.h | 3 - drivers/gpu/drm/display/drm_dp_mst_topology.c | 724 ++++++++++++------ drivers/gpu/drm/i915/display/intel_dp_mst.c | 67 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 24 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 167 ++-- include/drm/display/drm_dp_mst_helper.h | 177 +++-- 9 files changed, 878 insertions(+), 530 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 77277d90b6e2..674f5dc1102b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6548,7 +6548,6 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, const struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; struct drm_dp_mst_topology_mgr *mst_mgr; struct drm_dp_mst_port *mst_port; - struct drm_dp_mst_topology_state *mst_state; enum dc_color_depth color_depth; int clock, bpp = 0; bool is_y420 = false; @@ -6562,13 +6561,6 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, if (!crtc_state->connectors_changed && !crtc_state->mode_changed) return 0; - mst_state = drm_atomic_get_mst_topology_state(state, mst_mgr); - if (IS_ERR(mst_state)) - return PTR_ERR(mst_state); - - if (!mst_state->pbn_div) - mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_port->dc_link); - if (!state->duplicated) { int max_bpc = conn_state->max_requested_bpc; is_y420 = drm_mode_is_420_also(&connector->display_info, adjusted_mode) && @@ -6580,10 +6572,11 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, clock = adjusted_mode->clock; dm_new_connector_state->pbn = drm_dp_calc_pbn_mode(clock, bpp, false); } - - dm_new_connector_state->vcpi_slots = - drm_dp_atomic_find_time_slots(state, mst_mgr, mst_port, - dm_new_connector_state->pbn); + dm_new_connector_state->vcpi_slots = drm_dp_atomic_find_time_slots(state, + mst_mgr, + mst_port, + dm_new_connector_state->pbn, + dm_mst_get_pbn_divider(aconnector->dc_link)); if (dm_new_connector_state->vcpi_slots < 0) { DRM_DEBUG_ATOMIC("failed finding vcpi slots: %d\n", (int)dm_new_connector_state->vcpi_slots); return dm_new_connector_state->vcpi_slots; @@ -6654,14 +6647,17 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, dm_conn_state->vcpi_slots = slot_num; ret = drm_dp_mst_atomic_enable_dsc(state, aconnector->port, - dm_conn_state->pbn, false); + dm_conn_state->pbn, 0, false); if (ret < 0) return ret; continue; } - vcpi = drm_dp_mst_atomic_enable_dsc(state, aconnector->port, pbn, true); + vcpi = drm_dp_mst_atomic_enable_dsc(state, + aconnector->port, + pbn, pbn_div, + true); if (vcpi < 0) return vcpi; @@ -9497,6 +9493,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state; #if defined(CONFIG_DRM_AMD_DC_DCN) struct dsc_mst_fairness_vars vars[MAX_PIPES]; + struct drm_dp_mst_topology_state *mst_state; + struct drm_dp_mst_topology_mgr *mgr; #endif trace_amdgpu_dm_atomic_check_begin(state); @@ -9744,6 +9742,33 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; } +#if defined(CONFIG_DRM_AMD_DC_DCN) + /* set the slot info for each mst_state based on the link encoding format */ + for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { + struct amdgpu_dm_connector *aconnector; + struct drm_connector *connector; + struct drm_connector_list_iter iter; + u8 link_coding_cap; + + if (!mgr->mst_state ) + continue; + + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector = to_amdgpu_dm_connector(connector); + link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); + drm_dp_mst_update_slots(mst_state, link_coding_cap); + + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /** * Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 6994c9a1ed85..ac5a8cad0695 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -27,7 +27,6 @@ #include <linux/acpi.h> #include <linux/i2c.h> -#include <drm/drm_atomic.h> #include <drm/drm_probe_helper.h> #include <drm/amdgpu_drm.h> #include <drm/drm_edid.h> @@ -120,27 +119,40 @@ enum dc_edid_status dm_helpers_parse_edid_caps( } static void -fill_dc_mst_payload_table_from_drm(struct drm_dp_mst_topology_state *mst_state, - struct amdgpu_dm_connector *aconnector, - struct dc_dp_mst_stream_allocation_table *table) -{ - struct dc_dp_mst_stream_allocation_table new_table = { 0 }; - struct dc_dp_mst_stream_allocation *sa; - struct drm_dp_mst_atomic_payload *payload; - - /* Fill payload info*/ - list_for_each_entry(payload, &mst_state->payloads, next) { - if (payload->delete) - continue; - - sa = &new_table.stream_allocations[new_table.stream_count]; - sa->slot_count = payload->time_slots; - sa->vcp_id = payload->vcpi; - new_table.stream_count++; +fill_dc_mst_payload_table_from_drm(struct amdgpu_dm_connector *aconnector, + struct dc_dp_mst_stream_allocation_table *proposed_table) +{ + int i; + struct drm_dp_mst_topology_mgr *mst_mgr = + &aconnector->mst_port->mst_mgr; + + mutex_lock(&mst_mgr->payload_lock); + + proposed_table->stream_count = 0; + + /* number of active streams */ + for (i = 0; i < mst_mgr->max_payloads; i++) { + if (mst_mgr->payloads[i].num_slots == 0) + break; /* end of vcp_id table */ + + ASSERT(mst_mgr->payloads[i].payload_state != + DP_PAYLOAD_DELETE_LOCAL); + + if (mst_mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL || + mst_mgr->payloads[i].payload_state == + DP_PAYLOAD_REMOTE) { + + struct dc_dp_mst_stream_allocation *sa = + &proposed_table->stream_allocations[ + proposed_table->stream_count]; + + sa->slot_count = mst_mgr->payloads[i].num_slots; + sa->vcp_id = mst_mgr->proposed_vcpis[i]->vcpi; + proposed_table->stream_count++; + } } - /* Overwrite the old table */ - *table = new_table; + mutex_unlock(&mst_mgr->payload_lock); } void dm_helpers_dp_update_branch_info( @@ -158,9 +170,11 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( bool enable) { struct amdgpu_dm_connector *aconnector; - struct drm_dp_mst_topology_state *mst_state; - struct drm_dp_mst_atomic_payload *payload; + struct dm_connector_state *dm_conn_state; struct drm_dp_mst_topology_mgr *mst_mgr; + struct drm_dp_mst_port *mst_port; + bool ret; + u8 link_coding_cap = DP_8b_10b_ENCODING; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; /* Accessing the connector state is required for vcpi_slots allocation @@ -171,21 +185,40 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( if (!aconnector || !aconnector->mst_port) return false; + dm_conn_state = to_dm_connector_state(aconnector->base.state); + mst_mgr = &aconnector->mst_port->mst_mgr; - mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state); + + if (!mst_mgr->mst_state) + return false; + + mst_port = aconnector->port; + +#if defined(CONFIG_DRM_AMD_DC_DCN) + link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); +#endif + + if (enable) { + + ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, + dm_conn_state->pbn, + dm_conn_state->vcpi_slots); + if (!ret) + return false; + + } else { + drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port); + } /* It's OK for this to fail */ - payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->port); - if (enable) - drm_dp_add_payload_part1(mst_mgr, mst_state, payload); - else - drm_dp_remove_payload(mst_mgr, mst_state, payload); + drm_dp_update_payload_part1(mst_mgr, (link_coding_cap == DP_CAP_ANSI_128B132B) ? 0:1); /* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each * stream. AMD ASIC stream slot allocation should follow the same * sequence. copy DRM MST allocation to dc */ - fill_dc_mst_payload_table_from_drm(mst_state, aconnector, proposed_table); + + fill_dc_mst_payload_table_from_drm(aconnector, proposed_table); return true; } @@ -242,9 +275,8 @@ bool dm_helpers_dp_mst_send_payload_allocation( bool enable) { struct amdgpu_dm_connector *aconnector; - struct drm_dp_mst_topology_state *mst_state; struct drm_dp_mst_topology_mgr *mst_mgr; - struct drm_dp_mst_atomic_payload *payload; + struct drm_dp_mst_port *mst_port; enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD; enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD; @@ -253,16 +285,19 @@ bool dm_helpers_dp_mst_send_payload_allocation( if (!aconnector || !aconnector->mst_port) return false; + mst_port = aconnector->port; + mst_mgr = &aconnector->mst_port->mst_mgr; - mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state); - payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->port); + if (!mst_mgr->mst_state) + return false; + if (!enable) { set_flag = MST_CLEAR_ALLOCATED_PAYLOAD; clr_flag = MST_ALLOCATE_NEW_PAYLOAD; } - if (enable && drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload)) { + if (drm_dp_update_payload_part2(mst_mgr)) { amdgpu_dm_set_mst_status(&aconnector->mst_status, set_flag, false); } else { @@ -272,6 +307,9 @@ bool dm_helpers_dp_mst_send_payload_allocation( clr_flag, false); } + if (!enable) + drm_dp_mst_deallocate_vcpi(mst_mgr, mst_port); + return true; } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 1edf7385f8d8..6207026a200f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -598,8 +598,15 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, dc_link_dp_get_max_link_enc_cap(aconnector->dc_link, &max_link_enc_cap); aconnector->mst_mgr.cbs = &dm_mst_cbs; - drm_dp_mst_topology_mgr_init(&aconnector->mst_mgr, adev_to_drm(dm->adev), - &aconnector->dm_dp_aux.aux, 16, 4, aconnector->connector_id); + drm_dp_mst_topology_mgr_init( + &aconnector->mst_mgr, + adev_to_drm(dm->adev), + &aconnector->dm_dp_aux.aux, + 16, + 4, + max_link_enc_cap.lane_count, + drm_dp_bw_code_to_link_rate(max_link_enc_cap.link_rate), + aconnector->connector_id); drm_connector_attach_dp_subconnector_property(&aconnector->base); } @@ -710,13 +717,12 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn) return dsc_config.bits_per_pixel; } -static int increase_dsc_bpp(struct drm_atomic_state *state, - struct drm_dp_mst_topology_state *mst_state, - struct dc_link *dc_link, - struct dsc_mst_fairness_params *params, - struct dsc_mst_fairness_vars *vars, - int count, - int k) +static bool increase_dsc_bpp(struct drm_atomic_state *state, + struct dc_link *dc_link, + struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, + int count, + int k) { int i; bool bpp_increased[MAX_PIPES]; @@ -724,10 +730,13 @@ static int increase_dsc_bpp(struct drm_atomic_state *state, int min_initial_slack; int next_index; int remaining_to_increase = 0; + int pbn_per_timeslot; int link_timeslots_used; int fair_pbn_alloc; int ret = 0; + pbn_per_timeslot = dm_mst_get_pbn_divider(dc_link); + for (i = 0; i < count; i++) { if (vars[i + k].dsc_enabled) { initial_slack[i] = @@ -758,17 +767,18 @@ static int increase_dsc_bpp(struct drm_atomic_state *state, link_timeslots_used = 0; for (i = 0; i < count; i++) - link_timeslots_used += DIV_ROUND_UP(vars[i + k].pbn, mst_state->pbn_div); + link_timeslots_used += DIV_ROUND_UP(vars[i + k].pbn, pbn_per_timeslot); - fair_pbn_alloc = - (63 - link_timeslots_used) / remaining_to_increase * mst_state->pbn_div; + fair_pbn_alloc = (63 - link_timeslots_used) / remaining_to_increase * pbn_per_timeslot; if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; + ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + pbn_per_timeslot); if (ret < 0) return ret; @@ -780,7 +790,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state, ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + pbn_per_timeslot); if (ret < 0) return ret; } @@ -789,7 +800,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state, ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + pbn_per_timeslot); if (ret < 0) return ret; @@ -801,7 +813,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state, ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + pbn_per_timeslot); if (ret < 0) return ret; } @@ -857,10 +870,12 @@ static int try_disable_dsc(struct drm_atomic_state *state, break; vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps); + ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + dm_mst_get_pbn_divider(dc_link)); if (ret < 0) return ret; @@ -870,10 +885,12 @@ static int try_disable_dsc(struct drm_atomic_state *state, vars[next_index].bpp_x16 = 0; } else { vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.max_kbps); + ret = drm_dp_atomic_find_time_slots(state, params[next_index].port->mgr, params[next_index].port, - vars[next_index].pbn); + vars[next_index].pbn, + dm_mst_get_pbn_divider(dc_link)); if (ret < 0) return ret; } @@ -884,31 +901,21 @@ static int try_disable_dsc(struct drm_atomic_state *state, return 0; } -static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dc_link *dc_link, - struct dsc_mst_fairness_vars *vars, - struct drm_dp_mst_topology_mgr *mgr, - int *link_vars_start_index) +static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, + struct dc_state *dc_state, + struct dc_link *dc_link, + struct dsc_mst_fairness_vars *vars, + int *link_vars_start_index) { + int i, k, ret; struct dc_stream_state *stream; struct dsc_mst_fairness_params params[MAX_PIPES]; struct amdgpu_dm_connector *aconnector; - struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr); int count = 0; - int i, k, ret; bool debugfs_overwrite = false; memset(params, 0, sizeof(params)); - if (IS_ERR(mst_state)) - return PTR_ERR(mst_state); - - mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); -#if defined(CONFIG_DRM_AMD_DC_DCN) - drm_dp_mst_update_slots(mst_state, dc_link_dp_mst_decide_link_encoding_format(dc_link)); -#endif - /* Set up params */ for (i = 0; i < dc_state->stream_count; i++) { struct dc_dsc_policy dsc_policy = {0}; @@ -968,7 +975,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0; ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port, - vars[i + k].pbn); + vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link)); if (ret < 0) return ret; } @@ -987,7 +994,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn); + params[i].port, vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link)); if (ret < 0) return ret; } else { @@ -995,7 +1002,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0; ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn); + params[i].port, vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link)); if (ret < 0) return ret; } @@ -1005,7 +1012,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, return ret; /* Optimize degree of compression */ - ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars, count, k); + ret = increase_dsc_bpp(state, dc_link, params, vars, count, k); if (ret < 0) return ret; @@ -1155,7 +1162,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, continue; mst_mgr = aconnector->port->mgr; - ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, mst_mgr, + ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, &link_vars_start_index); if (ret != 0) return ret; @@ -1213,7 +1220,7 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, continue; mst_mgr = aconnector->port->mgr; - ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, mst_mgr, + ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, &link_vars_start_index); if (ret != 0) return ret; diff --git a/drivers/gpu/drm/amd/display/include/link_service_types.h b/drivers/gpu/drm/amd/display/include/link_service_types.h index d1e91d31d151..0889c2a86733 100644 --- a/drivers/gpu/drm/amd/display/include/link_service_types.h +++ b/drivers/gpu/drm/amd/display/include/link_service_types.h @@ -252,9 +252,6 @@ union dpcd_training_lane_set { * _ONLY_ be filled out from DM and then passed to DC, do NOT use these for _any_ kind of atomic * state calculations in DM, or you will break something. */ - -struct drm_dp_mst_port; - /* DP MST stream allocation (payload bandwidth number) */ struct dc_dp_mst_stream_allocation { uint8_t vcp_id; diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 51a46689cda7..95ff57d20216 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -68,7 +68,8 @@ static bool dump_dp_payload_table(struct drm_dp_mst_topology_mgr *mgr, static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port); static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, - int id, u8 start_slot, u8 num_slots); + int id, + struct drm_dp_payload *payload); static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, @@ -1234,6 +1235,57 @@ build_query_stream_enc_status(struct drm_dp_sideband_msg_tx *msg, u8 stream_id, return 0; } +static int drm_dp_mst_assign_payload_id(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_vcpi *vcpi) +{ + int ret, vcpi_ret; + + mutex_lock(&mgr->payload_lock); + ret = find_first_zero_bit(&mgr->payload_mask, mgr->max_payloads + 1); + if (ret > mgr->max_payloads) { + ret = -EINVAL; + drm_dbg_kms(mgr->dev, "out of payload ids %d\n", ret); + goto out_unlock; + } + + vcpi_ret = find_first_zero_bit(&mgr->vcpi_mask, mgr->max_payloads + 1); + if (vcpi_ret > mgr->max_payloads) { + ret = -EINVAL; + drm_dbg_kms(mgr->dev, "out of vcpi ids %d\n", ret); + goto out_unlock; + } + + set_bit(ret, &mgr->payload_mask); + set_bit(vcpi_ret, &mgr->vcpi_mask); + vcpi->vcpi = vcpi_ret + 1; + mgr->proposed_vcpis[ret - 1] = vcpi; +out_unlock: + mutex_unlock(&mgr->payload_lock); + return ret; +} + +static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr, + int vcpi) +{ + int i; + + if (vcpi == 0) + return; + + mutex_lock(&mgr->payload_lock); + drm_dbg_kms(mgr->dev, "putting payload %d\n", vcpi); + clear_bit(vcpi - 1, &mgr->vcpi_mask); + + for (i = 0; i < mgr->max_payloads; i++) { + if (mgr->proposed_vcpis[i] && + mgr->proposed_vcpis[i]->vcpi == vcpi) { + mgr->proposed_vcpis[i] = NULL; + clear_bit(i + 1, &mgr->payload_mask); + } + } + mutex_unlock(&mgr->payload_lock); +} + static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_sideband_msg_tx *txmsg) { @@ -1686,7 +1738,7 @@ drm_dp_mst_dump_port_topology_history(struct drm_dp_mst_port *port) {} #define save_port_topology_ref(port, type) #endif -struct drm_dp_mst_atomic_payload * +static struct drm_dp_mst_atomic_payload * drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state, struct drm_dp_mst_port *port) { @@ -1698,7 +1750,6 @@ drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state, return NULL; } -EXPORT_SYMBOL(drm_atomic_get_mst_payload_state); static void drm_dp_destroy_mst_branch_device(struct kref *kref) { @@ -3201,8 +3252,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, struct drm_dp_query_stream_enc_status_ack_reply *status) { - struct drm_dp_mst_topology_state *state; - struct drm_dp_mst_atomic_payload *payload; struct drm_dp_sideband_msg_tx *txmsg; u8 nonce[7]; int ret; @@ -3219,10 +3268,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr, get_random_bytes(nonce, sizeof(nonce)); - drm_modeset_lock(&mgr->base.lock, NULL); - state = to_drm_dp_mst_topology_state(mgr->base.state); - payload = drm_atomic_get_mst_payload_state(state, port); - /* * "Source device targets the QUERY_STREAM_ENCRYPTION_STATUS message * transaction at the MST Branch device directly connected to the @@ -3230,7 +3275,7 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr, */ txmsg->dst = mgr->mst_primary; - build_query_stream_enc_status(txmsg, payload->vcpi, nonce); + build_query_stream_enc_status(txmsg, port->vcpi.vcpi, nonce); drm_dp_queue_down_tx(mgr, txmsg); @@ -3247,7 +3292,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr, memcpy(status, &txmsg->reply.u.enc_status, sizeof(*status)); out: - drm_modeset_unlock(&mgr->base.lock); drm_dp_mst_topology_put_port(port); out_get_port: kfree(txmsg); @@ -3256,162 +3300,238 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr, EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status); static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_atomic_payload *payload) + int id, + struct drm_dp_payload *payload) { - return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, - payload->time_slots); + int ret; + + ret = drm_dp_dpcd_write_payload(mgr, id, payload); + if (ret < 0) { + payload->payload_state = 0; + return ret; + } + payload->payload_state = DP_PAYLOAD_LOCAL; + return 0; } static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_atomic_payload *payload) + struct drm_dp_mst_port *port, + int id, + struct drm_dp_payload *payload) { int ret; - struct drm_dp_mst_port *port = drm_dp_mst_topology_get_port_validated(mgr, payload->port); - - if (!port) - return -EIO; - ret = drm_dp_payload_send_msg(mgr, port, payload->vcpi, payload->pbn); - drm_dp_mst_topology_put_port(port); + ret = drm_dp_payload_send_msg(mgr, port, id, port->vcpi.pbn); + if (ret < 0) + return ret; + payload->payload_state = DP_PAYLOAD_REMOTE; return ret; } static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload) + struct drm_dp_mst_port *port, + int id, + struct drm_dp_payload *payload) { drm_dbg_kms(mgr->dev, "\n"); - /* it's okay for these to fail */ - drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0); - drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0); + if (port) { + drm_dp_payload_send_msg(mgr, port, id, 0); + } + drm_dp_dpcd_write_payload(mgr, id, payload); + payload->payload_state = DP_PAYLOAD_DELETE_LOCAL; + return 0; +} + +static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr, + int id, + struct drm_dp_payload *payload) +{ + payload->payload_state = 0; return 0; } /** - * drm_dp_add_payload_part1() - Execute payload update part 1 - * @mgr: Manager to use. - * @mst_state: The MST atomic state - * @payload: The payload to write + * drm_dp_update_payload_part1() - Execute payload update part 1 + * @mgr: manager to use. + * @start_slot: this is the cur slot + * + * NOTE: start_slot is a temporary workaround for non-atomic drivers, + * this will be removed when non-atomic mst helpers are moved out of the helper * - * Determines the starting time slot for the given payload, and programs the VCPI for this payload - * into hardware. After calling this, the driver should generate ACT and payload packets. + * This iterates over all proposed virtual channels, and tries to + * allocate space in the link for them. For 0->slots transitions, + * this step just writes the VCPI to the MST device. For slots->0 + * transitions, this writes the updated VCPIs and removes the + * remote VC payloads. * - * Returns: 0 on success, error code on failure. In the event that this fails, - * @payload.vc_start_slot will also be set to -1. + * after calling this the driver should generate ACT and payload + * packets. */ -int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload) +int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr, int start_slot) { + struct drm_dp_payload req_payload; struct drm_dp_mst_port *port; - int ret; + int i, j; + int cur_slots = start_slot; + bool skip; - port = drm_dp_mst_topology_get_port_validated(mgr, payload->port); - if (!port) - return 0; + mutex_lock(&mgr->payload_lock); + for (i = 0; i < mgr->max_payloads; i++) { + struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i]; + struct drm_dp_payload *payload = &mgr->payloads[i]; + bool put_port = false; - if (mgr->payload_count == 0) - mgr->next_start_slot = mst_state->start_slot; + /* solve the current payloads - compare to the hw ones + - update the hw view */ + req_payload.start_slot = cur_slots; + if (vcpi) { + port = container_of(vcpi, struct drm_dp_mst_port, + vcpi); - payload->vc_start_slot = mgr->next_start_slot; + mutex_lock(&mgr->lock); + skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary); + mutex_unlock(&mgr->lock); - ret = drm_dp_create_payload_step1(mgr, payload); - drm_dp_mst_topology_put_port(port); - if (ret < 0) { - drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n", - payload->port, ret); - payload->vc_start_slot = -1; - return ret; - } + if (skip) { + drm_dbg_kms(mgr->dev, + "Virtual channel %d is not in current topology\n", + i); + continue; + } + /* Validated ports don't matter if we're releasing + * VCPI + */ + if (vcpi->num_slots) { + port = drm_dp_mst_topology_get_port_validated( + mgr, port); + if (!port) { + if (vcpi->num_slots == payload->num_slots) { + cur_slots += vcpi->num_slots; + payload->start_slot = req_payload.start_slot; + continue; + } else { + drm_dbg_kms(mgr->dev, + "Fail:set payload to invalid sink"); + mutex_unlock(&mgr->payload_lock); + return -EINVAL; + } + } + put_port = true; + } - mgr->payload_count++; - mgr->next_start_slot += payload->time_slots; + req_payload.num_slots = vcpi->num_slots; + req_payload.vcpi = vcpi->vcpi; + } else { + port = NULL; + req_payload.num_slots = 0; + } - return 0; -} -EXPORT_SYMBOL(drm_dp_add_payload_part1); + payload->start_slot = req_payload.start_slot; + /* work out what is required to happen with this payload */ + if (payload->num_slots != req_payload.num_slots) { + + /* need to push an update for this payload */ + if (req_payload.num_slots) { + drm_dp_create_payload_step1(mgr, vcpi->vcpi, + &req_payload); + payload->num_slots = req_payload.num_slots; + payload->vcpi = req_payload.vcpi; + + } else if (payload->num_slots) { + payload->num_slots = 0; + drm_dp_destroy_payload_step1(mgr, port, + payload->vcpi, + payload); + req_payload.payload_state = + payload->payload_state; + payload->start_slot = 0; + } + payload->payload_state = req_payload.payload_state; + } + cur_slots += req_payload.num_slots; -/** - * drm_dp_remove_payload() - Remove an MST payload - * @mgr: Manager to use. - * @mst_state: The MST atomic state - * @payload: The payload to write - * - * Removes a payload from an MST topology if it was successfully assigned a start slot. Also updates - * the starting time slots of all other payloads which would have been shifted towards the start of - * the VC table as a result. After calling this, the driver should generate ACT and payload packets. - */ -void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload) -{ - struct drm_dp_mst_atomic_payload *pos; - bool send_remove = false; + if (put_port) + drm_dp_mst_topology_put_port(port); + } - /* We failed to make the payload, so nothing to do */ - if (payload->vc_start_slot == -1) - return; + for (i = 0; i < mgr->max_payloads; /* do nothing */) { + if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL) { + i++; + continue; + } - mutex_lock(&mgr->lock); - send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary); - mutex_unlock(&mgr->lock); + drm_dbg_kms(mgr->dev, "removing payload %d\n", i); + for (j = i; j < mgr->max_payloads - 1; j++) { + mgr->payloads[j] = mgr->payloads[j + 1]; + mgr->proposed_vcpis[j] = mgr->proposed_vcpis[j + 1]; - if (send_remove) - drm_dp_destroy_payload_step1(mgr, mst_state, payload); - else - drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n", - payload->vcpi); + if (mgr->proposed_vcpis[j] && + mgr->proposed_vcpis[j]->num_slots) { + set_bit(j + 1, &mgr->payload_mask); + } else { + clear_bit(j + 1, &mgr->payload_mask); + } + } - list_for_each_entry(pos, &mst_state->payloads, next) { - if (pos != payload && pos->vc_start_slot > payload->vc_start_slot) - pos->vc_start_slot -= payload->time_slots; + memset(&mgr->payloads[mgr->max_payloads - 1], 0, + sizeof(struct drm_dp_payload)); + mgr->proposed_vcpis[mgr->max_payloads - 1] = NULL; + clear_bit(mgr->max_payloads, &mgr->payload_mask); } - payload->vc_start_slot = -1; + mutex_unlock(&mgr->payload_lock); - mgr->payload_count--; - mgr->next_start_slot -= payload->time_slots; + return 0; } -EXPORT_SYMBOL(drm_dp_remove_payload); +EXPORT_SYMBOL(drm_dp_update_payload_part1); /** - * drm_dp_add_payload_part2() - Execute payload update part 2 - * @mgr: Manager to use. - * @state: The global atomic state - * @payload: The payload to update - * - * If @payload was successfully assigned a starting time slot by drm_dp_add_payload_part1(), this - * function will send the sideband messages to finish allocating this payload. + * drm_dp_update_payload_part2() - Execute payload update part 2 + * @mgr: manager to use. * - * Returns: 0 on success, negative error code on failure. + * This iterates over all proposed virtual channels, and tries to + * allocate space in the link for them. For 0->slots transitions, + * this step writes the remote VC payload commands. For slots->0 + * this just resets some internal state. */ -int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, - struct drm_atomic_state *state, - struct drm_dp_mst_atomic_payload *payload) +int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr) { + struct drm_dp_mst_port *port; + int i; int ret = 0; + bool skip; - /* Skip failed payloads */ - if (payload->vc_start_slot == -1) { - drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n", - payload->port->connector->name); - return -EIO; - } + mutex_lock(&mgr->payload_lock); + for (i = 0; i < mgr->max_payloads; i++) { - ret = drm_dp_create_payload_step2(mgr, payload); - if (ret < 0) { - if (!payload->delete) - drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n", - payload->port, ret); - else - drm_dbg_kms(mgr->dev, "Step 2 of removing MST payload for %p failed: %d\n", - payload->port, ret); - } + if (!mgr->proposed_vcpis[i]) + continue; - return ret; + port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi); + + mutex_lock(&mgr->lock); + skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary); + mutex_unlock(&mgr->lock); + + if (skip) + continue; + + drm_dbg_kms(mgr->dev, "payload %d %d\n", i, mgr->payloads[i].payload_state); + if (mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL) { + ret = drm_dp_create_payload_step2(mgr, port, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]); + } else if (mgr->payloads[i].payload_state == DP_PAYLOAD_DELETE_LOCAL) { + ret = drm_dp_destroy_payload_step2(mgr, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]); + } + if (ret) { + mutex_unlock(&mgr->payload_lock); + return ret; + } + } + mutex_unlock(&mgr->payload_lock); + return 0; } -EXPORT_SYMBOL(drm_dp_add_payload_part2); +EXPORT_SYMBOL(drm_dp_update_payload_part2); static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, @@ -3591,6 +3711,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms int ret = 0; struct drm_dp_mst_branch *mstb = NULL; + mutex_lock(&mgr->payload_lock); mutex_lock(&mgr->lock); if (mst_state == mgr->mst_state) goto out_unlock; @@ -3598,6 +3719,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms mgr->mst_state = mst_state; /* set the device into MST mode */ if (mst_state) { + struct drm_dp_payload reset_pay; + int lane_count; + int link_rate; + WARN_ON(mgr->mst_primary); /* get dpcd info */ @@ -3608,6 +3733,16 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms goto out_unlock; } + lane_count = min_t(int, mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK, mgr->max_lane_count); + link_rate = min_t(int, drm_dp_bw_code_to_link_rate(mgr->dpcd[1]), mgr->max_link_rate); + mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr, + link_rate, + lane_count); + if (mgr->pbn_div == 0) { + ret = -EINVAL; + goto out_unlock; + } + /* add initial branch device at LCT 1 */ mstb = drm_dp_add_mst_branch_device(1, NULL); if (mstb == NULL) { @@ -3627,8 +3762,9 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms if (ret < 0) goto out_unlock; - /* Write reset payload */ - drm_dp_dpcd_write_payload(mgr, 0, 0, 0x3f); + reset_pay.start_slot = 0; + reset_pay.num_slots = 0x3f; + drm_dp_dpcd_write_payload(mgr, 0, &reset_pay); queue_work(system_long_wq, &mgr->work); @@ -3640,11 +3776,19 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms /* this can fail if the device is gone */ drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, 0); ret = 0; + memset(mgr->payloads, 0, + mgr->max_payloads * sizeof(mgr->payloads[0])); + memset(mgr->proposed_vcpis, 0, + mgr->max_payloads * sizeof(mgr->proposed_vcpis[0])); + mgr->payload_mask = 0; + set_bit(0, &mgr->payload_mask); + mgr->vcpi_mask = 0; mgr->payload_id_table_cleared = false; } out_unlock: mutex_unlock(&mgr->lock); + mutex_unlock(&mgr->payload_lock); if (mstb) drm_dp_mst_topology_put_mstb(mstb); return ret; @@ -4163,18 +4307,62 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ } EXPORT_SYMBOL(drm_dp_mst_get_edid); +/** + * drm_dp_find_vcpi_slots() - Find time slots for this PBN value + * @mgr: manager to use + * @pbn: payload bandwidth to convert into slots. + * + * Calculate the number of time slots that will be required for the given PBN + * value. This function is deprecated, and should not be used in atomic + * drivers. + * + * RETURNS: + * The total slots required for this port, or error. + */ +int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, + int pbn) +{ + int num_slots; + + num_slots = DIV_ROUND_UP(pbn, mgr->pbn_div); + + /* max. time slots - one slot for MTP header */ + if (num_slots > 63) + return -ENOSPC; + return num_slots; +} +EXPORT_SYMBOL(drm_dp_find_vcpi_slots); + +static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_vcpi *vcpi, int pbn, int slots) +{ + int ret; + + vcpi->pbn = pbn; + vcpi->aligned_pbn = slots * mgr->pbn_div; + vcpi->num_slots = slots; + + ret = drm_dp_mst_assign_payload_id(mgr, vcpi); + if (ret < 0) + return ret; + return 0; +} + /** * drm_dp_atomic_find_time_slots() - Find and add time slots to the state * @state: global atomic state * @mgr: MST topology manager for the port * @port: port to find time slots for * @pbn: bandwidth required for the mode in PBN + * @pbn_div: divider for DSC mode that takes FEC into account * - * Allocates time slots to @port, replacing any previous time slot allocations it may - * have had. Any atomic drivers which support MST must call this function in - * their &drm_encoder_helper_funcs.atomic_check() callback unconditionally to - * change the current time slot allocation for the new state, and ensure the MST - * atomic state is added whenever the state of payloads in the topology changes. + * Allocates time slots to @port, replacing any previous timeslot allocations it + * may have had. Any atomic drivers which support MST must call this function + * in their &drm_encoder_helper_funcs.atomic_check() callback to change the + * current timeslot allocation for the new state, but only when + * &drm_crtc_state.mode_changed or &drm_crtc_state.connectors_changed is set + * to ensure compatibility with userspace applications that still use the + * legacy modesetting UAPI. * * Allocations set by this function are not checked against the bandwidth * restraints of @mgr until the driver calls drm_dp_mst_atomic_check(). @@ -4193,7 +4381,8 @@ EXPORT_SYMBOL(drm_dp_mst_get_edid); */ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_port *port, int pbn) + struct drm_dp_mst_port *port, int pbn, + int pbn_div) { struct drm_dp_mst_topology_state *topology_state; struct drm_dp_mst_atomic_payload *payload = NULL; @@ -4226,7 +4415,10 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state, } } - req_slots = DIV_ROUND_UP(pbn, topology_state->pbn_div); + if (pbn_div <= 0) + pbn_div = mgr->pbn_div; + + req_slots = DIV_ROUND_UP(pbn, pbn_div); drm_dbg_atomic(mgr->dev, "[CONNECTOR:%d:%s] [MST PORT:%p] TU %d -> %d\n", port->connector->base.id, port->connector->name, @@ -4235,7 +4427,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state, port->connector->base.id, port->connector->name, port, prev_bw, pbn); - /* Add the new allocation to the state, note the VCPI isn't assigned until the end */ + /* Add the new allocation to the state */ if (!payload) { payload = kzalloc(sizeof(*payload), GFP_KERNEL); if (!payload) @@ -4243,7 +4435,6 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state, drm_dp_mst_get_port_malloc(port); payload->port = port; - payload->vc_start_slot = -1; list_add(&payload->next, &topology_state->payloads); } payload->time_slots = req_slots; @@ -4260,12 +4451,10 @@ EXPORT_SYMBOL(drm_dp_atomic_find_time_slots); * @port: The port to release the time slots from * * Releases any time slots that have been allocated to a port in the atomic - * state. Any atomic drivers which support MST must call this function - * unconditionally in their &drm_connector_helper_funcs.atomic_check() callback. - * This helper will check whether time slots would be released by the new state and - * respond accordingly, along with ensuring the MST state is always added to the - * atomic state whenever a new state would modify the state of payloads on the - * topology. + * state. Any atomic drivers which support MST must call this function in + * their &drm_connector_helper_funcs.atomic_check() callback when the + * connector will no longer have VCPI allocated (e.g. because its CRTC was + * removed) when it had VCPI allocated in the previous atomic state. * * It is OK to call this even if @port has been removed from the system. * Additionally, it is OK to call this function multiple times on the same @@ -4330,7 +4519,6 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state, drm_dp_mst_put_port_malloc(port); payload->pbn = 0; payload->delete = true; - topology_state->payload_mask &= ~BIT(payload->vcpi - 1); } return 0; @@ -4381,8 +4569,7 @@ int drm_dp_mst_atomic_setup_commit(struct drm_atomic_state *state) EXPORT_SYMBOL(drm_dp_mst_atomic_setup_commit); /** - * drm_dp_mst_atomic_wait_for_dependencies() - Wait for all pending commits on MST topologies, - * prepare new MST state for commit + * drm_dp_mst_atomic_wait_for_dependencies() - Wait for all pending commits on MST topologies * @state: global atomic state * * Goes through any MST topologies in this atomic state, and waits for any pending commits which @@ -4400,30 +4587,17 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_setup_commit); */ void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state) { - struct drm_dp_mst_topology_state *old_mst_state, *new_mst_state; + struct drm_dp_mst_topology_state *old_mst_state; struct drm_dp_mst_topology_mgr *mgr; - struct drm_dp_mst_atomic_payload *old_payload, *new_payload; int i, j, ret; - for_each_oldnew_mst_mgr_in_state(state, mgr, old_mst_state, new_mst_state, i) { + for_each_old_mst_mgr_in_state(state, mgr, old_mst_state, i) { for (j = 0; j < old_mst_state->num_commit_deps; j++) { ret = drm_crtc_commit_wait(old_mst_state->commit_deps[j]); if (ret < 0) drm_err(state->dev, "Failed to wait for %s: %d\n", old_mst_state->commit_deps[j]->crtc->name, ret); } - - /* Now that previous state is committed, it's safe to copy over the start slot - * assignments - */ - list_for_each_entry(old_payload, &old_mst_state->payloads, next) { - if (old_payload->delete) - continue; - - new_payload = drm_atomic_get_mst_payload_state(new_mst_state, - old_payload->port); - new_payload->vc_start_slot = old_payload->vc_start_slot; - } } } EXPORT_SYMBOL(drm_dp_mst_atomic_wait_for_dependencies); @@ -4508,8 +4682,119 @@ void drm_dp_mst_update_slots(struct drm_dp_mst_topology_state *mst_state, uint8_ } EXPORT_SYMBOL(drm_dp_mst_update_slots); +/** + * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel + * @mgr: manager for this port + * @port: port to allocate a virtual channel for. + * @pbn: payload bandwidth number to request + * @slots: returned number of slots for this PBN. + */ +bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port, int pbn, int slots) +{ + int ret; + + if (slots < 0) + return false; + + port = drm_dp_mst_topology_get_port_validated(mgr, port); + if (!port) + return false; + + if (port->vcpi.vcpi > 0) { + drm_dbg_kms(mgr->dev, + "payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", + port->vcpi.vcpi, port->vcpi.pbn, pbn); + if (pbn == port->vcpi.pbn) { + drm_dp_mst_topology_put_port(port); + return true; + } + } + + ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots); + if (ret) { + drm_dbg_kms(mgr->dev, "failed to init time slots=%d ret=%d\n", + DIV_ROUND_UP(pbn, mgr->pbn_div), ret); + drm_dp_mst_topology_put_port(port); + goto out; + } + drm_dbg_kms(mgr->dev, "initing vcpi for pbn=%d slots=%d\n", pbn, port->vcpi.num_slots); + + /* Keep port allocated until its payload has been removed */ + drm_dp_mst_get_port_malloc(port); + drm_dp_mst_topology_put_port(port); + return true; +out: + return false; +} +EXPORT_SYMBOL(drm_dp_mst_allocate_vcpi); + +int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port) +{ + int slots = 0; + + port = drm_dp_mst_topology_get_port_validated(mgr, port); + if (!port) + return slots; + + slots = port->vcpi.num_slots; + drm_dp_mst_topology_put_port(port); + return slots; +} +EXPORT_SYMBOL(drm_dp_mst_get_vcpi_slots); + +/** + * drm_dp_mst_reset_vcpi_slots() - Reset number of slots to 0 for VCPI + * @mgr: manager for this port + * @port: unverified pointer to a port. + * + * This just resets the number of slots for the ports VCPI for later programming. + */ +void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port) +{ + /* + * A port with VCPI will remain allocated until its VCPI is + * released, no verified ref needed + */ + + port->vcpi.num_slots = 0; +} +EXPORT_SYMBOL(drm_dp_mst_reset_vcpi_slots); + +/** + * drm_dp_mst_deallocate_vcpi() - deallocate a VCPI + * @mgr: manager for this port + * @port: port to deallocate vcpi for + * + * This can be called unconditionally, regardless of whether + * drm_dp_mst_allocate_vcpi() succeeded or not. + */ +void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port) +{ + bool skip; + + if (!port->vcpi.vcpi) + return; + + mutex_lock(&mgr->lock); + skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary); + mutex_unlock(&mgr->lock); + + if (skip) + return; + + drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi); + port->vcpi.num_slots = 0; + port->vcpi.pbn = 0; + port->vcpi.aligned_pbn = 0; + port->vcpi.vcpi = 0; + drm_dp_mst_put_port_malloc(port); +} +EXPORT_SYMBOL(drm_dp_mst_deallocate_vcpi); + static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, - int id, u8 start_slot, u8 num_slots) + int id, struct drm_dp_payload *payload) { u8 payload_alloc[3], status; int ret; @@ -4519,8 +4804,8 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, DP_PAYLOAD_TABLE_UPDATED); payload_alloc[0] = id; - payload_alloc[1] = start_slot; - payload_alloc[2] = num_slots; + payload_alloc[1] = payload->start_slot; + payload_alloc[2] = payload->num_slots; ret = drm_dp_dpcd_write(mgr->aux, DP_PAYLOAD_ALLOCATE_SET, payload_alloc, 3); if (ret != 3) { @@ -4735,9 +5020,8 @@ static void fetch_monitor_name(struct drm_dp_mst_topology_mgr *mgr, void drm_dp_mst_dump_topology(struct seq_file *m, struct drm_dp_mst_topology_mgr *mgr) { - struct drm_dp_mst_topology_state *state; - struct drm_dp_mst_atomic_payload *payload; - int i, ret; + int i; + struct drm_dp_mst_port *port; mutex_lock(&mgr->lock); if (mgr->mst_primary) @@ -4746,35 +5030,36 @@ void drm_dp_mst_dump_topology(struct seq_file *m, /* dump VCPIs */ mutex_unlock(&mgr->lock); - ret = drm_modeset_lock_single_interruptible(&mgr->base.lock); - if (ret < 0) - return; + mutex_lock(&mgr->payload_lock); + seq_printf(m, "\n*** VCPI Info ***\n"); + seq_printf(m, "payload_mask: %lx, vcpi_mask: %lx, max_payloads: %d\n", mgr->payload_mask, mgr->vcpi_mask, mgr->max_payloads); - state = to_drm_dp_mst_topology_state(mgr->base.state); - seq_printf(m, "\n*** Atomic state info ***\n"); - seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u, pbn_div: %d\n", - state->payload_mask, mgr->max_payloads, state->start_slot, state->pbn_div); - - seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name |\n"); + seq_printf(m, "\n| idx | port # | vcp_id | # slots | sink name |\n"); for (i = 0; i < mgr->max_payloads; i++) { - list_for_each_entry(payload, &state->payloads, next) { + if (mgr->proposed_vcpis[i]) { char name[14]; - if (payload->vcpi != i || payload->delete) - continue; - - fetch_monitor_name(mgr, payload->port, name, sizeof(name)); - seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %19s\n", + port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi); + fetch_monitor_name(mgr, port, name, sizeof(name)); + seq_printf(m, "%10d%10d%10d%10d%20s\n", i, - payload->port->port_num, - payload->vcpi, - payload->vc_start_slot, - payload->vc_start_slot + payload->time_slots - 1, - payload->pbn, - payload->dsc_enabled ? "Y" : "N", + port->port_num, + port->vcpi.vcpi, + port->vcpi.num_slots, (*name != 0) ? name : "Unknown"); - } + } else + seq_printf(m, "%6d - Unused\n", i); + } + seq_printf(m, "\n*** Payload Info ***\n"); + seq_printf(m, "| idx | state | start slot | # slots |\n"); + for (i = 0; i < mgr->max_payloads; i++) { + seq_printf(m, "%10d%10d%15d%10d\n", + i, + mgr->payloads[i].payload_state, + mgr->payloads[i].start_slot, + mgr->payloads[i].num_slots); } + mutex_unlock(&mgr->payload_lock); seq_printf(m, "\n*** DPCD Info ***\n"); mutex_lock(&mgr->lock); @@ -4820,7 +5105,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m, out: mutex_unlock(&mgr->lock); - drm_modeset_unlock(&mgr->base.lock); + } EXPORT_SYMBOL(drm_dp_mst_dump_topology); @@ -5141,22 +5426,9 @@ drm_dp_mst_atomic_check_payload_alloc_limits(struct drm_dp_mst_topology_mgr *mgr mgr, mst_state, mgr->max_payloads); return -EINVAL; } - - /* Assign a VCPI */ - if (!payload->vcpi) { - payload->vcpi = ffz(mst_state->payload_mask) + 1; - drm_dbg_atomic(mgr->dev, "[MST PORT:%p] assigned VCPI #%d\n", - payload->port, payload->vcpi); - mst_state->payload_mask |= BIT(payload->vcpi - 1); - } } - - if (!payload_count) - mst_state->pbn_div = 0; - - drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p TU pbn_div=%d avail=%d used=%d\n", - mgr, mst_state, mst_state->pbn_div, avail_slots, - mst_state->total_avail_slots - avail_slots); + drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p TU avail=%d used=%d\n", + mgr, mst_state, avail_slots, mst_state->total_avail_slots - avail_slots); return 0; } @@ -5227,6 +5499,7 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs); * @state: Pointer to the new drm_atomic_state * @port: Pointer to the affected MST Port * @pbn: Newly recalculated bw required for link with DSC enabled + * @pbn_div: Divider to calculate correct number of pbn per slot * @enable: Boolean flag to enable or disable DSC on the port * * This function enables DSC on the given Port @@ -5237,7 +5510,8 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs); */ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state, struct drm_dp_mst_port *port, - int pbn, bool enable) + int pbn, int pbn_div, + bool enable) { struct drm_dp_mst_topology_state *mst_state; struct drm_dp_mst_atomic_payload *payload; @@ -5263,7 +5537,7 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state, } if (enable) { - time_slots = drm_dp_atomic_find_time_slots(state, port->mgr, port, pbn); + time_slots = drm_dp_atomic_find_time_slots(state, port->mgr, port, pbn, pbn_div); drm_dbg_atomic(state->dev, "[MST PORT:%p] Enabling DSC flag, reallocating %d time slots on the port\n", port, time_slots); @@ -5276,7 +5550,6 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state, return time_slots; } EXPORT_SYMBOL(drm_dp_mst_atomic_enable_dsc); - /** * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an * atomic update is valid @@ -5334,6 +5607,7 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs); /** * drm_atomic_get_mst_topology_state: get MST topology state + * * @state: global atomic state * @mgr: MST topology manager, also the private object in this case * @@ -5352,31 +5626,6 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_a } EXPORT_SYMBOL(drm_atomic_get_mst_topology_state); -/** - * drm_atomic_get_new_mst_topology_state: get new MST topology state in atomic state, if any - * @state: global atomic state - * @mgr: MST topology manager, also the private object in this case - * - * This function wraps drm_atomic_get_priv_obj_state() passing in the MST atomic - * state vtable so that the private object state returned is that of a MST - * topology object. - * - * Returns: - * - * The MST topology state, or NULL if there's no topology state for this MST mgr - * in the global atomic state - */ -struct drm_dp_mst_topology_state * -drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state, - struct drm_dp_mst_topology_mgr *mgr) -{ - struct drm_private_state *priv_state = - drm_atomic_get_new_private_obj_state(state, &mgr->base); - - return priv_state ? to_dp_mst_topology_state(priv_state) : NULL; -} -EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state); - /** * drm_dp_mst_topology_mgr_init - initialise a topology manager * @mgr: manager struct to initialise @@ -5384,6 +5633,8 @@ EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state); * @aux: DP helper aux channel to talk to this device * @max_dpcd_transaction_bytes: hw specific DPCD transaction limit * @max_payloads: maximum number of payloads this GPU can source + * @max_lane_count: maximum number of lanes this GPU supports + * @max_link_rate: maximum link rate per lane this GPU supports in kHz * @conn_base_id: the connector object ID the MST device is connected to. * * Return 0 for success, or negative error code on failure @@ -5391,12 +5642,14 @@ EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state); int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, struct drm_device *dev, struct drm_dp_aux *aux, int max_dpcd_transaction_bytes, int max_payloads, + int max_lane_count, int max_link_rate, int conn_base_id) { struct drm_dp_mst_topology_state *mst_state; mutex_init(&mgr->lock); mutex_init(&mgr->qlock); + mutex_init(&mgr->payload_lock); mutex_init(&mgr->delayed_destroy_lock); mutex_init(&mgr->up_req_lock); mutex_init(&mgr->probe_lock); @@ -5426,7 +5679,19 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, mgr->aux = aux; mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes; mgr->max_payloads = max_payloads; + mgr->max_lane_count = max_lane_count; + mgr->max_link_rate = max_link_rate; mgr->conn_base_id = conn_base_id; + if (max_payloads + 1 > sizeof(mgr->payload_mask) * 8 || + max_payloads + 1 > sizeof(mgr->vcpi_mask) * 8) + return -EINVAL; + mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL); + if (!mgr->payloads) + return -ENOMEM; + mgr->proposed_vcpis = kcalloc(max_payloads, sizeof(struct drm_dp_vcpi *), GFP_KERNEL); + if (!mgr->proposed_vcpis) + return -ENOMEM; + set_bit(0, &mgr->payload_mask); mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL); if (mst_state == NULL) @@ -5459,12 +5724,19 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr) destroy_workqueue(mgr->delayed_destroy_wq); mgr->delayed_destroy_wq = NULL; } + mutex_lock(&mgr->payload_lock); + kfree(mgr->payloads); + mgr->payloads = NULL; + kfree(mgr->proposed_vcpis); + mgr->proposed_vcpis = NULL; + mutex_unlock(&mgr->payload_lock); mgr->dev = NULL; mgr->aux = NULL; drm_atomic_private_obj_fini(&mgr->base); mgr->funcs = NULL; mutex_destroy(&mgr->delayed_destroy_lock); + mutex_destroy(&mgr->payload_lock); mutex_destroy(&mgr->qlock); mutex_destroy(&mgr->lock); mutex_destroy(&mgr->up_req_lock); diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 8b0e4defa3f1..4428eabc6ff7 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -57,7 +57,6 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder, struct drm_atomic_state *state = crtc_state->uapi.state; struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); struct intel_dp *intel_dp = &intel_mst->primary->dp; - struct drm_dp_mst_topology_state *mst_state; struct intel_connector *connector = to_intel_connector(conn_state->connector); struct drm_i915_private *i915 = to_i915(connector->base.dev); @@ -66,30 +65,23 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder, int bpp, slots = -EINVAL; int ret = 0; - mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr); - if (IS_ERR(mst_state)) - return PTR_ERR(mst_state); - crtc_state->lane_count = limits->max_lane_count; crtc_state->port_clock = limits->max_rate; - // TODO: Handle pbn_div changes by adding a new MST helper - if (!mst_state->pbn_div) { - mst_state->pbn_div = drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr, - crtc_state->port_clock, - crtc_state->lane_count); - } + for (bpp = limits->max_bpp; bpp >= limits->min_bpp; bpp -= 2 * 3) { + crtc_state->pipe_bpp = bpp; - for (bpp = max_bpp; bpp >= min_bpp; bpp -= step) { crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, dsc ? bpp << 4 : bpp, dsc); - drm_dbg_kms(&i915->drm, "Trying bpp %d\n", bpp); - slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr, connector->port, - crtc_state->pbn); + crtc_state->pbn, + drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr, + crtc_state->port_clock, + crtc_state->lane_count)); + if (slots == -EDEADLK) return slots; @@ -524,17 +516,21 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, struct intel_dp *intel_dp = &dig_port->dp; struct intel_connector *connector = to_intel_connector(old_conn_state->connector); - struct drm_dp_mst_topology_state *mst_state = - drm_atomic_get_mst_topology_state(&state->base, &intel_dp->mst_mgr); struct drm_i915_private *i915 = to_i915(connector->base.dev); + int start_slot = intel_dp_is_uhbr(old_crtc_state) ? 0 : 1; + int ret; drm_dbg_kms(&i915->drm, "active links %d\n", intel_dp->active_mst_links); intel_hdcp_disable(intel_mst->connector); - drm_dp_remove_payload(&intel_dp->mst_mgr, mst_state, - drm_atomic_get_mst_payload_state(mst_state, connector->port)); + drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port); + + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot); + if (ret) { + drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret); + } intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state); } @@ -562,6 +558,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, intel_disable_transcoder(old_crtc_state); + drm_dp_update_payload_part2(&intel_dp->mst_mgr); + clear_act_sent(encoder, old_crtc_state); intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL(old_crtc_state->cpu_transcoder), @@ -569,6 +567,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, wait_for_act_sent(encoder, old_crtc_state); + drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, connector->port); + intel_ddi_disable_transcoder_func(old_crtc_state); if (DISPLAY_VER(dev_priv) >= 9) @@ -635,8 +635,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_connector *connector = to_intel_connector(conn_state->connector); - struct drm_dp_mst_topology_state *mst_state = - drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr); + int start_slot = intel_dp_is_uhbr(pipe_config) ? 0 : 1; int ret; bool first_mst_stream; @@ -662,13 +661,16 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, dig_port->base.pre_enable(state, &dig_port->base, pipe_config, NULL); + ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr, + connector->port, + pipe_config->pbn, + pipe_config->dp_m_n.tu); + if (!ret) + drm_err(&dev_priv->drm, "failed to allocate vcpi\n"); + intel_dp->active_mst_links++; - ret = drm_dp_add_payload_part1(&intel_dp->mst_mgr, mst_state, - drm_atomic_get_mst_payload_state(mst_state, connector->port)); - if (ret < 0) - drm_err(&dev_priv->drm, "Failed to create MST payload for %s: %d\n", - connector->base.name, ret); + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot); /* * Before Gen 12 this is not done as part of @@ -691,10 +693,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); struct intel_digital_port *dig_port = intel_mst->primary; struct intel_dp *intel_dp = &dig_port->dp; - struct intel_connector *connector = to_intel_connector(conn_state->connector); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - struct drm_dp_mst_topology_state *mst_state = - drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr); enum transcoder trans = pipe_config->cpu_transcoder; drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder); @@ -722,8 +721,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, wait_for_act_sent(encoder, pipe_config); - drm_dp_add_payload_part2(&intel_dp->mst_mgr, &state->base, - drm_atomic_get_mst_payload_state(mst_state, connector->port)); + drm_dp_update_payload_part2(&intel_dp->mst_mgr); if (DISPLAY_VER(dev_priv) >= 14 && pipe_config->fec_enable) intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(trans), 0, @@ -1170,6 +1168,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id) struct intel_dp *intel_dp = &dig_port->dp; enum port port = dig_port->base.port; int ret; + int max_source_rate = + intel_dp->source_rates[intel_dp->num_source_rates - 1]; if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp)) return 0; @@ -1185,7 +1185,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id) /* create encoders */ intel_dp_create_fake_mst_encoders(dig_port); ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm, - &intel_dp->aux, 16, 3, conn_base_id); + &intel_dp->aux, 16, 3, + dig_port->max_lanes, + max_source_rate, + conn_base_id); if (ret) { intel_dp->mst_mgr.cbs = NULL; return ret; diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 6406fd487ee5..987e02eea66a 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -31,30 +31,8 @@ static int intel_conn_to_vcpi(struct intel_connector *connector) { - struct drm_dp_mst_topology_mgr *mgr; - struct drm_dp_mst_atomic_payload *payload; - struct drm_dp_mst_topology_state *mst_state; - int vcpi = 0; - /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ - if (!connector->port) - return 0; - mgr = connector->port->mgr; - - drm_modeset_lock(&mgr->base.lock, NULL); - mst_state = to_drm_dp_mst_topology_state(mgr->base.state); - payload = drm_atomic_get_mst_payload_state(mst_state, connector->port); - if (drm_WARN_ON(mgr->dev, !payload)) - goto out; - - vcpi = payload->vcpi; - if (drm_WARN_ON(mgr->dev, vcpi < 0)) { - vcpi = 0; - goto out; - } -out: - drm_modeset_unlock(&mgr->base.lock); - return vcpi; + return connector->port ? connector->port->vcpi.vcpi : 0; } /* diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index edcb2529b402..9bebe2a5e284 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -831,7 +831,6 @@ struct nv50_msto { struct nv50_head *head; struct nv50_mstc *mstc; bool disabled; - bool enabled; }; struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder) @@ -847,55 +846,82 @@ struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder) return msto->mstc->mstm->outp; } +static struct drm_dp_payload * +nv50_msto_payload(struct nv50_msto *msto) +{ + struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev); + struct nv50_mstc *mstc = msto->mstc; + struct nv50_mstm *mstm = mstc->mstm; + int vcpi = mstc->port->vcpi.vcpi, i; + + WARN_ON(!mutex_is_locked(&mstm->mgr.payload_lock)); + + NV_ATOMIC(drm, "%s: vcpi %d\n", msto->encoder.name, vcpi); + for (i = 0; i < mstm->mgr.max_payloads; i++) { + struct drm_dp_payload *payload = &mstm->mgr.payloads[i]; + NV_ATOMIC(drm, "%s: %d: vcpi %d start 0x%02x slots 0x%02x\n", + mstm->outp->base.base.name, i, payload->vcpi, + payload->start_slot, payload->num_slots); + } + + for (i = 0; i < mstm->mgr.max_payloads; i++) { + struct drm_dp_payload *payload = &mstm->mgr.payloads[i]; + if (payload->vcpi == vcpi) + return payload; + } + + return NULL; +} + static void -nv50_msto_cleanup(struct drm_atomic_state *state, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_topology_mgr *mgr, - struct nv50_msto *msto) +nv50_msto_cleanup(struct nv50_msto *msto) { struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev); - struct drm_dp_mst_atomic_payload *payload = - drm_atomic_get_mst_payload_state(mst_state, msto->mstc->port); + struct nv50_mstc *mstc = msto->mstc; + struct nv50_mstm *mstm = mstc->mstm; + + if (!msto->disabled) + return; NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name); - if (msto->disabled) { - msto->mstc = NULL; - msto->disabled = false; - } else if (msto->enabled) { - drm_dp_add_payload_part2(mgr, state, payload); - msto->enabled = false; - } + drm_dp_mst_deallocate_vcpi(&mstm->mgr, mstc->port); + + msto->mstc = NULL; + msto->disabled = false; } static void -nv50_msto_prepare(struct drm_atomic_state *state, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_topology_mgr *mgr, - struct nv50_msto *msto) +nv50_msto_prepare(struct nv50_msto *msto) { struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev); struct nv50_mstc *mstc = msto->mstc; struct nv50_mstm *mstm = mstc->mstm; - struct drm_dp_mst_atomic_payload *payload; + struct drm_dp_payload *payload = NULL; - NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name); + mutex_lock(&mstm->mgr.payload_lock); - payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port); + NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name); - // TODO: Figure out if we want to do a better job of handling VCPI allocation failures here? - if (msto->disabled) { - drm_dp_remove_payload(mgr, mst_state, payload); + if (mstc->port->vcpi.vcpi > 0) + payload = nv50_msto_payload(msto); - nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0); - } else { - if (msto->enabled) - drm_dp_add_payload_part1(mgr, mst_state, payload); + if (payload) { + NV_ATOMIC(drm, "%s: %s: %02x %02x %04x %04x\n", + msto->encoder.name, msto->head->base.base.name, + payload->start_slot, payload->num_slots, + mstc->port->vcpi.pbn, mstc->port->vcpi.aligned_pbn); nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, - payload->vc_start_slot, payload->time_slots, - payload->pbn, payload->time_slots * mst_state->pbn_div); + payload->start_slot, payload->num_slots, + mstc->port->vcpi.pbn, mstc->port->vcpi.aligned_pbn); + } else { + NV_ATOMIC(drm, "%s: %s: %02x %02x %04x %04x\n", + msto->encoder.name, msto->head->base.base.name, 0, 0, 0, 0); + nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0); } + + mutex_unlock(&mstm->mgr.payload_lock); } static int @@ -905,7 +931,6 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, { struct drm_atomic_state *state = crtc_state->state; struct drm_connector *connector = conn_state->connector; - struct drm_dp_mst_topology_state *mst_state; struct nv50_mstc *mstc = nv50_mstc(connector); struct nv50_mstm *mstm = mstc->mstm; struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); @@ -933,18 +958,8 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, false); } - mst_state = drm_atomic_get_mst_topology_state(state, &mstm->mgr); - if (IS_ERR(mst_state)) - return PTR_ERR(mst_state); - - if (!mst_state->pbn_div) { - struct nouveau_encoder *outp = mstc->mstm->outp; - - mst_state->pbn_div = drm_dp_get_vc_payload_bw(&mstm->mgr, - outp->dp.link_bw, outp->dp.link_nr); - } - - slots = drm_dp_atomic_find_time_slots(state, &mstm->mgr, mstc->port, asyh->dp.pbn); + slots = drm_dp_atomic_find_time_slots(state, &mstm->mgr, mstc->port, + asyh->dp.pbn, 0); if (slots < 0) return slots; @@ -976,6 +991,7 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st struct drm_connector *connector; struct drm_connector_list_iter conn_iter; u8 proto; + bool r; drm_connector_list_iter_begin(encoder->dev, &conn_iter); drm_for_each_connector_iter(connector, &conn_iter) { @@ -990,6 +1006,10 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st if (WARN_ON(!mstc)) return; + r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, asyh->dp.pbn, asyh->dp.tu); + if (!r) + DRM_DEBUG_KMS("Failed to allocate VCPI\n"); + if (!mstm->links++) { /*XXX: MST audio. */ nvif_outp_acquire_dp(&mstm->outp->outp, mstm->outp->dp.dpcd, 0, 0, false, true); @@ -1004,7 +1024,6 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st nv50_dp_bpc_to_depth(asyh->or.bpc)); msto->mstc = mstc; - msto->enabled = true; mstm->modified = true; } @@ -1015,6 +1034,8 @@ nv50_msto_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *s struct nv50_mstc *mstc = msto->mstc; struct nv50_mstm *mstm = mstc->mstm; + drm_dp_mst_reset_vcpi_slots(&mstm->mgr, mstc->port); + mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0); mstm->modified = true; if (!--mstm->links) @@ -1234,9 +1255,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port, } static void -nv50_mstm_cleanup(struct drm_atomic_state *state, - struct drm_dp_mst_topology_state *mst_state, - struct nv50_mstm *mstm) +nv50_mstm_cleanup(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; @@ -1244,12 +1263,14 @@ nv50_mstm_cleanup(struct drm_atomic_state *state, NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name); drm_dp_check_act_status(&mstm->mgr); + drm_dp_update_payload_part2(&mstm->mgr); + drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { struct nv50_msto *msto = nv50_msto(encoder); struct nv50_mstc *mstc = msto->mstc; if (mstc && mstc->mstm == mstm) - nv50_msto_cleanup(state, mst_state, &mstm->mgr, msto); + nv50_msto_cleanup(msto); } } @@ -1257,34 +1278,20 @@ nv50_mstm_cleanup(struct drm_atomic_state *state, } static void -nv50_mstm_prepare(struct drm_atomic_state *state, - struct drm_dp_mst_topology_state *mst_state, - struct nv50_mstm *mstm) +nv50_mstm_prepare(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); + drm_dp_update_payload_part1(&mstm->mgr, 1); - /* Disable payloads first */ - drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { - if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { - struct nv50_msto *msto = nv50_msto(encoder); - struct nv50_mstc *mstc = msto->mstc; - if (mstc && mstc->mstm == mstm && msto->disabled) - nv50_msto_prepare(state, mst_state, &mstm->mgr, msto); - } - } - - /* Add payloads for new heads, while also updating the start slots of any unmodified (but - * active) heads that may have had their VC slots shifted left after the previous step - */ drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { struct nv50_msto *msto = nv50_msto(encoder); struct nv50_mstc *mstc = msto->mstc; - if (mstc && mstc->mstm == mstm && !msto->disabled) - nv50_msto_prepare(state, mst_state, &mstm->mgr, msto); + if (mstc && mstc->mstm == mstm) + nv50_msto_prepare(msto); } } @@ -1455,7 +1462,9 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max, mstm->mgr.cbs = &nv50_mstm; ret = drm_dp_mst_topology_mgr_init(&mstm->mgr, dev, aux, aux_max, - max_payloads, conn_base_id); + max_payloads, outp->dcb->dpconf.link_nr, + drm_dp_bw_code_to_link_rate(outp->dcb->dpconf.link_bw), + conn_base_id); if (ret) return ret; @@ -1902,20 +1911,20 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe) static void nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock) { - struct drm_dp_mst_topology_mgr *mgr; - struct drm_dp_mst_topology_state *mst_state; struct nouveau_drm *drm = nouveau_drm(state->dev); struct nv50_disp *disp = nv50_disp(drm->dev); struct nv50_core *core = disp->core; struct nv50_mstm *mstm; - int i; + struct drm_encoder *encoder; NV_ATOMIC(drm, "commit core %08x\n", interlock[NV50_DISP_INTERLOCK_BASE]); - for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { - mstm = nv50_mstm(mgr); - if (mstm->modified) - nv50_mstm_prepare(state, mst_state, mstm); + drm_for_each_encoder(encoder, drm->dev) { + if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) { + mstm = nouveau_encoder(encoder)->dp.mstm; + if (mstm && mstm->modified) + nv50_mstm_prepare(mstm); + } } core->func->ntfy_init(disp->sync, NV50_DISP_CORE_NTFY); @@ -1924,10 +1933,12 @@ nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock) disp->core->chan.base.device)) NV_ERROR(drm, "core notifier timeout\n"); - for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { - mstm = nv50_mstm(mgr); - if (mstm->modified) - nv50_mstm_cleanup(state, mst_state, mstm); + drm_for_each_encoder(encoder, drm->dev) { + if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) { + mstm = nouveau_encoder(encoder)->dp.mstm; + if (mstm && mstm->modified) + nv50_mstm_cleanup(mstm); + } } } diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 41fd8352ab65..6b8f738bd622 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -48,6 +48,20 @@ struct drm_dp_mst_topology_ref_history { struct drm_dp_mst_branch; +/** + * struct drm_dp_vcpi - Virtual Channel Payload Identifier + * @vcpi: Virtual channel ID. + * @pbn: Payload Bandwidth Number for this channel + * @aligned_pbn: PBN aligned with slot size + * @num_slots: number of slots for this PBN + */ +struct drm_dp_vcpi { + int vcpi; + int pbn; + int aligned_pbn; + int num_slots; +}; + /** * struct drm_dp_mst_port - MST port * @port_num: port number @@ -131,6 +145,7 @@ struct drm_dp_mst_port { struct drm_dp_aux *passthrough_aux; struct drm_dp_mst_branch *parent; + struct drm_dp_vcpi vcpi; struct drm_connector *connector; struct drm_dp_mst_topology_mgr *mgr; @@ -515,6 +530,19 @@ struct drm_dp_mst_topology_cbs { void (*poll_hpd_irq)(struct drm_dp_mst_topology_mgr *mgr); }; +#define DP_MAX_PAYLOAD (sizeof(unsigned long) * 8) + +#define DP_PAYLOAD_LOCAL 1 +#define DP_PAYLOAD_REMOTE 2 +#define DP_PAYLOAD_DELETE_LOCAL 3 + +struct drm_dp_payload { + int payload_state; + int start_slot; + int num_slots; + int vcpi; +}; + #define to_dp_mst_topology_state(x) container_of(x, struct drm_dp_mst_topology_state, base) /** @@ -527,34 +555,6 @@ struct drm_dp_mst_atomic_payload { /** @port: The MST port assigned to this payload */ struct drm_dp_mst_port *port; - /** - * @vc_start_slot: The time slot that this payload starts on. Because payload start slots - * can't be determined ahead of time, the contents of this value are UNDEFINED at atomic - * check time. This shouldn't usually matter, as the start slot should never be relevant for - * atomic state computations. - * - * Since this value is determined at commit time instead of check time, this value is - * protected by the MST helpers ensuring that async commits operating on the given topology - * never run in parallel. In the event that a driver does need to read this value (e.g. to - * inform hardware of the starting timeslot for a payload), the driver may either: - * - * * Read this field during the atomic commit after - * drm_dp_mst_atomic_wait_for_dependencies() has been called, which will ensure the - * previous MST states payload start slots have been copied over to the new state. Note - * that a new start slot won't be assigned/removed from this payload until - * drm_dp_add_payload_part1()/drm_dp_remove_payload() have been called. - * * Acquire the MST modesetting lock, and then wait for any pending MST-related commits to - * get committed to hardware by calling drm_crtc_commit_wait() on each of the - * &drm_crtc_commit structs in &drm_dp_mst_topology_state.commit_deps. - * - * If neither of the two above solutions suffice (e.g. the driver needs to read the start - * slot in the middle of an atomic commit without waiting for some reason), then drivers - * should cache this value themselves after changing payloads. - */ - s8 vc_start_slot; - - /** @vcpi: The Virtual Channel Payload Identifier */ - u8 vcpi; /** * @time_slots: * The number of timeslots allocated to this payload from the source DP Tx to @@ -582,6 +582,8 @@ struct drm_dp_mst_topology_state { /** @base: Base private state for atomic */ struct drm_private_state base; + /** @payloads: The list of payloads being created/destroyed in this state */ + struct list_head payloads; /** @mgr: The topology manager */ struct drm_dp_mst_topology_mgr *mgr; @@ -598,21 +600,10 @@ struct drm_dp_mst_topology_state { /** @num_commit_deps: The number of CRTC commits in @commit_deps */ size_t num_commit_deps; - /** @payload_mask: A bitmask of allocated VCPIs, used for VCPI assignments */ - u32 payload_mask; - /** @payloads: The list of payloads being created/destroyed in this state */ - struct list_head payloads; - /** @total_avail_slots: The total number of slots this topology can handle (63 or 64) */ u8 total_avail_slots; /** @start_slot: The first usable time slot in this topology (1 or 0) */ u8 start_slot; - - /** - * @pbn_div: The current PBN divisor for this topology. The driver is expected to fill this - * out itself. - */ - int pbn_div; }; #define to_dp_mst_topology_mgr(x) container_of(x, struct drm_dp_mst_topology_mgr, base) @@ -652,6 +643,14 @@ struct drm_dp_mst_topology_mgr { * @max_payloads: maximum number of payloads the GPU can generate. */ int max_payloads; + /** + * @max_lane_count: maximum number of lanes the GPU can drive. + */ + int max_lane_count; + /** + * @max_link_rate: maximum link rate per lane GPU can output, in kHz. + */ + int max_link_rate; /** * @conn_base_id: DRM connector ID this mgr is connected to. Only used * to build the MST connector path value. @@ -694,20 +693,6 @@ struct drm_dp_mst_topology_mgr { */ bool payload_id_table_cleared : 1; - /** - * @payload_count: The number of currently active payloads in hardware. This value is only - * intended to be used internally by MST helpers for payload tracking, and is only safe to - * read/write from the atomic commit (not check) context. - */ - u8 payload_count; - - /** - * @next_start_slot: The starting timeslot to use for new VC payloads. This value is used - * internally by MST helpers for payload tracking, and is only safe to read/write from the - * atomic commit (not check) context. - */ - u8 next_start_slot; - /** * @mst_primary: Pointer to the primary/first branch device. */ @@ -721,6 +706,10 @@ struct drm_dp_mst_topology_mgr { * @sink_count: Sink count from DEVICE_SERVICE_IRQ_VECTOR_ESI0. */ u8 sink_count; + /** + * @pbn_div: PBN to slots divisor. + */ + int pbn_div; /** * @funcs: Atomic helper callbacks @@ -737,6 +726,32 @@ struct drm_dp_mst_topology_mgr { */ struct list_head tx_msg_downq; + /** + * @payload_lock: Protect payload information. + */ + struct mutex payload_lock; + /** + * @proposed_vcpis: Array of pointers for the new VCPI allocation. The + * VCPI structure itself is &drm_dp_mst_port.vcpi, and the size of + * this array is determined by @max_payloads. + */ + struct drm_dp_vcpi **proposed_vcpis; + /** + * @payloads: Array of payloads. The size of this array is determined + * by @max_payloads. + */ + struct drm_dp_payload *payloads; + /** + * @payload_mask: Elements of @payloads actually in use. Since + * reallocation of active outputs isn't possible gaps can be created by + * disabling outputs out of order compared to how they've been enabled. + */ + unsigned long payload_mask; + /** + * @vcpi_mask: Similar to @payload_mask, but for @proposed_vcpis. + */ + unsigned long vcpi_mask; + /** * @tx_waitq: Wait to queue stall for the tx worker. */ @@ -808,7 +823,9 @@ struct drm_dp_mst_topology_mgr { int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, struct drm_device *dev, struct drm_dp_aux *aux, int max_dpcd_transaction_bytes, - int max_payloads, int conn_base_id); + int max_payloads, + int max_lane_count, int max_link_rate, + int conn_base_id); void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr); @@ -831,17 +848,28 @@ int drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr, int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc); +bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port, int pbn, int slots); + +int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); + + +void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); + void drm_dp_mst_update_slots(struct drm_dp_mst_topology_state *mst_state, uint8_t link_encoding_cap); -int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload); -int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, - struct drm_atomic_state *state, - struct drm_dp_mst_atomic_payload *payload); -void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload); +void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port); + + +int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, + int pbn); + + +int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr, int start_slot); + + +int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr); int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr); @@ -863,22 +891,17 @@ int drm_dp_mst_connector_late_register(struct drm_connector *connector, void drm_dp_mst_connector_early_unregister(struct drm_connector *connector, struct drm_dp_mst_port *port); -struct drm_dp_mst_topology_state * -drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, - struct drm_dp_mst_topology_mgr *mgr); -struct drm_dp_mst_topology_state * -drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state, - struct drm_dp_mst_topology_mgr *mgr); -struct drm_dp_mst_atomic_payload * -drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state, - struct drm_dp_mst_port *port); +struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, + struct drm_dp_mst_topology_mgr *mgr); int __must_check drm_dp_atomic_find_time_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_mst_port *port, int pbn); + struct drm_dp_mst_port *port, int pbn, + int pbn_div); int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state, struct drm_dp_mst_port *port, - int pbn, bool enable); + int pbn, int pbn_div, + bool enable); int __must_check drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr); @@ -902,12 +925,6 @@ void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port); struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port); -static inline struct drm_dp_mst_topology_state * -to_drm_dp_mst_topology_state(struct drm_private_state *state) -{ - return container_of(state, struct drm_dp_mst_topology_state, base); -} - extern const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs; /** -- 2.37.3

1 year, 3 months

11
18
0 0

Re: [Nouveau] [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf

by Computer Enthusiastic

Hello, The patch "[Nouveau] [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf" [1] was marked for kernels v5.15+ and it was merged upstream. The same patch [1] works with kernel 5.10.y, but it is not been merged upstream so far. According to Karol Herbst suggestion [2], I'm sending this message to ask for merging it into 5.10 kernel. Thanks in advance. --- [1] https://lore.kernel.org/nouveau/20220819200928.401416-1-kherbst@redhat.com/ [2] https://lore.kernel.org/nouveau/CACO55tv0jO2TmuWcwFiAUQB-__DZVwhv7WNN9MfgMX…

1 year, 3 months

4
6
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2023