From nobody Thu Apr 9 08:51:48 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E46C441037 for ; Tue, 10 Mar 2026 09:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773134421; cv=none; b=MGz5PIBQKLKOTO5MNfXFdBYd2VZgHEArDD48rCKe1nf7ie4EHeXS78cItF8pSSwLRDhLsF/PG9ECbMUmz/U+tji+nzBirl47tSEQ7id7YH0e9t6bGtWpMa0DsqoEdDJCrujh+fPReXRNtmU7w7RsPfr/4yNWjqXyCm6hGEOB52E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773134421; c=relaxed/simple; bh=0s/EVo11KT6y6XGLMfn6PRuBMC+9QqPzMserznvxng4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tsESEo7d9+sZ5TLQ5AOTaLg7FXwvZDbKDx0xk6ycRNEhDN7uzMkZKlyzMcepLqZM/qn5JxWRyQrW0vIq0J7Lw2aYcLGqAvNaA7DFEL+4dCKZPJaHMjSwT3R+boGBr3RUCBsdL3+t78X2u/p4sRGy+S5p9VZtzC6cuPumox1n9es= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ZzGnGjMV; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZzGnGjMV" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-829abaaa92bso1831021b3a.1 for ; Tue, 10 Mar 2026 02:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773134416; x=1773739216; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=af02IVkQlyjh7MHZRvKNkK4tswtXHtMfEowyRfn4+2I=; b=ZzGnGjMVv6bjsjb8PIDtW/PmvRTxeIVdHYsOHrkDjCEsuxKk2MJ3z2rAcEuBUqaVrf inZlHA4YL/T8SiE46czoToCSMygth9FbK+6ubYNfniQGtUzWjk0yGBGaL4sVe0+GNn0e qnOMx2nP7F6Ek1Csa4+PrClm27FL9LPfYiM1U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773134416; x=1773739216; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=af02IVkQlyjh7MHZRvKNkK4tswtXHtMfEowyRfn4+2I=; b=iC7LkTgH2GPWpcNqe00CPdy0y17QLN9Ddn0hbePILDd+2LAK1LD8pW1ZSw+7qQR8y+ sdbOuMomh4YyVIbHctrSs1guj78XLP7t7xcnl6a93upX7LjVlWra9y+MD32iJWTHs0MZ d7iOLUafVUxUeGhxOZFvmKtP7BaQQk4QM/dzaEUrWpA8rYesWe6aqqnaxHgG8x/cQXTS hFGeTL/UlkcFrrHDu+DOBiuWlgB1RCy3V2mj3KcCepYKj7L2Heh06GogucHSlvzfZNUJ wZtiAPWYQqYdiKSx32pQdM5JXTRQEyMKDJMyWrrGZPwj9u4NxfM93SCJCyWK1zzpMpQb WkFw== X-Forwarded-Encrypted: i=1; AJvYcCV0bpxzgA2SL3RPQiqvgNx7WEZi2S3+dW7DSAkFotQTfKaoghO94hUkVIdYQBum8cN8PZ2B1i+aUMxTMfU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf8NUOTmFWelMbET+uZj5TeOANHFuzpi8W/4UtamNgLDwQOQ3l HASs0ARg6nbd/0PMhNfjAXrJ4uYwQSoFjsDEDWET93/NMUZnTkXl7BXMxW1iMIoVww== X-Gm-Gg: ATEYQzwsNE7WN/OEh3XO3SOwav1PCzLbwus2uuqCZ9km8fdKYpsxP7u/g6F0UChucnx ZpCeOZRp/Gk8OY4Jl799A0FqrWlg0CLlthtB8NVSe/yFXj71t5pKC1xl8LFhXHfxvnZ7idrYwpC SwfxtpU0DbDLyZndicCoIfCJLj5VWsXEJ9pcO8bds3jFJVDC8wx6kDclV6XQKbCXOJLwB72gRTG z+lkmv50nkjZemUpeyMVKsu3ka4fjR5NtYTi8w7Gs0wOzB687eKux+fMGOro2FSYkHPAjnWLSjP ENLBmkL/ty6XFJHJiJ0vqOuqYpo8k8cZ1Lm7jxIb8hkphhh+qfbrR8s3mVXbsSDULHot5Nuh/bb ZzqupBowaTwlGoE+w2LTwwKRe/N/WIFpusMbAtiesv6HbUvZ3+ElL1FmR4oOf0UC0Jhrs6NvoYm dG9/pqxKB62tCzj+i05FxUNJTNEWZSwtpx+TmZV4C4KZho+PO7Ck/Xq4UX60x5lKYvnwsyPRkrM DRqz7V3 X-Received: by 2002:a05:6a00:2d1e:b0:819:5db9:6ac0 with SMTP id d2e1a72fcca58-829a2f397femr11923975b3a.37.1773134416561; Tue, 10 Mar 2026 02:20:16 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829a48a3b74sm16965190b3a.45.2026.03.10.02.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 02:20:16 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Ryder Lee , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas Cc: Chen-Yu Tsai , Bartosz Golaszewski , linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 7/7] PCI: mediatek-gen3: Integrate new pwrctrl API Date: Tue, 10 Mar 2026 17:19:46 +0800 Message-ID: <20260310091947.2742004-8-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310091947.2742004-1-wenst@chromium.org> References: <20260310091947.2742004-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Bartosz Golaszewski Reviewed-by: Manivannan Sadhasivam Signed-off-by: Chen-Yu Tsai --- 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/cont= roller/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 #include #include +#include #include #include #include @@ -421,15 +422,23 @@ static int mtk_pcie_device_power_up(struct mtk_gen3_p= cie *pcie) val |=3D PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB; writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG); + } =20 - /* - * 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 =3D 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; + } =20 + /* + * 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 &=3D ~(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 |=3D PCIE_PE_RSTB; writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG); } + + pci_pwrctrl_power_off_devices(pcie->dev); } =20 static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie) @@ -1209,9 +1220,15 @@ static int mtk_pcie_probe(struct platform_device *pd= ev) if (err) return dev_err_probe(dev, err, "Failed to setup IRQ domains\n"); =20 + err =3D pci_pwrctrl_create_devices(pcie->dev); + if (err) { + goto err_teardown_irq; + dev_err_probe(dev, err, "failed to create pwrctrl devices\n"); + } + err =3D mtk_pcie_setup(pcie); if (err) - goto err_tear_down_irq; + goto err_destroy_pwrctrl; =20 host->ops =3D &mtk_pcie_ops; host->sysdata =3D pcie; @@ -1225,6 +1242,9 @@ static int mtk_pcie_probe(struct platform_device *pde= v) err_power_down_pcie: mtk_pcie_device_power_down(pcie); mtk_pcie_power_down(pcie); +err_destroy_pwrctrl: + if (err !=3D -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 *p= dev) pci_remove_root_bus(host->bus); pci_unlock_rescan_remove(); =20 + pci_pwrctrl_power_off_devices(pcie->dev); mtk_pcie_power_down(pcie); + pci_pwrctrl_destroy_devices(pcie->dev); mtk_pcie_irq_teardown(pcie); } =20 --=20 2.53.0.473.g4a7958ca14-goog