From nobody Sat May 4 07:26:43 2024 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=1679592978; cv=none; d=zohomail.com; s=zohoarc; b=YNcN4sgNAKC+QtaR9XRqvXXrS42zPaM7qyD5uuSlElOm+8J2R7dMwt0bbrebLmyn2u3xUcAk/c6gh2p28noygns9rTZY3FwuBT6gCb/HbhTGuyOT+Qd5LIjuPlL52KjA/hKwwH53Yd2XyVlMhOu3M8Y0EpUjjDFlgxP7l4QrVf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592978; 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=bdIPSm8RbTGPaRQgnOeVs/7K/mSdGK0oqaIYQBarrc8=; b=ASBnf3bjdiU60NLiuBpBc9orz8i8si9wf74BG2WuAeZR+ZBh2vPlD/JqrFbiZ9qmLR/jj3+v+RgkKD3wAT1pafhP51+yDiqzsBRVlzFq44E+vvyw6ZO4s/o/dBr/2t3wNUmdikd0/8mp+6WS2f1O3cufMvEdl1512hQVLZJws5M= 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 1679592978043903.5312196993901; Thu, 23 Mar 2023 10:36:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514000.795857 (Exim 4.92) (envelope-from ) id 1pfOqp-0000TS-4a; Thu, 23 Mar 2023 17:35:47 +0000 Received: by outflank-mailman (output) from mailman id 514000.795857; Thu, 23 Mar 2023 17:35:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOqp-0000TL-20; Thu, 23 Mar 2023 17:35:47 +0000 Received: by outflank-mailman (input) for mailman id 514000; Thu, 23 Mar 2023 17:35:46 +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 1pfOqn-0000TF-Ru for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:35:46 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 20e33923-c9a1-11ed-85db-49a42c6b2330; Thu, 23 Mar 2023 18:35:42 +0100 (CET) Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:37 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 23 Mar 2023 10:35:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AF393D0; Thu, 23 Mar 2023 19:36:11 +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: 20e33923-c9a1-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679592942; x=1711128942; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vwh9ptbMJOXQlZJdSj8+frJlz0P5NOeD/IEPLf/bFeA=; b=elih54Qcljimx3sGMruBQqztrNWSxynbyKa/PT+CigKI4GE7WTzwnfAq p13wnPnhYhU/uf9+ItqXIZ/kYjXpEZG4y0/eXoUYkQupTt6YeevJe3+W6 76D9XowzPj3vuwEs++OL/lyf/BDvkI4sVjBsjdPmEm4pymvE49iImM9Ta Kpy7loB9bawZeAdSi+waaHYCmZrnKtwf6kFnxM6p3wZXy+hh94Dus1eqw EGOsYrvE44QhLIt5QWHEIPQa7An6uNBuKmyXAbjL1TGeJyrSyxjw0QZPT O8+IIuE4wMZ2HlRl0Ete5ELf66yRCPUtziDxm9eDEg/3yVS0Z+2daKLY7 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="327969589" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="327969589" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="675794215" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="675794215" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 1/6] kernel.h: Split out COUNT_ARGS() and CONCATENATE() Date: Thu, 23 Mar 2023 19:36:05 +0200 Message-Id: <20230323173610.60442-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592979337100003 Content-Type: text/plain; charset="utf-8" kernel.h is being used as a dump for all kinds of stuff for a long time. The COUNT_ARGS() and CONCATENATE() macros may be used in some places without need of the full kernel.h dependency train with it. Here is the attempt on cleaning it up by splitting out these macros(). Signed-off-by: Andy Shevchenko --- include/linux/args.h | 13 +++++++++++++ include/linux/kernel.h | 8 +------- 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 include/linux/args.h diff --git a/include/linux/args.h b/include/linux/args.h new file mode 100644 index 000000000000..16ef6fad8add --- /dev/null +++ b/include/linux/args.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_ARGS_H +#define _LINUX_ARGS_H + +/* This counts to 12. Any more, it will return 13th argument. */ +#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12= , _n, X...) _n +#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4,= 3, 2, 1, 0) + +#define __CONCAT(a, b) a ## b +#define CONCATENATE(a, b) __CONCAT(a, b) + +#endif /* _LINUX_ARGS_H */ diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 40bce7495af8..c049d3394425 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -13,6 +13,7 @@ =20 #include #include +#include #include #include #include @@ -484,13 +485,6 @@ ftrace_vprintk(const char *fmt, va_list ap) static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } #endif /* CONFIG_TRACING */ =20 -/* This counts to 12. Any more, it will return 13th argument. */ -#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12= , _n, X...) _n -#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4,= 3, 2, 1, 0) - -#define __CONCAT(a, b) a ## b -#define CONCATENATE(a, b) __CONCAT(a, b) - /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ #ifdef CONFIG_FTRACE_MCOUNT_RECORD # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD --=20 2.40.0.1.gaa8946217a0b From nobody Sat May 4 07:26:43 2024 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=1679592984; cv=none; d=zohomail.com; s=zohoarc; b=X107h7XMFRO2ix+M+FAln7N9he3bfq7OKqUFkYrWWRV16+tF1QHa3exGkcIHEEeBRIp82/4hB1E92ChvSoJtftv5yfjaZlHQE715zKbvpvd6tPYSyYSFY1KIiDEDuqyEUVQ6MEbE0pcukpjKkoOtXZ22A4kNiG/O+h41+NpZI6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592984; 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=ZZ7a45GoO5PPlsTt4GhQwXf6mj8VqET3JzKtOOB6KPA=; b=XAz4bogjQQO43Q18hKncNrWxVpF1cgwGB8lBjWbYNvW/ApXmzjgjSzENJtn8JuNoYdvo/6ODOcWU3Xoe/z+8v41W/8ZFbnZROCxeKd6MUXgas1pWcBGRSRV/Tdsj30lIquL5UjFVV/Cs6kB7Gvmd1l+zpOKxa2thScjBOCCObSA= 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 1679592984818331.02090630231453; Thu, 23 Mar 2023 10:36:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514001.795868 (Exim 4.92) (envelope-from ) id 1pfOqr-0000j1-Et; Thu, 23 Mar 2023 17:35:49 +0000 Received: by outflank-mailman (output) from mailman id 514001.795868; Thu, 23 Mar 2023 17:35:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOqr-0000is-Bs; Thu, 23 Mar 2023 17:35:49 +0000 Received: by outflank-mailman (input) for mailman id 514001; Thu, 23 Mar 2023 17:35:47 +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 1pfOqp-0000TF-HG for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:35:47 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2444fffd-c9a1-11ed-85db-49a42c6b2330; Thu, 23 Mar 2023 18:35:45 +0100 (CET) Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:37 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 23 Mar 2023 10:35:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C8EA329D; Thu, 23 Mar 2023 19:36:11 +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: 2444fffd-c9a1-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679592945; x=1711128945; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WpHE2fMg8kec8Dg0J6kxCepndOofEkKDEHEEamRzDGU=; b=RkYLwLGBwFZtXTiMRHy+PiwAUyne0KGuoYsmwlOAzlYQRN4nJ2B9KCuz G2rt+CF7HyPFcOYdJmdUSTWm0QkBv96+KfEbeuLKakJzR5sGq9Iabq2JH acrcne1Yfqq1XK1me+hdCc3sgsgliRuASmG1qjvUyZ8xbwcMUldu1GwnX 5harcbuKMnk4InN3hMAsNsp9ZCBM3FeJMjaRHwU0mKMqRWJ84P1c1FX+M A8I4o+x163ho7Y1I4kGsMItTJhFUHQzt/F1OtbzSdBiPDUb3/FWVIlMg8 SASA/H96SdCExkcvJZcZgj8ypWkYd83bbfk4/Cr6FyDZteRHfF/zvr0Wm w==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="327969658" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="327969658" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="675794213" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="675794213" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 2/6] PCI: Introduce pci_dev_for_each_resource() Date: Thu, 23 Mar 2023 19:36:06 +0200 Message-Id: <20230323173610.60442-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592985192100001 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 Reviewed-by: Krzysztof Wilczy=C5=84ski --- .clang-format | 1 + arch/alpha/kernel/pci.c | 5 ++-- arch/arm/kernel/bios32.c | 16 ++++++------- arch/arm/mach-dove/pcie.c | 10 ++++---- arch/arm/mach-mv78xx0/pcie.c | 10 ++++---- arch/arm/mach-orion5x/pci.c | 10 ++++---- arch/mips/pci/ops-bcm63xx.c | 8 +++---- arch/mips/pci/pci-legacy.c | 3 +-- arch/powerpc/kernel/pci-common.c | 21 ++++++++-------- arch/powerpc/platforms/4xx/pci.c | 8 +++---- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 ++-- arch/powerpc/platforms/pseries/pci.c | 16 ++++++------- arch/sh/drivers/pci/pcie-sh7786.c | 10 ++++---- 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 | 27 ++++++++------------- drivers/pci/setup-res.c | 4 +--- drivers/pci/vgaarb.c | 17 ++++--------- drivers/pci/xen-pcifront.c | 4 +--- drivers/pnp/quirks.c | 29 ++++++++--------------- include/linux/pci.h | 16 +++++++++++++ 23 files changed, 113 insertions(+), 132 deletions(-) diff --git a/.clang-format b/.clang-format index d988e9fa9b26..2048b0296d76 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_dev_for_each_resource' - '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..d334c7fb672b 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(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(dev, r) { if ((r->start & ~0x80) =3D=3D 0x374) { r->start |=3D 2; r->end =3D r->start; diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 754ca381f600..3044b7e03890 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -142,14 +142,14 @@ static struct pci_ops pcie_ops =3D { static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 6190f538a124..0ebc909ea273 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -186,14 +186,14 @@ static struct pci_ops pcie_ops =3D { static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 888fdc9099c5..3313bc5a63ea 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -522,14 +522,14 @@ static int __init pci_setup(struct pci_sys_data *sys) static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/mips/pci/ops-bcm63xx.c b/arch/mips/pci/ops-bcm63xx.c index dc6dc2741272..b0ea023c47c0 100644 --- a/arch/mips/pci/ops-bcm63xx.c +++ b/arch/mips/pci/ops-bcm63xx.c @@ -413,18 +413,18 @@ struct pci_ops bcm63xx_cb_ops =3D { static void bcm63xx_fixup(struct pci_dev *dev) { static int io_window =3D -1; - int i, found, new_io_window; + int found, new_io_window; + struct resource *r; u32 val; =20 /* look for any io resource */ found =3D 0; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - if (pci_resource_flags(dev, i) & IORESOURCE_IO) { + pci_dev_for_each_resource(dev, r) { + if (resource_type(r) =3D=3D IORESOURCE_IO) { found =3D 1; break; } } - if (!found) return; =20 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..e88d7c9feeec 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -880,6 +880,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge = *bridge) static void pcibios_fixup_resources(struct pci_dev *dev) { struct pci_controller *hose =3D pci_bus_to_host(dev->bus); + struct resource *res; int i; =20 if (!hose) { @@ -891,9 +892,9 @@ static void pcibios_fixup_resources(struct pci_dev *dev) if (dev->is_virtfn) return; =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - struct resource *res =3D dev->resource + i; + pci_dev_for_each_resource(dev, res, i) { struct pci_bus_region reg; + if (!res->flags) continue; =20 @@ -1452,11 +1453,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 @@ -1705,19 +1705,20 @@ EXPORT_SYMBOL_GPL(pcibios_scan_phb); =20 static void fixup_hide_host_resource_fsl(struct pci_dev *dev) { - int i, class =3D dev->class >> 8; + int class =3D dev->class >> 8; /* When configured as agent, programming interface =3D 1 */ int prog_if =3D dev->class & 0xf; + struct resource *r; =20 if ((class =3D=3D PCI_CLASS_PROCESSOR_POWERPC || class =3D=3D PCI_CLASS_BRIDGE_OTHER) && (dev->hdr_type =3D=3D PCI_HEADER_TYPE_NORMAL) && (prog_if =3D=3D 0) && (dev->bus->parent =3D=3D NULL)) { - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/= pci.c index ca5dd7a5842a..07dcc2b8007f 100644 --- a/arch/powerpc/platforms/4xx/pci.c +++ b/arch/powerpc/platforms/4xx/pci.c @@ -57,7 +57,7 @@ static inline int ppc440spe_revA(void) static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev) { struct pci_controller *hose; - int i; + struct resource *r; =20 if (dev->devfn !=3D 0 || dev->bus->self !=3D NULL) return; @@ -79,9 +79,9 @@ static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev) /* Hide the PCI host BARs from the kernel as their content doesn't * fit well in the resource management */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D r->end =3D 0; + r->flags =3D 0; } =20 printk(KERN_INFO "PCI: Hiding 4xx host bridge resources %s\n", diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platf= orms/52xx/mpc52xx_pci.c index 859e2818c43d..0ca4401ba781 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c @@ -327,14 +327,13 @@ mpc52xx_pci_setup(struct pci_controller *hose, static void mpc52xx_pci_fixup_resources(struct pci_dev *dev) { - int i; + struct resource *res; =20 pr_debug("%s() %.4x:%.4x\n", __func__, dev->vendor, dev->device); =20 /* We don't rely on boot loader for PCI and resets all devices */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - struct resource *res =3D &dev->resource[i]; + pci_dev_for_each_resource(dev, res) { if (res->end > res->start) { /* Only valid resources */ res->end -=3D res->start; res->start =3D 0; diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/= pseries/pci.c index 60e0a58928ef..1772ae3d193d 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -240,7 +240,7 @@ void __init pSeries_final_fixup(void) */ static void fixup_winbond_82c105(struct pci_dev* dev) { - int i; + struct resource *r; unsigned int reg; =20 if (!machine_is(pseries)) @@ -251,14 +251,14 @@ static void fixup_winbond_82c105(struct pci_dev* dev) /* Enable LEGIRQ to use INTC instead of ISA interrupts */ pci_write_config_dword(dev, 0x40, reg | (1<<11)); =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; ++i) { + pci_dev_for_each_resource(dev, r) { /* zap the 2nd function of the winbond chip */ - if (dev->resource[i].flags & IORESOURCE_IO - && dev->bus->number =3D=3D 0 && dev->devfn =3D=3D 0x81) - dev->resource[i].flags &=3D ~IORESOURCE_IO; - if (dev->resource[i].start =3D=3D 0 && dev->resource[i].end) { - dev->resource[i].flags =3D 0; - dev->resource[i].end =3D 0; + if (dev->bus->number =3D=3D 0 && dev->devfn =3D=3D 0x81 && + r->flags & IORESOURCE_IO) + r->flags &=3D ~IORESOURCE_IO; + if (r->start =3D=3D 0 && r->end) { + r->flags =3D 0; + r->end =3D 0; } } } diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-s= h7786.c index b0c2a5238d04..4f5e49f10805 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c @@ -140,12 +140,12 @@ static void sh7786_pci_fixup(struct pci_dev *dev) * Prevent enumeration of root complex resources. */ if (pci_is_root_bus(dev->bus) && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } 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(dev, res) { if (res->parent) release_resource(res); } diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index c690572b10ce..027b985dd1ee 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(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(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))) @@ -1795,11 +1790,9 @@ static void remove_dev_resources(struct pci_dev *dev= , struct resource *io, struct resource *mmio, struct resource *mmio_pref) { - int i; - - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; + struct resource *res; =20 + pci_dev_for_each_resource(dev, res) { if (resource_type(res) =3D=3D IORESOURCE_IO) { remove_dev_resource(io, dev, res); } else if (resource_type(res) =3D=3D IORESOURCE_MEM) { 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/vgaarb.c b/drivers/pci/vgaarb.c index f80b6ec88dc3..5a696078b382 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -548,10 +548,8 @@ static bool vga_is_firmware_default(struct pci_dev *pd= ev) #if defined(CONFIG_X86) || defined(CONFIG_IA64) u64 base =3D screen_info.lfb_base; u64 size =3D screen_info.lfb_size; + struct resource *r; u64 limit; - resource_size_t start, end; - unsigned long flags; - int i; =20 /* Select the device owning the boot framebuffer if there is one */ =20 @@ -561,19 +559,14 @@ static bool vga_is_firmware_default(struct pci_dev *p= dev) limit =3D base + size; =20 /* Does firmware framebuffer belong to us? */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - flags =3D pci_resource_flags(pdev, i); - - if ((flags & IORESOURCE_MEM) =3D=3D 0) + pci_dev_for_each_resource(pdev, r) { + if (resource_type(r) !=3D IORESOURCE_MEM) continue; =20 - start =3D pci_resource_start(pdev, i); - end =3D pci_resource_end(pdev, i); - - if (!start || !end) + if (!r->start || !r->end) continue; =20 - if (base < start || limit >=3D end) + if (base < r->start || limit >=3D r->end) continue; =20 return true; diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index fcd029ca2eb1..83c0ab50676d 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/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index ac98b9919029..6085a1471de2 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -229,8 +229,7 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *= dev) static void quirk_system_pci_resources(struct pnp_dev *dev) { struct pci_dev *pdev =3D NULL; - struct resource *res; - resource_size_t pnp_start, pnp_end, pci_start, pci_end; + struct resource *res, *r; int i, j; =20 /* @@ -243,32 +242,26 @@ static void quirk_system_pci_resources(struct pnp_dev= *dev) * so they won't be claimed by the PNP system driver. */ for_each_pci_dev(pdev) { - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - unsigned long flags, type; + pci_dev_for_each_resource(pdev, r, i) { + unsigned long type =3D resource_type(r); =20 - flags =3D pci_resource_flags(pdev, i); - type =3D flags & (IORESOURCE_IO | IORESOURCE_MEM); - if (!type || pci_resource_len(pdev, i) =3D=3D 0) + if (!(type =3D=3D IORESOURCE_IO || type =3D=3D IORESOURCE_MEM) || + resource_size(r) =3D=3D 0) continue; =20 - if (flags & IORESOURCE_UNSET) + if (r->flags & IORESOURCE_UNSET) continue; =20 - pci_start =3D pci_resource_start(pdev, i); - pci_end =3D pci_resource_end(pdev, i); for (j =3D 0; (res =3D pnp_get_resource(dev, type, j)); j++) { if (res->start =3D=3D 0 && res->end =3D=3D 0) continue; =20 - pnp_start =3D res->start; - pnp_end =3D res->end; - /* * If the PNP region doesn't overlap the PCI * region at all, there's no problem. */ - if (pnp_end < pci_start || pnp_start > pci_end) + if (!resource_overlaps(res, r)) continue; =20 /* @@ -278,8 +271,7 @@ static void quirk_system_pci_resources(struct pnp_dev *= dev) * PNP device describes a bridge with PCI * behind it. */ - if (pnp_start <=3D pci_start && - pnp_end >=3D pci_end) + if (res->start <=3D r->start && res->end >=3D r->end) continue; =20 /* @@ -288,9 +280,8 @@ static void quirk_system_pci_resources(struct pnp_dev *= dev) * driver from requesting its resources. */ dev_warn(&dev->dev, - "disabling %pR because it overlaps " - "%s BAR %d %pR\n", res, - pci_name(pdev), i, &pdev->resource[i]); + "disabling %pR because it overlaps %s BAR %d %pR\n", + res, pci_name(pdev), i, r); res->flags |=3D IORESOURCE_DISABLED; } } diff --git a/include/linux/pci.h b/include/linux/pci.h index b50e5c79f7e3..e1277a2bb645 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -26,6 +26,7 @@ =20 #include =20 +#include #include #include #include @@ -1995,6 +1996,7 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, stru= ct vm_area_struct *vma); * These helpers provide future and backwards compatibility * for accessing popular PCI BAR info */ +#define pci_resource_n(dev, bar) (&(dev)->resource[(bar)]) #define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) #define pci_resource_end(dev, bar) ((dev)->resource[(bar)].end) #define pci_resource_flags(dev, bar) ((dev)->resource[(bar)].flags) @@ -2004,6 +2006,20 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, str= uct vm_area_struct *vma); (pci_resource_end((dev), (bar)) - \ pci_resource_start((dev), (bar)) + 1)) =20 +#define __pci_dev_for_each_resource_0(dev, res, ...) \ + for (unsigned int __b =3D 0; \ + res =3D pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ + __b++) + +#define __pci_dev_for_each_resource_1(dev, res, __b) \ + for (__b =3D 0; \ + res =3D pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ + __b++) + +#define pci_dev_for_each_resource(dev, res, ...) \ + CONCATENATE(__pci_dev_for_each_resource_, COUNT_ARGS(__VA_ARGS__)) \ + (dev, res, __VA_ARGS__) + /* * Similar to the helpers above, these manipulate per-pci_dev * driver-specific data. They are really just a wrapper around --=20 2.40.0.1.gaa8946217a0b From nobody Sat May 4 07:26:43 2024 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=1679592980; cv=none; d=zohomail.com; s=zohoarc; b=G5jd1nq/nQi7TO4+4wAtbr1WxGr3KqpRWiX0QiEfsZjkqa+MlUKVR90LMXgh5N5V++0wLDCFBVJaSScGZVdsP4AfJdpGcITMFHMms9f8nxCq4eYwkaqwx+SUvwAGrjUOqXETvV3GdKUBtCs6t0LIMzEZq3KvF8CbUeU2SmXa9+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592980; 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=eeb430h4TaRrJjxpHuQAIFSFoa6z4wzr7cwzJ9tQ7TE=; b=D9S/usanHpS3otHKqOAPeRMbzu+bSIMe7/eTv5kqiExGp+untzEG9nOUcjSGELqfapPn5pDi0ZiUYJ7saY5equZQT8xkLv0VF3dBvDHJffrmt/dFuQU9EeIhez1BamdBJOFMejbN3hfxKmTLSTCR/R4dt12Q84VhYYF1tlH9w+Y= 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 1679592980511883.0076694867307; Thu, 23 Mar 2023 10:36:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514004.795898 (Exim 4.92) (envelope-from ) id 1pfOr4-0001hg-E8; Thu, 23 Mar 2023 17:36:02 +0000 Received: by outflank-mailman (output) from mailman id 514004.795898; Thu, 23 Mar 2023 17:36:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOr4-0001hV-B0; Thu, 23 Mar 2023 17:36:02 +0000 Received: by outflank-mailman (input) for mailman id 514004; Thu, 23 Mar 2023 17:36:00 +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 1pfOr2-0000iP-HR for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:36:00 +0000 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2b00e363-c9a1-11ed-b464-930f4c7d94ae; Thu, 23 Mar 2023 18:35:58 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:36 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 23 Mar 2023 10:35:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DBBE42A0; Thu, 23 Mar 2023 19:36:11 +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: 2b00e363-c9a1-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=1679592958; x=1711128958; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nYcCzANNoRmgbtK/lt7NmDYl/Mib02Nl2jjjm9pP05E=; b=UdJpIMu8DAQBGt2fDYco6jT6bWnFwn5CDjZ+V9FuzTW67Z70TyUTJQmI u+8BjRUVK3+k+FEuOGrm9msTIPqYXqZtzWuMWK7N7vGhxHXskBjpmcB8/ oRiR7A9d++NQu2+/Jh2KC4I3v1UYmb68qShxNCU+P9IdIS8DhTZwMp2zQ GHl07yUruthx+uVWhB4bho7YckO3TtUfGkciMl6TrB/0PWQlGpr7WYaP+ +0GQnXqpGGpXN8eSskllSJXb6KPQXvPALyi58u/6nCaSZQ50RCO3Ou0M1 HgKsxTNUuVvKRq5CyCDz8zSJ1CseU2ADljtMXCHLRUqA/IBfTIspleaBp w==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="367308016" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="367308016" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="682380742" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="682380742" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 3/6] PCI: Allow pci_bus_for_each_resource() to take less arguments Date: Thu, 23 Mar 2023 19:36:07 +0200 Message-Id: <20230323173610.60442-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592981131100006 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 3 +-- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 17 +++++++++++++---- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 549c4bd5caec..5bc81cc0a2de 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(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(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..01d47a42da04 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(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(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(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..99299f1299c4 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(bus, r) { if (!r) continue; if (resource_contains(r, res)) { diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a3f68b6ba6ac..f8191750f6b7 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(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 027b985dd1ee..fdeb121e9175 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(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(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(b, parent_r) { if (!parent_r) continue; =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index e1277a2bb645..70a4684d5f26 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1446,10 +1446,19 @@ 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_0(bus, res, ...) \ + for (unsigned int __b =3D 0; \ + res =3D pci_bus_resource_n(bus, __b), __b < PCI_BRIDGE_RESOURCE_NUM;\ + __b++) + +#define __pci_bus_for_each_resource_1(bus, res, __b) \ + for (__b =3D 0; \ + res =3D pci_bus_resource_n(bus, __b), __b < PCI_BRIDGE_RESOURCE_NUM;\ + __b++) + +#define pci_bus_for_each_resource(bus, res, ...) \ + CONCATENATE(__pci_bus_for_each_resource_, COUNT_ARGS(__VA_ARGS__)) \ + (bus, res, __VA_ARGS__) =20 int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, --=20 2.40.0.1.gaa8946217a0b From nobody Sat May 4 07:26:43 2024 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=1679592975; cv=none; d=zohomail.com; s=zohoarc; b=goMF/YaJT6rwqeMokJpLIqPiVWqYk6hJCk5e6CBmZL42LmNPr5IW/5IvsSkXoQ6NQvvw+hi0QU8F7+kKjN/MjBADvVSUTMo85sM0uH8RuVSkavRQpJlynzuHZYr2AHLUeitAJchERPIWEliloD7yI8VfIj1zJgS3kSYBEQ7aNro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592975; 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=LoOIQues63fw4A/atvg8dXh1JRuotjlKwpIGJNEnMWA=; b=ClIAr0LRWCtz6olDrL1aIqC07Kyc5xIRnsVwehua7As+nxDR0tBI8EsctT/gtSSJnWvLNUy8uQJUMC+O+IOhp6hO1UNsUKZt2O6bGgdn6gQmJCxre51vOZXH4EXta54rv8QIYP5Y9u/7041+s5vor3l2s/VYCz8vEGyhRyNCxkg= 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 1679592975848538.9530376602481; Thu, 23 Mar 2023 10:36:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514002.795878 (Exim 4.92) (envelope-from ) id 1pfOqs-0000yK-M0; Thu, 23 Mar 2023 17:35:50 +0000 Received: by outflank-mailman (output) from mailman id 514002.795878; Thu, 23 Mar 2023 17:35:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOqs-0000yD-Ik; Thu, 23 Mar 2023 17:35:50 +0000 Received: by outflank-mailman (input) for mailman id 514002; Thu, 23 Mar 2023 17:35:48 +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 1pfOqq-0000iP-Fk for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:35:48 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 224efbf1-c9a1-11ed-b464-930f4c7d94ae; Thu, 23 Mar 2023 18:35:44 +0100 (CET) Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:37 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 23 Mar 2023 10:35:25 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EA7F02AA; Thu, 23 Mar 2023 19:36:11 +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: 224efbf1-c9a1-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=1679592944; x=1711128944; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+tkQnp5raP0E2HuwxHdpBNe2fRW/pW0M4CrsRaTr0mM=; b=RaR3c+Ko1Set9wT9fzmlryq8URPSnPkdDXMihD02D1y7y14x1E4Ltm1W eDuK8/EKQOKpxFbeZFhe8Q8JUS4yhltBuv7bUNGNe2c3PrddhvKOv+Vl/ RIFx8NM8JvydwvUNPxkwhtyUeyqfC464qnWk62Xeu3wVQRAlpGVHpDq4Q HLDQC7v+SohVNP/vqoeWK5kCJxtGOpRU/Mf05iuKtVlgxPuNKPg5rHYkQ hYl05MuXKfk1uEzjAsGpsJktCqcsLBDgHeWm21LU5plmNUaDugDWSqVxE rYKtnL7+TBJR1XFeeG+eKpNZVydrNiLCfukz9NRVLfxoMrK2gyPZactWf w==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="327969628" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="327969628" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="675794214" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="675794214" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 4/6] EISA: Convert to use less arguments in pci_bus_for_each_resource() Date: Thu, 23 Mar 2023 19:36:08 +0200 Message-Id: <20230323173610.60442-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592977627100001 The pci_bus_for_each_resource() can hide the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- drivers/eisa/pci_eisa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c index 930c2332c3c4..8173e60bb808 100644 --- a/drivers/eisa/pci_eisa.c +++ b/drivers/eisa/pci_eisa.c @@ -20,8 +20,8 @@ static struct eisa_root_device pci_eisa_root; =20 static int __init pci_eisa_init(struct pci_dev *pdev) { - int rc, i; struct resource *res, *bus_res =3D NULL; + int rc; =20 if ((rc =3D pci_enable_device (pdev))) { dev_err(&pdev->dev, "Could not enable device\n"); @@ -38,7 +38,7 @@ static int __init pci_eisa_init(struct pci_dev *pdev) * eisa_root_register() can only deal with a single io port resource, * so we use the first valid io port resource. */ - pci_bus_for_each_resource(pdev->bus, res, i) + pci_bus_for_each_resource(pdev->bus, res) if (res && (res->flags & IORESOURCE_IO)) { bus_res =3D res; break; --=20 2.40.0.1.gaa8946217a0b From nobody Sat May 4 07:26:43 2024 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=1679592981; cv=none; d=zohomail.com; s=zohoarc; b=WYzZ6+wXBsj5KJktHcPx2DPNJiLTiINRjQqBxUU3ra4LynE0Z8WKKx3hT5g67IxAJUHbLf4G6mevKi1kwXqQp1RyKH+NZrQ3ATIE8NlP+R5qiBWz+d/4A4rJ6ONxt16S3XQoRA9RCXcOTnOuMVCqJg0Gp4AjvNYCUfzPqBUW7Y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592981; 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=QeL1AtwXSCu6BtHRaduBPNduuZbKi0vfmTR7h3cfRP8=; b=LT9GTseZ0hFBNGrt43tQyh1GM7qh7LlagwMsYMfyYTLrSGlOR7yEJodZ+1FJDoa03/KXQey1BKXFNRmR0d5oQwrvluggWE3g205IhmFVrTJL/zVbgIu54IHSE0HLKN+yG0Myy00ti+AhMkyy6U/Ir3KyBncvW8dizR2UBR1I1D8= 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 1679592981040255.11736757043468; Thu, 23 Mar 2023 10:36:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514006.795909 (Exim 4.92) (envelope-from ) id 1pfOr5-0001tB-Gr; Thu, 23 Mar 2023 17:36:03 +0000 Received: by outflank-mailman (output) from mailman id 514006.795909; Thu, 23 Mar 2023 17:36:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOr5-0001qe-7u; Thu, 23 Mar 2023 17:36:03 +0000 Received: by outflank-mailman (input) for mailman id 514006; Thu, 23 Mar 2023 17:36:02 +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 1pfOr3-0000iP-SM for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:36:01 +0000 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2be43ad9-c9a1-11ed-b464-930f4c7d94ae; Thu, 23 Mar 2023 18:35:59 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:47 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 23 Mar 2023 10:35:36 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0945631F; Thu, 23 Mar 2023 19:36:11 +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: 2be43ad9-c9a1-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=1679592959; x=1711128959; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CylzEgRAmJXOphwnxg3IbL2UXwW6z4Wch9KnUOezzDg=; b=UVp31IiOnWt24/pWpijNEE94mvIgrhJ/DRAhZJ0qk+NCWVlUCUnPvdfC oE0oO6qEIul72vu3g99JRM7auhj9ZYewD6YrZvz3i94tVvNw2hlz2bCjF WLgi3Iky34Vdy7onXkPt3IW0enIfy5+Kk1y7yiUiiEUZMtlWQka1f3TYG 6Zrl1gceo26367cw4V3Pc0keZkUBWpT0vIyztvK6s5KK4C0zxt+sqxnvw L2yeQUhATV8WDt/bz/grM20p7892njoZtRDP5QRVyr5/kOsZTbQ1n2Mtw O0wgQH2Mq/+uYr1h7B7LoHzox9+4PBDdld2LcQYAPD+nrIZU3GN/kHB9W Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="367308164" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="367308164" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="682380753" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="682380753" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 5/6] pcmcia: Convert to use less arguments in pci_bus_for_each_resource() Date: Thu, 23 Mar 2023 19:36:09 +0200 Message-Id: <20230323173610.60442-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592983099100009 The pci_bus_for_each_resource() can hide the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski Acked-by: Dominik Brodowski --- drivers/pcmcia/rsrc_nonstatic.c | 9 +++------ drivers/pcmcia/yenta_socket.c | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstati= c.c index ad1141fddb4c..96264ebee46a 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -934,7 +934,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned = int action, unsigned long static int nonstatic_autoadd_resources(struct pcmcia_socket *s) { struct resource *res; - int i, done =3D 0; + int done =3D 0; =20 if (!s->cb_dev || !s->cb_dev->bus) return -ENODEV; @@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_s= ocket *s) */ if (s->cb_dev->bus->number =3D=3D 0) return -EINVAL; - - for (i =3D 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) { - res =3D s->cb_dev->bus->resource[i]; -#else - pci_bus_for_each_resource(s->cb_dev->bus, res, i) { #endif + + pci_bus_for_each_resource(s->cb_dev->bus, res) { if (!res) continue; =20 diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 1365eaa20ff4..fd18ab571ce8 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -673,9 +673,8 @@ static int yenta_search_res(struct yenta_socket *socket= , struct resource *res, u32 min) { struct resource *root; - int i; =20 - pci_bus_for_each_resource(socket->dev->bus, root, i) { + pci_bus_for_each_resource(socket->dev->bus, root) { if (!root) continue; =20 --=20 2.40.0.1.gaa8946217a0b From nobody Sat May 4 07:26:43 2024 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=1679592980; cv=none; d=zohomail.com; s=zohoarc; b=e278urZ6UehAIxFbgAeUq6jsDfdsan33Xdw2a3zTSMqwUUnRpLLufCmr7ohHlESZ8tTbgJRMTzl5ge8WgezmLA/Za/kOZi8/O7EW8DCyB0ir70AqX5276nLYwp0RqjvMa6j6RF8n160QXE2yusPp+vTuO2kezBktbvUc3ioCYsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679592980; 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=z4rdmNdp2XYKH1j9y5e4dc3+ql74INf8wD0CKVk+K18=; b=INfrN4Afa0I4tzvilAAAA4/SGSeP+6kdG84Njfi8je4wpzIUs7KFOQ64oQ6vEBHcy3EUVMKhfFMITptZZidT8f8wqggakOJT/YdF1L8duReS2ZeWECh9/CR+HvTpxKk5tRwH5FbYh9vT/u0WsKDHf5DOvgSaxIf5GG582AXHZVo= 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 1679592980819399.9927716518423; Thu, 23 Mar 2023 10:36:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.514005.795902 (Exim 4.92) (envelope-from ) id 1pfOr4-0001kv-TQ; Thu, 23 Mar 2023 17:36:02 +0000 Received: by outflank-mailman (output) from mailman id 514005.795902; Thu, 23 Mar 2023 17:36:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfOr4-0001kS-LD; Thu, 23 Mar 2023 17:36:02 +0000 Received: by outflank-mailman (input) for mailman id 514005; Thu, 23 Mar 2023 17:36:01 +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 1pfOr3-0000iP-6N for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 17:36:01 +0000 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2c59aa0b-c9a1-11ed-b464-930f4c7d94ae; Thu, 23 Mar 2023 18:35:59 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 10:35:46 -0700 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 23 Mar 2023 10:35:36 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1873736E; Thu, 23 Mar 2023 19:36:12 +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: 2c59aa0b-c9a1-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=1679592959; x=1711128959; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yfeoYNUxbO0e2gvMFM4I3e9/lrxCDzuwgcUE0vRubSk=; b=SnsPC8EmMiZi1EyU3GPkdcv2rNN7HJ4yLh8AdCyIFA4SZ48euhSX1lW+ rrHIa9gzDxTZusb6BbxusNULuLAzqlz0pnMDIROuxvM+wSql53f/3S9Jj ul77FVTI8THfhOPW0oCVMHE7pM/1jvlaGomKra8N0u9ChzvFCgTK/ynLl 2ya3Av+3Lw+Ed9z8EQs2V1tKnG+gh/JTMMI5Zctem8snBc/1Hn/885kRd eMYsxOqWY44WhaeDyTseU9vdnZbgj910ZUzaB3INL+bR04Eo3ngRTlYTF /LwWUNAW7jym4R4KkNjpFphUELz7l58OOkv6XmqAk5Qnm9xC/CHYvRysR w==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="367308136" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="367308136" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="682380750" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="682380750" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , 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 v7 6/6] PCI: Make use of pci_resource_n() Date: Thu, 23 Mar 2023 19:36:10 +0200 Message-Id: <20230323173610.60442-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323173610.60442-1-andriy.shevchenko@linux.intel.com> References: <20230323173610.60442-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: 1679592981094100005 Content-Type: text/plain; charset="utf-8" Replace open-coded implementations of pci_resource_n() in pci.h. Signed-off-by: Andy Shevchenko Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/linux/pci.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/include/linux/pci.h b/include/linux/pci.h index 70a4684d5f26..9539cf63fe5e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2006,14 +2006,12 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, st= ruct vm_area_struct *vma); * for accessing popular PCI BAR info */ #define pci_resource_n(dev, bar) (&(dev)->resource[(bar)]) -#define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) -#define pci_resource_end(dev, bar) ((dev)->resource[(bar)].end) -#define pci_resource_flags(dev, bar) ((dev)->resource[(bar)].flags) -#define pci_resource_len(dev,bar) \ - ((pci_resource_end((dev), (bar)) =3D=3D 0) ? 0 : \ - \ - (pci_resource_end((dev), (bar)) - \ - pci_resource_start((dev), (bar)) + 1)) +#define pci_resource_start(dev, bar) (pci_resource_n(dev, bar)->start) +#define pci_resource_end(dev, bar) (pci_resource_n(dev, bar)->end) +#define pci_resource_flags(dev, bar) (pci_resource_n(dev, bar)->flags) +#define pci_resource_len(dev,bar) \ + (pci_resource_end((dev), (bar)) ? \ + resource_size(pci_resource_n((dev), (bar))) : 0) =20 #define __pci_dev_for_each_resource_0(dev, res, ...) \ for (unsigned int __b =3D 0; \ --=20 2.40.0.1.gaa8946217a0b