Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054085; b=qaIvYO3zGghi1MTugXBDCfkp5tGDex0fRe8F+9nppv5QnUMOpfAjMQNorbMrdERm9p26 Q14fwS7jTgCTsnMvJ0dJqiVywSyYOM0MKCdNu70IsNYNJwhTj2pGlGaWcPK4jitefdkNe Td8HQ64E8T54sqediwi83Xx09Yf5hjZnsDKYZjD5n+i2CpiThMNObxsxbbOrSps8j5pjy pbIZm9puy6O9jhBvre2U2uNXPwFy0bGs5bEd6ni7gf2/8lJ4xbURBBNuDN3asnFF169eY xxQXwgk+MeLAAJDCefQexH8gAEhGdGEQkU0FZzAQQ9LT6ZPKyVejMaUK9L+B2+1xJpQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054085; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=24n8dzQxpe1C/V+t6gstLjHC5pvRCppJugsC8d0x4FE=; b=Eb3EfIX9BstTPXZ4RWRt3j4jwO1akixZ68AJMcVmJhF0ocd6re7uH50UJyt5HS1GYb5g pYrzZCnW6j9UzTlGsmHzZGNgxsAik6y+OABNn1O2Mmrs0Ph5qFzU31VBzlTiA9TlB4HLP JDPfys12X/J69VJBEtpkrc3EgmKNbFBjJJkBFsL5Pj/FuM2Zb7ht4Vc5Fllusw+q6yt3I JDn0NcdKFEHob0RqzHIkx0940RKfXVEW5vSGSmGAntgn50+XbOLrjBgjhPbrBusJYPVxN 91NUI4yak3MkWA6nzZp68Za7wY2v9WvyHdMW6zhIj5W0bsfXSHUR/nTACOxuLrhoY4A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=U2WPtxNN; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE41F606A31C; Thu, 19 Nov 2026 02:08:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=U2WPtxNN Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A66C1F000C4; Thu, 19 Nov 2026 02:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054085; bh=24n8dzQxpe1C/V+t6gstLjHC5pvRCppJugsC8d0x4FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U2WPtxNNVMD3bwQ+NWCDhjUK/tPHR5W8Ac4SNS8pvBo4rAvc250vKrjlzQtvBsamZ trj7HVk1Qx2fhvEzeymz4v+7dJzmwSWAvWPIIm0oV9nVK24MeOFdbChfXraKX4vpRr xT+8s2si2cFX5Vq0nYHe934y4Ly0nkujAYDp6Mlc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linmao Li , Manivannan Sadhasivam , Bjorn Helgaas , Aksh Garg , Sasha Levin Subject: [PATCH 5.15 1148/2214] PCI: cadence: Store the core controller in platform drvdata Date: Wed, 18 Nov 2026 15:47:04 +0100 Message-ID: <20261118150057.926887500@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linmao Li [ Upstream commit cfe96ce583c51bf6e034d4038c652a1e8227867c ] cdns_plat_pcie_probe() stores a struct cdns_plat_pcie pointer with platform_set_drvdata(). cdns_plat_pcie_shutdown() and the callbacks in cdns_pcie_pm_ops retrieve the same pointer with dev_get_drvdata() but use it as a struct cdns_pcie pointer. This makes them read phy_count and phy beyond the wrapper. struct cdns_plat_pcie only contains a pointer to struct cdns_pcie. Drop the redundant wrapper and store the struct cdns_pcie pointer directly. Fixes: bd22885aa188 ("PCI: cadence: Refactor driver to use as a core library") Signed-off-by: Linmao Li Signed-off-by: Manivannan Sadhasivam Signed-off-by: Bjorn Helgaas Reviewed-by: Aksh Garg Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260915082826.4135665-1-lilinmao@kylinos.cn [ sashal: Moved driver-data assignment before PHY initialization to preserve pointer availability when the existing probe error path returns success. ] Signed-off-by: Sasha Levin --- .../controller/cadence/pcie-cadence-plat.c | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c index a224afadbcc00..181b36a5d159d 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -15,17 +15,6 @@ #define CDNS_PLAT_CPU_TO_BUS_ADDR 0x0FFFFFFF -/** - * struct cdns_plat_pcie - private data for this PCIe platform driver - * @pcie: Cadence PCIe controller - * @is_rc: Set to 1 indicates the PCIe controller mode is Root Complex, - * if 0 it is in Endpoint mode. - */ -struct cdns_plat_pcie { - struct cdns_pcie *pcie; - bool is_rc; -}; - struct cdns_plat_pcie_of_data { bool is_rc; }; @@ -44,10 +33,10 @@ static const struct cdns_pcie_ops cdns_plat_ops = { static int cdns_plat_pcie_probe(struct platform_device *pdev) { const struct cdns_plat_pcie_of_data *data; - struct cdns_plat_pcie *cdns_plat_pcie; const struct of_device_id *match; struct device *dev = &pdev->dev; struct pci_host_bridge *bridge; + struct cdns_pcie *pcie; struct cdns_pcie_ep *ep; struct cdns_pcie_rc *rc; int phy_count; @@ -62,11 +51,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) is_rc = data->is_rc; pr_debug(" Started %s with is_rc: %d\n", __func__, is_rc); - cdns_plat_pcie = devm_kzalloc(dev, sizeof(*cdns_plat_pcie), GFP_KERNEL); - if (!cdns_plat_pcie) - return -ENOMEM; - - platform_set_drvdata(pdev, cdns_plat_pcie); if (is_rc) { if (!IS_ENABLED(CONFIG_PCIE_CADENCE_PLAT_HOST)) return -ENODEV; @@ -78,10 +62,10 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) rc = pci_host_bridge_priv(bridge); rc->pcie.dev = dev; rc->pcie.ops = &cdns_plat_ops; - cdns_plat_pcie->pcie = &rc->pcie; - cdns_plat_pcie->is_rc = is_rc; + pcie = &rc->pcie; + platform_set_drvdata(pdev, pcie); - ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie); + ret = cdns_pcie_init_phy(dev, pcie); if (ret) { dev_err(dev, "failed to init phy\n"); return ret; @@ -106,10 +90,10 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) ep->pcie.dev = dev; ep->pcie.ops = &cdns_plat_ops; - cdns_plat_pcie->pcie = &ep->pcie; - cdns_plat_pcie->is_rc = is_rc; + pcie = &ep->pcie; + platform_set_drvdata(pdev, pcie); - ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie); + ret = cdns_pcie_init_phy(dev, pcie); if (ret) { dev_err(dev, "failed to init phy\n"); return ret; @@ -133,10 +117,10 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) err_get_sync: pm_runtime_put_sync(dev); pm_runtime_disable(dev); - cdns_pcie_disable_phy(cdns_plat_pcie->pcie); - phy_count = cdns_plat_pcie->pcie->phy_count; + cdns_pcie_disable_phy(pcie); + phy_count = pcie->phy_count; while (phy_count--) - device_link_del(cdns_plat_pcie->pcie->link[phy_count]); + device_link_del(pcie->link[phy_count]); return 0; } -- 2.53.0