diff options
Diffstat (limited to 'arch/mips/mips-boards/generic/pci.c')
| -rw-r--r-- | arch/mips/mips-boards/generic/pci.c | 167 | 
1 files changed, 126 insertions, 41 deletions
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index 92c34bda02a..1f6f9df74ab 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c @@ -1,6 +1,8 @@  /* - * Carsten Langgaard, carstenl@mips.com - * Copyright (C) 1999, 2000 MIPS Technologies, Inc.  All rights reserved. + * Copyright (C) 1999, 2000, 2004, 2005  MIPS Technologies, Inc. + *	All rights reserved. + *	Authors: Carsten Langgaard <carstenl@mips.com> + *		 Maciej W. Rozycki <macro@mips.com>   *   * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)   * @@ -19,65 +21,46 @@   *   * MIPS boards specific PCI support.   */ -#include <linux/config.h>  #include <linux/types.h>  #include <linux/pci.h>  #include <linux/kernel.h>  #include <linux/init.h> -#include <asm/mips-boards/generic.h>  #include <asm/gt64120.h> + +#include <asm/mips-boards/generic.h>  #include <asm/mips-boards/bonito64.h>  #include <asm/mips-boards/msc01_pci.h> -#ifdef CONFIG_MIPS_MALTA -#include <asm/mips-boards/malta.h> -#endif  static struct resource bonito64_mem_resource = {  	.name	= "Bonito PCI MEM", -	.start	= 0x10000000UL, -	.end	= 0x1bffffffUL,  	.flags	= IORESOURCE_MEM,  };  static struct resource bonito64_io_resource = { -	.name	= "Bonito IO MEM", -	.start	= 0x00002000UL,	/* avoid conflicts with YAMON allocated I/O addresses */ +	.name	= "Bonito PCI I/O", +	.start	= 0x00000000UL,  	.end	= 0x000fffffUL,  	.flags	= IORESOURCE_IO,  };  static struct resource gt64120_mem_resource = { -	.name	= "GT64120 PCI MEM", -	.start	= 0x10000000UL, -	.end	= 0x1bdfffffUL, +	.name	= "GT-64120 PCI MEM",  	.flags	= IORESOURCE_MEM,  };  static struct resource gt64120_io_resource = { -	.name	= "GT64120 IO MEM", -#ifdef CONFIG_MIPS_ATLAS -	.start	= 0x18000000UL, -	.end	= 0x181fffffUL, -#endif -#ifdef CONFIG_MIPS_MALTA -	.start	= 0x00002000UL, -	.end	= 0x001fffffUL, -#endif +	.name	= "GT-64120 PCI I/O",  	.flags	= IORESOURCE_IO,  };  static struct resource msc_mem_resource = {  	.name	= "MSC PCI MEM", -	.start	= 0x10000000UL, -	.end	= 0x1fffffffUL,  	.flags	= IORESOURCE_MEM,  };  static struct resource msc_io_resource = { -	.name	= "MSC IO MEM", -	.start	= 0x00002000UL, -	.end	= 0x007fffffUL, +	.name	= "MSC PCI I/O",  	.flags	= IORESOURCE_IO,  }; @@ -89,7 +72,6 @@ static struct pci_controller bonito64_controller = {  	.pci_ops	= &bonito64_pci_ops,  	.io_resource	= &bonito64_io_resource,  	.mem_resource	= &bonito64_mem_resource, -	.mem_offset	= 0x10000000UL,  	.io_offset	= 0x00000000UL,  }; @@ -97,21 +79,18 @@ static struct pci_controller gt64120_controller = {  	.pci_ops	= >64120_pci_ops,  	.io_resource	= >64120_io_resource,  	.mem_resource	= >64120_mem_resource, -	.mem_offset	= 0x00000000UL, -	.io_offset	= 0x00000000UL,  }; -static struct pci_controller  msc_controller = { +static struct pci_controller msc_controller = {  	.pci_ops	= &msc_pci_ops,  	.io_resource	= &msc_io_resource,  	.mem_resource	= &msc_mem_resource, -	.mem_offset	= 0x10000000UL, -	.io_offset	= 0x00000000UL,  }; -static int __init pcibios_init(void) +void __init mips_pcibios_init(void)  {  	struct pci_controller *controller; +	unsigned long start, end, map, start1, end1, map1, map2, map3, mask;  	switch (mips_revision_corid) {  	case MIPS_REVISION_CORID_QED_RM5261: @@ -130,34 +109,140 @@ static int __init pcibios_init(void)  			 (0 << GT_PCI0_CFGADDR_DEVNUM_SHF) | /* GT64120 dev */  			 (0 << GT_PCI0_CFGADDR_FUNCTNUM_SHF) | /* Function 0*/  			 ((0x20/4) << GT_PCI0_CFGADDR_REGNUM_SHF) | /* BAR 4*/ -			 GT_PCI0_CFGADDR_CONFIGEN_BIT ); +			 GT_PCI0_CFGADDR_CONFIGEN_BIT);  		/* Perform the write */  		GT_WRITE(GT_PCI0_CFGDATA_OFS, CPHYSADDR(MIPS_GT_BASE)); +		/* Set up resource ranges from the controller's registers.  */ +		start = GT_READ(GT_PCI0M0LD_OFS); +		end = GT_READ(GT_PCI0M0HD_OFS); +		map = GT_READ(GT_PCI0M0REMAP_OFS); +		end = (end & GT_PCI_HD_MSK) | (start & ~GT_PCI_HD_MSK); +		start1 = GT_READ(GT_PCI0M1LD_OFS); +		end1 = GT_READ(GT_PCI0M1HD_OFS); +		map1 = GT_READ(GT_PCI0M1REMAP_OFS); +		end1 = (end1 & GT_PCI_HD_MSK) | (start1 & ~GT_PCI_HD_MSK); +		/* Cannot support multiple windows, use the wider.  */ +		if (end1 - start1 > end - start) { +			start = start1; +			end = end1; +			map = map1; +		} +		mask = ~(start ^ end); +                /* We don't support remapping with a discontiguous mask.  */ +		BUG_ON((start & GT_PCI_HD_MSK) != (map & GT_PCI_HD_MSK) && +		       mask != ~((mask & -mask) - 1)); +		gt64120_mem_resource.start = start; +		gt64120_mem_resource.end = end; +		gt64120_controller.mem_offset = (start & mask) - (map & mask); +		/* Addresses are 36-bit, so do shifts in the destinations.  */ +		gt64120_mem_resource.start <<= GT_PCI_DCRM_SHF; +		gt64120_mem_resource.end <<= GT_PCI_DCRM_SHF; +		gt64120_mem_resource.end |= (1 << GT_PCI_DCRM_SHF) - 1; +		gt64120_controller.mem_offset <<= GT_PCI_DCRM_SHF; + +		start = GT_READ(GT_PCI0IOLD_OFS); +		end = GT_READ(GT_PCI0IOHD_OFS); +		map = GT_READ(GT_PCI0IOREMAP_OFS); +		end = (end & GT_PCI_HD_MSK) | (start & ~GT_PCI_HD_MSK); +		mask = ~(start ^ end); +                /* We don't support remapping with a discontiguous mask.  */ +		BUG_ON((start & GT_PCI_HD_MSK) != (map & GT_PCI_HD_MSK) && +		       mask != ~((mask & -mask) - 1)); +		gt64120_io_resource.start = map & mask; +		gt64120_io_resource.end = (map & mask) | ~mask; +		gt64120_controller.io_offset = 0; +		/* Addresses are 36-bit, so do shifts in the destinations.  */ +		gt64120_io_resource.start <<= GT_PCI_DCRM_SHF; +		gt64120_io_resource.end <<= GT_PCI_DCRM_SHF; +		gt64120_io_resource.end |= (1 << GT_PCI_DCRM_SHF) - 1; +  		controller = >64120_controller;  		break;  	case MIPS_REVISION_CORID_BONITO64:  	case MIPS_REVISION_CORID_CORE_20K:  	case MIPS_REVISION_CORID_CORE_EMUL_BON: +		/* Set up resource ranges from the controller's registers.  */ +		map = BONITO_PCIMAP; +		map1 = (BONITO_PCIMAP & BONITO_PCIMAP_PCIMAP_LO0) >> +		       BONITO_PCIMAP_PCIMAP_LO0_SHIFT; +		map2 = (BONITO_PCIMAP & BONITO_PCIMAP_PCIMAP_LO1) >> +		       BONITO_PCIMAP_PCIMAP_LO1_SHIFT; +		map3 = (BONITO_PCIMAP & BONITO_PCIMAP_PCIMAP_LO2) >> +		       BONITO_PCIMAP_PCIMAP_LO2_SHIFT; +		/* Combine as many adjacent windows as possible.  */ +		map = map1; +		start = BONITO_PCILO0_BASE; +		end = 1; +		if (map3 == map2 + 1) { +			map = map2; +			start = BONITO_PCILO1_BASE; +			end++; +		} +		if (map2 == map1 + 1) { +			map = map1; +			start = BONITO_PCILO0_BASE; +			end++; +		} +		bonito64_mem_resource.start = start; +		bonito64_mem_resource.end = start + +					    BONITO_PCIMAP_WINBASE(end) - 1; +		bonito64_controller.mem_offset = start - +						 BONITO_PCIMAP_WINBASE(map); +  		controller = &bonito64_controller;  		break;  	case MIPS_REVISION_CORID_CORE_MSC:  	case MIPS_REVISION_CORID_CORE_FPGA2: +	case MIPS_REVISION_CORID_CORE_FPGA3:  	case MIPS_REVISION_CORID_CORE_EMUL_MSC: +		/* Set up resource ranges from the controller's registers.  */ +		MSC_READ(MSC01_PCI_SC2PMBASL, start); +		MSC_READ(MSC01_PCI_SC2PMMSKL, mask); +		MSC_READ(MSC01_PCI_SC2PMMAPL, map); +		msc_mem_resource.start = start & mask; +		msc_mem_resource.end = (start & mask) | ~mask; +		msc_controller.mem_offset = (start & mask) - (map & mask); + +		MSC_READ(MSC01_PCI_SC2PIOBASL, start); +		MSC_READ(MSC01_PCI_SC2PIOMSKL, mask); +		MSC_READ(MSC01_PCI_SC2PIOMAPL, map); +		msc_io_resource.start = map & mask; +		msc_io_resource.end = (map & mask) | ~mask; +		msc_controller.io_offset = 0; +		ioport_resource.end = ~mask; + +		/* If ranges overlap I/O takes precedence.  */ +		start = start & mask; +		end = start | ~mask; +		if ((start >= msc_mem_resource.start && +		     start <= msc_mem_resource.end) || +		    (end >= msc_mem_resource.start && +		     end <= msc_mem_resource.end)) { +			/* Use the larger space.  */ +			start = max(start, msc_mem_resource.start); +			end = min(end, msc_mem_resource.end); +			if (start - msc_mem_resource.start >= +			    msc_mem_resource.end - end) +				msc_mem_resource.end = start - 1; +			else +				msc_mem_resource.start = end + 1; +		} +  		controller = &msc_controller;  		break;  	default: -		return 1; +		return;  	} +	if (controller->io_resource->start < 0x00001000UL)	/* FIXME */ +		controller->io_resource->start = 0x00001000UL; + +	iomem_resource.end &= 0xfffffffffULL;			/* 64 GB */  	ioport_resource.end = controller->io_resource->end;  	register_pci_controller (controller); - -	return 0;  } - -early_initcall(pcibios_init);  | 
