kernel/git/next/linux-next.git/drivers/power, branch master

Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git

2026-07-09T15:27:28+00:00

power: supply: surface_{battery,charger}: Consistently define ssam_device_ids using named initializers

2026-07-09T08:53:55+00:00

The .driver_data member of the the two struct ssam_device_id arrays were initialized by list expressions. This isn't easily readable if you don't work with the Surface System Aggregator core regularily. Using named initializers is more explicit and thus easier to parse and also more robust to changes of the struct definition. This robustness is relevant for a planned change to struct ssam_device_id replacing .driver_data by an anonymous union. While touching these arrays, also drop the comma after the list terminators. This change doesn't introduce changes to the compiled ssam_device_id arrays. Signed-off-by: Uwe Kleine-König (The Capable Hub) Reviewed-by: Maximilian Luz Link: https://patch.msgid.link/bc8eff03b2f36c82af5a75fc7114c277228921db.1781526433.git.u.kleine-koenig@baylibre.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen

power: sequencing: pwrseq-pcie-m2: Add QCC2072 BT PCI device ID

2026-07-06T10:27:18+00:00

Add the Qualcomm QCC2072 Bluetooth device (PCI ID 0x1112) to the pwrseq_m2_pci_ids table so the M.2 power sequencer can create the serdev node for its BT interface on enumeration. Signed-off-by: Krishna Chaitanya Chundru Link: https://patch.msgid.link/20260703-eliza_evk-v1-3-7624440bd76d@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski

power: sequencing: pcie-m2: Add QCA2066 (QCNFA765) BT serdev ID

2026-07-03T08:30:08+00:00

Add PCI IDs for Qualcomm QCA2066/QCNFA765 to the M.2 serdev ID table, mapping it to the qcom,qca2066-bt compatible string. The Subsystem Vendor ID (SVID) 0x0108 distinguishes the QCA2066 from the WCN6855. This allows the pwrseq-pcie-m2 driver to automatically create the Bluetooth serdev device when a QCA2066-based M.2 card is enumerated. Reviewed-by: Manivannan Sadhasivam Reviewed-by: Dmitry Baryshkov Signed-off-by: Loic Poulain Link: https://patch.msgid.link/20260702-monza-wireless-v2-2-7b56e2a6a6d4@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski

Replace by more specific (c files)

2026-07-03T05:38:17+00:00

Replace the #include of by the more specific where applicable. For most cases the include can be dropped completely, only a few drivers need one or two headers added. Acked-by: Danilo Krummrich Acked-by: Takashi Sakamoto Acked-by: Bjorn Helgaas Link: https://patch.msgid.link/1a3f2007c5c5dcf555c09a4035ce3ae8ef1b6c49.1782808461.git.u.kleine-koenig@baylibre.com Signed-off-by: Uwe Kleine-König (The Capable Hub)

power: sequencing: pcie-m2: Add PCI ID for NXP 88W9098 and AW693 Bluetooth

2026-06-26T08:10:56+00:00

88W9098 is a NXP Wi-Fi/BT combo chip with PCI device ID 0x2b43 under Marvell Extended vendor ID. AW693 is a NXP Wi-Fi/BT combo chip with PCI device ID 0x3003 under NXP/Philips vendor ID. Add both chips to pwrseq_m2_pci_ids[] so that the pwrseq-pcie-m2 driver can create the Bluetooth serdev device when these cards are inserted into a PCIe M.2 Key E connector. Both chips use "nxp,88w8987-bt" as the serdev compatible string, which is the entry point for the btnxpuart driver. The driver identifies the actual chip variant at runtime via chip ID auto-detection and loads the appropriate firmware accordingly. Signed-off-by: Sherry Sun Reviewed-by: Frank Li Reviewed-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260626023126.2189931-3-sherry.sun@oss.nxp.com Signed-off-by: Bartosz Golaszewski

Merge tag 'pwrseq-fixes-for-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

2026-06-25T16:20:26+00:00

Pull power sequencing fixes from Bartosz Golaszewski: - fix an ABBA deadlock in pwrseq unregister path - fix a use-after-free bug in pwrseq core - sort PCI device IDs in ascending order in pwrseq-pcie-m2 * tag 'pwrseq-fixes-for-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: power: sequencing: fix ABBA deadlock in pwrseq_device_unregister() power: sequencing: pcie-m2: Sort PCI device IDs in ascending order pwrseq: core: fix use-after-free in pwrseq_debugfs_seq_next()

power: sequencing: fix ABBA deadlock in pwrseq_device_unregister()

2026-06-22T08:05:39+00:00

The pwrseq core takes three locks in consistent order everywhere: pwrseq_sem -> pwrseq->rw_lock -> pwrseq->state_lock pwrseq_get() -> pwrseq_match_device() takes pwrseq_sem for reading, then rw_lock for reading. pwrseq_power_on()/pwrseq_power_off() take rw_lock for reading and then state_lock. pwrseq_device_unregister() is the only exception, it takes: state_lock, then rw_lock for writing and finally pwrseq_sem for writing. This created two potential ABBA deadlock situations that sashiko pointed out. - pwrseq_power_on/off() take rw_lock for reading then state_lock, while pwrseq_unregister() takes state_lock then rw_lock for writing - pwrseq_get() takes pwrseq_sem for reading then rw_lock for reading, while pwrseq_unregister() takes rw_lock for writing then pwrseq_sem for writing Reorder the unregister path to taking pwrseq_sem for writing -> rw_lock for writing and drop the state_lock entirely. This is safe as enable_count is only ever written under rw_lock held for read (via pwrseq_unit_enable()/disable(), reached only from pwrseq_power_on/off()), so holding rw_lock for writing already excludes every other writer and reader and the active-users WARN() stays race-free without state_lock. Fixes: 249ebf3f65f8 ("power: sequencing: implement the pwrseq core") Closes: https://sashiko.dev/#/patchset/20260616151049.1705503-1-vulab%40iscas.ac.cn Link: https://patch.msgid.link/20260618-pwrseq-abba-deadlock-v1-1-943a3fd81c06@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski

power: sequencing: pcie-m2: Sort PCI device IDs in ascending order

2026-06-22T08:05:15+00:00

Sort the entries in pwrseq_m2_pci_ids[] by device ID in ascending order: 0x1103 (WCN6855) before 0x1107 (WCN7850). Fixes: 2abcfdd91e6a ("power: sequencing: pcie-m2: Add PCI ID 0x1103 for WCN6855 Bluetooth") Reviewed-by: Manivannan Sadhasivam Signed-off-by: Wei Deng Link: https://patch.msgid.link/20260617143055.820096-1-wei.deng@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski

pwrseq: core: fix use-after-free in pwrseq_debugfs_seq_next()

2026-06-22T08:01:08+00:00

pwrseq_debugfs_seq_next() declares 'next' with __free(put_device), which causes put_device() to be called on the returned pointer when the variable goes out of scope. This results in a use-after-free since the seq_file framework receives a pointer whose reference has already been dropped. Simply removing __free(put_device) would fix the UAF but would leak the reference acquired by bus_find_next_device(), as stop() only calls up_read(&pwrseq_sem) and never releases the device reference. Fix this by making the reference counting consistent across all seq_file callbacks, matching the standard pattern used by PCI and SCSI: - start(): use get_device() so it returns a referenced pointer. - next(): explicitly put_device(curr) to release the previous device's reference (no NULL check needed - the seq_file framework only calls next() while the previous return was non-NULL). - stop(): put_device(data) to release the last iterated device's reference, with a NULL guard since stop() may be called with NULL when start() returned NULL or next() reached end-of-sequence. Cc: stable@vger.kernel.org Fixes: 249ebf3f65f8 ("power: sequencing: implement the pwrseq core") Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20260616151049.1705503-1-vulab@iscas.ac.cn Signed-off-by: Bartosz Golaszewski