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 9A0B9347FFE; Wed, 19 Nov 2025 11:30:44 +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=1763551844; cv=none; b=SFtQA+zdjYLQz+kppMGMTQytHZptdTCk/fze4VS+j5efuR8c6/YmrJSriZXRXgLzw+YkpxmpzmGZHioKCiMiq7j0rU84/J6wd/6YV7bcq1Q+MzF2O0xTZI1k2FPIrJrZvPAZm9cDxnD1jjeKjD8aRdPHylJLcQvebsgPtTaCM94= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763551844; c=relaxed/simple; bh=+5YXdMx46saMCGpp0KfgT4nTqpINGY6N6o3Z2+eXPTE=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=SaI4bYBGCcKOQBeX8UdvIJjBdSHmyxoFdme4GmI9l6rhHUPMnPO22oGKKOC0bPiz1RKZUPRoHrwsYlYjDQb55LYmTM+O6akq5Bcl6NeC04TsG+6o5F0EZ5Zgl8dNjPswzm3twneaWvt/7Ld7SrDuXOwU/XfWVf9vnnOuJ+oPypA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tsCZ3b90; 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="tsCZ3b90" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5D8DC2BCC4; Wed, 19 Nov 2025 11:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763551844; bh=+5YXdMx46saMCGpp0KfgT4nTqpINGY6N6o3Z2+eXPTE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=tsCZ3b90FimZTdmqyKH7ucxujhM3RDOJEucEDRLCZK+PUzWI1DGqTA+smX8vh3SmE e2U2LfTyTs75TS1B4x9wKLllf3zvmRfSBmnHTeATzS/xCcuX3P3YsM3NL0V84M5Ty5 UpHN51yCpVxP0rkB9fxWoM7ySuIAE168EC7gXpb+DboICC8zCGSXabmPjsn8xR386o DsrlrHxoZvPwEBTGC1iTtaZoyWocNV7DBCOlEH3vBV/gvP28oQIyFFU2cox04BGTt6 3AVG12DxJ1kZo7nXkK/i/7UQ8LYny9VTyMW0BjfNE7RlZbio31UqfOy3EyLh5x1tGT g6OizM7QjNXfw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vLgOX-00000006Vas-0yGm; Wed, 19 Nov 2025 11:30:41 +0000 Date: Wed, 19 Nov 2025 11:30:40 +0000 Message-ID: <86ldk2s1i7.wl-maz@kernel.org> From: Marc Zyngier To: Radu Rendec Cc: Bjorn Helgaas , Manivannan Sadhasivam , Will Deacon , Rob Herring , Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?= , Lorenzo Pieralisi , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] PCI: apple: Store private pointer in platform device's drvdata In-Reply-To: <20251118221244.372423-3-rrendec@redhat.com> References: <20251118221244.372423-1-rrendec@redhat.com> <20251118221244.372423-3-rrendec@redhat.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: rrendec@redhat.com, bhelgaas@google.com, mani@kernel.org, will@kernel.org, robh@kernel.org, kwilczynski@kernel.org, lpieralisi@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Tue, 18 Nov 2025 22:12:44 +0000, Radu Rendec wrote: > > Now pci_host_common_init() no longer uses the platform device's drvdata > to store the pointer to the allocated struct pci_host_bridge. Use the > drvdata to store the pointer to the driver's private data, which is the > struct apple_pcie allocated in apple_pcie_probe(). This eliminates the > need to store these pointers in a separate mapping table. > > This reverts most of the changes in commit 643c0c9d0496 ("PCI: apple: > Add tracking of probed root ports"). No "Fixes" tag is added because > nothing is broken in that commit. This is just a simplification. > > Signed-off-by: Radu Rendec > --- > drivers/pci/controller/pcie-apple.c | 53 ++++------------------------- > 1 file changed, 7 insertions(+), 46 deletions(-) > > diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c > index 0380d300adca6..75bb6d51d31c2 100644 > --- a/drivers/pci/controller/pcie-apple.c > +++ b/drivers/pci/controller/pcie-apple.c > @@ -187,7 +187,6 @@ struct apple_pcie { > const struct hw_info *hw; > unsigned long *bitmap; > struct list_head ports; > - struct list_head entry; > struct completion event; > struct irq_fwspec fwspec; > u32 nvecs; > @@ -206,9 +205,6 @@ struct apple_pcie_port { > int idx; > }; > > -static LIST_HEAD(pcie_list); > -static DEFINE_MUTEX(pcie_list_lock); > - > static void rmw_set(u32 set, void __iomem *addr) > { > writel_relaxed(readl_relaxed(addr) | set, addr); > @@ -724,45 +720,13 @@ static int apple_msi_init(struct apple_pcie *pcie) > return 0; > } > > -static void apple_pcie_register(struct apple_pcie *pcie) > -{ > - guard(mutex)(&pcie_list_lock); > - > - list_add_tail(&pcie->entry, &pcie_list); > -} > - > -static void apple_pcie_unregister(struct apple_pcie *pcie) > -{ > - guard(mutex)(&pcie_list_lock); > - > - list_del(&pcie->entry); > -} > - > -static struct apple_pcie *apple_pcie_lookup(struct device *dev) > -{ > - struct apple_pcie *pcie; > - > - guard(mutex)(&pcie_list_lock); > - > - list_for_each_entry(pcie, &pcie_list, entry) { > - if (pcie->dev == dev) > - return pcie; > - } > - > - return NULL; > -} > - > static struct apple_pcie_port *apple_pcie_get_port(struct pci_dev *pdev) > { > struct pci_config_window *cfg = pdev->sysdata; > - struct apple_pcie *pcie; > + struct apple_pcie *pcie = platform_get_drvdata(to_platform_device(cfg->parent)); Isn't that an overly complicated way to write: struct apple_pcie *pcie = dev_get_drvdata(cfg->parent); > struct pci_dev *port_pdev; > struct apple_pcie_port *port; > > - pcie = apple_pcie_lookup(cfg->parent); > - if (WARN_ON(!pcie)) > - return NULL; > - > /* Find the root port this device is on */ > port_pdev = pcie_find_root_port(pdev); > > @@ -843,13 +807,9 @@ static void apple_pcie_disable_device(struct pci_host_bridge *bridge, struct pci > static int apple_pcie_init(struct pci_config_window *cfg) > { > struct device *dev = cfg->parent; > - struct apple_pcie *pcie; > + struct apple_pcie *pcie = platform_get_drvdata(to_platform_device(dev)); > int ret; > > - pcie = apple_pcie_lookup(dev); > - if (WARN_ON(!pcie)) > - return -ENOENT; > - > for_each_available_child_of_node_scoped(dev->of_node, of_port) { > ret = apple_pcie_setup_port(pcie, of_port); > if (ret) { > @@ -876,6 +836,7 @@ static int apple_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct apple_pcie *pcie; > + struct pci_host_bridge *bridge; > int ret; > > pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); > @@ -897,11 +858,11 @@ static int apple_pcie_probe(struct platform_device *pdev) > if (ret) > return ret; > > - apple_pcie_register(pcie); > + bridge = pci_host_common_init(pdev, &apple_pcie_cfg_ecam_ops); > + if (IS_ERR(bridge)) > + return PTR_ERR(bridge); > > - ret = pci_host_common_init(pdev, &apple_pcie_cfg_ecam_ops); > - if (ret) > - apple_pcie_unregister(pcie); > + platform_set_drvdata(pdev, pcie); Not quite. You probably want to look at: - when struct pci_ecam_ops::init() is called... - ... compared to when you populate the driver data. Thanks, M. -- Without deviation from the norm, progress is not possible.