Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: Move pci_iomap.c to drivers/pci/

Browse Source 
The entirety of pci_iomap.c is guarded by an #ifdef CONFIG_PCI. It,
consequently, does not belong to lib/ because it is not generic
infrastructure.

Move pci_iomap.c to drivers/pci/ and implement the necessary changes to
Makefiles and Kconfigs.

Update MAINTAINERS file.

Update Documentation.

Link: https://lore.kernel.org/r/20240131090023.12331-3-pstanner@redhat.com
[bhelgaas: squash in https://lore.kernel.org/r/20240212150934.24559-1-pstanner@redhat.com]
Suggested-by: Danilo Krummrich <dakr@redhat.com>
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Philipp Stanner 2024-01-31 10:00:21 +01:00 committed by Bjorn Helgaas
parent 7626913652
commit ae87402752
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/driver-api/device-io.rst
View File

@ -517,6 +517,3 @@ Public Functions Provided
.. kernel-doc:: arch/x86/include/asm/io.h .. kernel-doc:: arch/x86/include/asm/io.h
:internal: :internal:
.. kernel-doc:: lib/pci_iomap.c
:export:

3
Documentation/driver-api/pci/pci.rst
View File

@ -4,6 +4,9 @@ PCI Support Library
.. kernel-doc:: drivers/pci/pci.c .. kernel-doc:: drivers/pci/pci.c
:export: :export:
.. kernel-doc:: drivers/pci/iomap.c
:export:
.. kernel-doc:: drivers/pci/pci-driver.c .. kernel-doc:: drivers/pci/pci-driver.c
:export: :export:

1
MAINTAINERS
View File

@ -16954,7 +16954,6 @@ F: include/asm-generic/pci*
F: include/linux/of_pci.h F: include/linux/of_pci.h
F: include/linux/pci* F: include/linux/pci*
F: include/uapi/linux/pci* F: include/uapi/linux/pci*
F: lib/pci*
PCIE DRIVER FOR AMAZON ANNAPURNA LABS PCIE DRIVER FOR AMAZON ANNAPURNA LABS
M: Jonathan Chocron <jonnyc@amazon.com> M: Jonathan Chocron <jonnyc@amazon.com>

5
drivers/pci/Kconfig
View File

@ -13,6 +13,11 @@ config FORCE_PCI
select HAVE_PCI select HAVE_PCI
select PCI select PCI
# select this to provide a generic PCI iomap,
# without PCI itself having to be defined
config GENERIC_PCI_IOMAP
bool
menuconfig PCI menuconfig PCI
bool "PCI support" bool "PCI support"
depends on HAVE_PCI depends on HAVE_PCI

1
drivers/pci/Makefile
View File

@ -14,6 +14,7 @@ ifdef CONFIG_PCI
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_SYSFS) += slot.o obj-$(CONFIG_SYSFS) += slot.o
obj-$(CONFIG_ACPI) += pci-acpi.o obj-$(CONFIG_ACPI) += pci-acpi.o
obj-$(CONFIG_GENERIC_PCI_IOMAP) += iomap.o
endif endif
obj-$(CONFIG_OF) += of.o obj-$(CONFIG_OF) += of.o

3
lib/pci_iomap.c → drivers/pci/iomap.c
View File

@ -9,7 +9,6 @@
#include <linux/export.h> #include <linux/export.h>
#ifdef CONFIG_PCI
/** /**
* pci_iomap_range - create a virtual mapping cookie for a PCI BAR * pci_iomap_range - create a virtual mapping cookie for a PCI BAR
* @dev: PCI device that owns the BAR * @dev: PCI device that owns the BAR
@ -176,5 +175,3 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *p)
EXPORT_SYMBOL(pci_iounmap); EXPORT_SYMBOL(pci_iounmap);
#endif /* ARCH_WANTS_GENERIC_PCI_IOUNMAP */ #endif /* ARCH_WANTS_GENERIC_PCI_IOUNMAP */
#endif /* CONFIG_PCI */

3
lib/Kconfig
View File

@ -70,9 +70,6 @@ source "lib/math/Kconfig"
config NO_GENERIC_PCI_IOPORT_MAP config NO_GENERIC_PCI_IOPORT_MAP
bool bool
config GENERIC_PCI_IOMAP
bool
config GENERIC_IOMAP config GENERIC_IOMAP
bool bool
select GENERIC_PCI_IOMAP select GENERIC_PCI_IOMAP

1
lib/Makefile
View File

@ -153,7 +153,6 @@ CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
obj-y += math/ crypto/ obj-y += math/ crypto/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o