From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F2A2259CB1; Tue, 24 Jun 2025 22:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750804085; cv=none; b=HUwF21lx4eztV4WRHmJQovG+HjYuCrvlXhuQ+YeGkF4n8HL0NPJqtV2G2plhi2EqTToHPdFaEjgnZvsRH1kXp5NMnELoMMKPec+DT4CZyF4tRleX3iqT9PSmeMFUoskLNJRpZ+El0YKRlWZUMDJC/SPgP2EybhA5AxpNt8oBd1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750804085; c=relaxed/simple; bh=jXEq0Zryo5iWhdDOObD3sH++As83oQggjSwqxjEgGGE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=Rp+vytK+CH9kiIYfXMkFt6JkLJJxSWUdV32Stg7QjcLFmKpZOTYlSXVUEVaDXcKJBLYIz0a4OUEZuDfd2VZTXwTE+cH629GT+lJsi+k7UsMVvAOuKHlfvVPHstkskoH3zWTsFw++Dof76UvsEBF0pLlInTdn616w/5mvhxt204k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iA0eWhzZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iA0eWhzZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B82D4C4CEE3; Tue, 24 Jun 2025 22:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750804084; bh=jXEq0Zryo5iWhdDOObD3sH++As83oQggjSwqxjEgGGE=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=iA0eWhzZtQm8KYqXOu60xOUYe58rPuGOKbOApXGwGahTm/Oj78klw/cT8mRksPPQA tR6nH3Xx8P58UK0AUIedLQmj9kFsO962U0IZGcTjLIWSkls7nQaQo4+VVJgfY3Ro5L M+gEYg4qFsa++TmbjGysA9o7B1arJEYNUNm7rAVv0J7NC6cuSdm55gq0Ew7oKBvesc xa7tbWPTAwNItJckvmCgVUjyqeOYmbpUB6s7+EjRrwAhR6pc7m8rLVw4cRWyWNR5W/ VII/IFBXF0xndSwav8RZFZ9m6SVqH00P8EH5cmkvDqvy6X76eiiVRXKfsL3BGXu3/w H24EtUZCa3sEg== Date: Tue, 24 Jun 2025 17:28:03 -0500 From: Bjorn Helgaas To: Geert Uytterhoeven Cc: Marc Zyngier , Alyssa Rosenzweig , Rob Herring , Manivannan Sadhasivam , Will Deacon , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Bjorn Helgaas , Conor Dooley , Daire McNamara , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] PCI: host-generic: Set driver_data before calling gen_pci_init() Message-ID: <20250624222803.GA1549866@bhelgaas> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <774290708a6f0f683711914fda110742c18a7fb2.1750787223.git.geert+renesas@glider.be> On Tue, Jun 24, 2025 at 07:50:10PM +0200, Geert Uytterhoeven wrote: > On MicroChip MPFS Icicle: > > microchip-pcie 2000000000.pcie: host bridge /soc/pcie@2000000000 ranges: > microchip-pcie 2000000000.pcie: Parsing ranges property... > microchip-pcie 2000000000.pcie: MEM 0x2008000000..0x2087ffffff -> 0x0008000000 > Unable to handle kernel NULL pointer dereference at virtual address 0000000000000368 > Current swapper/0 pgtable: 4K pagesize, 39-bit VAs, pgdp=0x00000000814f1000 > [0000000000000368] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000 > Oops [#1] > Modules linked in: > CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.15.0-rc1-icicle-00003-gafc0a570bb61 #232 NONE > Hardware name: Microchip PolarFire-SoC Icicle Kit (DT) > [...] > [] plda_pcie_setup_iomems+0xe/0x78 > [] mc_platform_init+0x80/0x1d2 > [] pci_ecam_create+0x104/0x1e2 > [] pci_host_common_init+0x120/0x228 > [] pci_host_common_probe+0x7c/0x8a > > The initialization of driver_data was moved after the call to > gen_pci_init(), while the pci_ecam_ops.init() callback > mc_platform_init() expects it has already been initialized. > > Fix this by moving the initialization of driver_data up. > > Fixes: afc0a570bb613871 ("PCI: host-generic: Extract an ECAM bridge creation helper from pci_host_common_probe()") > Signed-off-by: Geert Uytterhoeven Applied to pci/for-linus for v6.16, since afc0a570bb613871 appeared in v6.16-rc1. > --- > Notes: > 1. Before, driver_data was initialized before calling > of_pci_check_probe_only(), but the latter doesn't rely on that, > 2. drivers/pci/controller/plda/pcie-microchip-host.c seems to be the > only driver relying on driver_data being set. > --- > drivers/pci/controller/pci-host-common.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c > index b0992325dd65f0da..b37052863847162d 100644 > --- a/drivers/pci/controller/pci-host-common.c > +++ b/drivers/pci/controller/pci-host-common.c > @@ -64,13 +64,13 @@ int pci_host_common_init(struct platform_device *pdev, > > of_pci_check_probe_only(); > > + platform_set_drvdata(pdev, bridge); > + > /* Parse and map our Configuration Space windows */ > cfg = gen_pci_init(dev, bridge, ops); > if (IS_ERR(cfg)) > return PTR_ERR(cfg); > > - platform_set_drvdata(pdev, bridge); > - > bridge->sysdata = cfg; > bridge->ops = (struct pci_ops *)&ops->pci_ops; > bridge->enable_device = ops->enable_device; > -- > 2.43.0 >