From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 C0C4231355C for ; Wed, 25 Feb 2026 07:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772004186; cv=none; b=ffj0HLj/Q7iueHJBr0pfE5ohD9IeYt2D0A47R4HhlRZqO6WEkdZO5FFiXkyNtv7veS5cJ3HeZzUTo7kOAdrLH8H+eSV3mL+V3qU+JJzzNM6QlHnY9XRyjl9ks9aDzst3xM+S8T03g3kw49Ou0Z3igDdEYw3WD3AALR9lNtQ6xnQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772004186; c=relaxed/simple; bh=x06EJt3U7JAQT3c2K6WG38OVJTg2BrI1PIPuHSdgkw4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rDoKo51zfuVasFanIw+vzxlUVIGFMBQoBiz0zqDs2gzlOGfdvw+eAvRIrflkrcOBrF1uLWVGIt4Z9TCVnI3MIf37ryvJCGCUr89n2GneaTQyvcw45ZLgL5WExaJAv23vjODFwyzGjvP9PGI5FPLGvMH74Vlj4ll0LfAlUGDS5qk= 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=CRZa7NBJ; arc=none smtp.client-ip=209.85.214.181 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="CRZa7NBJ" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2aaecf9c325so3964415ad.1 for ; Tue, 24 Feb 2026 23:23:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1772004184; x=1772608984; 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=oUo4vtr12HAXaUXM31/ATv4Xjd7UfeFJnf/tlsKW30E=; b=CRZa7NBJBQ/ZR2F3fLCGAYxN9BthVPifiw2AO8FQxX3U2qkL28XmothzQnfDn2lahO 8ZQ6GABYJ1P+QaPiHKS3ttOPRKUP7R/i1ow2J2oLhLWtLff29pLVo/H2Y5ZIwvr3Jt2K nFUJeqjGN/6ipVzJLjPMmbtNDQkFMYd42S5fc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772004184; x=1772608984; 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=oUo4vtr12HAXaUXM31/ATv4Xjd7UfeFJnf/tlsKW30E=; b=CKi+zn/sqkdB9n/TwD+TyV4nF0lkLPKbX7hi6Q2ji1IAyMYU+siMBHI2Z7dZIV8F/T UjQ5ldk9rjt7NGUPofXzIk22dHRHXnW/a9XrlH4ShEvGf9d+vxRRiBouyVj7y2F/pRd+ DvXoRljWGHquOar8ZTNCNdEcubHJ/dzeGVU27dHPIt+vmUzUzR6p/hFO8DBNa6Ufa4O6 wPNYIx9vOm02SW6VZyXaxhyb7mlvwlC6m2mFpB3JGdmK1gmYax0bszSylaMJns5FOVh0 OzGRpg0lh9WUZNiaoIHc92BH1WjLH0/9yArg7ev/IVn2uP2PR6I3+sy7hGvmlCQVnOY4 Ik1Q== X-Forwarded-Encrypted: i=1; AJvYcCW26BHAf9oP1OWplqQnqL570LFGJQ2EMNXU1EvDYsU3DFOiDFYXAxuW3hv9yarY4IbiikiVNwnFZObhkT4=@vger.kernel.org X-Gm-Message-State: AOJu0YwS17DHJAnQ1aF2J/LWxgOvwSKD6EY3S552EkawY3mjZ381uIeS 8hrl35uMswxCsmCnfMXXPrFkoJDjjE24z+hG7gy8L0OVwfGpmXSi4XRSoMSXFEVyUA== X-Gm-Gg: ATEYQzx4Yv7FzGHg3Yng3rB82hBUytuGhcLgkwjxWBDKHpsyRwDPBjwv79QTQulXVqW Rn4FIxetKx738mimoc1xb2P2gVpFDCglcVfjPLMvxS3v39jwPsGBoQBoDBXMzngG8F/5ViiT39K 9s9QPAMYV42Tt/oyuFozEZASoynnpprciFKfCYWghYg5KKJepGHJrtIu/hT0rCyp45R5YB+L2lS eQZoAQfi15hXSS04ClMcD8rNwyUUdFOsYbMdyNx+6aZ/uE/NjHGL6MRtip+V+wC7ljgeKxUbXOW ulvcRO6BtuonoE76wndRpHF0AWZuCrQzzWp64zjy7OUhsEDCupbwp0IxDzU2lreOTlgBPnQax3U zLVu3w8kBgDh1D63Dw4ihoohWTFnSqLxHZP+VSph7/VkDcRNwV/grdq1+w3V9wo9AJgutfTjv5X FwLdKe7vx8g4fiLv2BzvoO9R1pF6VlUkR+7k1wlGs6mu1LWqXa7CxeOQgf5cbFrB6L0oqH9qZwG t5coA== X-Received: by 2002:a17:903:230f:b0:2a7:aac1:7201 with SMTP id d9443c01a7336-2adbdc0fea2mr28441365ad.3.1772004184166; Tue, 24 Feb 2026 23:23:04 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:9d6:2e6a:941b:690]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad7503fdc9sm130814435ad.80.2026.02.24.23.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 23:23:03 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Ryder Lee , Jianjun Wang , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen-Yu Tsai , Bartosz Golaszewski , linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] PCI: mediatek-gen3: Integrate new pwrctrl API Date: Wed, 25 Feb 2026 15:22:22 +0800 Message-ID: <20260225072225.3345307-6-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.414.gf7e9f6c205-goog In-Reply-To: <20260225072225.3345307-1-wenst@chromium.org> References: <20260225072225.3345307-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: 8bit 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. Signed-off-by: Chen-Yu Tsai --- drivers/pci/controller/pcie-mediatek-gen3.c | 38 ++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c index 7459e1c1899d..93e591f788f7 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_pcie *pcie) val |= PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB; writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG); + } + + 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); + /* + * 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) @@ -1211,9 +1222,13 @@ static int mtk_pcie_probe(struct platform_device *pdev) pcie->soc = device_get_match_data(dev); platform_set_drvdata(pdev, pcie); + err = pci_pwrctrl_create_devices(pcie->dev); + if (err) + return dev_err_probe(dev, err, "failed to create pwrctrl devices\n"); + err = mtk_pcie_setup(pcie); if (err) - return err; + goto err_destroy_pwrctrl; host->ops = &mtk_pcie_ops; host->sysdata = pcie; @@ -1226,7 +1241,12 @@ static int mtk_pcie_probe(struct platform_device *pdev) err_teardown_irq_and_power_down: mtk_pcie_irq_teardown(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); + return err; } @@ -1241,7 +1261,9 @@ static void mtk_pcie_remove(struct platform_device *pdev) pci_unlock_rescan_remove(); mtk_pcie_irq_teardown(pcie); + pci_pwrctrl_power_off_devices(pcie->dev); mtk_pcie_power_down(pcie); + pci_pwrctrl_destroy_devices(pcie->dev); } static void mtk_pcie_irq_save(struct mtk_gen3_pcie *pcie) -- 2.53.0.414.gf7e9f6c205-goog