8a93c4968f
The problem was introduced in 2.6.18.3 with the casting of some
36bit-defines (PCI memory) in au1000.h to resource_size_t which may be
u32 or u64 depending on the experimental CONFIG_RESOURCES_64BIT.
With unset CONFIG_RESOURCES_64BIT, the pci-memory cannot be accessed
because the ioremap in arch/mips/au1000/common/pci.c already used the
truncated addresses.
With set CONFIG_RESOURCES_64BIT, things get even worse, because PCI-scan
aborts, due to resource conflict: request_resource() in arch/mips/pci/pci.c
fails because the maximum iomem-address is 0xffffffff (32bit) but the
pci-memory-start-address is 0x440000000 (36bit).
To get pci working again, I propose the following patch:
1. remove the resource_size_t-casting from au1000.h again
2. make the casting in arch/mips/au1000/common/pci.c (it's allowed and
necessary here. The 36bit-handling will be done in __fixup_bigphys_addr).
With this patch pci works again like in 2.6.18.2, the gcc-compile warnings
in pci.c are gone and it doesn't depend on CONFIG_EXPERIMENTAL.
Signed-off-by: Alexander Bigga <ab@mycable.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
96 lines
3.1 KiB
C
96 lines
3.1 KiB
C
/*
|
|
* BRIEF MODULE DESCRIPTION
|
|
* Alchemy/AMD Au1x00 pci support.
|
|
*
|
|
* Copyright 2001,2002,2003 MontaVista Software Inc.
|
|
* Author: MontaVista Software, Inc.
|
|
* ppopov@mvista.com or source@mvista.com
|
|
*
|
|
* Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
|
|
*
|
|
* Support for all devices (greater than 16) added by David Gathright.
|
|
*
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/mach-au1x00/au1000.h>
|
|
|
|
/* TBD */
|
|
static struct resource pci_io_resource = {
|
|
.start = (resource_size_t)PCI_IO_START,
|
|
.end = (resource_size_t)PCI_IO_END,
|
|
.name = "PCI IO space",
|
|
.flags = IORESOURCE_IO
|
|
};
|
|
|
|
static struct resource pci_mem_resource = {
|
|
.start = (resource_size_t)PCI_MEM_START,
|
|
.end = (resource_size_t)PCI_MEM_END,
|
|
.name = "PCI memory space",
|
|
.flags = IORESOURCE_MEM
|
|
};
|
|
|
|
extern struct pci_ops au1x_pci_ops;
|
|
|
|
static struct pci_controller au1x_controller = {
|
|
.pci_ops = &au1x_pci_ops,
|
|
.io_resource = &pci_io_resource,
|
|
.mem_resource = &pci_mem_resource,
|
|
};
|
|
|
|
#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
|
|
static unsigned long virt_io_addr;
|
|
#endif
|
|
|
|
static int __init au1x_pci_setup(void)
|
|
{
|
|
#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
|
|
virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START,
|
|
Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1);
|
|
|
|
if (!virt_io_addr) {
|
|
printk(KERN_ERR "Unable to ioremap pci space\n");
|
|
return 1;
|
|
}
|
|
|
|
#ifdef CONFIG_DMA_NONCOHERENT
|
|
/*
|
|
* Set the NC bit in controller for Au1500 pre-AC silicon
|
|
*/
|
|
u32 prid = read_c0_prid();
|
|
if ( (prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
|
|
au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG);
|
|
printk("Non-coherent PCI accesses enabled\n");
|
|
}
|
|
#endif
|
|
|
|
set_io_port_base(virt_io_addr);
|
|
#endif
|
|
|
|
register_pci_controller(&au1x_controller);
|
|
return 0;
|
|
}
|
|
|
|
arch_initcall(au1x_pci_setup);
|