{"id":2226611,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2226611/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260422161407.118748-19-kwilczynski@kernel.org/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/1.1/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260422161407.118748-19-kwilczynski@kernel.org>","date":"2026-04-22T16:14:01","name":"[v6,18/24] PCI/sysfs: Remove pci_{create,remove}_sysfs_dev_files()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"617e5b66a541a60f27b2488ba210348b3d0124c4","submitter":{"id":86709,"url":"http://patchwork.ozlabs.org/api/1.1/people/86709/?format=json","name":"Krzysztof Wilczyński","email":"kwilczynski@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260422161407.118748-19-kwilczynski@kernel.org/mbox/","series":[{"id":501041,"url":"http://patchwork.ozlabs.org/api/1.1/series/501041/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=501041","date":"2026-04-22T16:13:46","name":"PCI: Convert all dynamic sysfs attributes to static","version":6,"mbox":"http://patchwork.ozlabs.org/series/501041/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226611/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226611/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-pci@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=DIhQ6xey;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-pci+bounces-53004-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"DIhQ6xey\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g14Jv0RvHz1yCv\n\tfor ; Thu, 23 Apr 2026 02:23:11 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id A2BDF3082A14\n\tfor ; Wed, 22 Apr 2026 16:15:34 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 2E2FB382374;\n\tWed, 22 Apr 2026 16:15:16 +0000 (UTC)","from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id AFC083815C7;\n\tWed, 22 Apr 2026 16:15:15 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id E5F98C2BCB2;\n\tWed, 22 Apr 2026 16:15:11 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776874515; cv=none;\n b=jBVxdjPKexXEpX2L1ioSVANf+u7UQtUCvIGCqCDbgCvI/KjokeyCQ4ok2vngIkRxiR8kcH4nzUIgh4J+R2FXwnQiHI5xkmFXvXXsQAh6SC4YX+90u43Kwwmwn64h2sNocDeWvHo7xtgOeJf/96ZijxgaW6NO1KmhChR8W7T+26w=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776874515; c=relaxed/simple;\n\tbh=7ESpY/ci2/QoGHPloYeSwtMzBC3YJtfti1qemYpYGWA=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=JyY3T6ALqSV/3FLaQW5ebLC5WnOU64NJljHneDsvWOlWN5oAGH5XII/LMe4zCM4MzQuFjHtzH9oN16II07PB2hMjw9MZe5BxYykwdGEzZNYVBFE89sYDpfvEsX3PfzjBD7lVIyNJ56M7k24V/FSWeJxQ8ZHZu5XdDbpKsWmqUzo=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=DIhQ6xey; arc=none smtp.client-ip=10.30.226.201","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1776874515;\n\tbh=7ESpY/ci2/QoGHPloYeSwtMzBC3YJtfti1qemYpYGWA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DIhQ6xeye8W71LQdQScHQTjwk6sfVxy0BDM9+poypjbmW1vTDT/WFEJ9QaB3Hs407\n\t MigwA8SIJXdxjGuTnlKVZ8ByumvTd1oEtzws/ebuBYKMtN0h6VYSs4CVJvoxtMt0zf\n\t PIfiDdsIytwLbr9EKElFOgpiCoBrZRFraZ1JgJFNligSOUPG9137mM/q04CznbksDb\n\t 1jEUQnc9dNEtcr1mK9sNlKeDtavqIVk2BCo99Ul/fuzHbtTvaxuQX3fucpWl+HXGe1\n\t 5HZ0q1La7bnjBMIU8XPPDk271FrGz5ZKTUFL1MdX5/572woCf75lu1T/R0w2YhpcRC\n\t p3DcLh/Q4iTkg==","From":"=?utf-8?q?Krzysztof_Wilczy=C5=84ski?= ","To":"Bjorn Helgaas ","Cc":"Bjorn Helgaas ,\n Manivannan Sadhasivam ,\n Lorenzo Pieralisi ,\n Magnus Lindholm , Matt Turner ,\n Richard Henderson ,\n Christophe Leroy ,\n Madhavan Srinivasan ,\n Michael Ellerman , Nicholas Piggin ,\n Dexuan Cui ,\n =?utf-8?q?Krzysztof_Ha=C5=82asa?= ,\n Lukas Wunner , \"Oliver O'Halloran\" ,\n Saurabh Singh Sengar ,\n Shuan He , Srivatsa Bhat ,\n\t=?utf-8?q?Ilpo_J=C3=A4rvinen?= ,\n linux-pci@vger.kernel.org, linux-alpha@vger.kernel.org,\n linuxppc-dev@lists.ozlabs.org","Subject":"[PATCH v6 18/24] PCI/sysfs: Remove\n pci_{create,remove}_sysfs_dev_files()","Date":"Wed, 22 Apr 2026 16:14:01 +0000","Message-ID":"<20260422161407.118748-19-kwilczynski@kernel.org>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260422161407.118748-1-kwilczynski@kernel.org>","References":"<20260422161407.118748-1-kwilczynski@kernel.org>","Precedence":"bulk","X-Mailing-List":"linux-pci@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit"},"content":"Currently, pci_create_sysfs_dev_files() and pci_remove_sysfs_dev_files()\nare no-op stubs. With both the generic and Alpha resource files now\nhandled by static attribute groups, no platform needs dynamic per-device\nsysfs file creation.\n\nThus, remove both functions, their declarations, and the call sites in\npci_bus_add_device() and pci_stop_bus_device().\n\nRemove __weak pci_create_resource_files() and pci_remove_resource_files()\nstubs and their declarations in pci.h, as no architecture overrides them\nanymore.\n\nRemove the res_attr[] and res_attr_wc[] fields from struct pci_dev\nwhich were used to track dynamically allocated resource attributes.\n\nFinally, simplify pci_sysfs_init() to only handle legacy file creation\nunder HAVE_PCI_LEGACY, removing the per-device loop and the\nHAVE_PCI_SYSFS_INIT helper added earlier.\n\nSigned-off-by: Krzysztof Wilczyński \n---\n drivers/pci/bus.c | 1 -\n drivers/pci/pci-sysfs.c | 52 ++---------------------------------------\n drivers/pci/pci.h | 4 ----\n drivers/pci/remove.c | 1 -\n include/linux/pci.h | 9 -------\n 5 files changed, 2 insertions(+), 65 deletions(-)","diff":"diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c\nindex 6c1ad1f542d9..655ed53436d3 100644\n--- a/drivers/pci/bus.c\n+++ b/drivers/pci/bus.c\n@@ -354,7 +354,6 @@ void pci_bus_add_device(struct pci_dev *dev)\n \tpci_fixup_device(pci_fixup_final, dev);\n \tif (pci_is_bridge(dev))\n \t\tof_pci_make_dev_node(dev);\n-\tpci_create_sysfs_dev_files(dev);\n \tpci_proc_attach_device(dev);\n \tpci_bridge_d3_update(dev);\n \ndiff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c\nindex d22bc5c48bc0..3a7bbb00ca60 100644\n--- a/drivers/pci/pci-sysfs.c\n+++ b/drivers/pci/pci-sysfs.c\n@@ -37,12 +37,7 @@\n #define ARCH_PCI_DEV_GROUPS\n #endif\n \n-#if defined(HAVE_PCI_LEGACY) || \\\n-\t!defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)\n-#define HAVE_PCI_SYSFS_INIT\n-#endif\n-\n-#ifdef HAVE_PCI_SYSFS_INIT\n+#ifdef HAVE_PCI_LEGACY\n static int sysfs_initialized;\t/* = 0 */\n #endif\n \n@@ -1401,8 +1396,6 @@ static const struct attribute_group *pci_dev_resource_attr_groups[] = {\n };\n #else\n #define pci_dev_resource_attr_groups NULL\n-int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; }\n-void __weak pci_remove_resource_files(struct pci_dev *dev) { }\n #endif\n \n /**\n@@ -1772,54 +1765,13 @@ static const struct attribute_group pci_dev_resource_resize_attr_group = {\n \t.is_visible = resource_resize_attr_is_visible,\n };\n \n-#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)\n-int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; }\n-void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { }\n-#else\n-int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)\n-{\n-\tif (!sysfs_initialized)\n-\t\treturn -EACCES;\n-\n-\treturn pci_create_resource_files(pdev);\n-}\n-\n-/**\n- * pci_remove_sysfs_dev_files - cleanup PCI specific sysfs files\n- * @pdev: device whose entries we should free\n- *\n- * Cleanup when @pdev is removed from sysfs.\n- */\n-void pci_remove_sysfs_dev_files(struct pci_dev *pdev)\n-{\n-\tif (!sysfs_initialized)\n-\t\treturn;\n-\n-\tpci_remove_resource_files(pdev);\n-}\n-#endif\n-\n-#ifdef HAVE_PCI_SYSFS_INIT\n+#ifdef HAVE_PCI_LEGACY\n static int __init pci_sysfs_init(void)\n {\n-#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)\n \tstruct pci_bus *pbus = NULL;\n \n \tsysfs_initialized = 1;\n-#else\n-\tstruct pci_dev *pdev = NULL;\n-\tstruct pci_bus *pbus = NULL;\n-\tint retval;\n \n-\tsysfs_initialized = 1;\n-\tfor_each_pci_dev(pdev) {\n-\t\tretval = pci_create_sysfs_dev_files(pdev);\n-\t\tif (retval) {\n-\t\t\tpci_dev_put(pdev);\n-\t\t\treturn retval;\n-\t\t}\n-\t}\n-#endif\n \twhile ((pbus = pci_find_next_bus(pbus)))\n \t\tpci_create_legacy_files(pbus);\n \ndiff --git a/drivers/pci/pci.h b/drivers/pci/pci.h\nindex 13d998fbacce..1bf165595583 100644\n--- a/drivers/pci/pci.h\n+++ b/drivers/pci/pci.h\n@@ -391,16 +391,12 @@ static inline int pci_no_d1d2(struct pci_dev *dev)\n }\n \n #ifdef CONFIG_SYSFS\n-int pci_create_sysfs_dev_files(struct pci_dev *pdev);\n-void pci_remove_sysfs_dev_files(struct pci_dev *pdev);\n extern const struct attribute_group *pci_dev_groups[];\n extern const struct attribute_group *pci_dev_attr_groups[];\n extern const struct attribute_group *pcibus_groups[];\n extern const struct attribute_group *pci_bus_groups[];\n extern const struct attribute_group pci_doe_sysfs_group;\n #else\n-static inline int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; }\n-static inline void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { }\n #define pci_dev_groups NULL\n #define pci_dev_attr_groups NULL\n #define pcibus_groups NULL\ndiff --git a/drivers/pci/remove.c b/drivers/pci/remove.c\nindex e9d519993853..6e796dbc5b29 100644\n--- a/drivers/pci/remove.c\n+++ b/drivers/pci/remove.c\n@@ -26,7 +26,6 @@ static void pci_stop_dev(struct pci_dev *dev)\n \n \tdevice_release_driver(&dev->dev);\n \tpci_proc_detach_device(dev);\n-\tpci_remove_sysfs_dev_files(dev);\n \tof_pci_remove_node(dev);\n }\n \ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex 30aeb8e02b7b..f6f55005f82d 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -507,10 +507,6 @@ struct pci_dev {\n \tspinlock_t\tpcie_cap_lock;\t\t/* Protects RMW ops in capability accessors */\n \tu32\t\tsaved_config_space[16]; /* Config space saved at suspend time */\n \tstruct hlist_head saved_cap_space;\n-#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)\n-\tstruct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */\n-\tstruct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */\n-#endif\n \n #ifdef CONFIG_HOTPLUG_PCI_PCIE\n \tunsigned int\tbroken_cmd_compl:1;\t/* No compl for some cmds */\n@@ -2528,11 +2524,6 @@ int pcibios_alloc_irq(struct pci_dev *dev);\n void pcibios_free_irq(struct pci_dev *dev);\n resource_size_t pcibios_default_alignment(void);\n \n-#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)\n-extern int pci_create_resource_files(struct pci_dev *dev);\n-extern void pci_remove_resource_files(struct pci_dev *dev);\n-#endif\n-\n #if defined(CONFIG_PCI_MMCONFIG) || defined(CONFIG_ACPI_MCFG)\n void __init pci_mmcfg_early_init(void);\n void __init pci_mmcfg_late_init(void);\n","prefixes":["v6","18/24"]}