November 2021 - Linux-stable-mirror

[PATCH v3] drm/ast: Don't check new mode if CRTC is being disabled

by Thomas Zimmermann

Suspending failed because there's no mode if the CRTC is being disabled. Early-out in this case. This fixes runtime PM for ast. v3: * fixed commit message v2: * added Tested-by/Reported-by tags * added Fixes tags and CC (Sam) * improved comment Signed-off-by: Thomas Zimmermann <tzimmermann(a)suse.de> Reported-by: Cary Garrett <cogarre(a)gmail.com> Tested-by: Cary Garrett <cogarre(a)gmail.com> Fixes: b48e1b6ffd28 ("drm/ast: Add CRTC helpers for atomic modesetting") Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: <stable(a)vger.kernel.org> # v5.6+ --- drivers/gpu/drm/ast/ast_mode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 7a9f20a2fd303..0cbbb21edb4e1 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -801,6 +801,9 @@ static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc, return -EINVAL; } + if (!state->enable) + return 0; /* no mode checks if CRTC is being disabled */ + ast_state = to_ast_crtc_state(state); format = ast_state->format; -- 2.26.0

2 years, 3 months

3
3
0 0

[PATCH 02/12] RISC-V: MAXPHYSMEM_2GB doesn't depend on CMODEL_MEDLOW

by Palmer Dabbelt

From: Palmer Dabbelt <palmer(a)rivosinc.com> For non-relocatable kernels we need to be able to link the kernel at approximately PAGE_OFFSET, thus requiring medany (as medlow requires the code to be linked within 2GiB of 0). The inverse doesn't apply, though: since medany code can be linked anywhere it's fine to link it close to 0, so we can support the smaller memory config. Fixes: de5f4b8f634b ("RISC-V: Define MAXPHYSMEM_1GB only for RV32") Cc: stable(a)vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer(a)rivosinc.com> --- I found this when going through the savedefconfig diffs for the K210 defconfigs. I'm not entirely sure they're doing the right thing here (they should probably be setting CMODEL_LOW to take advantage of the better code generation), but I don't have any way to test those platforms so I don't want to change too much. --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 821252b65f89..61f64512dcde 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -280,7 +280,7 @@ choice depends on 32BIT bool "1GiB" config MAXPHYSMEM_2GB - depends on 64BIT && CMODEL_MEDLOW + depends on 64BIT bool "2GiB" config MAXPHYSMEM_128GB depends on 64BIT && CMODEL_MEDANY -- 2.32.0

2 years, 3 months

6
9
0 0

[PATCH 5.14 000/169] 5.14.15-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.14.15 release. There are 169 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, 27 Oct 2021 19:08:09 +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.14.15-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.14.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.14.15-rc1 Fabien Dessenne <fabien.dessenne(a)foss.st.com> pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume() Nick Desaulniers <ndesaulniers(a)google.com> ARM: 9122/1: select HAVE_FUTEX_CMPXCHG Sasha Neftin <sasha.neftin(a)intel.com> e1000e: Separate TGP board type from SPT Yanfei Xu <yanfei.xu(a)windriver.com> net: mdiobus: Fix memory leak in __mdiobus_register Oliver Neukum <oneukum(a)suse.com> usbnet: sanity check for maxpacket Daniel Borkmann <daniel(a)iogearbox.net> bpf, test, cgroup: Use sk_{alloc,free} for test cases Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: fix zpci_zdev_put() on reserve Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: cleanup resources only if necessary Dexuan Cui <decui(a)microsoft.com> scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma() Ian Kent <raven(a)themaw.net> autofs: fix wait name hash calculation in autofs_wait() Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Limit supported mode to 1080p Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Enable alpha blended second plane Maor Dickman <maord(a)nvidia.com> net/mlx5: Lag, change multipath and bonding to be mutually exclusive Mark Bloch <mbloch(a)nvidia.com> net/mlx5: Lag, move lag destruction to a workqueue Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: fix for miscalculation of rx unused desc Woody Lin <woodylin(a)google.com> sched/scs: Reset the shadow stack when idle_task_exit Marek Szyprowski <m.szyprowski(a)samsung.com> mm/thp: decrease nr_thps in file's mapping on THP split Joy Gu <jgu(a)purestorage.com> scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpi3mr: Fix duplicate device entries when scanning through sysfs Andrea Parri (Microsoft) <parri.andrea(a)gmail.com> scsi: storvsc: Fix validation for unsolicited incoming packets Mike Christie <michael.christie(a)oracle.com> scsi: iscsi: Fix set_param() handling Srinivasa Rao Mandadapu <srivasam(a)codeaurora.org> ASoC: codec: wcd938x: Add irq config support Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Input: snvs_pwrkey - add clk handling Kan Liang <kan.liang(a)linux.intel.com> perf/x86/msr: Add Sapphire Rapids CPU support Shunsuke Nakamura <nakamura.shun(a)fujitsu.com> libperf tests: Fix test_stat_cpu Shunsuke Nakamura <nakamura.shun(a)fujitsu.com> libperf test evsel: Fix build error on !x86 architectures Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi-mux: Fix false-positive lockdep splats Mark Brown <broonie(a)kernel.org> spi: Fix deadlock when adding SPI controllers on SPI buses Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda: avoid write to STATESTS if controller is in reset Prashant Malani <pmalani(a)chromium.org> platform/x86: intel_scu_ipc: Update timeout value in comment Prashant Malani <pmalani(a)chromium.org> platform/x86: intel_scu_ipc: Increase virtual timeout to 10s Zheyu Ma <zheyuma97(a)gmail.com> isdn: mISDN: Fix sleeping function called from invalid context Herve Codina <herve.codina(a)bootlin.com> ARM: dts: spear3xx: Fix gmac node Herve Codina <herve.codina(a)bootlin.com> net: stmmac: add support for dwmac 3.40a Filipe Manana <fdmanana(a)suse.com> btrfs: deal with errors when checking if a dir entry exists during log replay Takashi Iwai <tiwai(a)suse.de> ALSA: hda: intel: Allow repeatedly probing on codec configuration errors Michael Forney <mforney(a)mforney.org> objtool: Update section header before relocations Michael Forney <mforney(a)mforney.org> objtool: Check for gelf_update_rel[a] failures Arnd Bergmann <arnd(a)arndb.de> bitfield: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> thunderbolt: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> device property: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> iio/test-format: build kunit tests without structleak plugin Brendan Higgins <brendanhiggins(a)google.com> gcc-plugins/structleak: add makefile var for disabling structleak Rob Clark <robdclark(a)chromium.org> drm/msm/a6xx: Serialize GMU communication Xiyu Yang <xiyuyang19(a)fudan.edu.cn> kunit: fix reference count leak in kfree_at_end Chenyi Qiang <chenyi.qiang(a)intel.com> KVM: MMU: Reset mmu->pkru_mask to avoid stale data Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: fix the max tx size according to user manual Marek Vasut <marex(a)denx.de> drm: mxsfb: Fix NULL pointer dereference crash on unload Peter Gonda <pgonda(a)google.com> KVM: SEV-ES: Set guest_state_protected after VMSA update Nikolay Aleksandrov <nikolay(a)nvidia.com> net: bridge: mcast: use multicast_membership_interval for IGMPv3 Florian Westphal <fw(a)strlen.de> selftests: netfilter: remove stray bash debug line Vegard Nossum <vegard.nossum(a)gmail.com> netfilter: Kconfig: use 'default y' instead of 'm' for bool config option Xiaolong Huang <butterflyhuangxx(a)gmail.com> isdn: cpai: check ctr->cnr to avoid array index out of bound Lin Ma <linma(a)zju.edu.cn> nfc: nci: fix the UAF of rf_conn_info object Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: remove unnecessary arguments from complete_emulator_pio_in Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: split the two parts of emulator_pio_in Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: check for interrupts before deciding whether to exit the fast path Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: reduce ghcb_sa_len to 32 bits Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: fix length of string I/O Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: keep INS functions together Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: clean up kvm_sev_es_ins/outs Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV-ES: rename guest_ins_data to sev_pio_data Masahiro Kozuka <masa.koz(a)kozuka.jp> KVM: SEV: Flush cache on non-coherent systems before RECEIVE_UPDATE_DATA Paolo Bonzini <pbonzini(a)redhat.com> KVM: nVMX: promptly process interrupts delivered while in guest mode Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix incorrect memcg slab count for bulk free Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix potential use-after-free in slab_debugfs_fops Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix potential memoryleak in kmem_cache_open() Miaohe Lin <linmiaohe(a)huawei.com> mm, slub: fix mismatch between reconstructed freelist depth and cnt Michael Ellerman <mpe(a)ellerman.id.au> powerpc/idle: Don't corrupt back chain when going idle Michael Ellerman <mpe(a)ellerman.id.au> KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest Michael Ellerman <mpe(a)ellerman.id.au> KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest() Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Fix signal ucount refcounting Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Proper error handling in set_cred_ucounts Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds Eric W. Biederman <ebiederm(a)xmission.com> ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: correct ds->num_ports Gaosheng Cui <cuigaosheng1(a)huawei.com> audit: fix possible null-pointer dereference in audit_filter_rules Tejun Heo <tj(a)kernel.org> blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu Hans de Goede <hdegoede(a)redhat.com> ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working Takashi Iwai <tiwai(a)suse.de> ASoC: DAPM: Fix missing kctl change notifications Steven Clarkson <sc(a)lambdal.com> ALSA: hda/realtek: Add quirk for Clevo PC50HS Brendan Grieve <brendan(a)grieve.com.au> ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset Sean Christopherson <seanjc(a)google.com> mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem() Matthew Wilcox (Oracle) <willy(a)infradead.org> vfs: check fd has read access in kernel_read_file_from_fd() Lukas Bulwahn <lukas.bulwahn(a)gmail.com> elfcore: correct reference to CONFIG_UML Eric Dumazet <edumazet(a)google.com> mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind() Nadav Amit <namit(a)vmware.com> userfaultfd: fix a race between writeprotect and exit_mmap() Peter Xu <peterx(a)redhat.com> mm/userfaultfd: selftests: fix memory corruption with thp enabled Valentin Vidic <vvidic(a)valentin-vidic.from.hr> ocfs2: mount fails with buffer overflow in strlen Jan Kara <jack(a)suse.cz> ocfs2: fix data corruption after conversion from inline format Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Have all levels of checks prevent recursion Jeff Layton <jlayton(a)kernel.org> ceph: fix handling of "meta" errors Jeff Layton <jlayton(a)kernel.org> ceph: skip existing superblocks that are blocklisted or shut down when mounting Zhang Changzhong <zhangchangzhong(a)huawei.com> can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes Zhang Changzhong <zhangchangzhong(a)huawei.com> can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length Ziyang Xuan <william.xuanziyang(a)huawei.com> can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv Ziyang Xuan <william.xuanziyang(a)huawei.com> can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer Ziyang Xuan <william.xuanziyang(a)huawei.com> can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() Ziyang Xuan <william.xuanziyang(a)huawei.com> can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() Marc Kleine-Budde <mkl(a)pengutronix.de> can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path Zheyu Ma <zheyuma97(a)gmail.com> can: peak_pci: peak_pci_remove(): fix UAF Stephane Grosjean <s.grosjean(a)peak-system.com> can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> can: rcar_can: fix suspend/resume Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: make sure all traffic classes can send large frames Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: fix ethtool counter name for PM0_TERR Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Enable ADV bridge after modeset Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Corrected typo in handle_lcd_irq Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Disable change of plane parameters Edmund Dea <edmund.j.dea(a)intel.com> drm/kmb: Remove clearing DPHY regs Anitha Chrisanthus <anitha.chrisanthus(a)intel.com> drm/kmb: Work around for higher system clock Dan Johansen <strit(a)manjaro.org> drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel Emeel Hakim <ehakim(a)nvidia.com> net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags Emeel Hakim <ehakim(a)nvidia.com> net/mlx5e: IPsec: Fix a misuse of the software parser's fields Tony Nguyen <anthony.l.nguyen(a)intel.com> ice: Add missing E810 device ids Sasha Neftin <sasha.neftin(a)intel.com> igc: Update I226_K device ID Sasha Neftin <sasha.neftin(a)intel.com> e1000e: Fix packet loss on Tiger Lake and later Yang Yingliang <yangyingliang(a)huawei.com> ptp: Fix possible memory leak in ptp_clock_register() Kurt Kanzenbach <kurt(a)linutronix.de> net: stmmac: Fix E2E delay mechanism Peng Li <lipeng321(a)huawei.com> net: hns3: disable sriov before unload hclge layer Yufeng Mo <moyufeng(a)huawei.com> net: hns3: fix vf reset workqueue cannot exit Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: schedule the polling again when allocation fails Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: add limit ets dwrr bandwidth cannot be 0 Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: reset DWRR of unused tc to zero Jiaran Zhang <zhangjiaran(a)huawei.com> net: hns3: Add configuration of TM QCN error event Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/smp: do not decrement idle task preempt count in CPU offline Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()' Randy Dunlap <rdunlap(a)infradead.org> NIOS2: irqflags: rename a redefined register name Paul Blakey <paulb(a)nvidia.com> net/sched: act_ct: Fix byte count on fragmented packets Aleksander Jan Bajkowski <olek2(a)wp.pl> net: dsa: lantiq_gswip: fix register definition Randy Dunlap <rdunlap(a)infradead.org> hamradio: baycom_epp: fix build for UML Stephen Suryaputra <ssuryaextr(a)gmail.com> ipv6: When forwarding count rx stats on the orig netdev Leonard Crestez <cdleonard(a)gmail.com> tcp: md5: Fix overlap between vrf and non-vrf keys Vegard Nossum <vegard.nossum(a)oracle.com> lan78xx: select CRC32 Xin Long <lucien.xin(a)gmail.com> sctp: fix transport encap_port update in sctp_vtag_verify Antoine Tenart <atenart(a)kernel.org> netfilter: ipvs: make global sysctl readonly in non-init netns Xin Long <lucien.xin(a)gmail.com> netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6 Brett Creeley <brett.creeley(a)intel.com> ice: Print the api_patch as part of the fw.mgmt.api Michal Swiatkowski <michal.swiatkowski(a)linux.intel.com> ice: fix getting UDP tunnel entry Dave Ertman <david.m.ertman(a)intel.com> ice: Avoid crash from unnecessary IDA free Brett Creeley <brett.creeley(a)intel.com> ice: Fix failure to re-add LAN/RDMA Tx queues Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: wm8960: Fix clock configuration on slave mode Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> dma-debug: fix sg checks in debug_dma_map_sg() Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: skip netdev events generated on netns removal Juhee Kang <claudiajkang(a)gmail.com> netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value Quentin Perret <qperret(a)google.com> KVM: arm64: Release mmap_lock when using VM_SHARED with MTE Quentin Perret <qperret(a)google.com> KVM: arm64: Fix host stage-2 PGD refcount Mark Brown <broonie(a)kernel.org> ASoC: cs4341: Add SPI device ID table Mark Brown <broonie(a)kernel.org> ASoC: pcm179x: Add missing entries SPI to device ID table Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_xcvr: Fix channel swap issue with ARC Peter Rosin <peda(a)axentia.se> ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/security: Add a helper to query stf_barrier type Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Validate branch ranges Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/lib: Add helper to check if offset is within conditional branch range Benjamin Coddington <bcodding(a)redhat.com> NFSD: Keep existing listeners on portlist error Guenter Roeck <linux(a)roeck-us.net> xtensa: xtfpga: Try software restart before simulating CPU reset Max Filippov <jcmvbkbc(a)gmail.com> xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF Yifan Zhang <yifan1.zhang(a)amd.com> drm/amdgpu: init iommu after amdkfd device init Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI Hayes Wang <hayeswang(a)realtek.com> r8152: avoid to resubmit rx immediately Jan Beulich <jbeulich(a)suse.com> xen/x86: prevent PVH type from getting clobbered Johannes Thumshirn <johannes.thumshirn(a)wdc.com> block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output Eugen Hristev <eugen.hristev(a)microchip.com> ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Rob Herring <robh(a)kernel.org> arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address Geert Uytterhoeven <geert+renesas(a)glider.be> sh: pgtable-3level: fix cast to pointer from integer of different size Helge Deller <deller(a)gmx.de> parisc: math-emu: Fix fall-through warnings Geert Uytterhoeven <geert(a)linux-m68k.org> block/mq-deadline: Move dd_queued() to fix defined but not used warning ------------- Diffstat: Documentation/networking/devlink/ice.rst | 9 +- Makefile | 4 +- arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - arch/arm/boot/dts/spear3xx.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 1 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 13 +- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 ++ arch/arm64/kvm/mmu.c | 6 +- arch/nios2/include/asm/irqflags.h | 4 +- arch/nios2/include/asm/registers.h | 2 +- arch/parisc/math-emu/fpudispatch.c | 56 ++++++- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/security_features.h | 5 + arch/powerpc/kernel/idle_book3s.S | 10 +- arch/powerpc/kernel/security.c | 5 + arch/powerpc/kernel/smp.c | 2 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++-- arch/powerpc/lib/code-patching.c | 7 +- arch/powerpc/net/bpf_jit.h | 33 ++-- arch/powerpc/net/bpf_jit64.h | 8 +- arch/powerpc/net/bpf_jit_comp.c | 6 +- arch/powerpc/net/bpf_jit_comp32.c | 8 +- arch/powerpc/net/bpf_jit_comp64.c | 63 +++++++- arch/s390/include/asm/pci.h | 2 + arch/s390/pci/pci.c | 48 +++++- arch/s390/pci/pci_event.c | 4 +- arch/sh/include/asm/pgtable-3level.h | 2 +- arch/x86/events/msr.c | 1 + arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/mmu/mmu.c | 6 +- arch/x86/kvm/svm/sev.c | 16 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/vmx.c | 17 +- arch/x86/kvm/x86.c | 150 ++++++++++++------ arch/x86/xen/enlighten.c | 9 +- arch/xtensa/platforms/xtfpga/setup.c | 12 +- block/blk-cgroup.c | 5 +- block/blk-mq-debugfs.c | 1 + block/mq-deadline.c | 12 +- drivers/base/test/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/display/Kconfig | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 41 ++++- drivers/gpu/drm/kmb/kmb_drv.c | 10 +- drivers/gpu/drm/kmb/kmb_drv.h | 13 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 25 +-- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 122 +++++++++++++-- drivers/gpu/drm/kmb/kmb_plane.h | 11 +- drivers/gpu/drm/kmb/kmb_regs.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 40 ++++- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 +- drivers/iio/test/Makefile | 1 + drivers/input/keyboard/snvs_pwrkey.c | 29 ++++ drivers/isdn/capi/kcapi.c | 5 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/net/can/rcar/rcar_can.c | 20 ++- drivers/net/can/sja1000/peak_pci.c | 9 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/dsa/mt7530.c | 8 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 +- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 37 +++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 7 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 ++ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 5 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 31 +++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/e1000e/netdev.c | 29 ++-- drivers/net/ethernet/intel/ice/ice_common.c | 2 + drivers/net/ethernet/intel/ice/ice_devids.h | 4 + drivers/net/ethernet/intel/ice/ice_devlink.c | 3 +- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 9 ++ drivers/net/ethernet/intel/ice/ice_main.c | 8 +- drivers/net/ethernet/intel/ice/ice_sched.c | 13 ++ drivers/net/ethernet/intel/ice/ice_sched.h | 1 + drivers/net/ethernet/intel/igc/igc_hw.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 51 +++--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 20 +-- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 ++- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 2 + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 + drivers/net/hamradio/baycom_epp.c | 6 +- drivers/net/phy/mdio_bus.c | 1 + drivers/net/usb/Kconfig | 1 + drivers/net/usb/r8152.c | 16 +- drivers/net/usb/usbnet.c | 4 + drivers/pci/hotplug/s390_pci_hpc.c | 9 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/ptp/ptp_clock.c | 15 +- drivers/scsi/hosts.c | 3 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 - drivers/scsi/storvsc_drv.c | 32 ++-- drivers/spi/spi-mux.c | 7 + drivers/spi/spi.c | 27 ++-- drivers/thunderbolt/Makefile | 1 + fs/autofs/waitq.c | 2 +- fs/btrfs/tree-log.c | 47 +++--- fs/ceph/caps.c | 12 +- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 - fs/ceph/mds_client.c | 17 +- fs/ceph/super.c | 17 +- fs/ceph/super.h | 3 - fs/kernel_read_file.c | 2 +- fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/alloc.c | 46 ++---- fs/ocfs2/super.c | 14 +- fs/userfaultfd.c | 12 +- include/linux/elfcore.h | 2 +- include/linux/mlx5/driver.h | 1 - include/linux/secretmem.h | 2 +- include/linux/spi/spi.h | 3 + include/linux/trace_recursion.h | 49 ++---- include/linux/user_namespace.h | 2 + include/net/sctp/sm.h | 6 +- include/sound/hda_codec.h | 1 + kernel/auditsc.c | 2 +- kernel/cred.c | 9 +- kernel/dma/debug.c | 12 +- kernel/sched/core.c | 1 + kernel/signal.c | 25 +-- kernel/trace/ftrace.c | 4 +- kernel/ucount.c | 49 ++++++ lib/Makefile | 2 +- lib/kunit/executor_test.c | 4 +- mm/huge_memory.c | 6 +- mm/mempolicy.c | 16 +- mm/slub.c | 23 ++- net/bpf/test_run.c | 14 +- net/bridge/br_private.h | 4 +- net/can/isotp.c | 51 ++++-- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 7 +- net/can/j1939/transport.c | 14 +- net/dsa/dsa2.c | 9 +- net/ipv4/tcp_ipv4.c | 19 ++- net/ipv6/ip6_output.c | 3 +- net/ipv6/netfilter/ip6t_rt.c | 48 +----- net/netfilter/Kconfig | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 5 + net/netfilter/nft_chain_filter.c | 9 +- net/netfilter/xt_IDLETIMER.c | 2 +- net/nfc/nci/rsp.c | 2 + net/sched/act_ct.c | 2 +- scripts/Makefile.gcc-plugins | 4 + security/keys/process_keys.c | 8 + sound/hda/hdac_controller.c | 5 +- sound/pci/hda/hda_bind.c | 20 +-- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++- sound/pci/hda/hda_intel.h | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/cs4341.c | 7 + sound/soc/codecs/nau8824.c | 4 +- sound/soc/codecs/pcm179x-spi.c | 1 + sound/soc/codecs/pcm512x.c | 2 + sound/soc/codecs/wm8960.c | 13 +- sound/soc/fsl/fsl_xcvr.c | 17 +- sound/soc/soc-dapm.c | 13 +- sound/usb/quirks-table.h | 32 ++++ tools/lib/perf/tests/test-evlist.c | 6 +- tools/lib/perf/tests/test-evsel.c | 7 +- tools/objtool/elf.c | 56 +++---- tools/testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 +++++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - tools/testing/selftests/vm/userfaultfd.c | 23 ++- 196 files changed, 1761 insertions(+), 731 deletions(-)

2 years, 3 months

9
180
0 0

[PATCH 1/3] riscv: Don't use va_pa_offset on kdump

by Nick Kossifidis

On kdump instead of using an intermediate step to relocate the kernel, that lives in a "control buffer" outside the current kernel's mapping, we jump to the crash kernel directly by calling riscv_kexec_norelocate(). The current implementation uses va_pa_offset while switching to physical addressing, however since we moved the kernel outside the linear mapping this won't work anymore since riscv_kexec_norelocate() is part of the kernel mapping and we should use kernel_map.va_kernel_pa_offset, and also take XIP kernel into account. We don't really need to use va_pa_offset on riscv_kexec_norelocate, we can just set STVEC to the physical address of the new kernel instead and let the hart jump to the new kernel on the next instruction after setting SATP to zero. This fixes kdump and is also simpler/cleaner. I tested this on the latest qemu and HiFive Unmatched and works as expected. v2: I removed the direct jump after setting satp as suggested. Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping") Signed-off-by: Nick Kossifidis <mick(a)ics.forth.gr> Reviewed-by: Alexandre Ghiti <alex(a)ghiti.fr> Cc: <stable(a)vger.kernel.org> # 5.13 Cc: <stable(a)vger.kernel.org> # 5.14 --- arch/riscv/kernel/kexec_relocate.S | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/riscv/kernel/kexec_relocate.S b/arch/riscv/kernel/kexec_relocate.S index a80b52a74..059c5e216 100644 --- a/arch/riscv/kernel/kexec_relocate.S +++ b/arch/riscv/kernel/kexec_relocate.S @@ -159,25 +159,15 @@ SYM_CODE_START(riscv_kexec_norelocate) * s0: (const) Phys address to jump to * s1: (const) Phys address of the FDT image * s2: (const) The hartid of the current hart - * s3: (const) kernel_map.va_pa_offset, used when switching MMU off */ mv s0, a1 mv s1, a2 mv s2, a3 - mv s3, a4 /* Disable / cleanup interrupts */ csrw CSR_SIE, zero csrw CSR_SIP, zero - /* Switch to physical addressing */ - la s4, 1f - sub s4, s4, s3 - csrw CSR_STVEC, s4 - csrw CSR_SATP, zero - -.align 2 -1: /* Pass the arguments to the next kernel / Cleanup*/ mv a0, s2 mv a1, s1 @@ -214,7 +204,15 @@ SYM_CODE_START(riscv_kexec_norelocate) csrw CSR_SCAUSE, zero csrw CSR_SSCRATCH, zero - jalr zero, a2, 0 + /* + * Switch to physical addressing + * This will also trigger a jump to CSR_STVEC + * which in this case is the address of the new + * kernel. + */ + csrw CSR_STVEC, a2 + csrw CSR_SATP, zero + SYM_CODE_END(riscv_kexec_norelocate) .section ".rodata" -- 2.32.0

2 years, 3 months

2
3
0 0

[PATCH v3] perf/x86/intel/uncore: Fix CAS_COUNT_WRITE issue for ICX

by zhengjun.xing＠linux.intel.com

From: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> The user recently report a perf issue in the ICX platform, when test by perf event “uncore_imc_x/cas_count_write”,the write bandwidth is always very small (only 0.38MB/s), it is caused by the wrong "umask" for the "cas_count_write" event. When double-checking, find "cas_count_read" also is wrong. The public document for ICX uncore: https://www.intel.com/content/www/us/en/develop/download/3rd-gen-intel-xeon… On page 142, Table 2-143, defines Unit Masks for CAS_COUNT: RD b00001111 WR b00110000 So Corrected both "cas_count_read" and "cas_count_write" for ICX. Old settings: hswep_uncore_imc_events INTEL_UNCORE_EVENT_DESC(cas_count_read, "event=0x04,umask=0x03") INTEL_UNCORE_EVENT_DESC(cas_count_write, "event=0x04,umask=0x0c") New settings: snr_uncore_imc_events INTEL_UNCORE_EVENT_DESC(cas_count_read, "event=0x04,umask=0x0f") INTEL_UNCORE_EVENT_DESC(cas_count_write, "event=0x04,umask=0x30"), Fixes: 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support") Reviewed-by: Adrian Hunter <adrian.hunter(a)intel.com> Signed-off-by: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- Change log: v3: * Add change log v2: * Add stable tag arch/x86/events/intel/uncore_snbep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 5ddc0f30db6f..a6fd8eb410a9 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -5468,7 +5468,7 @@ static struct intel_uncore_type icx_uncore_imc = { .fixed_ctr_bits = 48, .fixed_ctr = SNR_IMC_MMIO_PMON_FIXED_CTR, .fixed_ctl = SNR_IMC_MMIO_PMON_FIXED_CTL, - .event_descs = hswep_uncore_imc_events, + .event_descs = snr_uncore_imc_events, .perf_ctr = SNR_IMC_MMIO_PMON_CTR0, .event_ctl = SNR_IMC_MMIO_PMON_CTL0, .event_mask = SNBEP_PMON_RAW_EVENT_MASK, -- 2.25.1

2 years, 4 months

3
2
0 0

[PATCH] mm: fix panic in __alloc_pages

by Alexey Makhalov

There is a kernel panic caused by __alloc_pages() accessing uninitialized NODE_DATA(nid). Uninitialized node data exists during the time when CPU with memoryless node was added but not onlined yet. Panic can be easy reproduced by disabling udev rule for automatic onlining hot added CPU followed by CPU with memoryless node hot add. This is a panic caused by percpu code doing allocations for all possible CPUs and hitting this issue: CPU2 has been hot-added BUG: unable to handle page fault for address: 0000000000001608 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 0 PID: 1 Comm: systemd Tainted: G E 5.15.0-rc7+ #11 Hardware name: VMware, Inc. VMware7,1/440BX Desktop Reference Platform, BIOS VMW RIP: 0010:__alloc_pages+0x127/0x290 Code: 4c 89 f0 5b 41 5c 41 5d 41 5e 41 5f 5d c3 44 89 e0 48 8b 55 b8 c1 e8 0c 83 e0 01 88 45 d0 4c 89 c8 48 85 d2 0f 85 1a 01 00 00 <45> 3b 41 08 0f 82 10 01 00 00 48 89 45 c0 48 8b 00 44 89 e2 81 e2 RSP: 0018:ffffc900006f3bc8 EFLAGS: 00010246 RAX: 0000000000001600 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000cc2 RBP: ffffc900006f3c18 R08: 0000000000000001 R09: 0000000000001600 R10: ffffc900006f3a40 R11: ffff88813c9fffe8 R12: 0000000000000cc2 R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000cc2 FS: 00007f27ead70500(0000) GS:ffff88807ce00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000001608 CR3: 000000000582c003 CR4: 00000000001706b0 Call Trace: pcpu_alloc_pages.constprop.0+0xe4/0x1c0 pcpu_populate_chunk+0x33/0xb0 pcpu_alloc+0x4d3/0x6f0 __alloc_percpu_gfp+0xd/0x10 alloc_mem_cgroup_per_node_info+0x54/0xb0 mem_cgroup_alloc+0xed/0x2f0 mem_cgroup_css_alloc+0x33/0x2f0 css_create+0x3a/0x1f0 cgroup_apply_control_enable+0x12b/0x150 cgroup_mkdir+0xdd/0x110 kernfs_iop_mkdir+0x4f/0x80 vfs_mkdir+0x178/0x230 do_mkdirat+0xfd/0x120 __x64_sys_mkdir+0x47/0x70 ? syscall_exit_to_user_mode+0x21/0x50 do_syscall_64+0x43/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae Node can be in one of the following states: 1. not present (nid == NUMA_NO_NODE) 2. present, but offline (nid > NUMA_NO_NODE, node_online(nid) == 0, NODE_DATA(nid) == NULL) 3. present and online (nid > NUMA_NO_NODE, node_online(nid) > 0, NODE_DATA(nid) != NULL) alloc_page_{bulk_array}node() functions verify for nid validity only and do not check if nid is online. Enhanced verification check allows to handle page allocation when node is in 2nd state. Signed-off-by: Alexey Makhalov <amakhalov(a)vmware.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: linux-mm(a)kvack.org Cc: linux-kernel(a)vger.kernel.org Cc: stable(a)vger.kernel.org --- include/linux/gfp.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 55b2ec1f9..34a5a7def 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -551,7 +551,8 @@ alloc_pages_bulk_array(gfp_t gfp, unsigned long nr_pages, struct page **page_arr static inline unsigned long alloc_pages_bulk_array_node(gfp_t gfp, int nid, unsigned long nr_pages, struct page **page_array) { - if (nid == NUMA_NO_NODE) + if (nid == NUMA_NO_NODE || (!node_online(nid) && + !(gfp & __GFP_THISNODE))) nid = numa_mem_id(); return __alloc_pages_bulk(gfp, nid, NULL, nr_pages, NULL, page_array); @@ -578,7 +579,8 @@ __alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) { - if (nid == NUMA_NO_NODE) + if (nid == NUMA_NO_NODE || (!node_online(nid) && + !(gfp_mask & __GFP_THISNODE))) nid = numa_mem_id(); return __alloc_pages_node(nid, gfp_mask, order); -- 2.30.0

2 years, 4 months

7
80
0 0

[PATCH 1/6] Bluetooth: add quirk disabling LE Read Transmit Power

by Aditya Garg

From: Aditya Garg <redecorating(a)protonmail.com> Some devices have a bug causing them to not work if they query LE tx power on startup. Thus we add a quirk in order to not query it and default min/max tx power values to HCI_TX_POWER_INVALID. Signed-off-by: Aditya Garg <gargaditya08(a)live.com> Tested-by: Aditya Garg <gargaditya08(a)live.com> --- include/net/bluetooth/hci.h | 9 +++++++++ net/bluetooth/hci_core.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 63065bc01b766c..383342efcdc464 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -246,6 +246,15 @@ enum { * HCI after resume. */ HCI_QUIRK_NO_SUSPEND_NOTIFIER, + + /* + * When this quirk is set, LE tx power is not queried on startup + * and the min/max tx power values default to HCI_TX_POWER_INVALID. + * + * This quirk can be set before hci_register_dev is called or + * during the hdev->setup vendor callback. + */ + HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, }; /* HCI device flags */ diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8d33aa64846b1c..434c6878fe9640 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -619,7 +619,8 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt) hci_req_add(req, HCI_OP_LE_READ_ADV_TX_POWER, 0, NULL); } - if (hdev->commands[38] & 0x80) { + if (hdev->commands[38] & 0x80 && + !test_bit(HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, &hdev->quirks)) { /* Read LE Min/Max Tx Power*/ hci_req_add(req, HCI_OP_LE_READ_TRANSMIT_POWER, 0, NULL);

2 years, 4 months

5
53
0 0

[PATCH] gpio: dln2: Fix interrupts when replugging the device

by Noralf Trønnes

When replugging the device the following message shows up: gpio gpiochip2: (dln2): detected irqchip that is shared with multiple gpiochips: please fix the driver. This also has the effect that interrupts won't work. The same problem would also show up if multiple devices where plugged in. Fix this by allocating the irq_chip data structure per instance like other drivers do. I don't know when this problem appeared, but it is present in 5.10. Cc: <stable(a)vger.kernel.org> # 5.10+ Cc: Daniel Baluta <daniel.baluta(a)gmail.com> Signed-off-by: Noralf Trønnes <noralf(a)tronnes.org> --- drivers/gpio/gpio-dln2.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-dln2.c b/drivers/gpio/gpio-dln2.c index 4c5f6d0c8d74..22f11dd5210d 100644 --- a/drivers/gpio/gpio-dln2.c +++ b/drivers/gpio/gpio-dln2.c @@ -46,6 +46,7 @@ struct dln2_gpio { struct platform_device *pdev; struct gpio_chip gpio; + struct irq_chip irqchip; /* * Cache pin direction to save us one transfer, since the hardware has @@ -383,15 +384,6 @@ static void dln2_irq_bus_unlock(struct irq_data *irqd) mutex_unlock(&dln2->irq_lock); } -static struct irq_chip dln2_gpio_irqchip = { - .name = "dln2-irq", - .irq_mask = dln2_irq_mask, - .irq_unmask = dln2_irq_unmask, - .irq_set_type = dln2_irq_set_type, - .irq_bus_lock = dln2_irq_bus_lock, - .irq_bus_sync_unlock = dln2_irq_bus_unlock, -}; - static void dln2_gpio_event(struct platform_device *pdev, u16 echo, const void *data, int len) { @@ -477,8 +469,15 @@ static int dln2_gpio_probe(struct platform_device *pdev) dln2->gpio.direction_output = dln2_gpio_direction_output; dln2->gpio.set_config = dln2_gpio_set_config; + dln2->irqchip.name = "dln2-irq", + dln2->irqchip.irq_mask = dln2_irq_mask, + dln2->irqchip.irq_unmask = dln2_irq_unmask, + dln2->irqchip.irq_set_type = dln2_irq_set_type, + dln2->irqchip.irq_bus_lock = dln2_irq_bus_lock, + dln2->irqchip.irq_bus_sync_unlock = dln2_irq_bus_unlock, + girq = &dln2->gpio.irq; - girq->chip = &dln2_gpio_irqchip; + girq->chip = &dln2->irqchip; /* The event comes from the outside so no parent handler */ girq->parent_handler = NULL; girq->num_parents = 0; -- 2.33.0

2 years, 4 months

3
5
0 0

FAILED: patch "[PATCH] drm/i915/hdmi: Turn DP++ TMDS output buffers back on in" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cecbc0c7eba7983965cac94f88d2db00b913253b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala(a)linux.intel.com> Date: Fri, 29 Oct 2021 22:18:02 +0300 Subject: [PATCH] drm/i915/hdmi: Turn DP++ TMDS output buffers back on in encoder->shutdown() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Looks like our VBIOS/GOP generally fail to turn the DP dual mode adater TMDS output buffers back on after a reboot. This leads to a black screen after reboot if we turned the TMDS output buffers off prior to reboot. And if i915 decides to do a fastboot the black screen will persist even after i915 takes over. Apparently this has been a problem ever since commit b2ccb822d376 ("drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed") if one rebooted while the display was turned off. And things became worse with commit fe0f1e3bfdfe ("drm/i915: Shut down displays gracefully on reboot") since now we always turn the display off before a reboot. This was reported on a RKL, but I confirmed the same behaviour on my SNB as well. So looks pretty universal. Let's fix this by explicitly turning the TMDS output buffers back on in the encoder->shutdown() hook. Note that this gets called after irqs have been disabled, so the i2c communication with the DP dual mode adapter has to be performed via polling (which the gmbus code is perfectly happy to do for us). We also need a bit of care in handling DDI encoders which may or may not be set up for HDMI output. Specifically ddc_pin will not be populated for a DP only DDI encoder, in which case we don't want to call intel_gmbus_get_adapter(). We can handle that by simply doing the dual mode adapter type check before calling intel_gmbus_get_adapter(). Cc: <stable(a)vger.kernel.org> # v5.11+ Fixes: fe0f1e3bfdfe ("drm/i915: Shut down displays gracefully on reboot") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/4371 Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211029191802.18448-2-ville.… Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy(a)intel.com> (cherry picked from commit 49c55f7b035b87371a6d3c53d9af9f92ddc962db) Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c index 88c427f3c346..f5b4dd5b4275 100644 --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c @@ -584,6 +584,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv, else intel_encoder->enable = g4x_enable_hdmi; } + intel_encoder->shutdown = intel_hdmi_encoder_shutdown; intel_encoder->type = INTEL_OUTPUT_HDMI; intel_encoder->power_domain = intel_port_to_power_domain(port); diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 1dcfe31e6c6f..cfb567df71b3 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4361,6 +4361,7 @@ static void intel_ddi_encoder_shutdown(struct intel_encoder *encoder) enum phy phy = intel_port_to_phy(i915, encoder->port); intel_dp_encoder_shutdown(encoder); + intel_hdmi_encoder_shutdown(encoder); if (!intel_phy_is_tc(i915, phy)) return; diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index d2e61f6c6e08..371736bdc01f 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1246,12 +1246,13 @@ static void hsw_set_infoframes(struct intel_encoder *encoder, void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable) { struct drm_i915_private *dev_priv = intel_hdmi_to_i915(hdmi); - struct i2c_adapter *adapter = - intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus); + struct i2c_adapter *adapter; if (hdmi->dp_dual_mode.type < DRM_DP_DUAL_MODE_TYPE2_DVI) return; + adapter = intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus); + drm_dbg_kms(&dev_priv->drm, "%s DP dual mode adaptor TMDS output\n", enable ? "Enabling" : "Disabling"); @@ -2258,6 +2259,17 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return 0; } +void intel_hdmi_encoder_shutdown(struct intel_encoder *encoder) +{ + struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); + + /* + * Give a hand to buggy BIOSen which forget to turn + * the TMDS output buffers back on after a reboot. + */ + intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); +} + static void intel_hdmi_unset_edid(struct drm_connector *connector) { diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h index b43a180d007e..2bf440eb400a 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.h +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h @@ -28,6 +28,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, int intel_hdmi_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state); +void intel_hdmi_encoder_shutdown(struct intel_encoder *encoder); bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder, struct drm_connector *connector, bool high_tmds_clock_ratio,

2 years, 4 months

3
2
0 0

[PATCH] remoteproc: qcom: pas: Add missing power-domain "mxc" for CDSP

by Sibi Sankar

Add missing power-domain "mxc" required by CDSP PAS remoteproc on SM8350 SoC. Fixes: e8b4e9a21af7 ("remoteproc: qcom: pas: Add SM8350 PAS remoteprocs") Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Cc: stable(a)vger.kernel.org --- The device tree and pas documentation lists mcx as a required pd for cdsp. Looks like it was missed while adding the proxy pds in the pas driver. Bjorn/Vinod you'll need to test this patch before picking it up. drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index b921fc26cd04..ad20065dbdea 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -661,6 +661,7 @@ static const struct adsp_data sm8350_cdsp_resource = { }, .proxy_pd_names = (char*[]){ "cx", + "mxc", NULL }, .ssr_name = "cdsp", -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 years, 4 months

2
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2021