From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D295E99049 for ; Fri, 10 Apr 2026 07:15:31 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fsSkV2NXFz2yZ6; Fri, 10 Apr 2026 17:15:30 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.105.4.254 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775800306; cv=none; b=Zst9NACO8HofNR1AkCCva+mlq1BJgWGqGEsEwktUyjPR1JQvRKIKmlaZpPfWXJnhn5m8idLfhIQV+ebaqBukH7fm3rwMuC5q+eN91mUkQn5BjpBQRI8MR9LYKz+BTpxBkbikVC2EUS31jKtox8BhW1+eTqnC5xr7kWvKLXG8tPSBco1Mb+YsTpc7k2gCXKz/jfhUfUj9hmtl1PbZ0ZtONsGv7LO03j/4qFajyUns58eggUx+WdQ9jktgLkQhVu3qvtNVZ/LZkEoDl5atpEB5eKpkCzzGCeQ2pXZXe6aS/OWS6SgGCH8ARhfm5zTqOgG5zgOMvlU9DI9t06JQMjLSwg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775800306; c=relaxed/relaxed; bh=dCYgudYHHOWWBef8ctNMRWHZz4BpARsdhTyPU9lZoEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MNOT2Fl7rcvLj4vdK1holm/oFrHNMoiRyXE6FBZe5LGdoC4HA6edAgGw3QGFAeSaIDa6vL3OiMJbq1ONgt1khppVE/uzUyl3HEAYJDymiBQg2d4vQgB0uqRzlHC+pyCKcZH43mm2eVwY5uAjGMlVq+VI4QYi4KWtS49MNIrjt74LwOtd6I0Jsvix/OdobzSA+xzzM8PGuT0pINQ/x1xOh5sJT9oMkLXwp2mN2mD4l9YCt1RKNaFNUBrNY8qaSvAv/wD5jLKq2vPhlaRhHiWgDWyaCH+lVRTEtGj7xiPVFGvhQbJXmjWY5oMurbtOiAtNCjEEQOghsqy/x8wC2MEa1g== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=fKo56qqF; dkim-atps=neutral; spf=pass (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=kwilczynski@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=fKo56qqF; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=kwilczynski@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4fsQss32Nqz2yRl for ; Fri, 10 Apr 2026 15:51:45 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 69E8C60128; Fri, 10 Apr 2026 05:51:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEE0EC2BCAF; Fri, 10 Apr 2026 05:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775800303; bh=lMntqWv4FJlC5Eob4H2wN2PzFM5mxJOGAsB5cVrnmM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fKo56qqFu7ujSnOWOqagKgX3VWv0GT5NKAEujmYnOzF9h0sRpa8zJ3on/SH6oj1kL xp5QljIGWbZEzixMNHy8hUhJbn+QBGR01XazochBtVcwgbDdTEI0mBQYDCJMKEtog7 2Q86p32GVBMbeUQaRIxEPrCsO8CKU2MZn0ma7X3v62w4WVEf1XqA8HQ/ulDtcG+H6M BE0Gw9zYvNdQUzAdNKZXcWDa7MX/D1jeWiGNjNJ+nDjom79bErOIVjtm0lkpzQZqz8 gXJoTFNXUcJEsJ20VbYQZ3goYpRJWcYt8/dGZfrJ92dEpS5nYvzHoQAr/D3H8Y/q1E yjOKLgrOifclw== From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= To: Bjorn Helgaas Cc: Bjorn Helgaas , Manivannan Sadhasivam , Lorenzo Pieralisi , Magnus Lindholm , Matt Turner , Richard Henderson , Christophe Leroy , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Dexuan Cui , =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= , Lukas Wunner , "Oliver O'Halloran" , Saurabh Singh Sengar , Shuan He , Srivatsa Bhat , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , linux-pci@vger.kernel.org, linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/20] PCI/sysfs: Remove pci_{create,remove}_sysfs_dev_files() Date: Fri, 10 Apr 2026 05:50:36 +0000 Message-ID: <20260410055040.39233-17-kwilczynski@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410055040.39233-1-kwilczynski@kernel.org> References: <20260410055040.39233-1-kwilczynski@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, pci_create_sysfs_dev_files() and pci_remove_sysfs_dev_files() are no-op stubs. With both the generic and Alpha resource files now handled by static attribute groups, no platform needs dynamic per-device sysfs file creation. Thus, remove both functions, their declarations, and the call sites in pci_bus_add_device() and pci_stop_bus_device(). Remove __weak pci_create_resource_files() and pci_remove_resource_files() stubs and their declarations in pci.h, as no architecture overrides them anymore. Remove the res_attr[] and res_attr_wc[] fields from struct pci_dev which were used to track dynamically allocated resource attributes. Finally, simplify pci_sysfs_init() to only handle legacy file creation under HAVE_PCI_LEGACY, removing the per-device loop and the HAVE_PCI_SYSFS_INIT helper added earlier. Signed-off-by: Krzysztof Wilczyński --- drivers/pci/bus.c | 1 - drivers/pci/pci-sysfs.c | 53 ++--------------------------------------- drivers/pci/pci.h | 4 ---- drivers/pci/remove.c | 1 - include/linux/pci.h | 9 ------- 5 files changed, 2 insertions(+), 66 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 6c1ad1f542d9..655ed53436d3 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -354,7 +354,6 @@ void pci_bus_add_device(struct pci_dev *dev) pci_fixup_device(pci_fixup_final, dev); if (pci_is_bridge(dev)) of_pci_make_dev_node(dev); - pci_create_sysfs_dev_files(dev); pci_proc_attach_device(dev); pci_bridge_d3_update(dev); diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 062921d5df9b..40b5e21d77f3 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -37,12 +37,7 @@ #define ARCH_PCI_DEV_GROUPS #endif -#if defined(HAVE_PCI_LEGACY) || \ - !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -#define HAVE_PCI_SYSFS_INIT -#endif - -#ifdef HAVE_PCI_SYSFS_INIT +#ifdef HAVE_PCI_LEGACY static int sysfs_initialized; /* = 0 */ #endif @@ -1399,9 +1394,6 @@ static const struct attribute_group *pci_dev_resource_attr_groups[] = { &pci_dev_resource_wc_attr_group, NULL, }; -#else -int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; } -void __weak pci_remove_resource_files(struct pci_dev *dev) { } #endif /** @@ -1771,54 +1763,13 @@ static const struct attribute_group pci_dev_resource_resize_attr_group = { }; #endif -#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; } -void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } -#else -int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) -{ - if (!sysfs_initialized) - return -EACCES; - - return pci_create_resource_files(pdev); -} - -/** - * pci_remove_sysfs_dev_files - cleanup PCI specific sysfs files - * @pdev: device whose entries we should free - * - * Cleanup when @pdev is removed from sysfs. - */ -void pci_remove_sysfs_dev_files(struct pci_dev *pdev) -{ - if (!sysfs_initialized) - return; - - pci_remove_resource_files(pdev); -} -#endif - -#ifdef HAVE_PCI_SYSFS_INIT +#ifdef HAVE_PCI_LEGACY static int __init pci_sysfs_init(void) { -#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) struct pci_bus *pbus = NULL; sysfs_initialized = 1; -#else - struct pci_dev *pdev = NULL; - struct pci_bus *pbus = NULL; - int retval; - sysfs_initialized = 1; - for_each_pci_dev(pdev) { - retval = pci_create_sysfs_dev_files(pdev); - if (retval) { - pci_dev_put(pdev); - return retval; - } - } -#endif while ((pbus = pci_find_next_bus(pbus))) pci_create_legacy_files(pbus); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 13d998fbacce..1bf165595583 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -391,16 +391,12 @@ static inline int pci_no_d1d2(struct pci_dev *dev) } #ifdef CONFIG_SYSFS -int pci_create_sysfs_dev_files(struct pci_dev *pdev); -void pci_remove_sysfs_dev_files(struct pci_dev *pdev); extern const struct attribute_group *pci_dev_groups[]; extern const struct attribute_group *pci_dev_attr_groups[]; extern const struct attribute_group *pcibus_groups[]; extern const struct attribute_group *pci_bus_groups[]; extern const struct attribute_group pci_doe_sysfs_group; #else -static inline int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; } -static inline void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } #define pci_dev_groups NULL #define pci_dev_attr_groups NULL #define pcibus_groups NULL diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index e9d519993853..6e796dbc5b29 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -26,7 +26,6 @@ static void pci_stop_dev(struct pci_dev *dev) device_release_driver(&dev->dev); pci_proc_detach_device(dev); - pci_remove_sysfs_dev_files(dev); of_pci_remove_node(dev); } diff --git a/include/linux/pci.h b/include/linux/pci.h index 2940c80fd7c5..5a418fbe5a5f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -507,10 +507,6 @@ struct pci_dev { spinlock_t pcie_cap_lock; /* Protects RMW ops in capability accessors */ u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; -#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) - struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ - struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ -#endif #ifdef CONFIG_HOTPLUG_PCI_PCIE unsigned int broken_cmd_compl:1; /* No compl for some cmds */ @@ -2503,11 +2499,6 @@ int pcibios_alloc_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev); resource_size_t pcibios_default_alignment(void); -#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -extern int pci_create_resource_files(struct pci_dev *dev); -extern void pci_remove_resource_files(struct pci_dev *dev); -#endif - #if defined(CONFIG_PCI_MMCONFIG) || defined(CONFIG_ACPI_MCFG) void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_late_init(void); -- 2.53.0