From nobody Wed Dec 17 11:02:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7030DC4167B for ; Tue, 28 Nov 2023 06:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343665AbjK1Gnz (ORCPT ); Tue, 28 Nov 2023 01:43:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231540AbjK1Gnx (ORCPT ); Tue, 28 Nov 2023 01:43:53 -0500 Received: from smtpbgbr1.qq.com (smtpbgbr1.qq.com [54.207.19.206]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D98A113 for ; Mon, 27 Nov 2023 22:43:55 -0800 (PST) X-QQ-mid: bizesmtp87t1701153823tkqoz2a2 Received: from HX09040029.powercore.com.cn ( [58.34.117.194]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 28 Nov 2023 14:43:40 +0800 (CST) X-QQ-SSF: 01400000000000302000000A0000000 X-QQ-FEAT: rZJGTgY0+YO7EsZrHxvcRIiveH2oXURd51CPdA8OFs/LdrcmP73El4CyEsk7G 0UiLBZ1Ds5Wq5Q13fzaCSpl9pdPE1lEMBROXPWcM75KL+QgnIuEfcmwhqSV2nHwaH86tNce BvRnVEuCkkkVZ6UQHSnu6mc95UjMs/g761i9Qz2s0ZIo3Y3QSptb8TXlOPuMQtkJVCCN6yK xlzM3a7t5+eOxC6jDxKLY0ZE5CRHhpP4jdD+XLuXg9y+c/zRqJ+Oc4arnzi2SCNjzsVuvoD RSecDodBqIhbgFlh7lyY/nLH2WM2OaoinLhbP8jWQ076A26jU8z05ywe+cLWFZBU0PqkzfA AaGSvLTK8GOQ3p4WI9mB4LFljniCi5DVZfmCnn50r2PzXKeB1j90fayy5IJ348j15XIuNec X-QQ-GoodBg: 2 X-BIZMAIL-ID: 10265059360266172005 From: Luming Yu To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: luming.yu@gmail.com, ke.zhao@shingroup.cn, dawei.li@shingroup.cn, shenghui.qu@shingroup.cn, Luming Yu Subject: [PATCH v1] powerpc/powernv/pci: fix PE in re-used pci_dn for pnv_pci_enable_device_hook Date: Tue, 28 Nov 2023 14:43:38 +0800 Message-ID: <7E99D8C8296BB626+20231128064339.5038-1-luming.yu@shingroup.cn> X-Mailer: git-send-email 2.42.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:shingroup.cn:qybglogicsvrgz:qybglogicsvrgz5a-1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" after hot remove a pcie deivce with pci_dn having pnp_php driver attached, pci rescan with echo 1 > /sys/bus/pci/rescan could fail with error message like: pci 0020:0e:00.0: BAR 0: assigned [mem 0x3fe801820000-0x3fe80182ffff 64bit] nvme nvme1: pci function 0020:0e:00.0 nvme 0020:0e:00.0 pci_enable_device() blocked, no PE assigned. It appears that the pci_dn object is reused with only pe_number clobbered in the case. And a simple call to pnv_ioda_setup_dev_PE should get PE number back and solve the problem. Signed-off-by: Luming Yu --- v0 -> v1: -clean up garbage leaked in git format patch that stems from git clone and = checkout=20 -conflicts of files in local windows filesystem with weird cases and names = quriks. --- arch/powerpc/platforms/powernv/pci-ioda.c | 11 +- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platf= orms/powernv/pci-ioda.c index 28fac4770073..9d7add79ee3d 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -2325,11 +2325,18 @@ static resource_size_t pnv_pci_default_alignment(vo= id) static bool pnv_pci_enable_device_hook(struct pci_dev *dev) { struct pci_dn *pdn; + struct pnv_ioda_pe *pe; =20 pdn =3D pci_get_pdn(dev); - if (!pdn || pdn->pe_number =3D=3D IODA_INVALID_PE) { - pci_err(dev, "pci_enable_device() blocked, no PE assigned.\n"); + if (!pdn) return false; + + if (pdn->pe_number =3D=3D IODA_INVALID_PE) { + pe =3D pnv_ioda_setup_dev_PE(dev); + if (!pe) { + pci_err(dev, "pci_enable_device() blocked, no PE assigned.\n"); + return false; + } } =20 return true;