With the new PCI pwrctrl API and PCI slot binding and power drivers, we
now have a way to describe and power up WiFi/BT adapters connected
through a PCIe or M.2 slot, or exploded onto the mainboard itself.
Integrate the PCI pwrctrl API into the PCIe driver, so that power is
properly enabled before PCIe link training is done, allowing the
card to successfully be detected.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
Changes since v3:
- Adapted changes to movement of existing setup code
Changes since v2:
- Added "select PCI_PWRCTRL_SLOT" to Kconfig to fix kernel test robot
compilation error
I'm wondering why the two existing uses select PCI_PWRCTRL_SLOT and not
PCI_PWRCTRL though.
---
drivers/pci/controller/Kconfig | 1 +
drivers/pci/controller/pcie-mediatek-gen3.c | 38 ++++++++++++++++-----
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 5aaed8ac6e44..e72ac6934379 100644
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -222,6 +222,7 @@ config PCIE_MEDIATEK_GEN3
depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
depends on PCI_MSI
select IRQ_MSI_LIB
+ select PCI_PWRCTRL_SLOT
help
Adds support for PCIe Gen3 MAC controller for MediaTek SoCs.
This PCIe controller is compatible with Gen3, Gen2 and Gen1 speed,
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
index f1a70b92cc9f..3800d0d730f2 100644
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -22,6 +22,7 @@
#include <linux/of_device.h>
#include <linux/of_pci.h>
#include <linux/pci.h>
+#include <linux/pci-pwrctrl.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
#include <linux/pm_domain.h>
@@ -421,15 +422,23 @@ static int mtk_pcie_device_power_up(struct mtk_gen3_pcie *pcie)
val |= PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB |
PCIE_PE_RSTB;
writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
+ }
- /*
- * Described in PCIe CEM specification revision 6.0.
- *
- * The deassertion of PERST# should be delayed 100ms (TPVPERL)
- * for the power and clock to become stable.
- */
- msleep(PCIE_T_PVPERL_MS);
+ err = pci_pwrctrl_power_on_devices(pcie->dev);
+ if (err) {
+ dev_err(pcie->dev, "Failed to power on devices: %pe\n", ERR_PTR(err));
+ return err;
+ }
+ /*
+ * Described in PCIe CEM specification revision 6.0.
+ *
+ * The deassertion of PERST# should be delayed 100ms (TPVPERL)
+ * for the power and clock to become stable.
+ */
+ msleep(PCIE_T_PVPERL_MS);
+
+ if (!(pcie->soc->flags & SKIP_PCIE_RSTB)) {
/* De-assert reset signals */
val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB |
PCIE_PE_RSTB);
@@ -449,6 +458,8 @@ static void mtk_pcie_device_power_down(struct mtk_gen3_pcie *pcie)
val |= PCIE_PE_RSTB;
writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
}
+
+ pci_pwrctrl_power_off_devices(pcie->dev);
}
static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie)
@@ -1209,9 +1220,15 @@ static int mtk_pcie_probe(struct platform_device *pdev)
if (err)
return dev_err_probe(dev, err, "Failed to setup IRQ domains\n");
+ err = pci_pwrctrl_create_devices(pcie->dev);
+ if (err) {
+ goto err_teardown_irq;
+ dev_err_probe(dev, err, "failed to create pwrctrl devices\n");
+ }
+
err = mtk_pcie_setup(pcie);
if (err)
- goto err_tear_down_irq;
+ goto err_destroy_pwrctrl;
host->ops = &mtk_pcie_ops;
host->sysdata = pcie;
@@ -1225,6 +1242,9 @@ static int mtk_pcie_probe(struct platform_device *pdev)
err_power_down_pcie:
mtk_pcie_device_power_down(pcie);
mtk_pcie_power_down(pcie);
+err_destroy_pwrctrl:
+ if (err != -EPROBE_DEFER)
+ pci_pwrctrl_destroy_devices(pcie->dev);
err_tear_down_irq:
mtk_pcie_irq_teardown(pcie);
return err;
@@ -1240,7 +1260,9 @@ static void mtk_pcie_remove(struct platform_device *pdev)
pci_remove_root_bus(host->bus);
pci_unlock_rescan_remove();
+ pci_pwrctrl_power_off_devices(pcie->dev);
mtk_pcie_power_down(pcie);
+ pci_pwrctrl_destroy_devices(pcie->dev);
mtk_pcie_irq_teardown(pcie);
}
--
2.53.0.473.g4a7958ca14-googHi Chen-Yu,
kernel test robot noticed the following build errors:
[auto build test ERROR on pci/next]
[also build test ERROR on pci/for-linus linus/master v7.0-rc3 next-20260310]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Chen-Yu-Tsai/PCI-mediatek-gen3-Clean-up-mtk_pcie_parse_port-with-dev_err_probe/20260310-175537
base: https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git next
patch link: https://lore.kernel.org/r/20260310091947.2742004-8-wenst%40chromium.org
patch subject: [PATCH v4 7/7] PCI: mediatek-gen3: Integrate new pwrctrl API
config: sparc64-randconfig-001-20260310 (https://download.01.org/0day-ci/archive/20260311/202603110916.8SVCCZYO-lkp@intel.com/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260311/202603110916.8SVCCZYO-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603110916.8SVCCZYO-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
>> drivers/pci/controller/pcie-mediatek-gen3.c:1225:8: error: use of undeclared label 'err_teardown_irq'
1225 | goto err_teardown_irq;
| ^
>> drivers/pci/controller/pcie-mediatek-gen3.c:1248:1: warning: unused label 'err_tear_down_irq' [-Wunused-label]
1248 | err_tear_down_irq:
| ^~~~~~~~~~~~~~~~~~
1 warning and 1 error generated.
vim +/err_teardown_irq +1225 drivers/pci/controller/pcie-mediatek-gen3.c
1201
1202 static int mtk_pcie_probe(struct platform_device *pdev)
1203 {
1204 struct device *dev = &pdev->dev;
1205 struct mtk_gen3_pcie *pcie;
1206 struct pci_host_bridge *host;
1207 int err;
1208
1209 host = devm_pci_alloc_host_bridge(dev, sizeof(*pcie));
1210 if (!host)
1211 return -ENOMEM;
1212
1213 pcie = pci_host_bridge_priv(host);
1214
1215 pcie->dev = dev;
1216 pcie->soc = device_get_match_data(dev);
1217 platform_set_drvdata(pdev, pcie);
1218
1219 err = mtk_pcie_setup_irq(pcie);
1220 if (err)
1221 return dev_err_probe(dev, err, "Failed to setup IRQ domains\n");
1222
1223 err = pci_pwrctrl_create_devices(pcie->dev);
1224 if (err) {
> 1225 goto err_teardown_irq;
1226 dev_err_probe(dev, err, "failed to create pwrctrl devices\n");
1227 }
1228
1229 err = mtk_pcie_setup(pcie);
1230 if (err)
1231 goto err_destroy_pwrctrl;
1232
1233 host->ops = &mtk_pcie_ops;
1234 host->sysdata = pcie;
1235
1236 err = pci_host_probe(host);
1237 if (err)
1238 goto err_power_down_pcie;
1239
1240 return 0;
1241
1242 err_power_down_pcie:
1243 mtk_pcie_device_power_down(pcie);
1244 mtk_pcie_power_down(pcie);
1245 err_destroy_pwrctrl:
1246 if (err != -EPROBE_DEFER)
1247 pci_pwrctrl_destroy_devices(pcie->dev);
> 1248 err_tear_down_irq:
1249 mtk_pcie_irq_teardown(pcie);
1250 return err;
1251 }
1252
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Tue, Mar 10, 2026 at 05:19:46PM +0800, Chen-Yu Tsai wrote: > With the new PCI pwrctrl API and PCI slot binding and power drivers, we > now have a way to describe and power up WiFi/BT adapters connected > through a PCIe or M.2 slot, or exploded onto the mainboard itself. On pci/controller/mediatek-gen3, I had replaced "exploded" with "populated". Maybe "exploded" is industry jargon, but IMO it's a little bit too obscure and evocative here. I'm also open to something better than "populated".
Hi Chen-Yu,
kernel test robot noticed the following build errors:
[auto build test ERROR on pci/next]
[also build test ERROR on pci/for-linus linus/master v7.0-rc3 next-20260309]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Chen-Yu-Tsai/PCI-mediatek-gen3-Clean-up-mtk_pcie_parse_port-with-dev_err_probe/20260310-175537
base: https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git next
patch link: https://lore.kernel.org/r/20260310091947.2742004-8-wenst%40chromium.org
patch subject: [PATCH v4 7/7] PCI: mediatek-gen3: Integrate new pwrctrl API
config: parisc-randconfig-001-20260310 (https://download.01.org/0day-ci/archive/20260311/202603110219.dgV01aTV-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 14.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260311/202603110219.dgV01aTV-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603110219.dgV01aTV-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
drivers/pci/controller/pcie-mediatek-gen3.c: In function 'mtk_pcie_probe':
>> drivers/pci/controller/pcie-mediatek-gen3.c:1248:1: warning: label 'err_tear_down_irq' defined but not used [-Wunused-label]
1248 | err_tear_down_irq:
| ^~~~~~~~~~~~~~~~~
>> drivers/pci/controller/pcie-mediatek-gen3.c:1225:17: error: label 'err_teardown_irq' used but not defined
1225 | goto err_teardown_irq;
| ^~~~
vim +/err_teardown_irq +1225 drivers/pci/controller/pcie-mediatek-gen3.c
1201
1202 static int mtk_pcie_probe(struct platform_device *pdev)
1203 {
1204 struct device *dev = &pdev->dev;
1205 struct mtk_gen3_pcie *pcie;
1206 struct pci_host_bridge *host;
1207 int err;
1208
1209 host = devm_pci_alloc_host_bridge(dev, sizeof(*pcie));
1210 if (!host)
1211 return -ENOMEM;
1212
1213 pcie = pci_host_bridge_priv(host);
1214
1215 pcie->dev = dev;
1216 pcie->soc = device_get_match_data(dev);
1217 platform_set_drvdata(pdev, pcie);
1218
1219 err = mtk_pcie_setup_irq(pcie);
1220 if (err)
1221 return dev_err_probe(dev, err, "Failed to setup IRQ domains\n");
1222
1223 err = pci_pwrctrl_create_devices(pcie->dev);
1224 if (err) {
> 1225 goto err_teardown_irq;
1226 dev_err_probe(dev, err, "failed to create pwrctrl devices\n");
1227 }
1228
1229 err = mtk_pcie_setup(pcie);
1230 if (err)
1231 goto err_destroy_pwrctrl;
1232
1233 host->ops = &mtk_pcie_ops;
1234 host->sysdata = pcie;
1235
1236 err = pci_host_probe(host);
1237 if (err)
1238 goto err_power_down_pcie;
1239
1240 return 0;
1241
1242 err_power_down_pcie:
1243 mtk_pcie_device_power_down(pcie);
1244 mtk_pcie_power_down(pcie);
1245 err_destroy_pwrctrl:
1246 if (err != -EPROBE_DEFER)
1247 pci_pwrctrl_destroy_devices(pcie->dev);
> 1248 err_tear_down_irq:
1249 mtk_pcie_irq_teardown(pcie);
1250 return err;
1251 }
1252
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.