0195c00244
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk 8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45 HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+ /5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9 Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK 4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD NypQthI85pc= =G9mT -----END PGP SIGNATURE----- Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system Pull "Disintegrate and delete asm/system.h" from David Howells: "Here are a bunch of patches to disintegrate asm/system.h into a set of separate bits to relieve the problem of circular inclusion dependencies. I've built all the working defconfigs from all the arches that I can and made sure that they don't break. The reason for these patches is that I recently encountered a circular dependency problem that came about when I produced some patches to optimise get_order() by rewriting it to use ilog2(). This uses bitops - and on the SH arch asm/bitops.h drags in asm-generic/get_order.h by a circuituous route involving asm/system.h. The main difficulty seems to be asm/system.h. It holds a number of low level bits with no/few dependencies that are commonly used (eg. memory barriers) and a number of bits with more dependencies that aren't used in many places (eg. switch_to()). These patches break asm/system.h up into the following core pieces: (1) asm/barrier.h Move memory barriers here. This already done for MIPS and Alpha. (2) asm/switch_to.h Move switch_to() and related stuff here. (3) asm/exec.h Move arch_align_stack() here. Other process execution related bits could perhaps go here from asm/processor.h. (4) asm/cmpxchg.h Move xchg() and cmpxchg() here as they're full word atomic ops and frequently used by atomic_xchg() and atomic_cmpxchg(). (5) asm/bug.h Move die() and related bits. (6) asm/auxvec.h Move AT_VECTOR_SIZE_ARCH here. Other arch headers are created as needed on a per-arch basis." Fixed up some conflicts from other header file cleanups and moving code around that has happened in the meantime, so David's testing is somewhat weakened by that. We'll find out anything that got broken and fix it.. * tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits) Delete all instances of asm/system.h Remove all #inclusions of asm/system.h Add #includes needed to permit the removal of asm/system.h Move all declarations of free_initmem() to linux/mm.h Disintegrate asm/system.h for OpenRISC Split arch_align_stack() out from asm-generic/system.h Split the switch_to() wrapper out of asm-generic/system.h Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h Create asm-generic/barrier.h Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h Disintegrate asm/system.h for Xtensa Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] Disintegrate asm/system.h for Tile Disintegrate asm/system.h for Sparc Disintegrate asm/system.h for SH Disintegrate asm/system.h for Score Disintegrate asm/system.h for S390 Disintegrate asm/system.h for PowerPC Disintegrate asm/system.h for PA-RISC Disintegrate asm/system.h for MN10300 ...
295 lines
7.3 KiB
C
295 lines
7.3 KiB
C
/*
|
|
* arch/arm/mach-ixp2000/ixdp2800.c
|
|
*
|
|
* IXDP2800 platform support
|
|
*
|
|
* Original Author: Jeffrey Daly <jeffrey.daly@intel.com>
|
|
* Maintainer: Deepak Saxena <dsaxena@plexity.net>
|
|
*
|
|
* Copyright (C) 2002 Intel Corp.
|
|
* Copyright (C) 2003-2004 MontaVista Software, Inc.
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/device.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/page.h>
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/mach/pci.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/mach/flash.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
/*************************************************************************
|
|
* IXDP2800 timer tick
|
|
*************************************************************************/
|
|
|
|
static void __init ixdp2800_timer_init(void)
|
|
{
|
|
ixp2000_init_time(50000000);
|
|
}
|
|
|
|
static struct sys_timer ixdp2800_timer = {
|
|
.init = ixdp2800_timer_init,
|
|
.offset = ixp2000_gettimeoffset,
|
|
};
|
|
|
|
/*************************************************************************
|
|
* IXDP2800 PCI
|
|
*************************************************************************/
|
|
static void __init ixdp2800_slave_disable_pci_master(void)
|
|
{
|
|
*IXP2000_PCI_CMDSTAT &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
|
|
}
|
|
|
|
static void __init ixdp2800_master_wait_for_slave(void)
|
|
{
|
|
volatile u32 *addr;
|
|
|
|
printk(KERN_INFO "IXDP2800: waiting for slave NPU to configure "
|
|
"its BAR sizes\n");
|
|
|
|
addr = ixp2000_pci_config_addr(0, IXDP2X00_SLAVE_NPU_DEVFN,
|
|
PCI_BASE_ADDRESS_1);
|
|
do {
|
|
*addr = 0xffffffff;
|
|
cpu_relax();
|
|
} while (*addr != 0xfe000008);
|
|
|
|
addr = ixp2000_pci_config_addr(0, IXDP2X00_SLAVE_NPU_DEVFN,
|
|
PCI_BASE_ADDRESS_2);
|
|
do {
|
|
*addr = 0xffffffff;
|
|
cpu_relax();
|
|
} while (*addr != 0xc0000008);
|
|
|
|
/*
|
|
* Configure the slave's SDRAM BAR by hand.
|
|
*/
|
|
*addr = 0x40000008;
|
|
}
|
|
|
|
static void __init ixdp2800_slave_wait_for_master_enable(void)
|
|
{
|
|
printk(KERN_INFO "IXDP2800: waiting for master NPU to enable us\n");
|
|
|
|
while ((*IXP2000_PCI_CMDSTAT & PCI_COMMAND_MASTER) == 0)
|
|
cpu_relax();
|
|
}
|
|
|
|
void __init ixdp2800_pci_preinit(void)
|
|
{
|
|
printk("ixdp2x00_pci_preinit called\n");
|
|
|
|
*IXP2000_PCI_ADDR_EXT = 0x0001e000;
|
|
|
|
if (!ixdp2x00_master_npu())
|
|
ixdp2800_slave_disable_pci_master();
|
|
|
|
*IXP2000_PCI_SRAM_BASE_ADDR_MASK = (0x2000000 - 1) & ~0x3ffff;
|
|
*IXP2000_PCI_DRAM_BASE_ADDR_MASK = (0x40000000 - 1) & ~0xfffff;
|
|
|
|
ixp2000_pci_preinit();
|
|
|
|
if (ixdp2x00_master_npu()) {
|
|
/*
|
|
* Wait until the slave set its SRAM/SDRAM BAR sizes
|
|
* correctly before we proceed to scan and enumerate
|
|
* the bus.
|
|
*/
|
|
ixdp2800_master_wait_for_slave();
|
|
|
|
/*
|
|
* We configure the SDRAM BARs by hand because they
|
|
* are 1G and fall outside of the regular allocated
|
|
* PCI address space.
|
|
*/
|
|
*IXP2000_PCI_SDRAM_BAR = 0x00000008;
|
|
} else {
|
|
/*
|
|
* Wait for the master to complete scanning the bus
|
|
* and assigning resources before we proceed to scan
|
|
* the bus ourselves. Set pci=firmware to honor the
|
|
* master's resource assignment.
|
|
*/
|
|
ixdp2800_slave_wait_for_master_enable();
|
|
pcibios_setup("firmware");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* We assign the SDRAM BARs for the two IXP2800 CPUs by hand, outside
|
|
* of the regular PCI window, because there's only 512M of outbound PCI
|
|
* memory window on each IXP, while we need 1G for each of the BARs.
|
|
*/
|
|
static void __devinit ixp2800_pci_fixup(struct pci_dev *dev)
|
|
{
|
|
if (machine_is_ixdp2800()) {
|
|
dev->resource[2].start = 0;
|
|
dev->resource[2].end = 0;
|
|
dev->resource[2].flags = 0;
|
|
}
|
|
}
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IXP2800, ixp2800_pci_fixup);
|
|
|
|
static int __init ixdp2800_pci_setup(int nr, struct pci_sys_data *sys)
|
|
{
|
|
sys->mem_offset = 0x00000000;
|
|
|
|
ixp2000_pci_setup(nr, sys);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int __init ixdp2800_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
|
u8 pin)
|
|
{
|
|
if (ixdp2x00_master_npu()) {
|
|
|
|
/*
|
|
* Root bus devices. Slave NPU is only one with interrupt.
|
|
* Everything else, we just return -1 which is invalid.
|
|
*/
|
|
if(!dev->bus->self) {
|
|
if(dev->devfn == IXDP2X00_SLAVE_NPU_DEVFN )
|
|
return IRQ_IXDP2800_INGRESS_NPU;
|
|
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
* Bridge behind the PMC slot.
|
|
*/
|
|
if(dev->bus->self->devfn == IXDP2X00_PMC_DEVFN &&
|
|
dev->bus->parent->self->devfn == IXDP2X00_P2P_DEVFN &&
|
|
!dev->bus->parent->self->bus->parent)
|
|
return IRQ_IXDP2800_PMC;
|
|
|
|
/*
|
|
* Device behind the first bridge
|
|
*/
|
|
if(dev->bus->self->devfn == IXDP2X00_P2P_DEVFN) {
|
|
switch(dev->devfn) {
|
|
case IXDP2X00_PMC_DEVFN:
|
|
return IRQ_IXDP2800_PMC;
|
|
|
|
case IXDP2800_MASTER_ENET_DEVFN:
|
|
return IRQ_IXDP2800_EGRESS_ENET;
|
|
|
|
case IXDP2800_SWITCH_FABRIC_DEVFN:
|
|
return IRQ_IXDP2800_FABRIC;
|
|
}
|
|
}
|
|
|
|
return -1;
|
|
} else return IRQ_IXP2000_PCIB; /* Slave NIC interrupt */
|
|
}
|
|
|
|
static void __init ixdp2800_master_enable_slave(void)
|
|
{
|
|
volatile u32 *addr;
|
|
|
|
printk(KERN_INFO "IXDP2800: enabling slave NPU\n");
|
|
|
|
addr = (volatile u32 *)ixp2000_pci_config_addr(0,
|
|
IXDP2X00_SLAVE_NPU_DEVFN,
|
|
PCI_COMMAND);
|
|
|
|
*addr |= PCI_COMMAND_MASTER;
|
|
}
|
|
|
|
static void __init ixdp2800_master_wait_for_slave_bus_scan(void)
|
|
{
|
|
volatile u32 *addr;
|
|
|
|
printk(KERN_INFO "IXDP2800: waiting for slave to finish bus scan\n");
|
|
|
|
addr = (volatile u32 *)ixp2000_pci_config_addr(0,
|
|
IXDP2X00_SLAVE_NPU_DEVFN,
|
|
PCI_COMMAND);
|
|
while ((*addr & PCI_COMMAND_MEMORY) == 0)
|
|
cpu_relax();
|
|
}
|
|
|
|
static void __init ixdp2800_slave_signal_bus_scan_completion(void)
|
|
{
|
|
printk(KERN_INFO "IXDP2800: bus scan done, signaling master\n");
|
|
*IXP2000_PCI_CMDSTAT |= PCI_COMMAND_MEMORY;
|
|
}
|
|
|
|
static void __init ixdp2800_pci_postinit(void)
|
|
{
|
|
if (!ixdp2x00_master_npu()) {
|
|
ixdp2x00_slave_pci_postinit();
|
|
ixdp2800_slave_signal_bus_scan_completion();
|
|
}
|
|
}
|
|
|
|
struct __initdata hw_pci ixdp2800_pci __initdata = {
|
|
.nr_controllers = 1,
|
|
.setup = ixdp2800_pci_setup,
|
|
.preinit = ixdp2800_pci_preinit,
|
|
.postinit = ixdp2800_pci_postinit,
|
|
.scan = ixp2000_pci_scan_bus,
|
|
.map_irq = ixdp2800_pci_map_irq,
|
|
};
|
|
|
|
int __init ixdp2800_pci_init(void)
|
|
{
|
|
if (machine_is_ixdp2800()) {
|
|
struct pci_dev *dev;
|
|
|
|
pci_common_init(&ixdp2800_pci);
|
|
if (ixdp2x00_master_npu()) {
|
|
dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
|
|
pci_stop_and_remove_bus_device(dev);
|
|
pci_dev_put(dev);
|
|
|
|
ixdp2800_master_enable_slave();
|
|
ixdp2800_master_wait_for_slave_bus_scan();
|
|
} else {
|
|
dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);
|
|
pci_stop_and_remove_bus_device(dev);
|
|
pci_dev_put(dev);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(ixdp2800_pci_init);
|
|
|
|
void __init ixdp2800_init_irq(void)
|
|
{
|
|
ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2800_NR_IRQS);
|
|
}
|
|
|
|
MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
|
|
/* Maintainer: MontaVista Software, Inc. */
|
|
.atag_offset = 0x100,
|
|
.map_io = ixdp2x00_map_io,
|
|
.init_irq = ixdp2800_init_irq,
|
|
.timer = &ixdp2800_timer,
|
|
.init_machine = ixdp2x00_init_machine,
|
|
.restart = ixp2000_restart,
|
|
MACHINE_END
|
|
|