From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 824D71D9663; Fri, 8 May 2026 04:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778214985; cv=none; b=GvN9CSa1cpDFOVgIcFA/7aIF84pZHJZIbAVpJy7Z2g6dxTRIDx9u7h6O83gQdLxs332V8CL/gg+0W3Dul/QcwZm9LsubXuHdMWHTGalaq874spwo3OWOlcMzoUnjxENmi6iBUEVLPmnmnbqbChN6bVBM/EPM0mdtY153lg84X+Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778214985; c=relaxed/simple; bh=XwywdNQStJKB2nARSUHqZ+M01XWfSdEtG3nW3a2lTfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s4oSuv1VLTOEXJmSpnaXWCXNpamvCuBFSgJ1MgbPs9beAtJBsma8LqcET4988HnFvU1N4x/QoD/tyyKkOG8DImZOpokYoMuFlmT+C6MlVqLZZwkU6uXP6PpgGUPOUvyxLd7aE+tKqs4/EHa7XQL+Za0u1lsl4udpHbyoE7qDA+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rh/5q/KS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rh/5q/KS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E00E3C2BCB4; Fri, 8 May 2026 04:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778214985; bh=XwywdNQStJKB2nARSUHqZ+M01XWfSdEtG3nW3a2lTfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rh/5q/KSOyqNiNpnrNf+NkkxPg8L1Zev7C/vrEesNsZlBBknrMXZvGpK11nn0XumL cFUnaIZb60HIJmq36t8QPr0VsyDaWP8wNPAhLdqEpj+LUzcNHTQH6wnjDXvOTgO+Ao BiLGRpySYs1oVUVWVEG84ViINV5tcIvMO7PV72uZogIH2M8YGkXWw5jVKKKDH+WgV/ tDAHSXJiWIyTe8ACpFvJP8XLpDpkrX1lmnl3P/QQ4qoKxSZKXU4Qu+xNAnPYz0T2K2 u2eWi84CXh/VCfhPfv7Wrh7ycf6NpDp5wdDRRsWYlfRcVXLXTqVueHq8VcCe2kABjp IzI1PYLxKCPEQ== From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= To: Bjorn Helgaas Cc: Bjorn Helgaas , Manivannan Sadhasivam , Lorenzo Pieralisi , Alex Williamson , 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 v7 10/24] PCI/sysfs: Limit pci_sysfs_init() late_initcall compile scope Date: Fri, 8 May 2026 04:35:29 +0000 Message-ID: <20260508043543.217179-11-kwilczynski@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508043543.217179-1-kwilczynski@kernel.org> References: <20260508043543.217179-1-kwilczynski@kernel.org> Precedence: bulk X-Mailing-List: linux-alpha@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, pci_sysfs_init() and sysfs_initialized compile unconditionally, even on platforms where static attribute groups handle all resource file creation. Thus, place them behind a new HAVE_PCI_SYSFS_INIT macro, especially as the late_initcall is only needed when: - HAVE_PCI_LEGACY is set, to iterate buses and create legacy I/O and memory files. - Neither HAVE_PCI_MMAP nor ARCH_GENERIC_PCI_MMAP_RESOURCE is set, to iterate devices and create resource files via the __weak pci_create_resource_files() stub override (this is how the Alpha architecture handles this currently). On most systems both conditions are false and the entire late_initcall compiles away. Tested-by: Shivaprasad G Bhat Signed-off-by: Krzysztof Wilczyński --- drivers/pci/pci-sysfs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index b2a2de622f39..225c3d0db74e 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -37,7 +37,14 @@ #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 static int sysfs_initialized; /* = 0 */ +#endif /* show configuration fields */ #define pci_config_attr(field, format_string) \ @@ -1768,6 +1775,7 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) } #endif +#ifdef HAVE_PCI_SYSFS_INIT static int __init pci_sysfs_init(void) { #if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) @@ -1794,6 +1802,7 @@ static int __init pci_sysfs_init(void) return 0; } late_initcall(pci_sysfs_init); +#endif static struct attribute *pci_dev_dev_attrs[] = { &dev_attr_boot_vga.attr, -- 2.54.0