Commit 9c67f908 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power sequencing fixes from Bartosz Golaszewski:
 "There's one fix for an invalid pointer dereference in error path
  reported by smatch and two patches that address the noisy config
  choices you reported earlier this week.

  Summary:

   - fix an invalid pointer dereference in error path in pwrseq core

   - reduce the Kconfig noise from PCI pwrctl choices"

* tag 'pwrseq-fixes-for-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  arm64: qcom: don't select HAVE_PWRCTL when PCI=n
  Kconfig: reduce the amount of power sequencing noise
  power: sequencing: fix an invalid pointer dereference in error path
parents 12cc3d53 1a8c67a8

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ config ARCH_QCOM 
	bool "Qualcomm Platforms"

	select GPIOLIB

	select PINCTRL

	select HAVE_PWRCTL if PCI

	help

	  This enables support for the ARMv8 based Qualcomm chipsets.

drivers/net/wireless/ath/ath11k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config ATH11K_PCI 
	select MHI_BUS

	select QRTR

	select QRTR_MHI

	select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL

	help

	  This module adds support for PCIE bus

drivers/net/wireless/ath/ath12k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ATH12K 
	select MHI_BUS

	select QRTR

	select QRTR_MHI

	select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL

	help

	  Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE

	  802.11be) family of chipsets, for example WCN7850 and

drivers/pci/pwrctl/Kconfig

+3 −8
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



menu "PCI Power control drivers"

config HAVE_PWRCTL

	bool



config PCI_PWRCTL

	tristate



config PCI_PWRCTL_PWRSEQ

	tristate "PCI Power Control driver using the Power Sequencing subsystem"

	tristate

	select POWER_SEQUENCING

	select PCI_PWRCTL
 
	default m if ((ATH11K_PCI || ATH12K) && ARCH_QCOM)

	help

	  Enable support for the PCI power control driver for device

	  drivers using the Power Sequencing subsystem.



endmenu

drivers/power/sequencing/core.c

+2 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ pwrseq_target_new(const struct pwrseq_target_data *data) 


static void pwrseq_target_free(struct pwrseq_target *target)

{

	if (!IS_ERR_OR_NULL(target->unit))

		pwrseq_unit_put(target->unit);

	kfree_const(target->name);

	kfree(target);