From patchwork Tue Mar 11 17:46:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 14012436 X-Patchwork-Delegate: bhelgaas@google.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03F6F1E9B26; Tue, 11 Mar 2025 17:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715231; cv=none; b=qibQWqG3SJZOxRKjtqYn9gnt/cC1/QF1p7z7VDim5KbEaflhdfjcDI+ViLQShVJnp9Kwg5+2DUfX18jJNVrZUUxT+I0CZuOU2siA0naV35peouA7rF4DgZDhEgC9+OMz0SfiIihGzOwEwnnc54q2zzm525IPzjE6JI+T0xGodbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715231; c=relaxed/simple; bh=dQMNvPwr30uRdcikX37ZIEUV+onSGkBkVN+Ew8Cp57Y=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=mR8LXQ3l0F6s8UB82ZMijfmG0anj2px44XABgJMVPjPeE7jVTIode9FdwtAT6t01yPUnVBIgSbfbJvyUVM6jHKuIuRq3AVMM348kPQbmuamO8BClovwHmFLZ8tSG6vBI5a1jowvsUW5WBSejG4dAEshyP3ZHsFE2irkh5CIyayo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aaj7vdOh; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aaj7vdOh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741715230; x=1773251230; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dQMNvPwr30uRdcikX37ZIEUV+onSGkBkVN+Ew8Cp57Y=; b=aaj7vdOhxbMgMUjC4DXlJ2Io4eWKJwOczqzvk5Lk1NLAxr5l2W7wKZtv As/U3P764GZLyDUIi3zevziaIIAeQA0hqLPfW6i0fVOeton7PgEkD2eIZ M0AHakpJeXFHyRIlHdMBpD9/2czBnE6b0QokUOmMR46qjgv5EwpfB0DZY BE+PRbMJWg7n5NVy7FBYAR/SqW3U+gHgiCpC6WOer19cFbURmOFylZ5xO UYcbBWAjBSeVmLv9ACQj77JRs/cTOV71HCxqa2Nb7TVyB8JBeD5LFhVti AgkkBWmI+9YVKMSD9RKhNfTETjvE+EEzjkRTmYaPoqm9WCB+HR5I8zswe A==; X-CSE-ConnectionGUID: OTk5xFXbTb2RT2M/i6cfXQ== X-CSE-MsgGUID: Vf2UoIuhTMia0OtXYkbafg== X-IronPort-AV: E=McAfee;i="6700,10204,11370"; a="46550713" X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="46550713" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:10 -0700 X-CSE-ConnectionGUID: ePXCid82RJ+Rd9kyerh/cw== X-CSE-MsgGUID: ZijMnOdZT+GmXSQoZ4kqBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="124563336" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.251]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:07 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 1/4] PCI: Move pci_rescan_bus_bridge_resize() declaration to pci/pci.h Date: Tue, 11 Mar 2025 19:46:58 +0200 Message-Id: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pci_rescan_bus_bridge_resize() is only used by code inside PCI subsystem. The comment also falsely advertizes it to be for hotplug drivers, yet the only caller is from sysfs store function. Move the function declaration into pci/pci.h. Signed-off-by: Ilpo Järvinen --- drivers/pci/pci.h | 2 ++ include/linux/pci.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 01e51db8d285..be2f43c9d3b0 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -309,6 +309,8 @@ enum pci_bar_type { struct device *pci_get_host_bridge_device(struct pci_dev *dev); void pci_put_host_bridge_device(struct device *dev); +unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge); + int pci_configure_extended_tags(struct pci_dev *dev, void *ign); bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, int rrs_timeout); diff --git a/include/linux/pci.h b/include/linux/pci.h index 47b31ad724fa..d788acf2686a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1455,7 +1455,6 @@ void set_pcie_port_type(struct pci_dev *pdev); void set_pcie_hotplug_bridge(struct pci_dev *pdev); /* Functions for PCI Hotplug drivers to use */ -unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge); unsigned int pci_rescan_bus(struct pci_bus *bus); void pci_lock_rescan_remove(void); void pci_unlock_rescan_remove(void); From patchwork Tue Mar 11 17:46:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 14012437 X-Patchwork-Delegate: bhelgaas@google.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6C62262D01; Tue, 11 Mar 2025 17:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715237; cv=none; b=LRM5sRf6RV1lXR0gdMogJ5o6MsDi/wANFHDo0s+XZP4K8JBKEvn3nfBihFXHdwDC+anMVRWXKSe4VJgL7TSTRN+aYWCvHGGxTya4sBqtuFP8EMldDPsa3zIH6ePYTTJP+rs52GhUW2N6m4/n7rf+KCsXpm9MplGIa4XVd8huU9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715237; c=relaxed/simple; bh=l//bDvKxTt9nSDAPrA6fxu4EWvJx8XcFretpSDHjdXk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=kmifskiR19TkKwbxJls2EPEBKIE7OXLjGcRO7UkuRYmZ7FFSFe5RijVmUseVP70uQfVBUhiCutMp66UMOZsfViQiixrzUrAjWnpjPuDI/BbUpdd18fPdSi+hlXHetY533mcHqTNmP+3gn+g7NtrsLeMDw9XYN+tAFhOj9gTns5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mJ236xM4; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mJ236xM4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741715236; x=1773251236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l//bDvKxTt9nSDAPrA6fxu4EWvJx8XcFretpSDHjdXk=; b=mJ236xM4bMrtvY3WdMmrbMjP3yFb6AJlbyEGdr5GXrd0v8O80K/MKay3 kE7ADv5bKYkIDpJLyrORq+2fTboTsUeHp5yEG6cle+A8ZcoGgOWXEhr5J cbl/wwHhGZQufk58f53RynMlIU7memCLbVvzKH35cd6k0eLhUvY130TR0 G4eiSkFslyn//mcOKfnv8ui9xLhz90kv2h0oyIJHou9tS0ShvcstFDhQl ZtV6m0kJ7aZlq6GjTO5BJSorl/TWuNvfsa4rjl+P/epg5tD0XA/0Wqnv1 M134Mk9g7w51bAVcJcKpVFC5a0hZI6YDToNpQkNrL4n4V7s216Qf/D0NG g==; X-CSE-ConnectionGUID: B+inrb3lQESySdIP2TSwVw== X-CSE-MsgGUID: HPbkWCrASBydfVY9j8UgNA== X-IronPort-AV: E=McAfee;i="6700,10204,11370"; a="46414980" X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="46414980" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:15 -0700 X-CSE-ConnectionGUID: voxJyQXpSA2u1eRYVtfGLw== X-CSE-MsgGUID: zw9m+tTmTAmmZMgZTSN5Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="125291586" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.251]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:13 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 2/4] PCI: Move resource reassignment func declarations into pci/pci.h Date: Tue, 11 Mar 2025 19:46:59 +0200 Message-Id: <20250311174701.3586-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> References: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Neither pci_reassign_bridge_resources() nor pci_reassign_resource() is used outside of the PCI subsystem. They seem to be naturally static functions but since resource fitting/assignment is split between setup-bus.c and setup-res.c, they fall into different sides of the divide and need to be declared). Move the declarations of pci_reassign_bridge_resources() and pci_reassign_resource() into pci/pci.h to keep them internal to PCI subsystem. Signed-off-by: Ilpo Järvinen --- drivers/pci/pci.h | 2 ++ include/linux/pci.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index be2f43c9d3b0..3e05e5506041 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -310,6 +310,8 @@ struct device *pci_get_host_bridge_device(struct pci_dev *dev); void pci_put_host_bridge_device(struct device *dev); unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge); +int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type); +int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align); int pci_configure_extended_tags(struct pci_dev *dev, void *ign); bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, diff --git a/include/linux/pci.h b/include/linux/pci.h index d788acf2686a..c629962f4ccd 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1396,7 +1396,6 @@ void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev); void pci_update_resource(struct pci_dev *dev, int resno); int __must_check pci_assign_resource(struct pci_dev *dev, int i); -int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align); void pci_release_resource(struct pci_dev *dev, int resno); static inline int pci_rebar_bytes_to_size(u64 bytes) { @@ -1476,7 +1475,6 @@ void pci_assign_unassigned_resources(void); void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge); void pci_assign_unassigned_bus_resources(struct pci_bus *bus); void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus); -int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type); int pci_enable_resources(struct pci_dev *, int mask); void pci_assign_irq(struct pci_dev *dev); struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res); From patchwork Tue Mar 11 17:47:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 14012438 X-Patchwork-Delegate: bhelgaas@google.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6689E26158C; Tue, 11 Mar 2025 17:47:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715242; cv=none; b=TuBkW9Ewk8lvr3HhKw/oaMSe5ZOmBBHsyH5V2+AvfU2DfGd/v9xRsN030PB5BxCMtOUKxSl+0555ZAeuwkDF9BfuxlI4lZmGA3AUsi9EGqF3W6C9rKmwqtJS7N5MMt0R269DW4Vw4LEplJt9R7/1gL5I1Zi50r9N473h3Qk5OJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715242; c=relaxed/simple; bh=6KeP7/65CU2roRCfckZMDuoWh/RmFYC3xcvJpC2jw2o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=OISjaqb/7BvBV3m01Nx8P1k6LoQ150veCM2o9N7zGoNdxMHUGvHDP5fuaAjwC1fm2nD6S2/TnIMFn/QaztzmdXECeP30zXNSjBYk/g5rNakJWEs8/dh3G9kIYugEqQHU84agZk9HkuI5QjM7yqcM64M9ipMis7kvxVhNwgprX6c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g0t6rNNu; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g0t6rNNu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741715242; x=1773251242; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6KeP7/65CU2roRCfckZMDuoWh/RmFYC3xcvJpC2jw2o=; b=g0t6rNNuaKKO90JLOegeTQxd+xjDWyaOe5JjmZrCJrXvLfh4VXOwWoaF N5K2RYfhf1OllAVwB/kbfVh/CAokwyRXbEgPPjKXZxY8vBYuKRaAgNsDL vBMWThtZam4VCcYmhJKp2CdFvSJ4ZePy27SRSEbJQrZHxLjZQh1t+aYHw PMOaRtpCBpkmwOwRLxOIQkEA5+bK8raxCLP7PnA8HgKGhW5+Qsa65azWj fzeJb36onIdRaqeWoDuzknfp9aPePe0vPgp3bxdcmMYctYYLhlKPIh7XG 2oNZrcTr1TIuxiZOJvPoi2pKbbv57zIzCbg1DeY30+GF9abuPboTDt67n w==; X-CSE-ConnectionGUID: /3H/plutQKay6u7qtKYcGg== X-CSE-MsgGUID: jo1TbBkLTGmgbyXgDKDJyQ== X-IronPort-AV: E=McAfee;i="6700,10204,11370"; a="46414994" X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="46414994" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:21 -0700 X-CSE-ConnectionGUID: kVbw+0gPQzywyKoG4Qmvlg== X-CSE-MsgGUID: oyJwascxQMy1RUINsSbkUQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="125291599" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.251]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:19 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 3/4] PCI: Make pci_setup_bridge() static Date: Tue, 11 Mar 2025 19:47:00 +0200 Message-Id: <20250311174701.3586-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> References: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pci_setup_bridge() is only used within setup-bus.c. Therefore, make it a static function. Signed-off-by: Ilpo Järvinen --- drivers/pci/setup-bus.c | 2 +- include/linux/pci.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 5e00cecf1f1a..836d260328a8 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -694,7 +694,7 @@ void __weak pcibios_setup_bridge(struct pci_bus *bus, unsigned long type) { } -void pci_setup_bridge(struct pci_bus *bus) +static void pci_setup_bridge(struct pci_bus *bus) { unsigned long type = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; diff --git a/include/linux/pci.h b/include/linux/pci.h index c629962f4ccd..9a703355ef06 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1634,7 +1634,6 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *), void *userdata); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); -void pci_setup_bridge(struct pci_bus *bus); resource_size_t pcibios_window_alignment(struct pci_bus *bus, unsigned long type); From patchwork Tue Mar 11 17:47:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 14012439 X-Patchwork-Delegate: bhelgaas@google.com Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CE45262D18; Tue, 11 Mar 2025 17:47:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715249; cv=none; b=aaPia1wx+WaEyWq7NO/ZPHqWu3pgty6RbpLWLcVv84jj4WMGWfaKokbD7jkDXtFYweTq0walBMBiCB1mEe3kPGHl2+byqtIl0XcNnzcmY2Zip5y4ksLJfqXSy2V/VzGNXrFoLzwJ8qbucO7g6S5dXUcn2Fhd5Gi6X8KVTA4DiTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741715249; c=relaxed/simple; bh=w7LIh57Ny/AtYF3IssH43Id/ZYUebLk4F68rc+M9SjA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=CSikXqj5iScIkgjibWmIBxD2aATPcYMwvNXhM5IdG6xNumkuraMo9PrdUM945zqehpEPR+CwqF0Jz7ZQkNDKvqGs+qjU7jVfHpZ+OII7gEKVzy5Y6qeejh/XIp29VqByBJKW+he+HJt4idijgQBmft73ofOCgS2oxZBfB7Zii6U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Tc66RtRb; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Tc66RtRb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741715248; x=1773251248; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w7LIh57Ny/AtYF3IssH43Id/ZYUebLk4F68rc+M9SjA=; b=Tc66RtRbownVibrKtlfP58mKP8GByMIn+6DYVRCr0zZtdBdk3+FseGgV ywGHTkFnQcdyh0YeZbeTZK9UbBon9jEUZgY4UeRgd1sIlFzLYHZf9g1rk 3AdvUL9y4jIX8brMobmQjRN+6ZqeBvGChQ7LPG1r/EUxtq6aAbkx2Xg1R bOtgI7hR4QYbWVasOe70xjA8vh8Kg4NcvjNDv3T90sb63gPauhuCYipMi hIn4+Y/qvLMU4Q724XlOOoJKex7zMbraMUVt8Ucqz5M3EHyqADjVk+T/6 gl0YsRpkZbC1WayOVsNBpatQXKaKv/DfHwYEmcYAjFQIJHf+QAilD7jEy Q==; X-CSE-ConnectionGUID: oI7a2IOmQ1aNE0KSh+QmHA== X-CSE-MsgGUID: 8RyLkWugTF+X1Kg0OXIDaA== X-IronPort-AV: E=McAfee;i="6700,10204,11370"; a="46415002" X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="46415002" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:28 -0700 X-CSE-ConnectionGUID: sIwJlPsVTDGiDx7vlLmVew== X-CSE-MsgGUID: aQtSORMDSZ+hXYspBm9MVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,239,1736841600"; d="scan'208";a="125291619" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.251]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 10:47:26 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 4/4] PCI: Move cardbus IO size declarations into pci/pci.h Date: Tue, 11 Mar 2025 19:47:01 +0200 Message-Id: <20250311174701.3586-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> References: <20250311174701.3586-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 For some reason, cardbus related io/mem size declarations are in linux/pci.h, whereas non-cardbus sizes are already in pci/pci.h. Move all them into one place in pci/pci.h. Signed-off-by: Ilpo Järvinen --- drivers/pci/pci.h | 2 ++ include/linux/pci.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 3e05e5506041..f88e28519f5c 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -266,6 +266,8 @@ extern unsigned long pci_hotplug_io_size; extern unsigned long pci_hotplug_mmio_size; extern unsigned long pci_hotplug_mmio_pref_size; extern unsigned long pci_hotplug_bus_size; +extern unsigned long pci_cardbus_io_size; +extern unsigned long pci_cardbus_mem_size; /** * pci_match_one_device - Tell if a PCI device structure has a matching diff --git a/include/linux/pci.h b/include/linux/pci.h index 9a703355ef06..f9424478a19a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2332,8 +2332,6 @@ extern int pci_pci_problems; #define PCIPCI_ALIMAGIK 32 /* Need low latency setting */ #define PCIAGP_FAIL 64 /* No PCI to AGP DMA */ -extern unsigned long pci_cardbus_io_size; -extern unsigned long pci_cardbus_mem_size; extern u8 pci_dfl_cache_line_size; extern u8 pci_cache_line_size;