From mboxrd@z Thu Jan 1 00:00:00 1970 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=1794046300; b=SmKPIl9VwGpRLLj9vF9WXT3PgF9MaBGh+3NYYYPLhmCPCVCTFDZKgpYdb4//ZrUBnGD1 q7crUArfvh9UCOjWMxdoMZypy60Qy6aolIVyyQs0+Gr7GLceX1wTfRDqL0D+6B3SEh7C8 CwpzcSLb5mDwWt9ea0llPeRsgekMHNRur9y3e6P3uYm6PSx51doAPGF6Fsod0XnjMDohf GFT+jX5QS32hhfQ73cmZudbXcOQM7PabjNGSJZKRciy6BbZuxlHW03WFLMf2ZREhpf1Gq 4RTMn9lJwUqIEyHpkSbRtXHofG0xvfhEyxl1LAkAfxc1IYjhFpPFZezDV2PWhEqfiCA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046300; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=Z2Mq3BqtActJIcZiMI4DDfZpMnFN60eo9PwYBG+Qb1A=; b=YwBcH/5fp90sHYjcOsGwNA3SFUgduVBkeJZwNhqY03ba5N07QBdSMRemCOFxFD6x2htp p4EKdeKaz67ZiXZbOdgGS2NoETrIWjo7zF8PI6hFgN2tnUFMo21c9ByvvUgEc8Ufgzurr eFQxEtyCTLfVFLLwugftJbMQk1Pmwz06E8MDWGd3BOOmjieUdyL1gAt/PjlWHE9HO6CDs G6KLUrVMAGrCUqw+hUUfMPPXaewYA4OJT/xDYsoy/h9px7c6Oj+6MsnsYLgoZCf0WuTdl 4aVpfOKS/0vy5oudBoktmRqrciI9VG+JMGfPxCTeBapJjbpcXmS+FqSEH5MWW7rYqyA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=XbT6mubJ; 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 8648C606A326 for ; Sat, 7 Nov 2026 10:11:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=XbT6mubJ Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4D691F0089F; Sat, 7 Nov 2026 10:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046300; bh=Z2Mq3BqtActJIcZiMI4DDfZpMnFN60eo9PwYBG+Qb1A=; h=From:To:Cc:Subject:Date; b=XbT6mubJXZ0RvU6RvflIi4fgHlyaEZRweRkPvwyoZ8nkNPUeWE3V9tGj2JKsoiO9u gHkEbJxvxIKJmcjKt6nxtyg+5o/pDbjKrGUzBtTB/6UKRNEGUfR0hAPOU9d7EgNPn8 KXhP2sMN5U32M+LdOd187rYGduEqkx9YOEVeMLBdYE2jkFgdz/DTaqukRAj3Otzqrb XmgSBq5Vx9Wea8llHOUHKE9XRA7iD/W8I6bStCUYvS+V7uECk7H1Gj3+t9PKGDhPmx JJTyPLpujQ3LT/opistDDnSRExINy8sp2Xc6Zhe4/YIRJ/Nr57s+xE7a3FFmZ54Zg8 T5Y/O7X6rOPKg== From: Sasha Levin To: lilinmao@kylinos.cn, manivannan.sadhasivam@oss.qualcomm.com, bhelgaas@google.com, a-garg7@ti.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] PCI: cadence: Store the core controller in platform drvdata" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:11:38 -0500 Message-ID: <20261107051138-failed-6.18-cfe96ce583c5@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x cfe96ce583c51bf6e034d4038c652a1e8227867c # git commit -s git send-email --to '' --in-reply-to '20261107051138-failed-6.18-cfe96ce583c5@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From cfe96ce583c51bf6e034d4038c652a1e8227867c Mon Sep 17 00:00:00 2001 From: Linmao Li Date: Tue, 15 Sep 2026 16:28:26 +0800 Subject: [PATCH] PCI: cadence: Store the core controller in platform drvdata 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 --- .../controller/cadence/pcie-cadence-plat.c | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c index 13edc6be21f59..4a24302cc5b2c 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -14,14 +14,6 @@ #define CDNS_PLAT_CPU_TO_BUS_ADDR 0x0FFFFFFF -/** - * struct cdns_plat_pcie - private data for this PCIe platform driver - * @pcie: Cadence PCIe controller - */ -struct cdns_plat_pcie { - struct cdns_pcie *pcie; -}; - static const struct of_device_id cdns_plat_pcie_of_match[]; static u64 cdns_plat_cpu_addr_fixup(struct cdns_pcie *pcie, u64 cpu_addr) @@ -36,9 +28,9 @@ 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; struct device *dev = &pdev->dev; struct pci_host_bridge *bridge; + struct cdns_pcie *pcie; struct cdns_pcie_ep *ep; struct cdns_pcie_rc *rc; bool is_rc; @@ -51,11 +43,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; @@ -67,9 +54,9 @@ 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; + pcie = &rc->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; @@ -94,9 +81,9 @@ 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; + pcie = &ep->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; @@ -114,13 +101,15 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) goto err_init; } + platform_set_drvdata(pdev, pcie); + return 0; err_init: err_get_sync: pm_runtime_put_sync(dev); pm_runtime_disable(dev); - cdns_pcie_disable_phy(cdns_plat_pcie->pcie); + cdns_pcie_disable_phy(pcie); return ret; } -- 2.53.0