From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=198.175.65.16 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795182464; b=ws4SwFhOuYHSMTK7DNhgWYTtpEQRk19OCK7mpBDwMeI1df4vlTLpPY+6NDFbHogtq9eP bT3+xHGVK0RanwffFKTOuzumnx81n3mXYAW9+1WgvKQGsFB0WmFZcm+hzmoVnxs69xYh8 taQYreeMycDn9kx4ZnED8eu5deLlY8ysqAcNtPQgfc6tnYAE7AlURZ37ut9fNmb0CX4Td DIvaeEOtEp9AB9AtLYgpydgvIWsSLup3WH/+Jj+7VbbKys/XtWQUFHU6L7hIA02a7SVTI 0U2qHkh1XxnFzsrZBe1W0G2HxMQqtFtdXIrmFxdEmpAOzNS9NtlYrsWd0KXvFRqAXSw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795182464; h=DMARC-Filter:DKIM-Signature:X-CSE-ConnectionGUID:X-CSE-MsgGUID: X-IronPort-AV:X-IronPort-AV:Received:X-CSE-ConnectionGUID: X-CSE-MsgGUID:X-ExtLoop1:X-IronPort-AV:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Type:Content-Transfer-Encoding; bh=jTT7ZQT/IeZuZXnF5eJK7WIKxpNbB7mlhkfRnq9M/Fg=; b=WZ64KtHP/duoQGbjj41WXqD0LEsVR9Dv/gfeH8iXu85MeXb6Y7ye6J8vwoDM8Z2h0P7N 94LCBtlb7N0NQ1bEAKm8vnICeTn9cFfRGQ+gomQtMa++5n7vtfPTGYnzTycusMCRH5OAi ngPwJFT7HQs5M4qE1lOCu9Zz2XsKjMmRUHeaWfZoxmbFWJYIWv8qhNyE1I37A2lXDJDJG 1hyAvQpsNOOwrcnt3athwMDGu5bSZ5/mhd5EtAaOYTjO0A0StDhHqV7WSJABPiP46KENv i5660rH7h9g0P054pwsGOt5OcxBh4bGUiYPADONPi4CMeb+0F0AagP6FkgdgTcRbAbg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=O2v2vwEF; arc=none smtp.remote-ip=198.175.65.16 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DF25606A325; Fri, 20 Nov 2026 13:47:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5DF25606A325 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=O2v2vwEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1795182465; x=1826718465; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kP2SPO5/6lORcTqOAcqARY5ZCI7i60ffA/JZ/vM2yOo=; b=O2v2vwEFfcj6tH++svvvT5+bQOEfg/MmQ5nlwm7sYSf8kagiy/rmchnm jFP+Yc3tF3kEGzrkFqJxdJbvfKbpluxQFjmKRiCaD3sFcFiCQzQDd3VW3 wSbY4bLE3Q4TdizrBHZosfXphMBX/nwlDfBhI1kKE5ktIDGbObJU2okZA +hdkL49k0rnfU6qiWP3qVhcYH/Yi3gapAOWDWKslDFoETN4f9vh+k7YoA sScN2QsA98Wc5RwjPM9fyBpTc7bydDZZ9mscCmKSl2TJvTjyJanTPoDE7 q478OpGbQt1fbsK3oHnmDYjXGMTWV8D1SmCRZJAOmjq+iVQ19azw5gO5W g==; X-CSE-ConnectionGUID: 2rPcKlU9SumbPcdITgz+4A== X-CSE-MsgGUID: FO3jCw/zR5KFC9uVHVNJvg== X-IronPort-AV: E=McAfee;i="6800,10657,11972"; a="4052866" X-IronPort-AV: E=Sophos;i="6.27,223,1787036400"; d="scan'208";a="4052866" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2026 05:47:43 -0800 X-CSE-ConnectionGUID: DGbbw3DBQwm7faPJizsrJA== X-CSE-MsgGUID: jGL/RBZuTbOQudBjx7Vs5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,223,1787036400"; d="scan'208";a="11277400" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.16]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2026 05:47:34 -0800 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , "Rafael J. Wysocki (Intel)" , Russell King , Greg Ungerer , Geert Uytterhoeven , Thomas Bogendoerfer , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "James E.J. Bottomley" , Helge Deller , Len Brown , Dominik Brodowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-sh@vger.kernel.org, linux-parisc@vger.kernel.org, linux-acpi@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , stable@vger.kernel.org Subject: [PATCH v2 01/16] PCI: Add pci_bus_size_and_assign_resources() Date: Fri, 20 Nov 2026 15:46:56 +0200 Message-ID: <20261120134716.3027-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261120134716.3027-1-ilpo.jarvinen@linux.intel.com> References: <20261120134716.3027-1-ilpo.jarvinen@linux.intel.com> X-Mailing-List: linux-pci@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 Bridge window sizing and resource assignment must not run concurrently with another sizing and assignment pass or with device removal. Preventing that requires holding locks across both phases. Many callers outside of PCI core call pci_bus_size_bridges() immediately followed by pci_bus_assign_resources() and cannot hold the PCI core internal locks across the two calls. Add pci_bus_size_and_assign_resources() into PCI core which combines these two operations and convert the callers that call them back to back. Signed-off-by: Ilpo Järvinen Acked-by: Rafael J. Wysocki (Intel) Cc: stable@vger.kernel.org --- arch/arm/kernel/bios32.c | 5 ++--- arch/m68k/coldfire/pci.c | 3 +-- arch/mips/pci/pci-legacy.c | 5 ++--- arch/sh/drivers/pci/pci.c | 3 +-- drivers/parisc/lba_pci.c | 7 ++----- drivers/pci/hotplug/acpiphp_glue.c | 3 +-- drivers/pci/setup-bus.c | 7 +++++++ drivers/pcmcia/cardbus.c | 3 +-- include/linux/pci.h | 1 + 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index ac0e890510da..555bfb091d30 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -510,15 +510,14 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) /* * We insert PCI resources into the iomem_resource and * ioport_resource trees in either pci_bus_claim_resources() - * or pci_bus_assign_resources(). + * or pci_bus_size_and_assign_resources(). */ if (pci_has_flag(PCI_PROBE_ONLY)) { pci_bus_claim_resources(bus); } else { struct pci_bus *child; - pci_bus_size_bridges(bus); - pci_bus_assign_resources(bus); + pci_bus_size_and_assign_resources(bus); list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c index 5afb207ccc51..dd21c77c43a6 100644 --- a/arch/m68k/coldfire/pci.c +++ b/arch/m68k/coldfire/pci.c @@ -250,8 +250,7 @@ static int __init mcf_pci_init(void) rootbus->resource[0] = &mcf_pci_io; rootbus->resource[1] = &mcf_pci_mem; - pci_bus_size_bridges(rootbus); - pci_bus_assign_resources(rootbus); + pci_bus_size_and_assign_resources(rootbus); pci_bus_add_devices(rootbus); return 0; } diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index dae6dafdd6e0..ec0e42d9a895 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -129,15 +129,14 @@ static void pcibios_scanbus(struct pci_controller *hose) /* * We insert PCI resources into the iomem_resource and * ioport_resource trees in either pci_bus_claim_resources() - * or pci_bus_assign_resources(). + * or pci_bus_size_and_assign_resources(). */ if (pci_has_flag(PCI_PROBE_ONLY)) { pci_bus_claim_resources(bus); } else { struct pci_bus *child; - pci_bus_size_bridges(bus); - pci_bus_assign_resources(bus); + pci_bus_size_and_assign_resources(bus); list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); } diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 878a27a1acfb..c91ca8f4cb1c 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -81,8 +81,7 @@ static void pcibios_scanbus(struct pci_channel *hose) need_domain_info = 1; } - pci_bus_size_bridges(hose->bus); - pci_bus_assign_resources(hose->bus); + pci_bus_size_and_assign_resources(hose->bus); pci_bus_add_devices(hose->bus); } diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 5197a3c93c70..39ab93ba458b 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1639,11 +1639,8 @@ lba_driver_probe(struct parisc_device *dev) if (is_pdc_pat()) { /* assign resources to un-initialized devices */ - DBG_PAT("LBA pci_bus_size_bridges()\n"); - pci_bus_size_bridges(lba_bus); - - DBG_PAT("LBA pci_bus_assign_resources()\n"); - pci_bus_assign_resources(lba_bus); + DBG_PAT("LBA pci_bus_size_and_assign_resources()\n"); + pci_bus_size_and_assign_resources(lba_bus); #ifdef DEBUG_LBA_PAT DBG_PAT("\nLBA PIOP resource tree\n"); diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 78e3effbb32d..632344f34cae 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -465,8 +465,7 @@ static void acpiphp_native_scan_bridge(struct pci_dev *bridge) max = pci_scan_bridge(bus, dev, max, 1); if (dev->subordinate) { pcibios_resource_survey_bus(dev->subordinate); - pci_bus_size_bridges(dev->subordinate); - pci_bus_assign_resources(dev->subordinate); + pci_bus_size_and_assign_resources(dev->subordinate); } } } diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index ed16ef7c26fa..29ec9ba59d92 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -2492,3 +2492,10 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) __pci_bus_assign_resources(bus, &add_list, NULL); } EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources); + +void pci_bus_size_and_assign_resources(struct pci_bus *bus) +{ + pci_bus_size_bridges(bus); + __pci_bus_assign_resources(bus, NULL, NULL); +} +EXPORT_SYMBOL_GPL(pci_bus_size_and_assign_resources); diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index 5e5cf2c3e2c8..19df3f9228a7 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c @@ -81,8 +81,7 @@ int __ref cb_alloc(struct pcmcia_socket *s) /* * Size all resources below the CardBus controller. */ - pci_bus_size_bridges(bus); - pci_bus_assign_resources(bus); + pci_bus_size_and_assign_resources(bus); cardbus_config_irq_and_cls(bus, s->pci_irq); /* socket specific tune function */ diff --git a/include/linux/pci.h b/include/linux/pci.h index aa3765a20a96..d89aeb7c9ff7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1569,6 +1569,7 @@ resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx); void pci_bus_assign_resources(const struct pci_bus *bus); void pci_bus_claim_resources(struct pci_bus *bus); void pci_bus_size_bridges(struct pci_bus *bus); +void pci_bus_size_and_assign_resources(struct pci_bus *bus); int pci_claim_resource(struct pci_dev *, int); int pci_claim_bridge_resource(struct pci_dev *bridge, int i); void pci_assign_unassigned_resources(void); -- 2.47.3