Skip to contentSkip to conversation

PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols

PATCH Applied Johan Hovold 4 participants 10 messages Apr 2, 2025 – Apr 22, 2025

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols

The PCI pwrctrl framework was renamed after being merged, but the Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

The ath11k, ath12k and arm64 changes could go theoretically go through the corresponding subsystem trees in turn once they have the new symbols, but to avoid tracking dependencies over multiple cycles it is much preferred to have all of these go in through the PCI tree.

The wifi patches have been acked by Jeff and I don't think Will or Catalin will mind the single rename in arm64 if they don't see this message in time.

Note that the patches could be squashed into one, but keeping them separate highlights the changes done to other subsystems. I also find it easier to review the changes this way.

There are some new pwrctrl drivers and an arm64 defconfig change on the lists, but the former should also go in through PCI anyway while we can make sure that the defconfig update matches the new slot symbol.

Note that getting this rename into rc1 would be great as that way it would end up in most subsystem trees soon as well.

Johan

Changes in v2:
- drop deprecated symbol for the new slot driver to avoid having to a add a new user visible symbol (e.g. any early adopters will be asked to enable the renamed option again)

- move arm64 patch last two avoid temporarily not having the pwrseq driver selected (Jonas)

Johan Hovold (4):
PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
arm64: Kconfig: switch to HAVE_PWRCTRL

 arch/arm64/Kconfig.platforms            |  2 +-
 drivers/net/wireless/ath/ath11k/Kconfig |  2 +-
 drivers/net/wireless/ath/ath12k/Kconfig |  2 +-
 drivers/pci/pwrctrl/Kconfig             | 22 ++++++++++++++++------
 drivers/pci/pwrctrl/Makefile            |  8 ++++----
 5 files changed, 23 insertions(+), 13 deletions(-)
Signature · 1 line
2.49.0
#1 lore raw

PATCH v2 1/4 PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module

Commits b88cbaaa6fa1 ("PCI/pwrctrl: Rename pwrctl files to pwrctrl") and 3f925cd62874 ("PCI/pwrctrl: Rename pwrctrl functions and structures") renamed the "pwrctl" framework to "pwrctrl" for consistency reasons.

Rename also the Kconfig symbols so that they reflect the new name while adding entries for the deprecated ones. The old symbols can be removed once everything that depends on them has been updated.

Note that no deprecated symbol is added for the new slot driver to avoid having to add a user visible option.

The new slot module is also renamed to reflect the framework name and match the other pwrctrl modules.

---
 drivers/pci/pwrctrl/Kconfig  | 22 ++++++++++++++++------
 drivers/pci/pwrctrl/Makefile |  8 ++++----
 2 files changed, 20 insertions(+), 10 deletions(-)
drivers/pci/pwrctrl/Kconfig +16 -6
index 990cab67d413..6956c1854811 100644
@@ -1,19 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-config HAVE_PWRCTL
+config HAVE_PWRCTRL
 	bool
 
-config PCI_PWRCTL
+config PCI_PWRCTRL
 	tristate
 
-config PCI_PWRCTL_PWRSEQ
+config PCI_PWRCTRL_PWRSEQ
 	tristate
 	select POWER_SEQUENCING
-	select PCI_PWRCTL
+	select PCI_PWRCTRL
 
-config PCI_PWRCTL_SLOT
+config PCI_PWRCTRL_SLOT
 	tristate "PCI Power Control driver for PCI slots"
-	select PCI_PWRCTL
+	select PCI_PWRCTRL
 	help
 	  Say Y here to enable the PCI Power Control driver to control the power
 	  state of PCI slots.
@@ -21,3 +21,13 @@ config PCI_PWRCTL_SLOT
 	  This is a generic driver that controls the power state of different
 	  PCI slots. The voltage regulators powering the rails of the PCI slots
 	  are expected to be defined in the devicetree node of the PCI bridge.
+
+# deprecated
+config HAVE_PWRCTL
+	bool
+	select HAVE_PWRCTRL
+
+# deprecated
+config PCI_PWRCTL_PWRSEQ
+	tristate
+	select PCI_PWRCTRL_PWRSEQ
drivers/pci/pwrctrl/Makefile +4 -4
index ddfb12c5aadf..a4e5808d7850 100644
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-obj-$(CONFIG_PCI_PWRCTL)		+= pci-pwrctrl-core.o
+obj-$(CONFIG_PCI_PWRCTRL)		+= pci-pwrctrl-core.o
 pci-pwrctrl-core-y			:= core.o
 
-obj-$(CONFIG_PCI_PWRCTL_PWRSEQ)		+= pci-pwrctrl-pwrseq.o
+obj-$(CONFIG_PCI_PWRCTRL_PWRSEQ)	+= pci-pwrctrl-pwrseq.o
 
-obj-$(CONFIG_PCI_PWRCTL_SLOT)		+= pci-pwrctl-slot.o
-pci-pwrctl-slot-y			:= slot.o
+obj-$(CONFIG_PCI_PWRCTRL_SLOT)		+= pci-pwrctrl-slot.o
+pci-pwrctrl-slot-y			:= slot.o
Signature · 1 line
2.49.0
#2 lore raw

PATCH v2 2/4 wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ

In reply to Johan Hovold

The PCI_PWRCTRL_PWRSEQ and HAVE_PWRCTRL symbols have been renamed to reflect the pwrctrl framework name. Switch to the non-deprecated symbols.

---
 drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/Kconfig +1 -1
index 2e935d381b6b..659ef134ef16 100644
@@ -24,7 +24,7 @@ config ATH11K_PCI
 	select MHI_BUS
 	select QRTR
 	select QRTR_MHI
-	select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL
+	select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL
 	help
 	  This module adds support for PCIE bus
 
Signature · 1 line
2.49.0
#3 lore raw

PATCH v2 3/4 wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ

In reply to Johan Hovold

The PCI_PWRCTRL_PWRSEQ and HAVE_PWRCTRL symbols have been renamed to reflect the pwrctrl framework name. Switch to the non-deprecated symbols.

---
 drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/Kconfig +1 -1
index 52a1bb19e3da..2d1eb22deda7 100644
@@ -7,7 +7,7 @@ config ATH12K
 	select MHI_BUS
 	select QRTR
 	select QRTR_MHI
-	select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL
+	select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL
 	help
 	  Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE
 	  802.11be) family of chipsets, for example WCN7850 and
Signature · 1 line
2.49.0
#4 lore raw

PATCH v2 4/4 arm64: Kconfig: switch to HAVE_PWRCTRL

In reply to Johan Hovold

The HAVE_PWRCTRL symbol has been renamed to reflect the pwrctrl framework name. Switch to the non-deprecated symbol.

---
 arch/arm64/Kconfig.platforms | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Kconfig.platforms +1 -1
index 02f9248f7c84..cc94845e9bbf 100644
@@ -269,7 +269,7 @@ config ARCH_QCOM
 	bool "Qualcomm Platforms"
 	select GPIOLIB
 	select PINCTRL
-	select HAVE_PWRCTL if PCI
+	select HAVE_PWRCTRL if PCI
 	help
 	  This enables support for the ARMv8 based Qualcomm chipsets.
 
Signature · 1 line
2.49.0
Acked-by Manivannan Sadhasivam Acked-by Bartosz Golaszewski on v2 4/4
#5 lore raw

Re: [PATCH v2 4/4] arm64: Kconfig: switch to HAVE_PWRCTRL

Quoted 4 lines · Johan Hovold

The HAVE_PWRCTRL symbol has been renamed to reflect the pwrctrl framework name. Switch to the non-deprecated symbol.

I forgot to add Mani's and Bartosz's acks here:

Johan

Acked-by on the v2 series
#6 lore raw
In reply to Johan Hovold
Quoted 9 lines · Johan Hovold

The PCI pwrctrl framework was renamed after being merged, but the Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

I'm re-adding the tag here as otherwise b4 will only pick it up for patch 4/4 on v2 of the series.

Bartosz

#7 lore raw
Quoted 8 lines · Bartosz Golaszewski
Quoted 7 lines · Johan Hovold

The PCI pwrctrl framework was renamed after being merged, but the Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in writing, inconsistencies in module naming, etc.

Quoted 7 lines
Quoted 2 lines

Let's rename also the Kconfig symbols before this gets any worse.

I'm re-adding the tag here as otherwise b4 will only pick it up for patch 4/4 on v2 of the series.

I had already added it to the first three patches so it was only missing on the last one.

Johan

#8 lore raw
Quoted 15 lines · Johan Hovold
Quoted 13 lines · Bartosz Golaszewski
Quoted 9 lines · Johan Hovold

The PCI pwrctrl framework was renamed after being merged, but the Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

Quoted 7 lines
Quoted 2 lines

I'm re-adding the tag here as otherwise b4 will only pick it up for patch 4/4 on v2 of the series.

I had already added it to the first three patches so it was only missing on the last one.

Johan

Indeed, sorry for the noise, I saw b4 only applying it for the last one and didn't check git log.

Bartosz

#9 lore raw
In reply to Johan Hovold

[cc->to Catalin, Will: note the arm64 Kconfig change; my understanding is that this shouldn't break existing configs]

Quoted 45 lines · Johan Hovold

The PCI pwrctrl framework was renamed after being merged, but the Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

The ath11k, ath12k and arm64 changes could go theoretically go through the corresponding subsystem trees in turn once they have the new symbols, but to avoid tracking dependencies over multiple cycles it is much preferred to have all of these go in through the PCI tree.

The wifi patches have been acked by Jeff and I don't think Will or Catalin will mind the single rename in arm64 if they don't see this message in time.

Note that the patches could be squashed into one, but keeping them separate highlights the changes done to other subsystems. I also find it easier to review the changes this way.

There are some new pwrctrl drivers and an arm64 defconfig change on the lists, but the former should also go in through PCI anyway while we can make sure that the defconfig update matches the new slot symbol.

Note that getting this rename into rc1 would be great as that way it would end up in most subsystem trees soon as well.

Johan

Changes in v2:
- drop deprecated symbol for the new slot driver to avoid having to a add a new user visible symbol (e.g. any early adopters will be asked to enable the renamed option again)

- move arm64 patch last two avoid temporarily not having the pwrseq driver selected (Jonas)

Johan Hovold (4):
PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
arm64: Kconfig: switch to HAVE_PWRCTRL

Quoted 6 lines
 arch/arm64/Kconfig.platforms            |  2 +-
 drivers/net/wireless/ath/ath11k/Kconfig |  2 +-
 drivers/net/wireless/ath/ath12k/Kconfig |  2 +-
 drivers/pci/pwrctrl/Kconfig             | 22 ++++++++++++++++------
 drivers/pci/pwrctrl/Makefile            |  8 ++++----
 5 files changed, 23 insertions(+), 13 deletions(-)

Applied to pci/pwrctrl for v6.16, thanks!