From nobody Fri Dec 19 21:57:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678822008; cv=none; d=zohomail.com; s=zohoarc; b=MrPDO6CuJiYoW3+wzBc52HRr6+EiFUrdStJvF2P31PEyHDGQ1v0erW/lRbh6QZHQEvwHMXoTZccY/uf3Zgwa97eMwy1ssp0lnGbhBpKz+W/1aXLrpD0mpoW0K9sKkYIx4xKiG5L16TTRpkNW859jZIhTkZIIRt7PCyYBJ+00u9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678822008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MBwndZ5KdCCYw0UKpNccOAYiMlycMj1klI8dQxBEiE0=; b=bSTbpfhCakrjs89P8hvotqaWcpd74kfgI/AHjlRfI28s62pgIyUA/MJyXUakXzKaVeuxeblMLPUlPCj7Q+eGH9j9Nfc1/92jx/NfebmIl1rO89+wf4TajpnJeM4kC6F1gNmnZSQ78+k9oJqNyP+WxcEZyEUTaA2oP+75BKsGilo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 167882200820090.8037413642594; Tue, 14 Mar 2023 12:26:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.509808.786340 (Exim 4.92) (envelope-from ) id 1pcAHp-00053Q-3Z; Tue, 14 Mar 2023 19:26:17 +0000 Received: by outflank-mailman (output) from mailman id 509808.786340; Tue, 14 Mar 2023 19:26:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pcAHo-00053J-Ut; Tue, 14 Mar 2023 19:26:16 +0000 Received: by outflank-mailman (input) for mailman id 509808; Tue, 14 Mar 2023 19:26:15 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pcAHn-0004ZR-30 for xen-devel@lists.xenproject.org; Tue, 14 Mar 2023 19:26:15 +0000 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 14b656e1-c29e-11ed-b464-930f4c7d94ae; Tue, 14 Mar 2023 20:26:12 +0100 (CET) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 12:26:02 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 14 Mar 2023 12:25:52 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 98A8B365; Tue, 14 Mar 2023 21:26:37 +0200 (EET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 14b656e1-c29e-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678821973; x=1710357973; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKBg2DWRtjN/3o0GQ+Gz1Jmqpx4HtRyfpegHo4oOuDE=; b=YAoc/49nG/xOAnU1cC69mMn32ZGfvVvExInOncTCX6T+df++3Vsr1IJb /Texh7kAZnzIFAMUmAabjNQZ8UyU20mJqaL4u2TKVgKIm6J01H5h31kHK vbqLar1VjD2/gXhiQhlVlR/wmXBiO7pXaEU7ZDsNAd6fSh0PqmNkAWYpU uWvPphjjIdqezGkIZoBI9RLZf24U9GcTa+EErl2ebWxz+wGsqjkVPi0EL nnSiPKToEV4zbjeqUPRZP/gkm60da2MJ4qZM+r8IqGKFZw4DxVHZE5Aoe 8QZKUjESoK/xs1AQtJwO1YnPzJi1M2cnIwQwPrVZyxANeEFyXr+3F3hmy A==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="402389753" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="402389753" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="656474979" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="656474979" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Andy Shevchenko , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v5 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Tue, 14 Mar 2023 21:26:32 +0200 Message-Id: <20230314192634.63531-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314192634.63531-1-andriy.shevchenko@linux.intel.com> References: <20230314192634.63531-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678822008741100003 Refactor pci_bus_for_each_resource() in the same way as it's done in pci_dev_for_each_resource() case. This will allow to hide iterator inside the loop, where it's not used otherwise. No functional changes intended. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski --- .clang-format | 1 + drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 5 ++--- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 14 ++++++++++---- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index 266abb843654..81c9f055086f 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_bus_for_each_resource_p' - 'pci_dev_for_each_resource' - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 549c4bd5caec..b0789d332d36 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -182,13 +182,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *= bus, struct resource *res, void *alignf_data, struct pci_bus_region *region) { - int i, ret; struct resource *r, avail; resource_size_t max; + int ret; =20 type_mask |=3D IORESOURCE_TYPE_BITS; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t min_used =3D min; =20 if (!r) @@ -289,9 +289,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) struct resource *res =3D &dev->resource[idx]; struct resource orig_res =3D *res; struct resource *r; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t start, end; =20 if (!r) diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpch= p_sysfs.c index 64beed7a26be..ff04f0c5e7c3 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c @@ -24,16 +24,16 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr= , char *buf) { struct pci_dev *pdev; - int index, busnr; struct resource *res; struct pci_bus *bus; size_t len =3D 0; + int busnr; =20 pdev =3D to_pci_dev(dev); bus =3D pdev->subordinate; =20 len +=3D sysfs_emit_at(buf, len, "Free resources: memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && !(res->flags & IORESOURCE_PREFETCH)) { len +=3D sysfs_emit_at(buf, len, @@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct devic= e_attribute *attr, char } } len +=3D sysfs_emit_at(buf, len, "Free resources: prefetchable memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PREFETCH)) { len +=3D sysfs_emit_at(buf, len, @@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct devic= e_attribute *attr, char } } len +=3D sysfs_emit_at(buf, len, "Free resources: IO\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_IO)) { len +=3D sysfs_emit_at(buf, len, "start =3D %8.8llx, length =3D %8.8llx\n", diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a67611dc5f4..2f8915ab41ef 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct = pci_dev *dev, { const struct pci_bus *bus =3D dev->bus; struct resource *r; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (!r) continue; if (resource_contains(r, res)) { @@ -799,7 +798,7 @@ struct resource *pci_find_parent_resource(const struct = pci_dev *dev, * be both a positively-decoded aperture and a * subtractively-decoded region that contain the BAR. * We want the positively-decoded one, so this depends - * on pci_bus_for_each_resource() giving us those + * on pci_bus_for_each_resource_p() giving us those * first. */ return r; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a3f68b6ba6ac..5ada4c155d3c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child) pci_read_bridge_mmio_pref(child); =20 if (dev->transparent) { - pci_bus_for_each_resource(child->parent, res, i) { + pci_bus_for_each_resource_p(child->parent, res) { if (res && res->flags) { pci_bus_add_resource(child, res, PCI_SUBTRACTIVE_DECODE); diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index d4fc7665f70a..d6ead027255f 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struc= t pci_bus *bus, unsigned long type) { struct resource *r, *r_assigned =3D NULL; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (r =3D=3D &ioport_resource || r =3D=3D &iomem_resource) continue; if (r && (r->flags & type_mask) =3D=3D type && !r->parent) @@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, stru= ct list_head *realloc_head) additional_mmio_pref_size =3D 0; struct resource *pref; struct pci_host_bridge *host; - int hdr_type, i, ret; + int hdr_type, ret; =20 list_for_each_entry(dev, &bus->devices, bus_list) { struct pci_bus *b =3D dev->subordinate; @@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, stru= ct list_head *realloc_head) host =3D to_pci_host_bridge(bus->bridge); if (!host->size_windows) return; - pci_bus_for_each_resource(bus, pref, i) + pci_bus_for_each_resource_p(bus, pref) if (pref && (pref->flags & IORESOURCE_PREFETCH)) break; hdr_type =3D -1; /* Intentionally invalid - not a PCI device. */ @@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges); =20 static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resourc= e *r) { - int i; struct resource *parent_r; unsigned long mask =3D IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; =20 - pci_bus_for_each_resource(b, parent_r, i) { + pci_bus_for_each_resource_p(b, parent_r) { if (!parent_r) continue; =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index a97f026afaed..f0be961fcd7e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1445,10 +1445,16 @@ int devm_request_pci_bus_resources(struct device *d= ev, /* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset(struct pci_dev *dev); =20 -#define pci_bus_for_each_resource(bus, res, i) \ - for (i =3D 0; \ - (res =3D pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ - i++) +#define __pci_bus_for_each_resource(bus, res, __i, vartype) \ + for (vartype __i =3D 0; \ + res =3D pci_bus_resource_n(bus, __i), __i < PCI_BRIDGE_RESOURCE_NUM;= \ + __i++) + +#define pci_bus_for_each_resource(bus, res, i) \ + __pci_bus_for_each_resource(bus, res, i, ) + +#define pci_bus_for_each_resource_p(bus, res) \ + __pci_bus_for_each_resource(bus, res, __i, unsigned int) =20 int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, --=20 2.39.2