Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: pci: make pcibios_assign_all_busses use pci_has_flag

Browse source 
Convert pcibios_assign_all_busses from a define to inline so platforms can
control this setting.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Rob Herring 2011-06-29 10:59:45 -05:00
parent b480a4b0c8
commit dc8d966bcc
25 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/include/asm/pci.h
View file

@ -3,10 +3,16 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#include <asm-generic/pci-bridge.h>
#include <asm/mach/pci.h> /* for pci_sys_data */ #include <asm/mach/pci.h> /* for pci_sys_data */
#include <mach/hardware.h> /* for PCIBIOS_MIN_* */ #include <mach/hardware.h> /* for PCIBIOS_MIN_* */
static inline int pcibios_assign_all_busses(void)
{
return pci_has_flag(PCI_REASSIGN_ALL_RSRC);
}
#ifdef CONFIG_PCI_DOMAINS #ifdef CONFIG_PCI_DOMAINS
static inline int pci_domain_nr(struct pci_bus *bus) static inline int pci_domain_nr(struct pci_bus *bus)
{ {

2
arch/arm/mach-bcmring/include/mach/hardware.h
View file

@ -36,8 +36,6 @@
#define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)
#define RAM_BASE PAGE_OFFSET #define RAM_BASE PAGE_OFFSET
#define pcibios_assign_all_busses() 1
/* Macros to make managing spinlocks a bit more controlled in terms of naming. */ /* Macros to make managing spinlocks a bit more controlled in terms of naming. */
/* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */ /* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */
#if defined(__KERNEL__) #if defined(__KERNEL__)

1
arch/arm/mach-cns3xxx/include/mach/hardware.h
View file

@ -17,6 +17,5 @@
/* macro to get at IO space when running virtually */ /* macro to get at IO space when running virtually */
#define PCIBIOS_MIN_IO 0x00000000 #define PCIBIOS_MIN_IO 0x00000000
#define PCIBIOS_MIN_MEM 0x00000000 #define PCIBIOS_MIN_MEM 0x00000000
#define pcibios_assign_all_busses() 1
#endif #endif

2
arch/arm/mach-dove/include/mach/hardware.h
View file

@ -11,8 +11,6 @@
#include "dove.h" #include "dove.h"
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x01000000 #define PCIBIOS_MIN_MEM 0x01000000
#define PCIMEM_BASE DOVE_PCIE0_MEM_PHYS_BASE #define PCIMEM_BASE DOVE_PCIE0_MEM_PHYS_BASE

2
arch/arm/mach-ep93xx/include/mach/hardware.h
View file

@ -8,8 +8,6 @@
#include <mach/ep93xx-regs.h> #include <mach/ep93xx-regs.h>
#include <mach/platform.h> #include <mach/platform.h>
#define pcibios_assign_all_busses() 0
/* /*
* The EP93xx has two external crystal oscillators. To generate the * The EP93xx has two external crystal oscillators. To generate the
* required high-frequency clocks, the processor uses two phase-locked- * required high-frequency clocks, the processor uses two phase-locked-

2
arch/arm/mach-footbridge/include/mach/hardware.h
View file

@ -100,8 +100,6 @@ extern unsigned int nw_gpio_read(void);
extern void nw_cpld_modify(unsigned int mask, unsigned int set); extern void nw_cpld_modify(unsigned int mask, unsigned int set);
#endif #endif
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x81000000 #define PCIBIOS_MIN_MEM 0x81000000

2
arch/arm/mach-integrator/include/mach/hardware.h
View file

@ -34,8 +34,6 @@
#define PCIMEM_BASE PCI_MEMORY_VADDR #define PCIMEM_BASE PCI_MEMORY_VADDR
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x6000 #define PCIBIOS_MIN_IO 0x6000
#define PCIBIOS_MIN_MEM 0x00100000 #define PCIBIOS_MIN_MEM 0x00100000

2
arch/arm/mach-iop13xx/include/mach/hardware.h
View file

@ -2,8 +2,6 @@
#define __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H
#include <asm/types.h> #include <asm/types.h>
#define pcibios_assign_all_busses() 1
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern unsigned long iop13xx_pcibios_min_io; extern unsigned long iop13xx_pcibios_min_io;
extern unsigned long iop13xx_pcibios_min_mem; extern unsigned long iop13xx_pcibios_min_mem;

1
arch/arm/mach-iop32x/include/mach/hardware.h
View file

@ -18,7 +18,6 @@
* but when we read them, we convert them to virtual addresses. See * but when we read them, we convert them to virtual addresses. See
* arch/arm/plat-iop/pci.c. * arch/arm/plat-iop/pci.c.
*/ */
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x00000000 #define PCIBIOS_MIN_IO 0x00000000
#define PCIBIOS_MIN_MEM 0x00000000 #define PCIBIOS_MIN_MEM 0x00000000

1
arch/arm/mach-iop33x/include/mach/hardware.h
View file

@ -18,7 +18,6 @@
* but when we read them, we convert them to virtual addresses. See * but when we read them, we convert them to virtual addresses. See
* arch/arm/mach-iop3xx/iop3xx-pci.c * arch/arm/mach-iop3xx/iop3xx-pci.c
*/ */
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x00000000 #define PCIBIOS_MIN_IO 0x00000000
#define PCIBIOS_MIN_MEM 0x00000000 #define PCIBIOS_MIN_MEM 0x00000000

2
arch/arm/mach-ixp2000/include/mach/hardware.h
View file

@ -27,8 +27,6 @@
#include "ixp2000-regs.h" /* Chipset Registers */ #include "ixp2000-regs.h" /* Chipset Registers */
#define pcibios_assign_all_busses() 0
/* /*
* Platform helper functions * Platform helper functions
*/ */

2
arch/arm/mach-ixp2000/pci.c
View file

@ -196,6 +196,8 @@ clear_master_aborts(void)
void __init void __init
ixp2000_pci_preinit(void) ixp2000_pci_preinit(void)
{ {
pci_set_flags(0);
#ifndef CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO #ifndef CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO
/* /*
* Configure the PCI unit to properly byteswap I/O transactions, * Configure the PCI unit to properly byteswap I/O transactions,

2
arch/arm/mach-ixp23xx/include/mach/hardware.h
View file

@ -20,8 +20,6 @@
#include "ixp23xx.h" #include "ixp23xx.h"
#define pcibios_assign_all_busses() 0
/* /*
* Platform helper functions * Platform helper functions
*/ */

2
arch/arm/mach-ixp23xx/pci.c
View file

@ -227,6 +227,8 @@ static void __init ixp23xx_pci_common_init(void)
void __init ixp23xx_pci_preinit(void) void __init ixp23xx_pci_preinit(void)
{ {
pci_set_flags(0);
ixp23xx_pci_common_init(); ixp23xx_pci_common_init();
hook_fault_code(16+6, ixp23xx_pci_abort_handler, SIGBUS, 0, hook_fault_code(16+6, ixp23xx_pci_abort_handler, SIGBUS, 0,

2
arch/arm/mach-ixp4xx/include/mach/hardware.h
View file

@ -28,8 +28,6 @@
#define ARCH_HAS_DMA_SET_COHERENT_MASK #define ARCH_HAS_DMA_SET_COHERENT_MASK
#define pcibios_assign_all_busses() 1
/* Register locations and bits */ /* Register locations and bits */
#include "ixp4xx-regs.h" #include "ixp4xx-regs.h"

3
arch/arm/mach-kirkwood/include/mach/hardware.h
View file

@ -11,9 +11,6 @@
#include "kirkwood.h" #include "kirkwood.h"
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x00001000
#define PCIBIOS_MIN_MEM 0x01000000 #define PCIBIOS_MIN_MEM 0x01000000
#define PCIMEM_BASE KIRKWOOD_PCIE_MEM_PHYS_BASE /* mem base for VGA */ #define PCIMEM_BASE KIRKWOOD_PCIE_MEM_PHYS_BASE /* mem base for VGA */

2
arch/arm/mach-ks8695/include/mach/hardware.h
View file

@ -46,8 +46,6 @@
/* /*
* PCI support * PCI support
*/ */
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_IO 0
#define PCIBIOS_MIN_MEM 0 #define PCIBIOS_MIN_MEM 0

2
arch/arm/mach-mv78xx0/include/mach/hardware.h
View file

@ -11,8 +11,6 @@
#include "mv78xx0.h" #include "mv78xx0.h"
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x00001000 #define PCIBIOS_MIN_IO 0x00001000
#define PCIBIOS_MIN_MEM 0x01000000 #define PCIBIOS_MIN_MEM 0x01000000
#define PCIMEM_BASE MV78XX0_PCIE_MEM_PHYS_BASE /* mem base for VGA */ #define PCIMEM_BASE MV78XX0_PCIE_MEM_PHYS_BASE /* mem base for VGA */

2
arch/arm/mach-orion5x/include/mach/hardware.h
View file

@ -11,8 +11,6 @@
#include "orion5x.h" #include "orion5x.h"
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x00001000 #define PCIBIOS_MIN_IO 0x00001000
#define PCIBIOS_MIN_MEM 0x01000000 #define PCIBIOS_MIN_MEM 0x01000000
#define PCIMEM_BASE ORION5X_PCIE_MEM_PHYS_BASE #define PCIMEM_BASE ORION5X_PCIE_MEM_PHYS_BASE

1
arch/arm/mach-pxa/include/mach/hardware.h
View file

@ -339,7 +339,6 @@ extern unsigned long get_clock_tick_rate(void);
#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
#define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_IO 0
#define PCIBIOS_MIN_MEM 0 #define PCIBIOS_MIN_MEM 0
#define pcibios_assign_all_busses() 1
#define ARCH_HAS_DMA_SET_COHERENT_MASK #define ARCH_HAS_DMA_SET_COHERENT_MASK
#endif #endif

1
arch/arm/mach-sa1100/include/mach/hardware.h
View file

@ -79,7 +79,6 @@ static inline unsigned long get_clock_tick_rate(void)
#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_PCI) #if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_PCI)
#define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_IO 0
#define PCIBIOS_MIN_MEM 0 #define PCIBIOS_MIN_MEM 0
#define pcibios_assign_all_busses() 1
#define HAVE_ARCH_PCI_SET_DMA_MASK 1 #define HAVE_ARCH_PCI_SET_DMA_MASK 1
#endif #endif

2
arch/arm/mach-shark/include/mach/hardware.h
View file

@ -12,8 +12,6 @@
#define UNCACHEABLE_ADDR 0xdf010000 #define UNCACHEABLE_ADDR 0xdf010000
#define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x6000 #define PCIBIOS_MIN_IO 0x6000
#define PCIBIOS_MIN_MEM 0x50000000 #define PCIBIOS_MIN_MEM 0x50000000
#define PCIMEM_BASE 0xe8000000 #define PCIMEM_BASE 0xe8000000

1
arch/arm/mach-tegra/include/mach/hardware.h
View file

@ -23,6 +23,5 @@
#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0 #define PCIBIOS_MIN_MEM 0
#define pcibios_assign_all_busses() 1
#endif #endif

2
arch/arm/mach-versatile/include/mach/hardware.h
View file

@ -34,8 +34,6 @@
#define PCIBIOS_MIN_IO 0x44000000 #define PCIBIOS_MIN_IO 0x44000000
#define PCIBIOS_MIN_MEM 0x50000000 #define PCIBIOS_MIN_MEM 0x50000000
#define pcibios_assign_all_busses() 1
/* macro to get at IO space when running virtually */ /* macro to get at IO space when running virtually */
#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)

4
arch/arm/mm/iomap.c
View file

@ -8,6 +8,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/pci.h>
#ifdef __io #ifdef __io
void __iomem *ioport_map(unsigned long port, unsigned int nr) void __iomem *ioport_map(unsigned long port, unsigned int nr)
@ -23,6 +24,9 @@ EXPORT_SYMBOL(ioport_unmap);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC;
EXPORT_SYMBOL(pci_flags);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
{ {
resource_size_t start = pci_resource_start(dev, bar); resource_size_t start = pci_resource_start(dev, bar);