Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8074aa2 authored by Denis Efremov's avatar Denis Efremov Committed by Bjorn Helgaas
Browse files

PCI: Convert pci_resource_to_user() to a weak function 

Convert pci_resource_to_user() to a weak function so the existing
architecture-specific implementations will automatically override the
generic one.  This allows us to remove HAVE_ARCH_PCI_RESOURCE_TO_USER
definitions and avoid the conditional compilation for this single function.

Link: https://lore.kernel.org/r/20190729101401.28068-1-efremov@linux.com
Link: https://lore.kernel.org/r/20190729101401.28068-2-efremov@linux.com
Link: https://lore.kernel.org/r/20190729101401.28068-3-efremov@linux.com
Link: https://lore.kernel.org/r/20190729101401.28068-4-efremov@linux.com
Link: https://lore.kernel.org/r/20190729101401.28068-5-efremov@linux.com
Link: https://lore.kernel.org/r/20190729101401.28068-6-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
[bhelgaas: squash into one commit]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: Paul Burton <paul.burton@mips.com>	# MIPS
parent 5f9e832c

arch/microblaze/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 unsigned long size,

					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER



/* This part of code was originally in xilinx-pci.h */

#ifdef CONFIG_PCI_XILINX

extern void __init xilinx_pci_init(void);

arch/mips/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ extern unsigned long PCIBIOS_MIN_MEM; 


#define HAVE_PCI_MMAP

#define ARCH_GENERIC_PCI_MMAP_RESOURCE

#define HAVE_ARCH_PCI_RESOURCE_TO_USER



/*

 * Dynamic DMA mapping stuff.

arch/powerpc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 unsigned long size,

					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER



extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose);

extern void pcibios_setup_bus_devices(struct pci_bus *bus);

extern void pcibios_setup_bus_self(struct pci_bus *bus);

arch/sparc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define arch_can_pci_mmap_io()	1

#define HAVE_ARCH_PCI_GET_UNMAPPED_AREA

#define get_pci_unmapped_area get_fb_unmapped_area



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

#endif /* CONFIG_SPARC64 */



#if defined(CONFIG_SPARC64) || defined(CONFIG_LEON_PCI)

drivers/pci/pci.c

+12 −0
Original line number Diff line number Diff line
@@ -5932,6 +5932,18 @@ resource_size_t __weak pcibios_default_alignment(void) 
	return 0;

}



/*

 * Arches that don't want to expose struct resource to userland as-is in

 * sysfs and /proc can implement their own pci_resource_to_user().

 */

void __weak pci_resource_to_user(const struct pci_dev *dev, int bar,

				 const struct resource *rsrc,

				 resource_size_t *start, resource_size_t *end)

{

	*start = rsrc->start;

	*end = rsrc->end;

}



#define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE

static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};

static DEFINE_SPINLOCK(resource_alignment_lock);