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 D7CFDE99049 for ; Fri, 10 Apr 2026 07:14:35 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fsSjP55yZz2ynf; Fri, 10 Apr 2026 17:14:33 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c04:e001:324:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775800276; cv=none; b=JnK45PzUsvF8DoID46Zk8RvUY3fiI97BrbQrxrHiWPcf2S/WtKIEFPSe/OdminehF50iZdrkdzqNXmKaruPpz7JGgVNLgFDjEcPoHkVgWakXvLvS8S5qTEDr3AvZieuydan0xU9xu+giFJntVRgMg/wgQ2ms7PNieicpuhrrbGbzvhcuTF9nU3hHK15weNsooa9mrcuC3Q10NXzQ95gnYq2WWNt4ogY5zbGpg5WU1luRN5yVHlfCHaqw/eXCgyXZmacCHBOyYokOFR0AMVQgZnqnEMBSADaL3F/vqtAYdHW5aLfKBfsAhDe84/oYw6yFHS3/K4vAmgvainr9ca5gRg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775800276; c=relaxed/relaxed; bh=mItEgTMcAZxYVmAbDBQ8+vIoD/HVCYQFX7X6snQPJ48=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dr9LIQJI+DXlHU775qUM01by7c5hFtP3pwdbA6ld2cW5UcWReQTDLuoaBlC7G2NTB7HWx+EC47ZZS0PcSHNlKRYtaW8lxHLU6sIyWw64E9cNZLnAogE/6gP2urnYDgg1fdyOQJMsjXRBKtM72guNVYLNa+kFXZ3DLp47KriTtVoF5zmTUutvywubztBidqsCXc/Vao+FPXHtCrNOdtfTavGzh8oQOApkkE8hYgTXrhC036FW9l3WbOb5xibzjSbsBtgNZFcTLdM4sApTNwvqWUePNnz4dmHgXWD2rD4sCJ28/akDJuFqs8OS2tK/Zr5Fmry/7lx2e1KUAJTcbA0+4g== 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=ceRd9YGA; dkim-atps=neutral; spf=pass (client-ip=2600:3c04:e001:324:0:1991:8:25; 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=ceRd9YGA; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=kwilczynski@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) (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 4fsQsH5xbGz2yRl for ; Fri, 10 Apr 2026 15:51:15 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id F022060141; Fri, 10 Apr 2026 05:51:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 756A3C2BC9E; Fri, 10 Apr 2026 05:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775800273; bh=XOJ3T7pI3/OxG4g9Rl+t5NTqEP9psqg4UFOrTulCQA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ceRd9YGA1ojtv46l8hviu49R6hBCpnUEnKBzDUtnRa7P7I1Y053W75UsNmHrAPW0L UPPmGvsC/U8noYEuOTFsUCSVpu9bl0tdtNTJte+1ulfgFFYwt4B14wLiBAOjczRoRB eUQqsgF6iyN8Q9WcLVKUrDkY8hPH4z/h9HeUezY0yLbT+F0KBvTdsh4j8VVeEk5Rey ns9h9D1kwckKneSc8RcAQ5V8XR7uvHvEjvBEX8h4++wmme5RTkJuxuKraKYZIE+Fr+ iP+6j0BWUqg2hDF5P/c1YdVfTvT8EVmNsy6mQjWUWs36XHPDIcuqkeFvMDSBwJ4nSe t6Tvpd/s9TG0A== 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 08/20] PCI/sysfs: Add stubs for pci_{create,remove}_sysfs_dev_files() Date: Fri, 10 Apr 2026 05:50:28 +0000 Message-ID: <20260410055040.39233-9-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 On platforms with HAVE_PCI_MMAP or ARCH_GENERIC_PCI_MMAP_RESOURCE, resource files are now handled by static attribute groups registered via pci_dev_groups[]. Thus, the pci_create_sysfs_dev_files() and pci_remove_sysfs_dev_files() can now be stubbed out, as the dynamic resource file creation is no longer needed. Also, simplify pci_sysfs_init() on these platforms to only iterate buses for legacy attributes creation, skipping the per-device loop. Move the __weak stubs for pci_create_resource_files() and pci_remove_resource_files() into the #else branch since only platforms without HAVE_PCI_MMAP (such as Alpha architecture) still need them. Guard the res_attr[] and res_attr_wc[] fields in struct pci_dev the same way. Signed-off-by: Krzysztof Wilczyński --- drivers/pci/pci-sysfs.c | 16 +++++++++++++--- include/linux/pci.h | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 1fabd0baeb56..e200514bbaed 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1392,10 +1392,10 @@ static const struct attribute_group *pci_dev_resource_attr_groups[] = { &pci_dev_resource_wc_attr_group, NULL, }; -#endif - +#else int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; } void __weak pci_remove_resource_files(struct pci_dev *dev) { } +#endif /** * pci_write_rom - used to enable access to the PCI ROM display @@ -1764,6 +1764,10 @@ 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) @@ -1785,9 +1789,15 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) pci_remove_resource_files(pdev); } +#endif 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; @@ -1800,7 +1810,7 @@ static int __init pci_sysfs_init(void) return retval; } } - +#endif while ((pbus = pci_find_next_bus(pbus))) pci_create_legacy_files(pbus); diff --git a/include/linux/pci.h b/include/linux/pci.h index a7a104427b07..2940c80fd7c5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -507,8 +507,10 @@ 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 */ @@ -2501,8 +2503,10 @@ 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); -- 2.53.0