* [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
@ 2025-03-28 14:36 ` Johan Hovold
2025-03-28 15:13 ` Bjorn Helgaas
2025-04-02 11:54 ` Jonas Gorski
2025-03-28 14:36 ` [PATCH 2/4] arm64: Kconfig: switch to HAVE_PWRCTRL Johan Hovold
` (5 subsequent siblings)
6 siblings, 2 replies; 12+ messages in thread
From: Johan Hovold @ 2025-03-28 14:36 UTC (permalink / raw)
To: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson
Cc: Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel, Johan Hovold
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.
The new slot module is also renamed to reflect the framework name and
match the other pwrctrl modules.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++++------
drivers/pci/pwrctrl/Makefile | 8 ++++----
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
index 990cab67d413..62f176e42e33 100644
--- a/drivers/pci/pwrctrl/Kconfig
+++ b/drivers/pci/pwrctrl/Kconfig
@@ -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,18 @@ 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
+
+# deprecated
+config PCI_PWRCTL_SLOT
+ tristate
+ select PCI_PWRCTRL_SLOT
diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile
index ddfb12c5aadf..a4e5808d7850 100644
--- a/drivers/pci/pwrctrl/Makefile
+++ b/drivers/pci/pwrctrl/Makefile
@@ -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
--
2.48.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
2025-03-28 14:36 ` [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module Johan Hovold
@ 2025-03-28 15:13 ` Bjorn Helgaas
2025-03-28 15:50 ` Johan Hovold
2025-04-02 11:54 ` Jonas Gorski
1 sibling, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2025-03-28 15:13 UTC (permalink / raw)
To: Johan Hovold
Cc: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson, Manivannan Sadhasivam, linux-pci, linux-arm-kernel,
ath11k, ath12k, linux-wireless, linux-kernel
On Fri, Mar 28, 2025 at 03:36:43PM +0100, Johan Hovold wrote:
> 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.
I considered changing the Kconfig symbols at the time, but didn't do
it because I didn't want to break existing .config files. Is that not
a concern? Or do you think the long-term benefit is worth having
users re-answer these config questions?
We have lots of Kconfig symbols that are not what we would choose
today, e.g., my misguided suggestion years ago to use "CONFIG_PCI_*"
instead of "CONFIG_PCIE_*" for PCIe controller drivers that didn't
have any PCIe content.
If we do want this, I would think we should squash all these so we
don't have breakage between this patch and the following ones.
Bjorn
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
2025-03-28 15:13 ` Bjorn Helgaas
@ 2025-03-28 15:50 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2025-03-28 15:50 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Johan Hovold, Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas,
Will Deacon, Jeff Johnson, Manivannan Sadhasivam, linux-pci,
linux-arm-kernel, ath11k, ath12k, linux-wireless, linux-kernel
On Fri, Mar 28, 2025 at 10:13:43AM -0500, Bjorn Helgaas wrote:
> On Fri, Mar 28, 2025 at 03:36:43PM +0100, Johan Hovold wrote:
> > 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.
>
> I considered changing the Kconfig symbols at the time, but didn't do
> it because I didn't want to break existing .config files. Is that not
> a concern? Or do you think the long-term benefit is worth having
> users re-answer these config questions?
I added entries for the old (deprecated) symbol names that select the
new ones so that should not be a problem.
> If we do want this, I would think we should squash all these so we
> don't have breakage between this patch and the following ones.
The entries using the old names make sure that there is no breakage as
long as the patches are applied in order. They also handle any new
users being added to other subsystem trees.
(As I mentioned in the cover letter we can drop those entries after a
couple of releases.)
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
2025-03-28 14:36 ` [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module Johan Hovold
2025-03-28 15:13 ` Bjorn Helgaas
@ 2025-04-02 11:54 ` Jonas Gorski
2025-04-02 12:38 ` Johan Hovold
1 sibling, 1 reply; 12+ messages in thread
From: Jonas Gorski @ 2025-04-02 11:54 UTC (permalink / raw)
To: Johan Hovold
Cc: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson, Manivannan Sadhasivam, linux-pci, linux-arm-kernel,
ath11k, ath12k, linux-wireless, linux-kernel
Hi,
I have some nitpicks ...
On Fri, Mar 28, 2025 at 3:41 PM Johan Hovold <johan+linaro@kernel.org> wrote:
>
> 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.
>
> The new slot module is also renamed to reflect the framework name and
> match the other pwrctrl modules.
>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
> drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++++------
> drivers/pci/pwrctrl/Makefile | 8 ++++----
> 2 files changed, 25 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
> index 990cab67d413..62f176e42e33 100644
> --- a/drivers/pci/pwrctrl/Kconfig
> +++ b/drivers/pci/pwrctrl/Kconfig
> @@ -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,18 @@ 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
I'm not sure this will work as intended. This symbol can only be != n
if anything selects it, but there may also be (outdated) config
symbols that depend on its value. E.g. ath1*k has "select
PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL", and if there is nothing selecting
HAVE_PWRCTL, but HAVE_PWRCTRL directly instead, HAVE_PWRCTL will be =n
and the condition will fail.
Since you rename the only one selecting HAVE_PWRCTL in patch 2/4, but
update ath1*k in 3/4 and 4/4, their select PCI_PWRCT(R)L_PWRSEQ use is
temporarily ineffective. Moving the arm64 patch last would avoid that
though, at least for the current state.
The alternative would be split this by config symbol instead of per
tree, so all users would be atomatically updated as well. These
patches need to go through the same tree anyways, so I see no issue
doing it that way.
> +
> +# deprecated
> +config PCI_PWRCTL_PWRSEQ
> + tristate
> + select PCI_PWRCTRL_PWRSEQ
Similar issue, but there are no conditionals based on this, so this may be fine.
> +
> +# deprecated
> +config PCI_PWRCTL_SLOT
> + tristate
> + select PCI_PWRCTRL_SLOT
This one won't work. Its value will be automatically calculated based
on other symbols selecting it, and since there is nothing selecting
it, it will always be n, regardless what any existing .config says.
So unless you make this a user selectable symbol as well, this will
(potentially) break existing .configs since its value will be then
automatically calculated as =n, and the new symbol takes the default
=n (unless explicitly enabled, or selected by ath1*k).
Best regards,
Jonas
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
2025-04-02 11:54 ` Jonas Gorski
@ 2025-04-02 12:38 ` Johan Hovold
0 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2025-04-02 12:38 UTC (permalink / raw)
To: Jonas Gorski
Cc: Johan Hovold, Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas,
Will Deacon, Jeff Johnson, Manivannan Sadhasivam, linux-pci,
linux-arm-kernel, ath11k, ath12k, linux-wireless, linux-kernel
On Wed, Apr 02, 2025 at 01:54:36PM +0200, Jonas Gorski wrote:
> I have some nitpicks ...
Thanks for taking a look.
> On Fri, Mar 28, 2025 at 3:41 PM Johan Hovold <johan+linaro@kernel.org> wrote:
> >
> > 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.
> >
> > The new slot module is also renamed to reflect the framework name and
> > match the other pwrctrl modules.
> >
> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> > ---
> > drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++++------
> > drivers/pci/pwrctrl/Makefile | 8 ++++----
> > 2 files changed, 25 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
> > index 990cab67d413..62f176e42e33 100644
> > --- a/drivers/pci/pwrctrl/Kconfig
> > +++ b/drivers/pci/pwrctrl/Kconfig
> > @@ -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,18 @@ 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
>
> I'm not sure this will work as intended. This symbol can only be != n
> if anything selects it, but there may also be (outdated) config
> symbols that depend on its value. E.g. ath1*k has "select
> PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL", and if there is nothing selecting
> HAVE_PWRCTL, but HAVE_PWRCTRL directly instead, HAVE_PWRCTL will be =n
> and the condition will fail.
>
> Since you rename the only one selecting HAVE_PWRCTL in patch 2/4, but
> update ath1*k in 3/4 and 4/4, their select PCI_PWRCT(R)L_PWRSEQ use is
> temporarily ineffective. Moving the arm64 patch last would avoid that
> though, at least for the current state.
You're right, thanks for catching this.
> The alternative would be split this by config symbol instead of per
> tree, so all users would be atomatically updated as well. These
> patches need to go through the same tree anyways, so I see no issue
> doing it that way.
Moving the arm64 patch last would take care of the temporary glitch, but
since it seems we need to take this through one tree (e.g. to avoid
merging it over three cycles) perhaps we can just squash them.
That said, it seems I would need to reverse the logic for HAVE_PWRCTL so
that it is selected by HAVE_PWRCTRL if we think we still need to worry
about new users of HAVE_PWRCTL being adding to other trees.
If we could get this renamed already in rc1, we probably do no need to
care about that though.
> > +
> > +# deprecated
> > +config PCI_PWRCTL_PWRSEQ
> > + tristate
> > + select PCI_PWRCTRL_PWRSEQ
>
> Similar issue, but there are no conditionals based on this, so this may be fine.
Yeah, this one should be fine.
> > +
> > +# deprecated
> > +config PCI_PWRCTL_SLOT
> > + tristate
> > + select PCI_PWRCTRL_SLOT
>
> This one won't work. Its value will be automatically calculated based
> on other symbols selecting it, and since there is nothing selecting
> it, it will always be n, regardless what any existing .config says.
>
> So unless you make this a user selectable symbol as well, this will
> (potentially) break existing .configs since its value will be then
> automatically calculated as =n, and the new symbol takes the default
> =n (unless explicitly enabled, or selected by ath1*k).
Right. Since PCI_PWRCTL_SLOT will be new in rc1 and there is nothing
selecting it, I think we can just rename this one. At least if we can
get this into rc1 and make sure that the pending defconfig update is
respun.
Otherwise it would indeed need to be user selectable.
Let me respin this. Since this is all quite new, we should be able to
just rip of the band-aid for rc1 and not need to worry about this going
forward.
Johan
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] arm64: Kconfig: switch to HAVE_PWRCTRL
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
2025-03-28 14:36 ` [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module Johan Hovold
@ 2025-03-28 14:36 ` Johan Hovold
2025-03-28 14:36 ` [PATCH 3/4] wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ Johan Hovold
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2025-03-28 14:36 UTC (permalink / raw)
To: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson
Cc: Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel, Johan Hovold
The HAVE_PWRCTRL symbol has been renamed to reflect the pwrctrl
framework name. Switch to the non-deprecated symbol.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
arch/arm64/Kconfig.platforms | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 02f9248f7c84..cc94845e9bbf 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -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.
--
2.48.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/4] wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
2025-03-28 14:36 ` [PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module Johan Hovold
2025-03-28 14:36 ` [PATCH 2/4] arm64: Kconfig: switch to HAVE_PWRCTRL Johan Hovold
@ 2025-03-28 14:36 ` Johan Hovold
2025-03-28 14:36 ` [PATCH 4/4] wifi: ath12k: " Johan Hovold
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2025-03-28 14:36 UTC (permalink / raw)
To: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson
Cc: Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel, 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.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
index 2e935d381b6b..659ef134ef16 100644
--- a/drivers/net/wireless/ath/ath11k/Kconfig
+++ b/drivers/net/wireless/ath/ath11k/Kconfig
@@ -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
--
2.48.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/4] wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
` (2 preceding siblings ...)
2025-03-28 14:36 ` [PATCH 3/4] wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ Johan Hovold
@ 2025-03-28 14:36 ` Johan Hovold
2025-03-28 16:11 ` [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Jeff Johnson
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Johan Hovold @ 2025-03-28 14:36 UTC (permalink / raw)
To: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson
Cc: Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel, 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.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/Kconfig b/drivers/net/wireless/ath/ath12k/Kconfig
index 52a1bb19e3da..2d1eb22deda7 100644
--- a/drivers/net/wireless/ath/ath12k/Kconfig
+++ b/drivers/net/wireless/ath/ath12k/Kconfig
@@ -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
--
2.48.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
` (3 preceding siblings ...)
2025-03-28 14:36 ` [PATCH 4/4] wifi: ath12k: " Johan Hovold
@ 2025-03-28 16:11 ` Jeff Johnson
2025-04-02 8:00 ` Manivannan Sadhasivam
2025-04-02 8:13 ` Bartosz Golaszewski
6 siblings, 0 replies; 12+ messages in thread
From: Jeff Johnson @ 2025-03-28 16:11 UTC (permalink / raw)
To: Johan Hovold, Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas,
Will Deacon, Jeff Johnson
Cc: Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel
On 3/28/2025 7:36 AM, Johan Hovold wrote:
> 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 arm64, ath11k and ath12k changes could go through the corresponding
> subsystem trees once they have the new symbols (e.g. in the next cycle)
> or they could all go in via the PCI tree with an ack from their
> maintainers.
I'm fine with the entire series going through PCI
Acked-by: Jeff Johnson <jjohnson@kernel.org> # drivers/net/wireless/ath/...
>
> There are some new pwrctrl drivers and an arm64 defconfig change on the
> lists so we may need to keep deprecated symbols for a release or two.
>
> Johan
>
>
> Johan Hovold (4):
> PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
> arm64: Kconfig: switch to HAVE_PWRCTRL
> wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
> wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
>
> arch/arm64/Kconfig.platforms | 2 +-
> drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
> drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
> drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++------
> drivers/pci/pwrctrl/Makefile | 8 ++++----
> 5 files changed, 28 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
` (4 preceding siblings ...)
2025-03-28 16:11 ` [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Jeff Johnson
@ 2025-04-02 8:00 ` Manivannan Sadhasivam
2025-04-02 8:13 ` Bartosz Golaszewski
6 siblings, 0 replies; 12+ messages in thread
From: Manivannan Sadhasivam @ 2025-04-02 8:00 UTC (permalink / raw)
To: Johan Hovold
Cc: Bartosz Golaszewski, Bjorn Helgaas, Catalin Marinas, Will Deacon,
Jeff Johnson, linux-pci, linux-arm-kernel, ath11k, ath12k,
linux-wireless, linux-kernel
On Fri, Mar 28, 2025 at 03:36:42PM +0100, Johan Hovold wrote:
> 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 arm64, ath11k and ath12k changes could go through the corresponding
> subsystem trees once they have the new symbols (e.g. in the next cycle)
> or they could all go in via the PCI tree with an ack from their
> maintainers.
>
> There are some new pwrctrl drivers and an arm64 defconfig change on the
> lists so we may need to keep deprecated symbols for a release or two.
>
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- Mani
> Johan
>
>
> Johan Hovold (4):
> PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
> arm64: Kconfig: switch to HAVE_PWRCTRL
> wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
> wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
>
> arch/arm64/Kconfig.platforms | 2 +-
> drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
> drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
> drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++------
> drivers/pci/pwrctrl/Makefile | 8 ++++----
> 5 files changed, 28 insertions(+), 13 deletions(-)
>
> --
> 2.48.1
>
--
மணிவண்ணன் சதாசிவம்
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols
2025-03-28 14:36 [PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols Johan Hovold
` (5 preceding siblings ...)
2025-04-02 8:00 ` Manivannan Sadhasivam
@ 2025-04-02 8:13 ` Bartosz Golaszewski
6 siblings, 0 replies; 12+ messages in thread
From: Bartosz Golaszewski @ 2025-04-02 8:13 UTC (permalink / raw)
To: Johan Hovold
Cc: Bjorn Helgaas, Catalin Marinas, Will Deacon, Jeff Johnson,
Manivannan Sadhasivam, linux-pci, linux-arm-kernel, ath11k,
ath12k, linux-wireless, linux-kernel
On Fri, Mar 28, 2025 at 3:41 PM Johan Hovold <johan+linaro@kernel.org> wrote:
>
> 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 arm64, ath11k and ath12k changes could go through the corresponding
> subsystem trees once they have the new symbols (e.g. in the next cycle)
> or they could all go in via the PCI tree with an ack from their
> maintainers.
>
> There are some new pwrctrl drivers and an arm64 defconfig change on the
> lists so we may need to keep deprecated symbols for a release or two.
>
> Johan
>
>
> Johan Hovold (4):
> PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
> arm64: Kconfig: switch to HAVE_PWRCTRL
> wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
> wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
>
> arch/arm64/Kconfig.platforms | 2 +-
> drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
> drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
> drivers/pci/pwrctrl/Kconfig | 27 +++++++++++++++++++------
> drivers/pci/pwrctrl/Makefile | 8 ++++----
> 5 files changed, 28 insertions(+), 13 deletions(-)
>
> --
> 2.48.1
>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
^ permalink raw reply [flat|nested] 12+ messages in thread