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

Commit 2b0c28d7 authored by Matt Porter's avatar Matt Porter Committed by Linus Torvalds
Browse files

[PATCH] RapidIO support: ppc32 



Adds PPC32 RIO support.  Init code for the MPC85xx RIO ports and glue for the
STx GP3 board to use it.

Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa78cc51

arch/ppc/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,14 @@ source "drivers/pci/Kconfig" 


source "drivers/pcmcia/Kconfig"



config RAPIDIO

	bool "RapidIO support" if MPC8540 || MPC8560

	help

	  If you say Y here, the kernel will include drivers and

	  infrastructure code to support RapidIO interconnect devices.



source "drivers/rapidio/Kconfig"



endmenu



menu "Advanced setup"

arch/ppc/configs/stx_gp3_defconfig

+52 −34
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.11-rc2

# Wed Jan 26 14:32:58 2005

# Linux kernel version: 2.6.12-rc4

# Tue May 24 18:11:04 2005

#

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y
@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=y 
CONFIG_PPC=y

CONFIG_PPC32=y

CONFIG_GENERIC_NVRAM=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y



#

# Code maturity level options
@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y 
CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -29,7 +31,6 @@ CONFIG_SYSVIPC=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set
@@ -37,6 +38,9 @@ CONFIG_EMBEDDED=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -46,6 +50,7 @@ CONFIG_CC_ALIGN_LABELS=0 
CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0



#

# Loadable module support
@@ -69,9 +74,11 @@ CONFIG_KMOD=y 
CONFIG_E500=y

CONFIG_BOOKE=y

CONFIG_FSL_BOOKE=y

# CONFIG_PHYS_64BIT is not set

# CONFIG_SPE is not set

CONFIG_MATH_EMULATION=y

# CONFIG_CPU_FREQ is not set

# CONFIG_PM is not set

CONFIG_85xx=y

CONFIG_PPC_INDIRECT_PCI_BE=y
@@ -96,6 +103,7 @@ CONFIG_HIGHMEM=y 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

# CONFIG_CMDLINE_BOOL is not set

CONFIG_ISA_DMA_API=y



#

# Bus options
@@ -104,15 +112,15 @@ CONFIG_PCI=y 
CONFIG_PCI_DOMAINS=y

# CONFIG_PCI_LEGACY_PROC is not set

# CONFIG_PCI_NAMES is not set

# CONFIG_PCI_DEBUG is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#

# PC-card bridges

#

CONFIG_RAPIDIO=y

CONFIG_RAPIDIO_8_BIT_TRANSPORT=y

CONFIG_RAPIDIO_DISC_TIMEOUT=30



#

# Advanced setup
@@ -152,7 +160,7 @@ CONFIG_PARPORT=m 
CONFIG_PARPORT_PC=m

# CONFIG_PARPORT_PC_FIFO is not set

# CONFIG_PARPORT_PC_SUPERIO is not set

# CONFIG_PARPORT_OTHER is not set

# CONFIG_PARPORT_GSC is not set

# CONFIG_PARPORT_1284 is not set



#
@@ -264,7 +272,6 @@ CONFIG_SCSI_CONSTANTS=y 
# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_EATA_PIO is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_IPS is not set
@@ -274,7 +281,6 @@ CONFIG_SCSI_CONSTANTS=y 
# CONFIG_SCSI_IMM is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_ISP is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

CONFIG_SCSI_QLA2XXX=m
@@ -283,6 +289,7 @@ CONFIG_SCSI_QLA2XXX=m 
# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_NSP32 is not set
@@ -322,7 +329,6 @@ CONFIG_NET=y 
#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -431,7 +437,7 @@ CONFIG_IP_NF_NAT_FTP=m 
#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

CONFIG_NET_PKTGEN=y

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set
@@ -499,6 +505,7 @@ CONFIG_GFAR_NAPI=y 
# Wan interfaces

#

# CONFIG_WAN is not set

CONFIG_RIONET=y

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

# CONFIG_PLIP is not set
@@ -535,20 +542,6 @@ CONFIG_INPUT_JOYDEV=m 
CONFIG_INPUT_EVDEV=m

# CONFIG_INPUT_EVBUG is not set



#

# Input I/O drivers

#

# CONFIG_GAMEPORT is not set

CONFIG_SOUND_GAMEPORT=y

CONFIG_SERIO=y

CONFIG_SERIO_I8042=y

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_CT82C710 is not set

# CONFIG_SERIO_PARKBD is not set

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set



#

# Input Device Drivers

#
@@ -566,6 +559,19 @@ CONFIG_MOUSE_PS2=y 
# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

CONFIG_SERIO=y

CONFIG_SERIO_I8042=y

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_PARKBD is not set

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set

CONFIG_SOUND_GAMEPORT=y



#

# Character devices

#
@@ -590,6 +596,7 @@ CONFIG_SERIAL_CPM_SCC2=y 
# CONFIG_SERIAL_CPM_SCC4 is not set

# CONFIG_SERIAL_CPM_SMC1 is not set

# CONFIG_SERIAL_CPM_SMC2 is not set

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -625,6 +632,11 @@ CONFIG_DRM=m 
# CONFIG_DRM_SIS is not set

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support

#
@@ -648,12 +660,12 @@ CONFIG_I2C_ALGOBIT=m 
# CONFIG_I2C_AMD8111 is not set

# CONFIG_I2C_I801 is not set

# CONFIG_I2C_I810 is not set

# CONFIG_I2C_PIIX4 is not set

# CONFIG_I2C_ISA is not set

# CONFIG_I2C_MPC is not set

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_PARPORT is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PIIX4 is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_SCx200_ACB is not set
@@ -677,7 +689,9 @@ CONFIG_I2C_ALGOBIT=m 
# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set
@@ -688,9 +702,11 @@ CONFIG_I2C_ALGOBIT=m 
# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_W83781D is not set
@@ -700,10 +716,12 @@ CONFIG_I2C_ALGOBIT=m 
#

# Other I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_M41T00 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -732,7 +750,6 @@ CONFIG_I2C_ALGOBIT=m 
# Graphics support

#

# CONFIG_FB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -752,13 +769,9 @@ CONFIG_SOUND=m 
#

# USB support

#

# CONFIG_USB is not set

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

#

# CONFIG_USB is not set



#

# USB Gadget Support
@@ -789,6 +802,10 @@ CONFIG_JBD_DEBUG=y 
CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set



#

# XFS support

#

# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -859,7 +876,6 @@ CONFIG_NFS_V3=y 
CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

# CONFIG_EXPORTFS is not set

CONFIG_SUNRPC=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -942,8 +958,10 @@ CONFIG_ZLIB_INFLATE=m 
#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_MAGIC_SYSRQ is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SPINLOCK is not set

arch/ppc/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4) += cpu_setup_power4.o 
obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o

obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o

obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_RAPIDIO)		+= rio.o

obj-$(CONFIG_KGDB)		+= ppc-stub.o

obj-$(CONFIG_SMP)		+= smp.o smp-tbsync.o

obj-$(CONFIG_TAU)		+= temp.o

arch/ppc/kernel/rio.c

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

 * RapidIO PPC32 support

 *

 * Copyright 2005 MontaVista Software, Inc.

 * Matt Porter <mporter@kernel.crashing.org>

 *

 * 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/init.h>

#include <linux/kernel.h>

#include <linux/rio.h>



#include <asm/rio.h>



/**

 * platform_rio_init - Do platform specific RIO init

 *

 * Any platform specific initialization of RapdIO

 * hardware is done here as well as registration

 * of any active master ports in the system.

 */

void __attribute__ ((weak))

    platform_rio_init(void)

{

	printk(KERN_WARNING "RIO: No platform_rio_init() present\n");

}



/**

 * ppc_rio_init - Do PPC32 RIO init

 *

 * Calls platform-specific RIO init code and then calls

 * rio_init_mports() to initialize any master ports that

 * have been registered with the RIO subsystem.

 */

static int __init ppc_rio_init(void)

{

	printk(KERN_INFO "RIO: RapidIO init\n");



	/* Platform specific initialization */

	platform_rio_init();



	/* Enumerate all registered ports */

	rio_init_mports();



	return 0;

}



subsys_initcall(ppc_rio_init);

arch/ppc/platforms/85xx/mpc85xx_ads_common.c

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 


#include <mm/mmu_decl.h>



#include <syslib/ppc85xx_rio.h>



#include <platforms/85xx/mpc85xx_ads_common.h>



#ifndef CONFIG_PCI
@@ -189,3 +191,11 @@ mpc85xx_exclude_device(u_char bus, u_char devfn) 
}



#endif /* CONFIG_PCI */



#ifdef CONFIG_RAPIDIO

void platform_rio_init(void)

{

	/* 512MB RIO LAW at 0xc0000000 */

	mpc85xx_rio_setup(0xc0000000, 0x20000000);

}

#endif /* CONFIG_RAPIDIO */