January 2024 - Linux-stable-mirror

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.7.1 release. There are 28 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 Sat, 20 Jan 2024 10:42:49 +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/v6.x/stable-review/patch-6.7.1-rc1.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.7.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.7.1-rc1 Sumanth Korikkar <sumanthk(a)linux.ibm.com> mm/memory_hotplug: fix memmap_on_memory sysfs value retrieval Vegard Nossum <vegard.nossum(a)oracle.com> docs: kernel_feat.py: fix potential command injection Carlos Llamas <cmllamas(a)google.com> scripts/decode_stacktrace.sh: optionally use LLVM utilities James Clark <james.clark(a)arm.com> coresight: etm4x: Fix width of CCITMIN field LeoLiuoc <LeoLiu-oc(a)zhaoxin.com> PCI: Add ACS quirk for more Zhaoxin Root Ports Florian Eckert <fe(a)dev.tdt.de> leds: ledtrig-tty: Free allocated ttyname buffer on deactivate Cameron Williams <cang1(a)live.co.uk> parport: parport_serial: Add Brainboxes device IDs and geometry Cameron Williams <cang1(a)live.co.uk> parport: parport_serial: Add Brainboxes BAR details Guanghui Feng <guanghuifeng(a)linux.alibaba.com> uio: Fix use-after-free in uio_open Carlos Llamas <cmllamas(a)google.com> binder: fix comment on binder_alloc_new_buf() return value Carlos Llamas <cmllamas(a)google.com> binder: fix trivial typo of binder_free_buf_locked() Carlos Llamas <cmllamas(a)google.com> binder: fix use-after-free in shinker's callback Carlos Llamas <cmllamas(a)google.com> binder: use EPOLLERR from eventpoll.h Junxiao Bi <junxiao.bi(a)oracle.com> Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d" Fedor Pchelkin <pchelkin(a)ispras.ru> ksmbd: free ppace array on error in parse_dacl Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: don't allow O_TRUNC open on read-only share Lewis Huang <lewis.huang(a)amd.com> drm/amd/display: Pass pwrseq inst for backlight and ABM Sjoerd Simons <sjoerd(a)collabora.com> bus: moxtet: Add spi device table Sjoerd Simons <sjoerd(a)collabora.com> bus: moxtet: Mark the irq as shared Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Add another DMI match for the TongFang GMxXGxx Lorenz Brun <lorenz(a)brun.one> ALSA: hda: cs35l41: Support more HP models without _DSD Tom Jason Schwanke <tom(a)catboys.cloud> ALSA: hda/realtek: Fix mute and mic-mute LEDs for HP Envy X360 13-ay0xxx Dorian Cruveiller <doriancruveiller(a)gmail.com> ALSA: hda/realtek: enable SND_PCI_QUIRK for Lenovo Legion Slim 7 Gen 8 (2023) serie Dorian Cruveiller <doriancruveiller(a)gmail.com> ALSA: hda: Add driver properties for cs35l41 for Lenovo Legion Slim 7 Gen 8 serie Stefan Binding <sbinding(a)opensource.cirrus.com> ALSA: hda: cs35l41: Prevent firmware load if SPI speed too low Stefan Binding <sbinding(a)opensource.cirrus.com> ALSA: hda: cs35l41: Support additional Dell models without _DSD Stefan Binding <sbinding(a)opensource.cirrus.com> ALSA: hda/realtek: Add quirks for Dell models Eric Biggers <ebiggers(a)google.com> f2fs: explicitly null-terminate the xattr list ------------- Diffstat: Documentation/admin-guide/features.rst | 2 +- Documentation/arch/arc/features.rst | 2 +- Documentation/arch/arm/features.rst | 2 +- Documentation/arch/arm64/features.rst | 2 +- Documentation/arch/loongarch/features.rst | 2 +- Documentation/arch/m68k/features.rst | 2 +- Documentation/arch/mips/features.rst | 2 +- Documentation/arch/nios2/features.rst | 2 +- Documentation/arch/openrisc/features.rst | 2 +- Documentation/arch/parisc/features.rst | 2 +- Documentation/arch/powerpc/features.rst | 2 +- Documentation/arch/riscv/features.rst | 2 +- Documentation/arch/s390/features.rst | 2 +- Documentation/arch/sh/features.rst | 2 +- Documentation/arch/sparc/features.rst | 2 +- Documentation/arch/x86/features.rst | 2 +- Documentation/arch/xtensa/features.rst | 2 +- Documentation/sphinx/kernel_feat.py | 57 ++-------- .../translations/zh_CN/arch/loongarch/features.rst | 2 +- .../translations/zh_CN/arch/mips/features.rst | 2 +- .../translations/zh_TW/arch/loongarch/features.rst | 2 +- .../translations/zh_TW/arch/mips/features.rst | 2 +- Makefile | 4 +- drivers/acpi/resource.c | 7 ++ drivers/android/binder.c | 2 +- drivers/android/binder_alloc.c | 10 +- drivers/bus/moxtet.c | 9 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 +- .../gpu/drm/amd/display/dc/bios/command_table2.c | 12 +- .../gpu/drm/amd/display/dc/bios/command_table2.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 8 +- drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 7 +- drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 2 +- .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 5 +- .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 16 +-- .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 36 ++++-- drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 2 + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 59 +++++++--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 14 ++- drivers/hwtracing/coresight/coresight-etm4x.h | 2 +- drivers/leds/trigger/ledtrig-tty.c | 4 + drivers/md/raid5.c | 12 -- drivers/parport/parport_serial.c | 64 +++++++++++ drivers/pci/quirks.c | 8 +- drivers/uio/uio.c | 7 +- fs/f2fs/xattr.c | 6 + fs/smb/server/smb2pdu.c | 23 ++-- fs/smb/server/smbacl.c | 11 +- mm/memory_hotplug.c | 8 +- scripts/decode_stacktrace.sh | 19 +++- sound/pci/hda/cs35l41_hda.c | 25 +++- sound/pci/hda/cs35l41_hda.h | 12 +- sound/pci/hda/cs35l41_hda_i2c.c | 2 +- sound/pci/hda/cs35l41_hda_property.c | 126 +++++++++++++++------ sound/pci/hda/cs35l41_hda_spi.c | 2 +- sound/pci/hda/patch_realtek.c | 18 +++ 58 files changed, 443 insertions(+), 209 deletions(-)

1 year, 1 month

12
41
0 0

Built-in Intel Bluetooth device disappeared after booting Linux 6.7

by Ramses

I am running an alder lake i7 1260P with built-in bluetooth. This adapter always worked fine with no special config, but since I booted Linux 6.7, the device completely disappeared. There's no mention of bluetooth in the kernel or system logs, there's no device node, and there's no entry in lspci. When I boot the last working kernel again (6.6.10), the device also doesn't appear (even though it did before, see logs below). I also tried booting a ubuntu live ISO to exclude any configuration issues with my distro's (NixOS) kernel or such, and also there the device did not show up. I am not sure at all that this is related to the kernel, but I wouldn't know where else to look. I am including below my system logs (journalctl -g 'blue|Blue|Linux') showing the kernel version and the bluetooth related entries. As you can see, on 6.6.10 the bluetooth module got loaded, /dev/hci0 gets created, and user space sets up the bluetooth stack. The next boot entry is the first time I booted 6.7, and there's no mention of bluetooth at all in the logs. I tried to load the bluetooth module manually, which succeeds but doesn't create a device node. When I boot 6.6.10 again now, I get exactly the same as on 6.7. I don't know if the kernel could have done anything persistent to the device that makes that it doesn't get initialised anymore? I'm not sure how to debug this further, let me know if there's a way to get more detailed info in the kernel logs or such. Thanks, Ramses Logs with 6.6.10: -- Boot 7847b5595e1d40a8bf2624542e5fff74 -- jan 09 02:03:50 localhost kernel: Linux version 6.6.10 (nixbld@localhost) (gcc (GCC) 12.3.0, GNU ld (GNU Binutils) 2.40) #1-NixOS SMP PREEMPT_DYNAMIC Fri Jan 5 14:19:45 UTC 2024 jan 09 02:03:50 localhost kernel: SELinux: Initializing. jan 09 02:03:50 localhost kernel: usb usb1: Manufacturer: Linux 6.6.10 xhci-hcd jan 09 02:03:50 localhost kernel: usb usb2: Manufacturer: Linux 6.6.10 xhci-hcd jan 09 02:04:02 starbook kernel: Linux agpgart interface v0.103 jan 09 02:04:02 starbook kernel: mc: Linux media interface: v0.10 jan 09 02:04:02 starbook kernel: Bluetooth: Core ver 2.22 jan 09 02:04:02 starbook kernel: Bluetooth: HCI device and connection manager initialized jan 09 02:04:02 starbook kernel: Bluetooth: HCI socket layer initialized jan 09 02:04:02 starbook kernel: Bluetooth: L2CAP socket layer initialized jan 09 02:04:02 starbook kernel: Bluetooth: SCO socket layer initialized jan 09 02:04:03 starbook kernel: videodev: Linux video capture interface: v2.00 jan 09 02:04:03 starbook kernel: Intel(R) Wireless WiFi driver for Linux jan 09 02:04:03 starbook kernel: Bluetooth: hci0: Firmware timestamp 2023.42 buildtype 1 build 73111 jan 09 02:04:03 starbook kernel: Bluetooth: hci0: No support for _PRR ACPI method jan 09 02:04:03 starbook kernel: Bluetooth: hci0: Found device firmware: intel/ibt-0041-0041.sfi jan 09 02:04:03 starbook kernel: Bluetooth: hci0: Boot Address: 0x100800 jan 09 02:04:03 starbook kernel: Bluetooth: hci0: Firmware Version: 151-42.23 jan 09 02:04:03 starbook kernel: Bluetooth: hci0: Firmware already loaded jan 09 02:04:03 starbook kernel: pps_core: LinuxPPS API ver. 1 registered jan 09 02:04:04 starbook dbus-broker-launch[1265]: Ignoring duplicate name 'org.bluez.mesh' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/system-services/org.bluez.> jan 09 02:04:04 starbook dbus-broker-launch[1265]: Ignoring duplicate name 'org.bluez' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/system-services/org.bluez.servi> jan 09 02:04:04 starbook systemd[1]: Starting Bluetooth service... jan 09 02:04:04 starbook (uetoothd)[1275]: bluetooth.service: ConfigurationDirectory 'bluetooth' already exists but the mode is different. (File system: 755 ConfigurationDirectoryMode: 555) jan 09 02:04:04 starbook kernel: Bluetooth: BNEP (Ethernet Emulation) ver 1.3 jan 09 02:04:04 starbook kernel: Bluetooth: BNEP socket layer initialized jan 09 02:04:04 starbook kernel: Bluetooth: MGMT ver 1.22 jan 09 02:04:04 starbook bluetoothd[1275]: Bluetooth daemon 5.70 jan 09 02:04:04 starbook bluetoothd[1275]: Bluetooth management interface 1.22 initialized jan 09 02:04:04 starbook systemd[1]: Started Bluetooth service. jan 09 02:04:04 starbook systemd[1]: Reached target Bluetooth Support. jan 09 02:04:05 starbook dbus-broker-launch[1774]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/hkws1iw1422s6jifkv2n6xc3iwad5pyg-system-path/share/dbus-1/services/org.bluez.obex.s> jan 09 02:04:05 starbook dbus-broker-launch[1774]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/services/org.bluez.obex.se> jan 09 02:04:08 starbook kernel: Bluetooth: RFCOMM TTY layer initialized jan 09 02:04:08 starbook kernel: Bluetooth: RFCOMM socket layer initialized jan 09 02:04:08 starbook kernel: Bluetooth: RFCOMM ver 1.11 jan 09 02:04:15 starbook dbus-broker-launch[2343]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/hkws1iw1422s6jifkv2n6xc3iwad5pyg-system-path/share/dbus-1/services/org.bluez.obex.s> jan 09 02:04:15 starbook dbus-broker-launch[2343]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/services/org.bluez.obex.se> jan 09 09:22:05 starbook systemd[1]: Stopped target Bluetooth Support. jan 09 09:22:05 starbook systemd[1]: Stopping Bluetooth service... jan 09 09:22:05 starbook systemd[1]: bluetooth.service: Deactivated successfully. jan 09 09:22:05 starbook systemd[1]: Stopped Bluetooth service. With 6.7 -- Boot 7840f56ab2434c9fb1b899e7abea32cc -- jan 09 09:26:07 localhost kernel: Linux version 6.7.0 (nixbld@localhost) (gcc (GCC) 12.3.0, GNU ld (GNU Binutils) 2.40) #1-NixOS SMP PREEMPT_DYNAMIC Sun Jan 7 20:18:38 UTC 2024 jan 09 09:26:07 localhost kernel: SELinux: Initializing. jan 09 09:26:07 localhost kernel: usb usb1: Manufacturer: Linux 6.7.0 xhci-hcd jan 09 09:26:07 localhost kernel: usb usb2: Manufacturer: Linux 6.7.0 xhci-hcd jan 09 09:26:17 starbook kernel: mc: Linux media interface: v0.10 jan 09 09:26:17 starbook kernel: Linux agpgart interface v0.103 jan 09 09:26:17 starbook kernel: videodev: Linux video capture interface: v2.00 jan 09 09:26:17 starbook kernel: Intel(R) Wireless WiFi driver for Linux jan 09 09:26:17 starbook kernel: pps_core: LinuxPPS API ver. 1 registered jan 09 09:26:18 starbook dbus-broker-launch[1198]: Ignoring duplicate name 'org.bluez.mesh' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/system-services/org.bluez.> jan 09 09:26:18 starbook dbus-broker-launch[1198]: Ignoring duplicate name 'org.bluez' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/system-services/org.bluez.servi> jan 09 09:26:20 starbook dbus-broker-launch[1691]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/faz2vqhyjls6xvblgv959qpsj33bclwa-system-path/share/dbus-1/services/org.bluez.obex.s> jan 09 09:26:20 starbook dbus-broker-launch[1691]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/services/org.bluez.obex.se> jan 09 09:26:39 starbook dbus-broker-launch[2309]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/faz2vqhyjls6xvblgv959qpsj33bclwa-system-path/share/dbus-1/services/org.bluez.obex.s> jan 09 09:26:39 starbook dbus-broker-launch[2309]: Ignoring duplicate name 'org.bluez.obex' in service file '/nix/store/6dln0pmd1zb9xg4c81l3k08igxh98j0w-bluez-5.70/share/dbus-1/services/org.bluez.obex.se> jan 09 09:26:43 starbook systemd[1]: Bluetooth service was skipped because of an unmet condition check (ConditionPathIsDirectory=/sys/class/bluetooth). lspci output (on 6.7): ➜ lspci -v 00:00.0 Host bridge: Intel Corporation Device 4621 (rev 02) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0 Capabilities: <access denied> Kernel driver in use: igen6_edac Kernel modules: igen6_edac 00:02.0 VGA compatible controller: Intel Corporation Alder Lake-P GT2 [Iris Xe Graphics] (rev 0c) (prog-if 00 [VGA controller]) DeviceName: VGA compatible controller Subsystem: Intel Corporation Alder Lake-P GT2 [Iris Xe Graphics] Flags: bus master, fast devsel, latency 0, IRQ 158 Memory at 81000000 (64-bit, non-prefetchable) [size=16M] Memory at 90000000 (64-bit, prefetchable) [size=256M] I/O ports at 1000 [size=64] Expansion ROM at 000c0000 [virtual] [disabled] [size=128K] Capabilities: <access denied> Kernel driver in use: i915 Kernel modules: i915 00:08.0 System peripheral: Intel Corporation 12th Gen Core Processor Gaussian & Neural Accelerator (rev 02) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0, IRQ 255 Memory at 80720000 (64-bit, non-prefetchable) [size=4K] Capabilities: <access denied> 00:0a.0 Signal processing controller: Intel Corporation Platform Monitoring Technology (rev 01) Subsystem: Intel Corporation Device 7270 Flags: fast devsel Memory at 80710000 (64-bit, non-prefetchable) [size=32K] Capabilities: <access denied> Kernel driver in use: intel_vsec Kernel modules: intel_vsec 00:14.0 USB controller: Intel Corporation Alder Lake PCH USB 3.2 xHCI Host Controller (rev 01) (prog-if 30 [XHCI]) Flags: bus master, medium devsel, latency 0, IRQ 124 Memory at 80700000 (64-bit, non-prefetchable) [size=64K] Capabilities: <access denied> Kernel driver in use: xhci_hcd Kernel modules: xhci_pci 00:14.2 RAM memory: Intel Corporation Alder Lake PCH Shared SRAM (rev 01) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0 Memory at 80718000 (64-bit, non-prefetchable) [size=16K] Memory at 80721000 (64-bit, non-prefetchable) [size=4K] Capabilities: <access denied> 00:15.0 Serial bus controller: Intel Corporation Alder Lake PCH Serial IO I2C Controller #0 (rev 01) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0, IRQ 37 Memory at 80722000 (64-bit, non-prefetchable) [size=4K] Capabilities: <access denied> Kernel driver in use: intel-lpss Kernel modules: intel_lpss_pci 00:1c.0 PCI bridge: Intel Corporation Device 51bc (rev 01) (prog-if 00 [Normal decode]) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0, IRQ 122 Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: [disabled] [16-bit] Memory behind bridge: 80400000-804fffff [size=1M] [32-bit] Prefetchable memory behind bridge: [disabled] [64-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:1d.0 PCI bridge: Intel Corporation Alder Lake PCI Express Root Port #9 (rev 01) (prog-if 00 [Normal decode]) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0, IRQ 123 Bus: primary=00, secondary=02, subordinate=02, sec-latency=0 I/O behind bridge: 2000-2fff [size=4K] [16-bit] Memory behind bridge: 80500000-805fffff [size=1M] [32-bit] Prefetchable memory behind bridge: 87fc00000-87fdfffff [size=2M] [32-bit] Capabilities: <access denied> Kernel driver in use: pcieport 00:1e.0 Communication controller: Intel Corporation Alder Lake PCH UART #0 (rev 01) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0, IRQ 23 Memory at fe03e000 (64-bit, non-prefetchable) [size=4K] Memory at 80724000 (64-bit, non-prefetchable) [size=4K] Capabilities: <access denied> Kernel driver in use: intel-lpss Kernel modules: intel_lpss_pci 00:1f.0 ISA bridge: Intel Corporation Alder Lake PCH eSPI Controller (rev 01) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0 00:1f.3 Audio device: Intel Corporation Alder Lake PCH-P High Definition Audio Controller (rev 01) Flags: bus master, fast devsel, latency 64, IRQ 159 Memory at 8071c000 (64-bit, non-prefetchable) [size=16K] Memory at 80600000 (64-bit, non-prefetchable) [size=1M] Capabilities: <access denied> Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel, snd_sof_pci_intel_tgl 00:1f.4 SMBus: Intel Corporation Alder Lake PCH-P SMBus Host Controller (rev 01) Subsystem: Intel Corporation Device 7270 Flags: medium devsel, IRQ 23 Memory at 80726000 (64-bit, non-prefetchable) [size=256] I/O ports at efa0 [size=32] Kernel driver in use: i801_smbus Kernel modules: i2c_i801 00:1f.5 Serial bus controller: Intel Corporation Alder Lake-P PCH SPI Controller (rev 01) Subsystem: Intel Corporation Device 7270 Flags: bus master, fast devsel, latency 0 Memory at 80725000 (32-bit, non-prefetchable) [size=4K] Kernel driver in use: intel-spi Kernel modules: spi_intel_pci 01:00.0 Network controller: Intel Corporation Wi-Fi 6 AX210/AX211/AX411 160MHz (rev 1a) Subsystem: Intel Corporation Wi-Fi 6 AX210 160MHz Flags: bus master, fast devsel, latency 0, IRQ 16 Memory at 80400000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: iwlwifi Kernel modules: iwlwifi 02:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd NVMe SSD Controller S4LV008[Pascal] (prog-if 02 [NVM Express]) Subsystem: Samsung Electronics Co Ltd Device a801 Physical Slot: 8 Flags: bus master, fast devsel, latency 0, IRQ 16 Memory at 80500000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: nvme Kernel modules: nvme

1 year, 1 month

2
3
0 0

[PATCH] block: Remove unnecessary unlikely()

by Matthew Wilcox (Oracle)

Jens added unlikely() thinking that this was an error path. It's actually just the end of the iteration, so does not warrant an unlikely(). Fixes: 7bed6f3d08b7 ("block: Fix iterating over an empty bio with bio_for_each_folio_all") Cc: stable(a)vger.kernel.org Signed-off-by: Matthew Wilcox (Oracle) <willy(a)infradead.org> --- include/linux/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index 875d792bffff..1518f1201ddd 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -286,7 +286,7 @@ static inline void bio_first_folio(struct folio_iter *fi, struct bio *bio, { struct bio_vec *bvec = bio_first_bvec_all(bio) + i; - if (unlikely(i >= bio->bi_vcnt)) { + if (i >= bio->bi_vcnt) { fi->folio = NULL; return; } -- 2.43.0

1 year, 1 month

2
2
0 0

[PATCH V2 1/3] wifi: brcmfmac: Demote vendor-specific attach/detach messages to info

by Arend van Spriel

From: Hector Martin <marcan(a)marcan.st> People are getting spooked by brcmfmac errors on their boot console. There's no reason for these messages to be errors. Cc: stable(a)vger.kernel.org # 6.2.x Fixes: d6a5c562214f ("wifi: brcmfmac: add support for vendor-specific firmware api") Signed-off-by: Hector Martin <marcan(a)marcan.st> [arend.vanspriel(a)broadcom.com: remove attach/detach vendor callbacks] Signed-off-by: Arend van Spriel <arend.vanspriel(a)broadcom.com> --- .../broadcom/brcm80211/brcmfmac/bca/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/cyw/core.c | 13 ---------- .../broadcom/brcm80211/brcmfmac/fwvid.c | 7 +++-- .../broadcom/brcm80211/brcmfmac/fwvid.h | 26 ++----------------- .../broadcom/brcm80211/brcmfmac/wcc/core.c | 15 +---------- 5 files changed, 6 insertions(+), 68 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c index a5d9ac5e6763..a963c242975a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c @@ -11,17 +11,6 @@ #include "vops.h" -static int brcmf_bca_attach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); - return 0; -} - -static void brcmf_bca_detach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); -} - static void brcmf_bca_feat_attach(struct brcmf_if *ifp) { /* SAE support not confirmed so disabling for now */ @@ -29,7 +18,5 @@ static void brcmf_bca_feat_attach(struct brcmf_if *ifp) } const struct brcmf_fwvid_ops brcmf_bca_ops = { - .attach = brcmf_bca_attach, - .detach = brcmf_bca_detach, .feat_attach = brcmf_bca_feat_attach, }; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c index 24670497f1a4..bec5748310b9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c @@ -11,17 +11,6 @@ #include "vops.h" -static int brcmf_cyw_attach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); - return 0; -} - -static void brcmf_cyw_detach(struct brcmf_pub *drvr) -{ - pr_err("%s: executing\n", __func__); -} - static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto) { @@ -49,7 +38,5 @@ static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, } const struct brcmf_fwvid_ops brcmf_cyw_ops = { - .attach = brcmf_cyw_attach, - .detach = brcmf_cyw_detach, .set_sae_password = brcmf_cyw_set_sae_pwd, }; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c index 86eafdb40541..f633e2bbd891 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c @@ -89,8 +89,7 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *vmod, if (fwvid >= BRCMF_FWVENDOR_NUM) return -ERANGE; - if (WARN_ON(!vmod) || WARN_ON(!vops) || - WARN_ON(!vops->attach) || WARN_ON(!vops->detach)) + if (WARN_ON(!vmod) || WARN_ON(!vops)) return -EINVAL; if (WARN_ON(fwvid_list[fwvid].vmod)) @@ -150,7 +149,7 @@ static inline int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid) } #endif -int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr) +int brcmf_fwvid_attach(struct brcmf_pub *drvr) { enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid; int ret; @@ -175,7 +174,7 @@ int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr) return ret; } -void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr) +void brcmf_fwvid_detach(struct brcmf_pub *drvr) { enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h index d9fc76b46db9..dac22534d033 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h @@ -12,8 +12,6 @@ struct brcmf_pub; struct brcmf_if; struct brcmf_fwvid_ops { - int (*attach)(struct brcmf_pub *drvr); - void (*detach)(struct brcmf_pub *drvr); void (*feat_attach)(struct brcmf_if *ifp); int (*set_sae_password)(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto); }; @@ -24,30 +22,10 @@ int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *mod, int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod); /* core driver functions */ -int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr); -void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr); +int brcmf_fwvid_attach(struct brcmf_pub *drvr); +void brcmf_fwvid_detach(struct brcmf_pub *drvr); const char *brcmf_fwvid_vendor_name(struct brcmf_pub *drvr); -static inline int brcmf_fwvid_attach(struct brcmf_pub *drvr) -{ - int ret; - - ret = brcmf_fwvid_attach_ops(drvr); - if (ret) - return ret; - - return drvr->vops->attach(drvr); -} - -static inline void brcmf_fwvid_detach(struct brcmf_pub *drvr) -{ - if (!drvr->vops) - return; - - drvr->vops->detach(drvr); - brcmf_fwvid_detach_ops(drvr); -} - static inline void brcmf_fwvid_feat_attach(struct brcmf_if *ifp) { const struct brcmf_fwvid_ops *vops = ifp->drvr->vops; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c index 2d8f80bd7382..fd593b93ad40 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c @@ -7,21 +7,10 @@ #include <core.h> #include <bus.h> #include <fwvid.h> -#include <fwil.h> +#include <cfg80211.h> #include "vops.h" -static int brcmf_wcc_attach(struct brcmf_pub *drvr) -{ - pr_debug("%s: executing\n", __func__); - return 0; -} - -static void brcmf_wcc_detach(struct brcmf_pub *drvr) -{ - pr_debug("%s: executing\n", __func__); -} - static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto) { @@ -30,7 +19,5 @@ static int brcmf_wcc_set_sae_pwd(struct brcmf_if *ifp, } const struct brcmf_fwvid_ops brcmf_wcc_ops = { - .attach = brcmf_wcc_attach, - .detach = brcmf_wcc_detach, .set_sae_password = brcmf_wcc_set_sae_pwd, }; -- 2.32.0

1 year, 1 month

4
4
0 0

[PATCH] block: Fix iterating over an empty bio with bio_for_each_folio_all

by Matthew Wilcox (Oracle)

If the bio contains no data, bio_first_folio() calls page_folio() on a NULL pointer and oopses. Move the test that we've reached the end of the bio from bio_next_folio() to bio_first_folio(). Reported-by: syzbot+8b23309d5788a79d3eea(a)syzkaller.appspotmail.com Reported-by: syzbot+004c1e0fced2b4bc3dcc(a)syzkaller.appspotmail.com Fixes: 640d1930bef4 ("block: Add bio_for_each_folio_all()") Cc: stable(a)vger.kernel.org Signed-off-by: Matthew Wilcox (Oracle) <willy(a)infradead.org> --- include/linux/bio.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index ec4db73e5f4e..1518f1201ddd 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -286,6 +286,11 @@ static inline void bio_first_folio(struct folio_iter *fi, struct bio *bio, { struct bio_vec *bvec = bio_first_bvec_all(bio) + i; + if (i >= bio->bi_vcnt) { + fi->folio = NULL; + return; + } + fi->folio = page_folio(bvec->bv_page); fi->offset = bvec->bv_offset + PAGE_SIZE * (bvec->bv_page - &fi->folio->page); @@ -303,10 +308,8 @@ static inline void bio_next_folio(struct folio_iter *fi, struct bio *bio) fi->offset = 0; fi->length = min(folio_size(fi->folio), fi->_seg_count); fi->_next = folio_next(fi->folio); - } else if (fi->_i + 1 < bio->bi_vcnt) { - bio_first_folio(fi, bio, fi->_i + 1); } else { - fi->folio = NULL; + bio_first_folio(fi, bio, fi->_i + 1); } } -- 2.43.0

1 year, 1 month

3
2
0 0

[PATCH v4 3/4] ASoC: codecs: lpass-wsa-macro: fix compander volume hack

by Johan Hovold

The LPASS WSA macro codec driver is updating the digital gain settings behind the back of user space on DAPM events if companding has been enabled. As compander control is exported to user space, this can result in the digital gain setting being incremented (or decremented) every time the sound server is started and the codec suspended depending on what the UCM configuration looks like. Soon enough playback will become distorted (or too quiet). This is specifically a problem on the Lenovo ThinkPad X13s as this bypasses the limit for the digital gain setting that has been set by the machine driver. Fix this by simply dropping the compander gain offset hack. If someone cares about modelling the impact of the compander setting this can possibly be done by exporting it as a volume control later. Note that the volume registers still need to be written after enabling clocks in order for any prior updates to take effect. Fixes: 2c4066e5d428 ("ASoC: codecs: lpass-wsa-macro: add dapm widgets and route") Cc: stable(a)vger.kernel.org # 5.11 Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- sound/soc/codecs/lpass-wsa-macro.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 7e21cec3c2fb..6ce309980cd1 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1584,7 +1584,6 @@ static int wsa_macro_enable_interpolator(struct snd_soc_dapm_widget *w, u16 gain_reg; u16 reg; int val; - int offset_val = 0; struct wsa_macro *wsa = snd_soc_component_get_drvdata(component); if (w->shift == WSA_MACRO_COMP1) { @@ -1623,10 +1622,8 @@ static int wsa_macro_enable_interpolator(struct snd_soc_dapm_widget *w, CDC_WSA_RX1_RX_PATH_MIX_SEC0, CDC_WSA_RX_PGA_HALF_DB_MASK, CDC_WSA_RX_PGA_HALF_DB_ENABLE); - offset_val = -2; } val = snd_soc_component_read(component, gain_reg); - val += offset_val; snd_soc_component_write(component, gain_reg, val); wsa_macro_config_ear_spkr_gain(component, wsa, event, gain_reg); @@ -1654,10 +1651,6 @@ static int wsa_macro_enable_interpolator(struct snd_soc_dapm_widget *w, CDC_WSA_RX1_RX_PATH_MIX_SEC0, CDC_WSA_RX_PGA_HALF_DB_MASK, CDC_WSA_RX_PGA_HALF_DB_DISABLE); - offset_val = 2; - val = snd_soc_component_read(component, gain_reg); - val += offset_val; - snd_soc_component_write(component, gain_reg, val); } wsa_macro_config_ear_spkr_gain(component, wsa, event, gain_reg); -- 2.41.0

1 year, 1 month

1
0
0 0

[PATCH v4 1/4] ASoC: codecs: wsa883x: fix PA volume control

by Johan Hovold

The PA gain can be set in steps of 1.5 dB from -3 dB to 18 dB, that is, in 15 levels. Fix the dB values for the PA volume control as experiments using wsa8835 show that the first 16 levels all map to the same lowest gain while the last three map to the highest gain. These values specifically need to be correct for the sound server to provide proper volume control. Note that level 0 (-3 dB) does not mute the PA so the mute flag should also not be set. Fixes: cdb09e623143 ("ASoC: codecs: wsa883x: add control, dapm widgets and map") Cc: stable(a)vger.kernel.org # 6.0 Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- sound/soc/codecs/wsa883x.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index cb83c569e18d..a2e86ef7d18f 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -1098,7 +1098,11 @@ static int wsa_dev_mode_put(struct snd_kcontrol *kcontrol, return 1; } -static const DECLARE_TLV_DB_SCALE(pa_gain, -300, 150, -300); +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(pa_gain, + 0, 14, TLV_DB_SCALE_ITEM(-300, 0, 0), + 15, 29, TLV_DB_SCALE_ITEM(-300, 150, 0), + 30, 31, TLV_DB_SCALE_ITEM(1800, 0, 0), +); static int wsa883x_get_swr_port(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -- 2.41.0

1 year, 1 month

1
0
0 0

[REGRESSION] After kernel upgrade 6.1.70 to 6.1.71, the computer hangs during shutdown

by email200202

#regzbot introduced: v6.1.70..v6.1.71 After kernel upgrade 6.1.70 to 6.1.71, the computer hangs during shutdown. The problem is related to NFS service. Stopping NFS service hangs: # /etc/init.d/nfs stop * Caching service dependencies ... [ ok ] * Stopping NFS mountd ... [ ok ] * Stopping NFS daemon ... [ ok ] then it hangs Shutdown does not hang when NFS service is removed. # rc-update del nfs I had this kernel error in the log: Jan 10 17:32:25 [rpc.mountd] Caught signal 15, un-registering and exiting. Jan 10 17:32:25 [kernel] [ 2005.560991] ------------[ cut here ]------------ Jan 10 17:32:25 [kernel] [ 2005.560996] kernel BUG at net/sunrpc/svc.c:576! Jan 10 17:32:25 [kernel] [ 2005.561004] invalid opcode: 0000 [#1] PREEMPT SMP PTI Jan 10 17:32:25 [kernel] [ 2005.561012] CPU: 0 PID: 8079 Comm: nfsd Tainted: P O 6.1.71-gentoo #1 Jan 10 17:32:25 [kernel] [ 2005.561017] Hardware name: Gigabyte Technology Co., Ltd. X58A-UD3R/X58A-UD3R, BIOS FB 08/24/2010 Jan 10 17:32:25 [kernel] [ 2005.561020] RIP: 0010:svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561033] Code: 5b 5d 41 5c 41 5d c3 cc cc cc cc 55 48 8d 6f ec 53 48 89 fb 48 83 c7 44 e8 b6 6c 5f ff 48 8b 53 1c 48 8d 43 1c 48 39 c2 74 02 <0f> 0b 48 8b 53 2c 48 8d 43 2c 48 39 c2 74 02 0f 0b 48 89 ef e8 6b Jan 10 17:32:25 [kernel] [ 2005.561038] RSP: 0018:ffffc90001edbee8 EFLAGS: 00010287 Jan 10 17:32:25 [kernel] [ 2005.561043] RAX: ffff88816c1a1c30 RBX: ffff88816c1a1c14 RCX: 0000000000000000 Jan 10 17:32:25 [kernel] [ 2005.561047] RDX: ffff88813dfcc018 RSI: 0000000000000286 RDI: ffff88890bc9b9c0 Jan 10 17:32:25 [kernel] [ 2005.561051] RBP: ffff88816c1a1c00 R08: ffff88810310b600 R09: 0000000000000000 Jan 10 17:32:25 [kernel] [ 2005.561055] R10: ffff8881bc3b4000 R11: ffff8881bc3b4000 R12: ffffffff82e061c0 Jan 10 17:32:25 [kernel] [ 2005.561058] R13: ffff8881bc0e8000 R14: ffff88810310b600 R15: ffffc90002323c80 Jan 10 17:32:25 [kernel] [ 2005.561062] FS: 0000000000000000(0000) GS:ffff88890bc00000(0000) knlGS:0000000000000000 Jan 10 17:32:25 [kernel] [ 2005.561067] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Jan 10 17:32:25 [kernel] [ 2005.561071] CR2: 000055e971e376f8 CR3: 000000000260a000 CR4: 00000000000006f0 Jan 10 17:32:25 [kernel] [ 2005.561075] Call Trace: Jan 10 17:32:25 [kernel] [ 2005.561079] <TASK> Jan 10 17:32:25 [kernel] [ 2005.561082] ? __die_body+0x15/0x57 Jan 10 17:32:25 [kernel] [ 2005.561091] ? die+0x2b/0x44 Jan 10 17:32:25 [kernel] [ 2005.561097] ? do_trap+0x76/0xf9 Jan 10 17:32:25 [kernel] [ 2005.561102] ? svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561108] ? svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561114] ? do_error_trap+0x69/0x93 Jan 10 17:32:25 [kernel] [ 2005.561119] ? svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561126] ? exc_invalid_op+0x49/0x5d Jan 10 17:32:25 [kernel] [ 2005.561133] ? svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561139] ? asm_exc_invalid_op+0x16/0x20 Jan 10 17:32:25 [kernel] [ 2005.561148] ? svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561155] ? svc_destroy+0x12/0x56 Jan 10 17:32:25 [kernel] [ 2005.561161] nfsd+0x13d/0x162 Jan 10 17:32:25 [kernel] [ 2005.561170] ? svc_put+0x2f/0x2f Jan 10 17:32:25 [kernel] [ 2005.561176] kthread+0xd0/0xd8 Jan 10 17:32:25 [kernel] [ 2005.561183] ? kthread_complete_and_exit+0x16/0x16 Jan 10 17:32:25 [kernel] [ 2005.561189] ret_from_fork+0x22/0x30 Jan 10 17:32:25 [kernel] [ 2005.561196] </TASK> Jan 10 17:32:25 [kernel] [ 2005.561198] Modules linked in: snd_seq_dummy snd_seq snd_seq_device nvidia_uvm(PO) bluetooth ecdh_generic ecc bridge stp llc ipv6 crc_ccitt ch341 usbserial nvidia_drm(PO) nvidia_modeset(PO) nvidia(PO) tda10048 tda8290 iTCO_wdt iTCO_vendor_support tda18271 it87 hwmon_vid dm_crypt coretemp dm_multipath dm_mod kvm_intel dax video snd_hda_codec_realtek snd_hda_codec_generic kvm drm_kms_helper irqbypass ledtrig_audio i2c_i801 pcspkr serio_raw drm i2c_smbus snd_hda_intel i2c_core snd_intel_dspcfg fb_sys_fops syscopyarea snd_hda_codec sysfillrect lpc_ich snd_hda_core sysimgblt mfd_core snd_hwdep uhci_hcd rtc_cmos wmi Jan 10 17:32:25 [kernel] [ 2005.561274] ---[ end trace 0000000000000000 ]--- Jan 10 17:32:25 [kernel] [ 2005.561277] RIP: 0010:svc_destroy+0x1f/0x56 Jan 10 17:32:25 [kernel] [ 2005.561284] Code: 5b 5d 41 5c 41 5d c3 cc cc cc cc 55 48 8d 6f ec 53 48 89 fb 48 83 c7 44 e8 b6 6c 5f ff 48 8b 53 1c 48 8d 43 1c 48 39 c2 74 02 <0f> 0b 48 8b 53 2c 48 8d 43 2c 48 39 c2 74 02 0f 0b 48 89 ef e8 6b The problem is always reproducible. Steps to reproduce: 1. Update to kernel 6.1.71 2. Start nfs service 3. Try to shutdown 4. The computer hangs Reverting the following 3 commits fixed the problem in kernel 6.1.71: f9a01938e07910224d4a2fd00583725d686c3f38 bb4f791cb2de1140d0fbcedfe9e791ff364021d7 03d68ffc48b94cc1e15bbf3b4f16f1e1e4fa286a

1 year, 1 month

5
9
0 0

[PATCH] drm/i915/psr: Only allow PSR in LPSP mode on HSW non-ULT

by Ville Syrjala

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> On HSW non-ULT (or at least on Dell Latitude E6540) external displays start to flicker when we enable PSR on the eDP. We observe a much higher SR and PC6 residency than should be possible with an external display, and indeen much higher than what we observe with eDP disabled and only the external display enabled. Looks like the hardware is somehow ignoring the fact that the external display is active during PSR. I wasn't able to redproduce this on my HSW ULT machine, or BDW. So either there's something specific about this particular laptop (eg. some unknown firmware thing) or the issue is limited to just non-ULT HSW systems. All known registers that could affect this look perfectly reasonable on the affected machine. As a workaround let's unmask the LPSP event to prevent PSR entry except while in LPSP mode (only pipe A + eDP active). This will prevent PSR entry entirely when multiple pipes are active. The one slight downside is that we now also prevent PSR entry when driving eDP with pipe B or C, but I think that's a reasonable tradeoff to avoid having to implement a more complex workaround. Cc: stable(a)vger.kernel.org Fixes: 783d8b80871f ("drm/i915/psr: Re-enable PSR1 on hsw/bdw") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10092 Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/i915/display/intel_psr.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 696d5d32ca9d..1010b8c405df 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1544,8 +1544,18 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, * can rely on frontbuffer tracking. */ mask = EDP_PSR_DEBUG_MASK_MEMUP | - EDP_PSR_DEBUG_MASK_HPD | - EDP_PSR_DEBUG_MASK_LPSP; + EDP_PSR_DEBUG_MASK_HPD; + + /* + * For some unknown reason on HSW non-ULT (or at least on + * Dell Latitude E6540) external displays start to flicker + * when PSR is enabled on the eDP. SR/PC6 residency is much + * higher than should be possible with an external display. + * As a workaround leave LPSP unmasked to prevent PSR entry + * when external displays are active. + */ + if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL_ULT(dev_priv)) + mask |= EDP_PSR_DEBUG_MASK_LPSP; if (DISPLAY_VER(dev_priv) < 20) mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP; -- 2.41.0

1 year, 1 month

2
1
0 0

[PATCH] Revert "drm/amd/pm: fix the high voltage and temperature issue"

by Mario Limonciello

This reverts commit 5f38ac54e60562323ea4abb1bfb37d043ee23357. This causes issues with rebooting and the 7800XT. Cc: Kenneth Feng <kenneth.feng(a)amd.com> Cc: stable(a)vger.kernel.org Fixes: 5f38ac54e605 ("drm/amd/pm: fix the high voltage and temperature issue") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3062 Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++++---------- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 ++----------------- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +---- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +---- 5 files changed, 11 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index b4c19e3d0bf1..56d9dfa61290 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4131,23 +4131,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, } } } else { - switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) { - case IP_VERSION(13, 0, 0): - case IP_VERSION(13, 0, 7): - case IP_VERSION(13, 0, 10): - r = psp_gpu_reset(adev); - break; - default: - tmp = amdgpu_reset_method; - /* It should do a default reset when loading or reloading the driver, - * regardless of the module parameter reset_method. - */ - amdgpu_reset_method = AMD_RESET_METHOD_NONE; - r = amdgpu_asic_reset(adev); - amdgpu_reset_method = tmp; - break; - } - + tmp = amdgpu_reset_method; + /* It should do a default reset when loading or reloading the driver, + * regardless of the module parameter reset_method. + */ + amdgpu_reset_method = AMD_RESET_METHOD_NONE; + r = amdgpu_asic_reset(adev); + amdgpu_reset_method = tmp; if (r) { dev_err(adev->dev, "asic reset on init failed\n"); goto failed; diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index c16703868e5c..961cd2aaf137 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -733,7 +733,7 @@ static int smu_early_init(void *handle) smu->adev = adev; smu->pm_enabled = !!amdgpu_dpm; smu->is_apu = false; - smu->smu_baco.state = SMU_BACO_STATE_NONE; + smu->smu_baco.state = SMU_BACO_STATE_EXIT; smu->smu_baco.platform_support = false; smu->user_dpm_profile.fan_mode = -1; @@ -1961,31 +1961,10 @@ static int smu_smc_hw_cleanup(struct smu_context *smu) return 0; } -static int smu_reset_mp1_state(struct smu_context *smu) -{ - struct amdgpu_device *adev = smu->adev; - int ret = 0; - - if ((!adev->in_runpm) && (!adev->in_suspend) && - (!amdgpu_in_reset(adev))) - switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) { - case IP_VERSION(13, 0, 0): - case IP_VERSION(13, 0, 7): - case IP_VERSION(13, 0, 10): - ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD); - break; - default: - break; - } - - return ret; -} - static int smu_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct smu_context *smu = adev->powerplay.pp_handle; - int ret; if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) return 0; @@ -2003,15 +1982,7 @@ static int smu_hw_fini(void *handle) adev->pm.dpm_enabled = false; - ret = smu_smc_hw_cleanup(smu); - if (ret) - return ret; - - ret = smu_reset_mp1_state(smu); - if (ret) - return ret; - - return 0; + return smu_smc_hw_cleanup(smu); } static void smu_late_fini(void *handle) diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h index 2aa4fea87314..66e84defd0b6 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h @@ -424,7 +424,6 @@ enum smu_reset_mode { enum smu_baco_state { SMU_BACO_STATE_ENTER = 0, SMU_BACO_STATE_EXIT, - SMU_BACO_STATE_NONE, }; struct smu_baco_context { diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c index 231122622a9c..bc8bd67c48ac 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c @@ -2748,13 +2748,7 @@ static int smu_v13_0_0_set_mp1_state(struct smu_context *smu, switch (mp1_state) { case PP_MP1_STATE_UNLOAD: - ret = smu_cmn_send_smc_msg_with_param(smu, - SMU_MSG_PrepareMp1ForUnload, - 0x55, NULL); - - if (!ret && smu->smu_baco.state == SMU_BACO_STATE_EXIT) - ret = smu_v13_0_disable_pmfw_state(smu); - + ret = smu_cmn_set_mp1_state(smu, mp1_state); break; default: /* Ignore others */ diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c index 59606a19e3d2..0906221231ea 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c @@ -2504,13 +2504,7 @@ static int smu_v13_0_7_set_mp1_state(struct smu_context *smu, switch (mp1_state) { case PP_MP1_STATE_UNLOAD: - ret = smu_cmn_send_smc_msg_with_param(smu, - SMU_MSG_PrepareMp1ForUnload, - 0x55, NULL); - - if (!ret && smu->smu_baco.state == SMU_BACO_STATE_EXIT) - ret = smu_v13_0_disable_pmfw_state(smu); - + ret = smu_cmn_set_mp1_state(smu, mp1_state); break; default: /* Ignore others */ -- 2.34.1

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2024