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

Commit f4ffd5e5 authored by Rob Herring's avatar Rob Herring
Browse files

pci: move microblaze and powerpc pci flag functions into asm-generic 



Move separate microblaze and powerpc pci flag functions pci_set_flags,
pci_add_flags, and pci_has_flag into asm-generic/pci-bridge.h so other
archs can use them.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 0e47ff1c

arch/microblaze/include/asm/pci-bridge.h

+10 −57
Original line number Diff line number Diff line
@@ -10,31 +10,19 @@ 
#include <linux/pci.h>

#include <linux/list.h>

#include <linux/ioport.h>

#include <asm-generic/pci-bridge.h>



struct device_node;



enum {

	/* Force re-assigning all resources (ignore firmware

	 * setup completely)

	 */

	PCI_REASSIGN_ALL_RSRC	= 0x00000001,



	/* Re-assign all bus numbers */

	PCI_REASSIGN_ALL_BUS	= 0x00000002,



	/* Do not try to assign, just use existing setup */

	PCI_PROBE_ONLY		= 0x00000004,



	/* Don't bother with ISA alignment unless the bridge has

	 * ISA forwarding enabled

	 */

	PCI_CAN_SKIP_ISA_ALIGN	= 0x00000008,



	/* Enable domain numbers in /proc */

	PCI_ENABLE_PROC_DOMAINS	= 0x00000010,

	/* ... except for domain 0 */

	PCI_COMPAT_DOMAIN_0		= 0x00000020,

};

#ifdef CONFIG_PCI

extern struct list_head hose_list;

extern int pcibios_vaddr_is_ioport(void __iomem *address);

#else

static inline int pcibios_vaddr_is_ioport(void __iomem *address)

{

	return 0;

}

#endif



/*

 * Structure of a PCI controller (host bridge)
@@ -164,40 +152,5 @@ extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev); 
extern void pcibios_free_controller(struct pci_controller *phb);

extern void pcibios_setup_phb_resources(struct pci_controller *hose);



#ifdef CONFIG_PCI

extern unsigned int pci_flags;



static inline void pci_set_flags(int flags)

{

	pci_flags = flags;

}



static inline void pci_add_flags(int flags)

{

	pci_flags |= flags;

}



static inline int pci_has_flag(int flag)

{

	return pci_flags & flag;

}



extern struct list_head hose_list;



extern int pcibios_vaddr_is_ioport(void __iomem *address);

#else

static inline int pcibios_vaddr_is_ioport(void __iomem *address)

{

	return 0;

}



static inline void pci_set_flags(int flags) { }

static inline void pci_add_flags(int flags) { }

static inline int pci_has_flag(int flag)

{

	return 0;

}

#endif	/* CONFIG_PCI */



#endif	/* __KERNEL__ */

#endif	/* _ASM_MICROBLAZE_PCI_BRIDGE_H */

arch/powerpc/include/asm/pci-bridge.h

+1 −49
Original line number Diff line number Diff line
@@ -10,58 +10,10 @@ 
#include <linux/pci.h>

#include <linux/list.h>

#include <linux/ioport.h>

#include <asm-generic/pci-bridge.h>



struct device_node;



enum {

	/* Force re-assigning all resources (ignore firmware

	 * setup completely)

	 */

	PCI_REASSIGN_ALL_RSRC	= 0x00000001,



	/* Re-assign all bus numbers */

	PCI_REASSIGN_ALL_BUS	= 0x00000002,



	/* Do not try to assign, just use existing setup */

	PCI_PROBE_ONLY		= 0x00000004,



	/* Don't bother with ISA alignment unless the bridge has

	 * ISA forwarding enabled

	 */

	PCI_CAN_SKIP_ISA_ALIGN	= 0x00000008,



	/* Enable domain numbers in /proc */

	PCI_ENABLE_PROC_DOMAINS	= 0x00000010,

	/* ... except for domain 0 */

	PCI_COMPAT_DOMAIN_0		= 0x00000020,

};

#ifdef CONFIG_PCI

extern unsigned int pci_flags;



static inline void pci_set_flags(int flags)

{

	pci_flags = flags;

}



static inline void pci_add_flags(int flags)

{

	pci_flags |= flags;

}



static inline int pci_has_flag(int flag)

{

	return (pci_flags & flag);

}

#else

static inline void pci_set_flags(int flags) { }

static inline void pci_add_flags(int flags) { }

static inline int pci_has_flag(int flag)

{

	return 0;

}

#endif





/*

 * Structure of a PCI controller (host bridge)

 */

include/asm-generic/pci-bridge.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#ifndef _ASM_GENERIC_PCI_BRIDGE_H

#define _ASM_GENERIC_PCI_BRIDGE_H



#ifdef __KERNEL__



enum {

	/* Force re-assigning all resources (ignore firmware

	 * setup completely)

	 */

	PCI_REASSIGN_ALL_RSRC	= 0x00000001,



	/* Re-assign all bus numbers */

	PCI_REASSIGN_ALL_BUS	= 0x00000002,



	/* Do not try to assign, just use existing setup */

	PCI_PROBE_ONLY		= 0x00000004,



	/* Don't bother with ISA alignment unless the bridge has

	 * ISA forwarding enabled

	 */

	PCI_CAN_SKIP_ISA_ALIGN	= 0x00000008,



	/* Enable domain numbers in /proc */

	PCI_ENABLE_PROC_DOMAINS	= 0x00000010,

	/* ... except for domain 0 */

	PCI_COMPAT_DOMAIN_0	= 0x00000020,

};



#ifdef CONFIG_PCI

extern unsigned int pci_flags;



static inline void pci_set_flags(int flags)

{

	pci_flags = flags;

}



static inline void pci_add_flags(int flags)

{

	pci_flags |= flags;

}



static inline int pci_has_flag(int flag)

{

	return pci_flags & flag;

}

#else

static inline void pci_set_flags(int flags) { }

static inline void pci_add_flags(int flags) { }

static inline int pci_has_flag(int flag)

{

	return 0;

}

#endif	/* CONFIG_PCI */



#endif	/* __KERNEL__ */

#endif	/* _ASM_GENERIC_PCI_BRIDGE_H */