From nobody Sun Feb 8 10:33:54 2026 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=1667494030; cv=none; d=zohomail.com; s=zohoarc; b=hXKVlTY4sjmHs8/T85PGA7F4q02wPdmx1lc7fQzHxI+2kiwnVR2MqyE8h/lAPRiKNxzIFMqoXEkjbhhs/IEaNoW7eIziTFocPNoq75AsnL4UUXoZQ6m5cX23L0WmfeUVWaFDVh3jr6FwcUFc7ronMuZRR67rgIDTacb6G6UQS3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667494030; h=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=Kon1yVFoK/gj7/7tZxAaZpaui/cV2ZCf52yzpIrnIkQ=; b=XLN6Gyr7mG+/VgI8QZtKCS6s8gMvSKRFuLDHeI7mcnVTmvc68Kq6f4rjtvC53t5FghOO2JoSug5IgA4I3PG6fYKQLyEzWgQRXOFOOKxq9aR0ZTi9MkbY3iuat2VFk4h+ryycgriPExDrulUjTQQXCKaicHeWJaO7PAJDhAg7HIA= 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 166749403005434.396277042854535; Thu, 3 Nov 2022 09:47:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.436895.691112 (Exim 4.92) (envelope-from ) id 1oqdMc-0002He-M7; Thu, 03 Nov 2022 16:46:46 +0000 Received: by outflank-mailman (output) from mailman id 436895.691112; Thu, 03 Nov 2022 16:46:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oqdMc-0002HR-I6; Thu, 03 Nov 2022 16:46:46 +0000 Received: by outflank-mailman (input) for mailman id 436895; Thu, 03 Nov 2022 16:46:45 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oqdMa-000197-OP for xen-devel@lists.xenproject.org; Thu, 03 Nov 2022 16:46:45 +0000 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 18a401a8-5b97-11ed-91b5-6bf2151ebd3b; Thu, 03 Nov 2022 17:46:43 +0100 (CET) Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2022 09:46:37 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 03 Nov 2022 09:46:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9492D84; Thu, 3 Nov 2022 18:46:52 +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: 18a401a8-5b97-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667494003; x=1699030003; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7KOeu9S/6WwS70MbWmycrnSpR5o2Z9FEl6F8XDmROM0=; b=cWEU3n5oqQfsxlb0VcV7T6y/jnsjIJrVSlUQ4I59feLbCShG8pFK94kN ndsGfT8ea7HNEU+1fOj0WlNPXyGEvirBOKHmycd+JGb1p6S7tlkAD2D0L tncdoG/qX4GV22m9pcyhJ0tsRYB0Uob+CqGtAUAgSLd31D+cCcij/2Xk2 6bYN4zMPCHIMSCpQzputx5uEz2TanmIG9SvvlqbFgAbw37lOuy3B+vlru UmooJm5XxGkvMfRsvSA2lLvlNVb1qgzCc337sehyQfy7Tnd4WDVFpdaIS MJgYxJDHIIFceMsVEGO7X0xB1RApu00JdVcuiSoaOvTfpYFjFpJoPghNi w==; X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="309732836" X-IronPort-AV: E=Sophos;i="5.96,134,1665471600"; d="scan'208";a="309732836" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="629408023" X-IronPort-AV: E=Sophos;i="5.96,134,1665471600"; d="scan'208";a="629408023" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , Michael Ellerman , Arnd Bergmann , Bjorn Helgaas , "Rafael J. Wysocki" , 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, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v2 1/4] PCI: Introduce pci_dev_for_each_resource() Date: Thu, 3 Nov 2022 18:46:41 +0200 Message-Id: <20221103164644.70554-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221103164644.70554-1-andriy.shevchenko@linux.intel.com> References: <20221103164644.70554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1667494030947100005 Content-Type: text/plain; charset="utf-8" From: Mika Westerberg Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it. While at it drop doubled empty line before pdev_sort_resources(). No functional changes intended. Suggested-by: Andy Shevchenko Signed-off-by: Mika Westerberg Signed-off-by: Andy Shevchenko --- .clang-format | 2 ++ arch/alpha/kernel/pci.c | 5 ++--- arch/arm/kernel/bios32.c | 16 +++++++--------- arch/mips/pci/pci-legacy.c | 3 +-- arch/powerpc/kernel/pci-common.c | 5 ++--- arch/sparc/kernel/leon_pci.c | 5 ++--- arch/sparc/kernel/pci.c | 10 ++++------ arch/sparc/kernel/pcic.c | 5 ++--- drivers/pci/remove.c | 5 ++--- drivers/pci/setup-bus.c | 26 ++++++++++---------------- drivers/pci/setup-res.c | 4 +--- drivers/pci/xen-pcifront.c | 4 +--- include/linux/pci.h | 11 +++++++++++ 13 files changed, 47 insertions(+), 54 deletions(-) diff --git a/.clang-format b/.clang-format index f98481a53ea8..08d579fea6cf 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,8 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_dev_for_each_resource' + - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' - 'pcl_for_each_chunk' - 'pcl_for_each_segment' diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 64fbfb0763b2..4458eb7f44f0 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -288,11 +288,10 @@ pcibios_claim_one_bus(struct pci_bus *b) struct pci_bus *child_bus; =20 list_for_each_entry(dev, &b->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; if (pci_has_flag(PCI_PROBE_ONLY) || diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index e7ef2b5bea9c..5254734b23e6 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -142,15 +142,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_= DEVICE_ID_WINBOND2_89C940F, */ static void pci_fixup_dec21285(struct pci_dev *dev) { - int i; - if (dev->devfn =3D=3D 0) { + struct resource *r; + dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } @@ -162,13 +162,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVIC= E_ID_DEC_21285, pci_fixup_d static void pci_fixup_ide_bases(struct pci_dev *dev) { struct resource *r; - int i; =20 if ((dev->class >> 8) !=3D PCI_CLASS_STORAGE_IDE) return; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - r =3D dev->resource + i; + pci_dev_for_each_resource_p(dev, r) { if ((r->start & ~0x80) =3D=3D 0x374) { r->start |=3D 2; r->end =3D r->start; diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 468722c8a5c6..ec2567f8efd8 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -249,12 +249,11 @@ static int pcibios_enable_resources(struct pci_dev *d= ev, int mask) =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd =3D cmd; - for (idx =3D 0; idx < PCI_NUM_RESOURCES; idx++) { + pci_dev_for_each_resource(dev, r, idx) { /* Only set up the requested stuff */ if (!(mask & (1<resource[idx]; if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) continue; if ((idx =3D=3D PCI_ROM_RESOURCE) && diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-com= mon.c index d67cf79bf5d0..8ddcfa6bcb50 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1452,11 +1452,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus) struct pci_bus *child_bus; =20 list_for_each_entry(dev, &bus->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; =20 diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c index e5e5ff6b9a5c..b6663a3fbae9 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c @@ -62,15 +62,14 @@ void leon_pci_init(struct platform_device *ofdev, struc= t leon_pci_info *info) =20 int pcibios_enable_device(struct pci_dev *dev, int mask) { + struct resource *res; u16 cmd, oldcmd; int i; =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); oldcmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; =20 @@ -724,15 +723,14 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info = *pbm, =20 int pcibios_enable_device(struct pci_dev *dev, int mask) { + struct resource *res; u16 cmd, oldcmd; int i; =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); oldcmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<resource + i; + pci_dev_for_each_resource_p(dev, res) { if (res->parent) release_resource(res); } diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index e512f9ecb9d0..336d6e6ef76a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -124,20 +124,17 @@ static resource_size_t get_res_add_align(struct list_= head *head, return dev_res ? dev_res->min_align : 0; } =20 - /* Sort resources by alignment */ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *hea= d) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r; + pci_dev_for_each_resource(dev, r, i) { struct pci_dev_resource *dev_res, *tmp; resource_size_t r_align; struct list_head *n; =20 - r =3D &dev->resource[i]; - if (r->flags & IORESOURCE_PCI_FIXED) continue; =20 @@ -895,10 +892,9 @@ static void pbus_size_io(struct pci_bus *bus, resource= _size_t min_size, =20 min_align =3D window_alignment(bus, IORESOURCE_IO); list_for_each_entry(dev, &bus->devices, bus_list) { - int i; + struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; + pci_dev_for_each_resource_p(dev, r) { unsigned long r_size; =20 if (r->parent || !(r->flags & IORESOURCE_IO)) @@ -1014,10 +1010,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsig= ned long mask, size =3D 0; =20 list_for_each_entry(dev, &bus->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; + pci_dev_for_each_resource(dev, r, i) { resource_size_t r_size; =20 if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) || @@ -1358,11 +1354,10 @@ static void assign_fixed_resource_on_bus(struct pci= _bus *b, struct resource *r) */ static void pdev_assign_fixed_resources(struct pci_dev *dev) { - int i; + struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { + pci_dev_for_each_resource_p(dev, r) { struct pci_bus *b; - struct resource *r =3D &dev->resource[i]; =20 if (r->parent || !(r->flags & IORESOURCE_PCI_FIXED) || !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) @@ -1845,7 +1840,7 @@ static void pci_bus_distribute_available_resources(st= ruct pci_bus *bus, * distributing the rest. */ list_for_each_entry(dev, &bus->devices, bus_list) { - int i; + struct resource *dev_res; =20 if (dev =3D=3D bridge) continue; @@ -1857,8 +1852,7 @@ static void pci_bus_distribute_available_resources(st= ruct pci_bus *bus, if (!dev->multifunction) return; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - const struct resource *dev_res =3D &dev->resource[i]; + pci_dev_for_each_resource_p(dev, dev_res) { resource_size_t dev_sz; struct resource *b_res; =20 diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index b492e67c3d87..967f9a758923 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -484,12 +484,10 @@ int pci_enable_resources(struct pci_dev *dev, int mas= k) pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { + pci_dev_for_each_resource(dev, r, i) { if (!(mask & (1 << i))) continue; =20 - r =3D &dev->resource[i]; - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) continue; if ((i =3D=3D PCI_ROM_RESOURCE) && diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 7378e2f3e525..ce485ef59656 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -390,9 +390,7 @@ static int pcifront_claim_resource(struct pci_dev *dev,= void *data) int i; struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (!r->parent && r->start && r->flags) { dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n", pci_name(dev), i); diff --git a/include/linux/pci.h b/include/linux/pci.h index 2bda4a4e47e8..3940435fa90a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1407,6 +1407,17 @@ int pci_request_selected_regions(struct pci_dev *, i= nt, const char *); int pci_request_selected_regions_exclusive(struct pci_dev *, int, const ch= ar *); void pci_release_selected_regions(struct pci_dev *, int); =20 +#define __pci_dev_for_each_resource(dev, res, __i, vartype) \ + for (vartype __i =3D 0; \ + res =3D &(dev)->resource[__i], __i < PCI_NUM_RESOURCES; \ + __i++) + +#define pci_dev_for_each_resource(dev, res, i) \ + __pci_dev_for_each_resource(dev, res, i, ) + +#define pci_dev_for_each_resource_p(dev, res) \ + __pci_dev_for_each_resource(dev, res, i, unsigned int) + /* drivers/pci/bus.c */ void pci_add_resource(struct list_head *resources, struct resource *res); void pci_add_resource_offset(struct list_head *resources, struct resource = *res, --=20 2.35.1