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 0117E143C7E; Sun, 28 Jul 2024 16:07:14 +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=1722182835; cv=none; b=Kz5ckfhyWSeec7LsHJs7HTx69Cljw40WlnPojEx4/T6KVZwCHiRNQtXQJ5w80KI/+fZPeROb6OFLebo6SCoN02uNFezQ2ZOhTrdpZSmRiM4mEzwLZaDSy4C2ZlrT+L5os1IzJHs1942+ZAXRx1dOkWpZ9TlBuO76D33yaD2OafI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722182835; c=relaxed/simple; bh=ZI5AWqvz0DyorLkp5KM0L+Vqbt9/YI6EUF0PAnQuU7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IQxQFsHSALOnq3HMFAfxrnSW1n7iQqL9eqvW2kCsFnaYid/wSwzG8BfOB4wFK8CJs26tF+bm+nInL60mXsW8jiENjqEZPTJ+ifPKRmf7Auj56LuOTwj5IMTF2B3tVOcyGD46RD/P+9kKZn21yQCjS16TB0OkJSxx6Hg8b3K281w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HzV9bB36; 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="HzV9bB36" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDD04C4AF13; Sun, 28 Jul 2024 16:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722182834; bh=ZI5AWqvz0DyorLkp5KM0L+Vqbt9/YI6EUF0PAnQuU7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzV9bB36UTtliBDdxwFQAe+RAuqocITYDuSLp8x+4dIxgWdgNJug6wGNf8dn7aN57 q/98Pj8AF1GZM0PGrBcVv0axy+PFkGjGamRsqVplLnf+hDb96dxeGn/jISQAF16VfR NhHJSCoTBcmElYnlRB0pYth+HelKfxVFmyZsBiaJXtlV5b4vct/BQ8Mdk/ix4jXhYu P6gAL6LbfoBT30Vaw/uW6xlEKwNESMk0lbaJ8LJq4X7JvdKOPqYf9A14LnZTEbUcjp xT4D/Q+fMEtXDmTOStEX7oBd3pdys/jSR7JOyCWIWp7KjJY6+cn4916UqM889yl31j l7TESv2RnrOYQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vidya Sagar , Bjorn Helgaas , Sasha Levin , will@kernel.org, lpieralisi@kernel.org, kw@linux.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 02/17] PCI: Use preserve_config in place of pci_flags Date: Sun, 28 Jul 2024 12:06:38 -0400 Message-ID: <20240728160709.2052627-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728160709.2052627-1-sashal@kernel.org> References: <20240728160709.2052627-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.43 Content-Transfer-Encoding: 8bit From: Vidya Sagar [ Upstream commit 7246a4520b4bf1494d7d030166a11b5226f6d508 ] Use preserve_config in place of checking for PCI_PROBE_ONLY flag to enable support for "linux,pci-probe-only" on a per host bridge basis. This also obviates the use of adding PCI_REASSIGN_ALL_BUS flag if !PCI_PROBE_ONLY, as pci_assign_unassigned_root_bus_resources() takes care of reassigning the resources that are not already claimed. Link: https://lore.kernel.org/r/20240508174138.3630283-5-vidyas@nvidia.com Signed-off-by: Vidya Sagar Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/controller/pci-host-common.c | 4 ---- drivers/pci/probe.c | 20 +++++++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c index 6be3266cd7b5b..e2602e38ae452 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -73,10 +73,6 @@ int pci_host_common_probe(struct platform_device *pdev) if (IS_ERR(cfg)) return PTR_ERR(cfg); - /* Do not reassign resources if probe only */ - if (!pci_has_flag(PCI_PROBE_ONLY)) - pci_add_flags(PCI_REASSIGN_ALL_BUS); - bridge->sysdata = cfg; bridge->ops = (struct pci_ops *)&ops->pci_ops; bridge->msi_domain = true; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 43159965e09e9..217cf8a491eda 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -3080,20 +3080,18 @@ int pci_host_probe(struct pci_host_bridge *bridge) bus = bridge->bus; + /* If we must preserve the resource configuration, claim now */ + if (bridge->preserve_config) + pci_bus_claim_resources(bus); + /* - * We insert PCI resources into the iomem_resource and - * ioport_resource trees in either pci_bus_claim_resources() - * or pci_bus_assign_resources(). + * Assign whatever was left unassigned. If we didn't claim above, + * this will reassign everything. */ - if (pci_has_flag(PCI_PROBE_ONLY)) { - pci_bus_claim_resources(bus); - } else { - pci_bus_size_bridges(bus); - pci_bus_assign_resources(bus); + pci_assign_unassigned_root_bus_resources(bus); - list_for_each_entry(child, &bus->children, node) - pcie_bus_configure_settings(child); - } + list_for_each_entry(child, &bus->children, node) + pcie_bus_configure_settings(child); pci_bus_add_devices(bus); return 0; -- 2.43.0