diff for duplicates of <11180976151080@foobar.com> diff --git a/a/1.txt b/N1/1.txt index 4329e65..5db5164 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,9 +7,9 @@ diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -1177,6 +1177,14 @@ source "drivers/pci/Kconfig" -=20 + source "drivers/pcmcia/Kconfig" -=20 + +config RAPIDIO + bool "RapidIO support" if MPC8540 || MPC8560 + help @@ -19,10 +19,9 @@ diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig +source "drivers/rio/Kconfig" + endmenu -=20 + menu "Advanced setup" -diff --git a/arch/ppc/configs/stx_gp3_defconfig b/arch/ppc/configs/stx_gp3_= -defconfig +diff --git a/arch/ppc/configs/stx_gp3_defconfig b/arch/ppc/configs/stx_gp3_defconfig --- a/arch/ppc/configs/stx_gp3_defconfig +++ b/arch/ppc/configs/stx_gp3_defconfig @@ -1,7 +1,7 @@ @@ -33,76 +32,76 @@ defconfig +# Linux kernel version: 2.6.12-rc4 +# Tue May 24 18:11:04 2005 # - CONFIG_MMU=3Dy - CONFIG_GENERIC_HARDIRQS=3Dy -@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=3Dy - CONFIG_PPC=3Dy - CONFIG_PPC32=3Dy - CONFIG_GENERIC_NVRAM=3Dy -+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=3Dy -=20 + 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=3Dy - CONFIG_EXPERIMENTAL=3Dy - CONFIG_CLEAN_COMPILE=3Dy - CONFIG_BROKEN_ON_SMP=3Dy -+CONFIG_INIT_ENV_ARG_LIMIT=3D32 -=20 +@@ -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=3Dy +@@ -29,7 +31,6 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set - CONFIG_SYSCTL=3Dy + CONFIG_SYSCTL=y # CONFIG_AUDIT is not set --CONFIG_LOG_BUF_SHIFT=3D14 - CONFIG_HOTPLUG=3Dy - CONFIG_KOBJECT_UEVENT=3Dy +-CONFIG_LOG_BUF_SHIFT=14 + CONFIG_HOTPLUG=y + CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set -@@ -37,6 +38,9 @@ CONFIG_EMBEDDED=3Dy - CONFIG_KALLSYMS=3Dy +@@ -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=3Dy -+CONFIG_BUG=3Dy -+CONFIG_BASE_FULL=3Dy - CONFIG_FUTEX=3Dy - CONFIG_EPOLL=3Dy ++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=3D0 - CONFIG_CC_ALIGN_LOOPS=3D0 - CONFIG_CC_ALIGN_JUMPS=3D0 +@@ -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=3D0 -=20 ++CONFIG_BASE_SMALL=0 + # # Loadable module support -@@ -69,9 +74,11 @@ CONFIG_KMOD=3Dy - CONFIG_E500=3Dy - CONFIG_BOOKE=3Dy - CONFIG_FSL_BOOKE=3Dy +@@ -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=3Dy + CONFIG_MATH_EMULATION=y # CONFIG_CPU_FREQ is not set +# CONFIG_PM is not set - CONFIG_85xx=3Dy - CONFIG_PPC_INDIRECT_PCI_BE=3Dy -=20 -@@ -96,6 +103,7 @@ CONFIG_HIGHMEM=3Dy - CONFIG_BINFMT_ELF=3Dy - CONFIG_BINFMT_MISC=3Dm + 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=3Dy -=20 ++CONFIG_ISA_DMA_API=y + # # Bus options -@@ -104,15 +112,15 @@ CONFIG_PCI=3Dy - CONFIG_PCI_DOMAINS=3Dy +@@ -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 -=20 + # # PCCARD (PCMCIA/CardBus) support # @@ -111,22 +110,22 @@ defconfig -# -# PC-card bridges -# -+CONFIG_RAPIDIO=3Dy -+CONFIG_RAPIDIO_8_BIT_TRANSPORT=3Dy -+CONFIG_RAPIDIO_DISC_TIMEOUT=3D30 -=20 ++CONFIG_RAPIDIO=y ++CONFIG_RAPIDIO_8_BIT_TRANSPORT=y ++CONFIG_RAPIDIO_DISC_TIMEOUT=30 + # # Advanced setup -@@ -152,7 +160,7 @@ CONFIG_PARPORT=3Dm - CONFIG_PARPORT_PC=3Dm +@@ -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 -=20 + # -@@ -264,7 +272,6 @@ CONFIG_SCSI_CONSTANTS=3Dy +@@ -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 @@ -134,15 +133,15 @@ defconfig # 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=3Dy +@@ -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=3Dm -@@ -283,6 +289,7 @@ CONFIG_SCSI_QLA2XXX=3Dm + 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 @@ -150,83 +149,83 @@ defconfig # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set -@@ -322,7 +329,6 @@ CONFIG_NET=3Dy +@@ -322,7 +329,6 @@ CONFIG_NET=y # - CONFIG_PACKET=3Dy + CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set -# CONFIG_NETLINK_DEV is not set - CONFIG_UNIX=3Dy + CONFIG_UNIX=y # CONFIG_NET_KEY is not set - CONFIG_INET=3Dy -@@ -431,7 +437,7 @@ CONFIG_IP_NF_NAT_FTP=3Dm + CONFIG_INET=y +@@ -431,7 +437,7 @@ CONFIG_IP_NF_NAT_FTP=m # # Network testing # -# CONFIG_NET_PKTGEN is not set -+CONFIG_NET_PKTGEN=3Dy ++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=3Dy +@@ -499,6 +505,7 @@ CONFIG_GFAR_NAPI=y # Wan interfaces # # CONFIG_WAN is not set -+CONFIG_RIONET=3Dy ++CONFIG_RIONET=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -@@ -536,20 +543,6 @@ CONFIG_INPUT_EVDEV=3Dm +@@ -536,20 +543,6 @@ CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set -=20 + # -# Input I/O drivers -# -# CONFIG_GAMEPORT is not set --CONFIG_SOUND_GAMEPORT=3Dy --CONFIG_SERIO=3Dy --CONFIG_SERIO_I8042=3Dy --CONFIG_SERIO_SERPORT=3Dy +-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=3Dy +-CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set - -# # Input Device Drivers # - CONFIG_INPUT_KEYBOARD=3Dy -@@ -567,6 +560,19 @@ CONFIG_MOUSE_PS2=3Dy + CONFIG_INPUT_KEYBOARD=y +@@ -567,6 +560,19 @@ CONFIG_MOUSE_PS2=y # CONFIG_INPUT_MISC is not set -=20 + # +# Hardware I/O ports +# -+CONFIG_SERIO=3Dy -+CONFIG_SERIO_I8042=3Dy -+CONFIG_SERIO_SERPORT=3Dy ++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=3Dy ++CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set -+CONFIG_SOUND_GAMEPORT=3Dy ++CONFIG_SOUND_GAMEPORT=y + +# # Character devices # # CONFIG_VT is not set -@@ -590,6 +596,7 @@ CONFIG_SERIAL_CPM_SCC2=3Dy +@@ -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=3Dy - CONFIG_LEGACY_PTYS=3Dy - CONFIG_LEGACY_PTY_COUNT=3D256 -@@ -626,6 +633,11 @@ CONFIG_DRM=3Dm + CONFIG_UNIX98_PTYS=y + CONFIG_LEGACY_PTYS=y + CONFIG_LEGACY_PTY_COUNT=256 +@@ -626,6 +633,11 @@ CONFIG_DRM=m # CONFIG_RAW_DRIVER is not set -=20 + # +# TPM devices +# @@ -235,8 +234,8 @@ defconfig +# # I2C support # - CONFIG_I2C=3Dm -@@ -648,12 +660,12 @@ CONFIG_I2C_ALGOBIT=3Dm + CONFIG_I2C=m +@@ -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 @@ -250,7 +249,7 @@ defconfig # 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=3Dm +@@ -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 @@ -260,7 +259,7 @@ defconfig # 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=3Dm +@@ -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 @@ -272,7 +271,7 @@ defconfig # 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=3Dm +@@ -700,10 +716,12 @@ CONFIG_I2C_ALGOBIT=m # # Other I2C Chip support # @@ -285,32 +284,31 @@ defconfig # 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=3Dm +@@ -732,7 +750,6 @@ CONFIG_I2C_ALGOBIT=m # Graphics support # # CONFIG_FB is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -=20 + # # Sound -@@ -752,13 +769,9 @@ CONFIG_SOUND=3Dm +@@ -752,13 +769,9 @@ CONFIG_SOUND=m # # USB support # -# CONFIG_USB is not set - CONFIG_USB_ARCH_HAS_HCD=3Dy - CONFIG_USB_ARCH_HAS_OHCI=3Dy + CONFIG_USB_ARCH_HAS_HCD=y + CONFIG_USB_ARCH_HAS_OHCI=y - -# --# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be need= -ed; see USB_STORAGE Help for more information +-# 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 -=20 + # # USB Gadget Support -@@ -789,6 +802,10 @@ CONFIG_JBD_DEBUG=3Dy - CONFIG_FS_MBCACHE=3Dy +@@ -789,6 +802,10 @@ CONFIG_JBD_DEBUG=y + CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set + @@ -320,36 +318,36 @@ ed; see USB_STORAGE Help for more information # 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=3Dy - CONFIG_ROOT_NFS=3Dy - CONFIG_LOCKD=3Dy - CONFIG_LOCKD_V4=3Dy +@@ -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=3Dy + CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -@@ -942,8 +958,10 @@ CONFIG_ZLIB_INFLATE=3Dm +@@ -942,8 +958,10 @@ CONFIG_ZLIB_INFLATE=m # # Kernel hacking # +# CONFIG_PRINTK_TIME is not set - CONFIG_DEBUG_KERNEL=3Dy + CONFIG_DEBUG_KERNEL=y # CONFIG_MAGIC_SYSRQ is not set -+CONFIG_LOG_BUF_SHIFT=3D14 ++CONFIG_LOG_BUF_SHIFT=14 # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile -@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4) +=3D cpu_setup_power - obj-$(CONFIG_MODULES) +=3D module.o ppc_ksyms.o - obj-$(CONFIG_NOT_COHERENT_CACHE) +=3D dma-mapping.o - obj-$(CONFIG_PCI) +=3D pci.o -+obj-$(CONFIG_RAPIDIO) +=3D rio.o - obj-$(CONFIG_KGDB) +=3D ppc-stub.o - obj-$(CONFIG_SMP) +=3D smp.o smp-tbsync.o - obj-$(CONFIG_TAU) +=3D temp.o +@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4) += cpu_setup_power + 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 diff --git a/arch/ppc/kernel/rio.c b/arch/ppc/kernel/rio.c new file mode 100644 --- /dev/null @@ -407,8 +405,7 @@ new file mode 100644 +} + +subsys_initcall(ppc_rio_init); -diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/st= -x_gp3.c +diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c --- a/arch/ppc/platforms/85xx/stx_gp3.c +++ b/arch/ppc/platforms/85xx/stx_gp3.c @@ -38,6 +38,7 @@ @@ -416,29 +413,29 @@ x_gp3.c #include <linux/fsl_devices.h> #include <linux/interrupt.h> +#include <linux/rio.h> -=20 + #include <asm/system.h> #include <asm/pgtable.h> @@ -59,6 +60,7 @@ -=20 + #include <syslib/cpm2_pic.h> #include <syslib/ppc85xx_common.h> +#include <syslib/ppc85xx_rio.h> -=20 + extern void cpm2_reset(void); -=20 -@@ -200,7 +202,6 @@ static struct irqaction cpm2_irqaction =3D + +@@ -200,7 +202,6 @@ static struct irqaction cpm2_irqaction = static void __init gp3_init_IRQ(void) { - int i; - bd_t *binfo =3D (bd_t *) __res; -=20 + bd_t *binfo = (bd_t *) __res; + /* @@ -297,6 +298,18 @@ int mpc85xx_exclude_device(u_char bus, u } #endif /* CONFIG_PCI */ -=20 + +#ifdef CONFIG_RAPIDIO +void +platform_rio_init(void) @@ -457,13 +454,13 @@ x_gp3.c diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile -@@ -101,6 +101,7 @@ obj-$(CONFIG_85xx) +=3D open_pic.o ppc85x +@@ -101,6 +101,7 @@ obj-$(CONFIG_85xx) += open_pic.o ppc85x mpc85xx_devices.o ifeq ($(CONFIG_85xx),y) - obj-$(CONFIG_PCI) +=3D indirect_pci.o pci_auto.o -+obj-$(CONFIG_RAPIDIO) +=3D ppc85xx_rio.o + obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o ++obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o endif - obj-$(CONFIG_83xx) +=3D ipic.o ppc83xx_setup.o ppc_sys.o \ + obj-$(CONFIG_83xx) += ipic.o ppc83xx_setup.o ppc_sys.o \ mpc83xx_sys.o mpc83xx_devices.o diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c new file mode 100644 @@ -531,7 +528,7 @@ new file mode 100644 +#define DBELL_TID(x) (*(u8 *)(x + DOORBELL_TID_OFFSET)) +#define DBELL_INF(x) (*(u16 *)(x + DOORBELL_INFO_OFFSET)) + -+#define is_power_of_2(x) (((x) & ((x) - 1)) =3D=3D 0) ++#define is_power_of_2(x) (((x) & ((x) - 1)) == 0) + +struct rio_atmu_regs { + u32 rowtar; @@ -645,12 +642,11 @@ new file mode 100644 + * Generates a MPC85xx local configuration space read. Returns %0 on + * success or %-EINVAL on failure. + */ -+static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 *= - data) ++static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 * data) +{ + pr_debug("mpc85xx_local_config_read: index %d offset %8.8x\n", index, + offset); -+ *data =3D in_be32((void *)(regs_win + offset)); ++ *data = in_be32((void *)(regs_win + offset)); + + return 0; +} @@ -665,8 +661,7 @@ new file mode 100644 + * Generates a MPC85xx local configuration space write. Returns %0 on + * success or %-EINVAL on failure. + */ -+static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 = -data) ++static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 data) +{ + pr_debug + ("mpc85xx_local_config_write: index %d offset %8.8x data %8.8x\n", @@ -677,8 +672,7 @@ data) +} + +/** -+ * mpc85xx_rio_config_read - Generate a MPC85xx read maintenance transacti= -on ++ * mpc85xx_rio_config_read - Generate a MPC85xx read maintenance transaction + * @index: ID of RapdiIO interface + * @destid: Destination ID of transaction + * @hopcount: Number of hops to target device @@ -690,29 +684,27 @@ on + * success or %-EINVAL on failure. + */ +static int -+mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, in= -t len, ++mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, int len, + u32 * val) +{ + u8 *data; + + pr_debug -+ ("mpc85xx_rio_config_read: index %d destid %d hopcount %d offset %8.8= -x len %d\n", ++ ("mpc85xx_rio_config_read: index %d destid %d hopcount %d offset %8.8x len %d\n", + index, destid, hopcount, offset, len); + out_be32((void *)&maint_atmu_regs->rowtar, + (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9)); + -+ data =3D (u8 *) maint_win + offset; ++ data = (u8 *) maint_win + offset; + switch (len) { + case 1: -+ *val =3D in_8((u8 *) data); ++ *val = in_8((u8 *) data); + break; + case 2: -+ *val =3D in_be16((u16 *) data); ++ *val = in_be16((u16 *) data); + break; + default: -+ *val =3D in_be32((u32 *) data); ++ *val = in_be32((u32 *) data); + break; + } + @@ -720,8 +712,7 @@ x len %d\n", +} + +/** -+ * mpc85xx_rio_config_write - Generate a MPC85xx write maintenance transac= -tion ++ * mpc85xx_rio_config_write - Generate a MPC85xx write maintenance transaction + * @index: ID of RapdiIO interface + * @destid: Destination ID of transaction + * @hopcount: Number of hops to target device @@ -738,13 +729,12 @@ tion +{ + u8 *data; + pr_debug -+ ("mpc85xx_rio_config_write: index %d destid %d hopcount %d offset %8.= -8x len %d val %8.8x\n", ++ ("mpc85xx_rio_config_write: index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n", + index, destid, hopcount, offset, len, val); + out_be32((void *)&maint_atmu_regs->rowtar, + (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9)); + -+ data =3D (u8 *) maint_win + offset; ++ data = (u8 *) maint_win + offset; + switch (len) { + case 1: + out_8((u8 *) data, val); @@ -761,8 +751,7 @@ tion +} + +/** -+ * rio_hw_add_outb_message - Add message to the MPC85xx outbound message q= -ueue ++ * rio_hw_add_outb_message - Add message to the MPC85xx outbound message queue + * @mport: Master port with outbound message queue + * @rdev: Target of outbound message + * @mbox: Outbound mailbox @@ -773,22 +762,20 @@ ueue + * %0 on success or %-EINVAL on failure. + */ +int -+rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int= - mbox, ++rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox, + void *buffer, size_t len) +{ + u32 omr; -+ struct rio_tx_desc *desc =3D ++ struct rio_tx_desc *desc = + (struct rio_tx_desc *)msg_tx_ring.virt + msg_tx_ring.tx_slot; -+ int ret =3D 0; ++ int ret = 0; + + pr_debug(KERN_INFO -+ "RIO: rio_hw_add_outb_message(): destid %4.4x mbox %d buffer %8.8x len = -%8.8x\n", ++ "RIO: rio_hw_add_outb_message(): destid %4.4x mbox %d buffer %8.8x len %8.8x\n", + rdev->destid, mbox, (int)buffer, len); + + if ((len < 8) || (len > RIO_MAX_MSG_SIZE)) { -+ ret =3D -EINVAL; ++ ret = -EINVAL; + goto out; + } + @@ -800,24 +787,24 @@ ueue + RIO_MAX_MSG_SIZE - len); + + /* Set mbox field for message */ -+ desc->dport =3D mbox & 0x3; ++ desc->dport = mbox & 0x3; + + /* Enable EOMI interrupt, set priority, and set destid */ -+ desc->dattr =3D 0x28000000 | (rdev->destid << 2); ++ desc->dattr = 0x28000000 | (rdev->destid << 2); + + /* Set transfer size aligned to next power of 2 (in double words) */ -+ desc->dwcnt =3D is_power_of_2(len) ? len : 1 << get_bitmask_order(len); ++ desc->dwcnt = is_power_of_2(len) ? len : 1 << get_bitmask_order(len); + + /* Set snooping and source buffer address */ -+ desc->saddr =3D 0x00000004 | msg_tx_ring.phys_buffer[msg_tx_ring.tx_slot]; ++ desc->saddr = 0x00000004 | msg_tx_ring.phys_buffer[msg_tx_ring.tx_slot]; + + /* Increment enqueue pointer */ -+ omr =3D in_be32((void *)&msg_regs->omr); ++ omr = in_be32((void *)&msg_regs->omr); + out_be32((void *)&msg_regs->omr, omr | RIO_MSG_OMR_MUI); + + /* Go to next descriptor */ -+ if (++msg_tx_ring.tx_slot =3D=3D msg_tx_ring.size) -+ msg_tx_ring.tx_slot =3D 0; ++ if (++msg_tx_ring.tx_slot == msg_tx_ring.size) ++ msg_tx_ring.tx_slot = 0; + + out: + return ret; @@ -838,9 +825,9 @@ ueue +mpc85xx_rio_tx_handler(int irq, void *dev_instance, struct pt_regs *regs) +{ + int osr; -+ struct rio_mport *port =3D (struct rio_mport *)dev_instance; ++ struct rio_mport *port = (struct rio_mport *)dev_instance; + -+ osr =3D in_be32((void *)&msg_regs->osr); ++ osr = in_be32((void *)&msg_regs->osr); + + if (osr & RIO_MSG_OSR_TE) { + printk(KERN_INFO "RIO: outbound message transmission error\n"); @@ -855,8 +842,8 @@ ueue + } + + if (osr & RIO_MSG_OSR_EOMI) { -+ u32 dqp =3D in_be32((void *)&msg_regs->odqdpar); -+ int slot =3D (dqp - msg_tx_ring.phys) >> 5; ++ u32 dqp = in_be32((void *)&msg_regs->odqdpar); ++ int slot = (dqp - msg_tx_ring.phys) >> 5; + port->outb_msg[0].mcback(port, -1, slot); + + /* Ack the end-of-message interrupt */ @@ -879,31 +866,31 @@ ueue + */ +int rio_open_outb_mbox(struct rio_mport *mport, int mbox, int entries) +{ -+ int i, rc =3D 0; ++ int i, rc = 0; + + if ((entries < RIO_MIN_TX_RING_SIZE) || + (entries > RIO_MAX_TX_RING_SIZE) || (!is_power_of_2(entries))) { -+ rc =3D -EINVAL; ++ rc = -EINVAL; + goto out; + } + + /* Initialize shadow copy ring */ -+ msg_tx_ring.size =3D entries; ++ msg_tx_ring.size = entries; + -+ for (i =3D 0; i < msg_tx_ring.size; i++) { -+ msg_tx_ring.virt_buffer[i] =3D ++ for (i = 0; i < msg_tx_ring.size; i++) { ++ msg_tx_ring.virt_buffer[i] = + (void *)__get_free_page(GFP_KERNEL); -+ msg_tx_ring.phys_buffer[i] =3D ++ msg_tx_ring.phys_buffer[i] = + (dma_addr_t) __pa(msg_tx_ring.virt_buffer[i]); + } + + /* Initialize outbound message descriptor ring */ -+ msg_tx_ring.virt =3D dma_alloc_coherent(NULL, ++ msg_tx_ring.virt = dma_alloc_coherent(NULL, + msg_tx_ring.size * + RIO_MSG_DESC_SIZE, + &msg_tx_ring.phys, GFP_KERNEL); + memset(msg_tx_ring.virt, 0, msg_tx_ring.size * RIO_MSG_DESC_SIZE); -+ msg_tx_ring.tx_slot =3D 0; ++ msg_tx_ring.tx_slot = 0; + + /* Point dequeue/enqueue pointers at first entry in ring */ + out_be32((void *)&msg_regs->odqdpar, msg_tx_ring.phys); @@ -974,9 +961,9 @@ ueue +mpc85xx_rio_rx_handler(int irq, void *dev_instance, struct pt_regs *regs) +{ + int isr; -+ struct rio_mport *port =3D (struct rio_mport *)dev_instance; ++ struct rio_mport *port = (struct rio_mport *)dev_instance; + -+ isr =3D in_be32((void *)&msg_regs->isr); ++ isr = in_be32((void *)&msg_regs->isr); + + if (isr & RIO_MSG_ISR_TE) { + printk(KERN_INFO "RIO: inbound message reception error\n"); @@ -1014,22 +1001,22 @@ ueue + */ +int rio_open_inb_mbox(struct rio_mport *mport, int mbox, int entries) +{ -+ int i, rc =3D 0; ++ int i, rc = 0; + + if ((entries < RIO_MIN_RX_RING_SIZE) || + (entries > RIO_MAX_RX_RING_SIZE) || (!is_power_of_2(entries))) { -+ rc =3D -EINVAL; ++ rc = -EINVAL; + goto out; + } + + /* Initialize client buffer ring */ -+ msg_rx_ring.size =3D entries; -+ msg_rx_ring.rx_slot =3D 0; -+ for (i =3D 0; i < msg_rx_ring.size; i++) -+ msg_rx_ring.virt_buffer[i] =3D NULL; ++ msg_rx_ring.size = entries; ++ msg_rx_ring.rx_slot = 0; ++ for (i = 0; i < msg_rx_ring.size; i++) ++ msg_rx_ring.virt_buffer[i] = NULL; + + /* Initialize inbound message ring */ -+ msg_rx_ring.virt =3D dma_alloc_coherent(NULL, ++ msg_rx_ring.virt = dma_alloc_coherent(NULL, + msg_rx_ring.size * + RIO_MAX_MSG_SIZE, + &msg_rx_ring.phys, GFP_KERNEL); @@ -1098,7 +1085,7 @@ ueue + */ +int rio_hw_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf) +{ -+ int rc =3D 0; ++ int rc = 0; + + pr_debug("RIO: rio_hw_add_inb_buffer(), msg_rx_ring.rx_slot %d\n", + msg_rx_ring.rx_slot); @@ -1107,13 +1094,13 @@ ueue + printk(KERN_ERR + "RIO: error adding inbound buffer %d, buffer exists\n", + msg_rx_ring.rx_slot); -+ rc =3D -EINVAL; ++ rc = -EINVAL; + goto out; + } + -+ msg_rx_ring.virt_buffer[msg_rx_ring.rx_slot] =3D buf; -+ if (++msg_rx_ring.rx_slot =3D=3D msg_rx_ring.size) -+ msg_rx_ring.rx_slot =3D 0; ++ msg_rx_ring.virt_buffer[msg_rx_ring.rx_slot] = buf; ++ if (++msg_rx_ring.rx_slot == msg_rx_ring.size) ++ msg_rx_ring.rx_slot = 0; + + out: + return rc; @@ -1122,8 +1109,7 @@ ueue +EXPORT_SYMBOL_GPL(rio_hw_add_inb_buffer); + +/** -+ * rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message= - unit ++ * rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message unit + * @mport: Master port implementing the inbound message unit + * @mbox: Inbound mailbox number + * @@ -1134,18 +1120,18 @@ ueue +{ + u32 imr; + u32 phys_buf, virt_buf; -+ void *buf =3D NULL; ++ void *buf = NULL; + int buf_idx; + -+ phys_buf =3D in_be32((void *)&msg_regs->ifqdpar); ++ phys_buf = in_be32((void *)&msg_regs->ifqdpar); + + /* If no more messages, then bail out */ -+ if (phys_buf =3D=3D in_be32((void *)&msg_regs->ifqepar)) ++ if (phys_buf == in_be32((void *)&msg_regs->ifqepar)) + goto out2; + -+ virt_buf =3D (u32) msg_rx_ring.virt + (phys_buf - msg_rx_ring.phys); -+ buf_idx =3D (phys_buf - msg_rx_ring.phys) / RIO_MAX_MSG_SIZE; -+ buf =3D msg_rx_ring.virt_buffer[buf_idx]; ++ virt_buf = (u32) msg_rx_ring.virt + (phys_buf - msg_rx_ring.phys); ++ buf_idx = (phys_buf - msg_rx_ring.phys) / RIO_MAX_MSG_SIZE; ++ buf = msg_rx_ring.virt_buffer[buf_idx]; + + if (!buf) { + pr_debug(KERN_ERR @@ -1157,10 +1143,10 @@ ueue + memcpy(buf, (void *)virt_buf, RIO_MAX_MSG_SIZE); + + /* Clear the available buffer */ -+ msg_rx_ring.virt_buffer[buf_idx] =3D NULL; ++ msg_rx_ring.virt_buffer[buf_idx] = NULL; + + out1: -+ imr =3D in_be32((void *)&msg_regs->imr); ++ imr = in_be32((void *)&msg_regs->imr); + out_be32((void *)&msg_regs->imr, imr | RIO_MSG_IMR_MI); + + out2: @@ -1179,13 +1165,12 @@ ueue + * doorbell event handlers and executes a matching event handler. + */ +static irqreturn_t -+mpc85xx_rio_dbell_handler(int irq, void *dev_instance, struct pt_regs *reg= -s) ++mpc85xx_rio_dbell_handler(int irq, void *dev_instance, struct pt_regs *regs) +{ + int dsr; -+ struct rio_mport *port =3D (struct rio_mport *)dev_instance; ++ struct rio_mport *port = (struct rio_mport *)dev_instance; + -+ dsr =3D in_be32((void *)&msg_regs->dsr); ++ dsr = in_be32((void *)&msg_regs->dsr); + + if (dsr & DOORBELL_DSR_TE) { + printk(KERN_INFO "RIO: doorbell reception error\n"); @@ -1201,21 +1186,21 @@ s) + + /* XXX Need to check/dispatch until queue empty */ + if (dsr & DOORBELL_DSR_DIQI) { -+ u32 dmsg =3D ++ u32 dmsg = + (u32) dbell_ring.virt + + (in_be32((void *)&msg_regs->dqdpar) & 0xfff); + u32 dmr; + struct rio_dbell *dbell; -+ int found =3D 0; ++ int found = 0; + + pr_debug(KERN_INFO + "RIO: processing doorbell, sid %2.2x tid %2.2x info %4.4x\n", + DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg)); + + list_for_each_entry(dbell, &port->dbells, node) { -+ if ((dbell->res->start <=3D DBELL_INF(dmsg)) && -+ (dbell->res->end >=3D DBELL_INF(dmsg))) { -+ found =3D 1; ++ if ((dbell->res->start <= DBELL_INF(dmsg)) && ++ (dbell->res->end >= DBELL_INF(dmsg))) { ++ found = 1; + break; + } + } @@ -1228,7 +1213,7 @@ s) + DBELL_SID(dmsg), DBELL_TID(dmsg), + DBELL_INF(dmsg)); + } -+ dmr =3D in_be32((void *)&msg_regs->dmr); ++ dmr = in_be32((void *)&msg_regs->dmr); + out_be32((void *)&msg_regs->dmr, dmr | DOORBELL_DMR_DI); + out_be32((void *)&msg_regs->dsr, DOORBELL_DSR_DIQI); + } @@ -1247,12 +1232,12 @@ s) +static void mpc85xx_rio_doorbell_init(struct rio_mport *mport) +{ + /* Map outbound doorbell window immediately after maintenance window */ -+ dbell_win =3D ++ dbell_win = + (u32) ioremap(mport->iores.start + RIO_MAINT_WIN_SIZE, + RIO_DBELL_WIN_SIZE); + + /* Initialize inbound doorbells */ -+ dbell_ring.virt =3D dma_alloc_coherent(NULL, ++ dbell_ring.virt = dma_alloc_coherent(NULL, + 512 * DOORBELL_MESSAGE_SIZE, + &dbell_ring.phys, GFP_KERNEL); + @@ -1271,7 +1256,7 @@ s) + out_be32((void *)&msg_regs->dmr, 0x00108161); +} + -+static char *cmdline =3D NULL; ++static char *cmdline = NULL; + +static int mpc85xx_rio_get_hdid(int index) +{ @@ -1287,11 +1272,11 @@ s) + if (!s) + return 0; + -+ cmdline =3D s; ++ cmdline = s; + return 1; +} + -+__setup("riohdid=3D", mpc85xx_rio_get_cmdline); ++__setup("riohdid=", mpc85xx_rio_get_cmdline); + +/** + * mpc85xx_rio_setup - Setup MPC85xx RapidIO interface @@ -1307,42 +1292,42 @@ s) + struct rio_ops *ops; + struct rio_mport *port; + -+ ops =3D kmalloc(sizeof(struct rio_ops), GFP_KERNEL); -+ ops->lcread =3D mpc85xx_local_config_read; -+ ops->lcwrite =3D mpc85xx_local_config_write; -+ ops->cread =3D mpc85xx_rio_config_read; -+ ops->cwrite =3D mpc85xx_rio_config_write; -+ ops->dsend =3D mpc85xx_rio_doorbell_send; ++ ops = kmalloc(sizeof(struct rio_ops), GFP_KERNEL); ++ ops->lcread = mpc85xx_local_config_read; ++ ops->lcwrite = mpc85xx_local_config_write; ++ ops->cread = mpc85xx_rio_config_read; ++ ops->cwrite = mpc85xx_rio_config_write; ++ ops->dsend = mpc85xx_rio_doorbell_send; + -+ port =3D kmalloc(sizeof(struct rio_mport), GFP_KERNEL); -+ port->id =3D 0; -+ port->index =3D 0; ++ port = kmalloc(sizeof(struct rio_mport), GFP_KERNEL); ++ port->id = 0; ++ port->index = 0; + INIT_LIST_HEAD(&port->dbells); -+ port->iores.start =3D law_start; -+ port->iores.end =3D law_start + law_size; -+ port->iores.flags =3D IORESOURCE_MEM; ++ port->iores.start = law_start; ++ port->iores.end = law_start + law_size; ++ port->iores.flags = IORESOURCE_MEM; + + rio_init_dbell_res(&port->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff); + rio_init_mbox_res(&port->riores[RIO_INB_MBOX_RESOURCE], 0, 0); + rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0); + strcpy(port->name, "RIO0 mport"); + -+ port->ops =3D ops; -+ port->host_deviceid =3D mpc85xx_rio_get_hdid(port->id); ++ port->ops = ops; ++ port->host_deviceid = mpc85xx_rio_get_hdid(port->id); + + rio_register_mport(port); + -+ regs_win =3D (u32) ioremap(RIO_REGS_BASE, 0x20000); -+ atmu_regs =3D (struct rio_atmu_regs *)(regs_win + RIO_ATMU_REGS_OFFSET); -+ maint_atmu_regs =3D atmu_regs + 1; -+ dbell_atmu_regs =3D atmu_regs + 2; -+ msg_regs =3D (struct rio_msg_regs *)(regs_win + RIO_MSG_REGS_OFFSET); ++ regs_win = (u32) ioremap(RIO_REGS_BASE, 0x20000); ++ atmu_regs = (struct rio_atmu_regs *)(regs_win + RIO_ATMU_REGS_OFFSET); ++ maint_atmu_regs = atmu_regs + 1; ++ dbell_atmu_regs = atmu_regs + 2; ++ msg_regs = (struct rio_msg_regs *)(regs_win + RIO_MSG_REGS_OFFSET); + + /* Configure maintenance transaction window */ + out_be32((void *)&maint_atmu_regs->rowbar, 0x000c0000); + out_be32((void *)&maint_atmu_regs->rowar, 0x80077015); + -+ maint_win =3D (u32) ioremap(law_start, RIO_MAINT_WIN_SIZE); ++ maint_win = (u32) ioremap(law_start, RIO_MAINT_WIN_SIZE); + + /* Configure outbound doorbell window */ + out_be32((void *)&dbell_atmu_regs->rowbar, 0x000c0400); diff --git a/a/content_digest b/N1/content_digest index 5c3403d..040c4db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,9 +15,9 @@ "--- a/arch/ppc/Kconfig\n" "+++ b/arch/ppc/Kconfig\n" "@@ -1177,6 +1177,14 @@ source \"drivers/pci/Kconfig\"\n" - "=20\n" + " \n" " source \"drivers/pcmcia/Kconfig\"\n" - "=20\n" + " \n" "+config RAPIDIO\n" "+\tbool \"RapidIO support\" if MPC8540 || MPC8560\n" "+\thelp\n" @@ -27,10 +27,9 @@ "+source \"drivers/rio/Kconfig\"\n" "+\n" " endmenu\n" - "=20\n" + " \n" " menu \"Advanced setup\"\n" - "diff --git a/arch/ppc/configs/stx_gp3_defconfig b/arch/ppc/configs/stx_gp3_=\n" - "defconfig\n" + "diff --git a/arch/ppc/configs/stx_gp3_defconfig b/arch/ppc/configs/stx_gp3_defconfig\n" "--- a/arch/ppc/configs/stx_gp3_defconfig\n" "+++ b/arch/ppc/configs/stx_gp3_defconfig\n" "@@ -1,7 +1,7 @@\n" @@ -41,76 +40,76 @@ "+# Linux kernel version: 2.6.12-rc4\n" "+# Tue May 24 18:11:04 2005\n" " #\n" - " CONFIG_MMU=3Dy\n" - " CONFIG_GENERIC_HARDIRQS=3Dy\n" - "@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=3Dy\n" - " CONFIG_PPC=3Dy\n" - " CONFIG_PPC32=3Dy\n" - " CONFIG_GENERIC_NVRAM=3Dy\n" - "+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=3Dy\n" - "=20\n" + " CONFIG_MMU=y\n" + " CONFIG_GENERIC_HARDIRQS=y\n" + "@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=y\n" + " CONFIG_PPC=y\n" + " CONFIG_PPC32=y\n" + " CONFIG_GENERIC_NVRAM=y\n" + "+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y\n" + " \n" " #\n" " # Code maturity level options\n" - "@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=3Dy\n" - " CONFIG_EXPERIMENTAL=3Dy\n" - " CONFIG_CLEAN_COMPILE=3Dy\n" - " CONFIG_BROKEN_ON_SMP=3Dy\n" - "+CONFIG_INIT_ENV_ARG_LIMIT=3D32\n" - "=20\n" + "@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y\n" + " CONFIG_EXPERIMENTAL=y\n" + " CONFIG_CLEAN_COMPILE=y\n" + " CONFIG_BROKEN_ON_SMP=y\n" + "+CONFIG_INIT_ENV_ARG_LIMIT=32\n" + " \n" " #\n" " # General setup\n" - "@@ -29,7 +31,6 @@ CONFIG_SYSVIPC=3Dy\n" + "@@ -29,7 +31,6 @@ CONFIG_SYSVIPC=y\n" " # CONFIG_BSD_PROCESS_ACCT is not set\n" - " CONFIG_SYSCTL=3Dy\n" + " CONFIG_SYSCTL=y\n" " # CONFIG_AUDIT is not set\n" - "-CONFIG_LOG_BUF_SHIFT=3D14\n" - " CONFIG_HOTPLUG=3Dy\n" - " CONFIG_KOBJECT_UEVENT=3Dy\n" + "-CONFIG_LOG_BUF_SHIFT=14\n" + " CONFIG_HOTPLUG=y\n" + " CONFIG_KOBJECT_UEVENT=y\n" " # CONFIG_IKCONFIG is not set\n" - "@@ -37,6 +38,9 @@ CONFIG_EMBEDDED=3Dy\n" - " CONFIG_KALLSYMS=3Dy\n" + "@@ -37,6 +38,9 @@ CONFIG_EMBEDDED=y\n" + " CONFIG_KALLSYMS=y\n" " # CONFIG_KALLSYMS_ALL is not set\n" " # CONFIG_KALLSYMS_EXTRA_PASS is not set\n" - "+CONFIG_PRINTK=3Dy\n" - "+CONFIG_BUG=3Dy\n" - "+CONFIG_BASE_FULL=3Dy\n" - " CONFIG_FUTEX=3Dy\n" - " CONFIG_EPOLL=3Dy\n" + "+CONFIG_PRINTK=y\n" + "+CONFIG_BUG=y\n" + "+CONFIG_BASE_FULL=y\n" + " CONFIG_FUTEX=y\n" + " CONFIG_EPOLL=y\n" " # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set\n" - "@@ -46,6 +50,7 @@ CONFIG_CC_ALIGN_LABELS=3D0\n" - " CONFIG_CC_ALIGN_LOOPS=3D0\n" - " CONFIG_CC_ALIGN_JUMPS=3D0\n" + "@@ -46,6 +50,7 @@ CONFIG_CC_ALIGN_LABELS=0\n" + " CONFIG_CC_ALIGN_LOOPS=0\n" + " CONFIG_CC_ALIGN_JUMPS=0\n" " # CONFIG_TINY_SHMEM is not set\n" - "+CONFIG_BASE_SMALL=3D0\n" - "=20\n" + "+CONFIG_BASE_SMALL=0\n" + " \n" " #\n" " # Loadable module support\n" - "@@ -69,9 +74,11 @@ CONFIG_KMOD=3Dy\n" - " CONFIG_E500=3Dy\n" - " CONFIG_BOOKE=3Dy\n" - " CONFIG_FSL_BOOKE=3Dy\n" + "@@ -69,9 +74,11 @@ CONFIG_KMOD=y\n" + " CONFIG_E500=y\n" + " CONFIG_BOOKE=y\n" + " CONFIG_FSL_BOOKE=y\n" "+# CONFIG_PHYS_64BIT is not set\n" " # CONFIG_SPE is not set\n" - " CONFIG_MATH_EMULATION=3Dy\n" + " CONFIG_MATH_EMULATION=y\n" " # CONFIG_CPU_FREQ is not set\n" "+# CONFIG_PM is not set\n" - " CONFIG_85xx=3Dy\n" - " CONFIG_PPC_INDIRECT_PCI_BE=3Dy\n" - "=20\n" - "@@ -96,6 +103,7 @@ CONFIG_HIGHMEM=3Dy\n" - " CONFIG_BINFMT_ELF=3Dy\n" - " CONFIG_BINFMT_MISC=3Dm\n" + " CONFIG_85xx=y\n" + " CONFIG_PPC_INDIRECT_PCI_BE=y\n" + " \n" + "@@ -96,6 +103,7 @@ CONFIG_HIGHMEM=y\n" + " CONFIG_BINFMT_ELF=y\n" + " CONFIG_BINFMT_MISC=m\n" " # CONFIG_CMDLINE_BOOL is not set\n" - "+CONFIG_ISA_DMA_API=3Dy\n" - "=20\n" + "+CONFIG_ISA_DMA_API=y\n" + " \n" " #\n" " # Bus options\n" - "@@ -104,15 +112,15 @@ CONFIG_PCI=3Dy\n" - " CONFIG_PCI_DOMAINS=3Dy\n" + "@@ -104,15 +112,15 @@ CONFIG_PCI=y\n" + " CONFIG_PCI_DOMAINS=y\n" " # CONFIG_PCI_LEGACY_PROC is not set\n" " # CONFIG_PCI_NAMES is not set\n" "+# CONFIG_PCI_DEBUG is not set\n" - "=20\n" + " \n" " #\n" " # PCCARD (PCMCIA/CardBus) support\n" " #\n" @@ -119,22 +118,22 @@ "-#\n" "-# PC-card bridges\n" "-#\n" - "+CONFIG_RAPIDIO=3Dy\n" - "+CONFIG_RAPIDIO_8_BIT_TRANSPORT=3Dy\n" - "+CONFIG_RAPIDIO_DISC_TIMEOUT=3D30\n" - "=20\n" + "+CONFIG_RAPIDIO=y\n" + "+CONFIG_RAPIDIO_8_BIT_TRANSPORT=y\n" + "+CONFIG_RAPIDIO_DISC_TIMEOUT=30\n" + " \n" " #\n" " # Advanced setup\n" - "@@ -152,7 +160,7 @@ CONFIG_PARPORT=3Dm\n" - " CONFIG_PARPORT_PC=3Dm\n" + "@@ -152,7 +160,7 @@ CONFIG_PARPORT=m\n" + " CONFIG_PARPORT_PC=m\n" " # CONFIG_PARPORT_PC_FIFO is not set\n" " # CONFIG_PARPORT_PC_SUPERIO is not set\n" "-# CONFIG_PARPORT_OTHER is not set\n" "+# CONFIG_PARPORT_GSC is not set\n" " # CONFIG_PARPORT_1284 is not set\n" - "=20\n" + " \n" " #\n" - "@@ -264,7 +272,6 @@ CONFIG_SCSI_CONSTANTS=3Dy\n" + "@@ -264,7 +272,6 @@ CONFIG_SCSI_CONSTANTS=y\n" " # CONFIG_SCSI_BUSLOGIC is not set\n" " # CONFIG_SCSI_DMX3191D is not set\n" " # CONFIG_SCSI_EATA is not set\n" @@ -142,15 +141,15 @@ " # CONFIG_SCSI_FUTURE_DOMAIN is not set\n" " # CONFIG_SCSI_GDTH is not set\n" " # CONFIG_SCSI_IPS is not set\n" - "@@ -274,7 +281,6 @@ CONFIG_SCSI_CONSTANTS=3Dy\n" + "@@ -274,7 +281,6 @@ CONFIG_SCSI_CONSTANTS=y\n" " # CONFIG_SCSI_IMM is not set\n" " # CONFIG_SCSI_SYM53C8XX_2 is not set\n" " # CONFIG_SCSI_IPR is not set\n" "-# CONFIG_SCSI_QLOGIC_ISP is not set\n" " # CONFIG_SCSI_QLOGIC_FC is not set\n" " # CONFIG_SCSI_QLOGIC_1280 is not set\n" - " CONFIG_SCSI_QLA2XXX=3Dm\n" - "@@ -283,6 +289,7 @@ CONFIG_SCSI_QLA2XXX=3Dm\n" + " CONFIG_SCSI_QLA2XXX=m\n" + "@@ -283,6 +289,7 @@ CONFIG_SCSI_QLA2XXX=m\n" " # CONFIG_SCSI_QLA2300 is not set\n" " # CONFIG_SCSI_QLA2322 is not set\n" " # CONFIG_SCSI_QLA6312 is not set\n" @@ -158,83 +157,83 @@ " # CONFIG_SCSI_DC395x is not set\n" " # CONFIG_SCSI_DC390T is not set\n" " # CONFIG_SCSI_NSP32 is not set\n" - "@@ -322,7 +329,6 @@ CONFIG_NET=3Dy\n" + "@@ -322,7 +329,6 @@ CONFIG_NET=y\n" " #\n" - " CONFIG_PACKET=3Dy\n" + " CONFIG_PACKET=y\n" " # CONFIG_PACKET_MMAP is not set\n" "-# CONFIG_NETLINK_DEV is not set\n" - " CONFIG_UNIX=3Dy\n" + " CONFIG_UNIX=y\n" " # CONFIG_NET_KEY is not set\n" - " CONFIG_INET=3Dy\n" - "@@ -431,7 +437,7 @@ CONFIG_IP_NF_NAT_FTP=3Dm\n" + " CONFIG_INET=y\n" + "@@ -431,7 +437,7 @@ CONFIG_IP_NF_NAT_FTP=m\n" " #\n" " # Network testing\n" " #\n" "-# CONFIG_NET_PKTGEN is not set\n" - "+CONFIG_NET_PKTGEN=3Dy\n" + "+CONFIG_NET_PKTGEN=y\n" " # CONFIG_NETPOLL is not set\n" " # CONFIG_NET_POLL_CONTROLLER is not set\n" " # CONFIG_HAMRADIO is not set\n" - "@@ -499,6 +505,7 @@ CONFIG_GFAR_NAPI=3Dy\n" + "@@ -499,6 +505,7 @@ CONFIG_GFAR_NAPI=y\n" " # Wan interfaces\n" " #\n" " # CONFIG_WAN is not set\n" - "+CONFIG_RIONET=3Dy\n" + "+CONFIG_RIONET=y\n" " # CONFIG_FDDI is not set\n" " # CONFIG_HIPPI is not set\n" " # CONFIG_PLIP is not set\n" - "@@ -536,20 +543,6 @@ CONFIG_INPUT_EVDEV=3Dm\n" + "@@ -536,20 +543,6 @@ CONFIG_INPUT_EVDEV=m\n" " # CONFIG_INPUT_EVBUG is not set\n" - "=20\n" + " \n" " #\n" "-# Input I/O drivers\n" "-#\n" "-# CONFIG_GAMEPORT is not set\n" - "-CONFIG_SOUND_GAMEPORT=3Dy\n" - "-CONFIG_SERIO=3Dy\n" - "-CONFIG_SERIO_I8042=3Dy\n" - "-CONFIG_SERIO_SERPORT=3Dy\n" + "-CONFIG_SOUND_GAMEPORT=y\n" + "-CONFIG_SERIO=y\n" + "-CONFIG_SERIO_I8042=y\n" + "-CONFIG_SERIO_SERPORT=y\n" "-# CONFIG_SERIO_CT82C710 is not set\n" "-# CONFIG_SERIO_PARKBD is not set\n" "-# CONFIG_SERIO_PCIPS2 is not set\n" - "-CONFIG_SERIO_LIBPS2=3Dy\n" + "-CONFIG_SERIO_LIBPS2=y\n" "-# CONFIG_SERIO_RAW is not set\n" "-\n" "-#\n" " # Input Device Drivers\n" " #\n" - " CONFIG_INPUT_KEYBOARD=3Dy\n" - "@@ -567,6 +560,19 @@ CONFIG_MOUSE_PS2=3Dy\n" + " CONFIG_INPUT_KEYBOARD=y\n" + "@@ -567,6 +560,19 @@ CONFIG_MOUSE_PS2=y\n" " # CONFIG_INPUT_MISC is not set\n" - "=20\n" + " \n" " #\n" "+# Hardware I/O ports\n" "+#\n" - "+CONFIG_SERIO=3Dy\n" - "+CONFIG_SERIO_I8042=3Dy\n" - "+CONFIG_SERIO_SERPORT=3Dy\n" + "+CONFIG_SERIO=y\n" + "+CONFIG_SERIO_I8042=y\n" + "+CONFIG_SERIO_SERPORT=y\n" "+# CONFIG_SERIO_PARKBD is not set\n" "+# CONFIG_SERIO_PCIPS2 is not set\n" - "+CONFIG_SERIO_LIBPS2=3Dy\n" + "+CONFIG_SERIO_LIBPS2=y\n" "+# CONFIG_SERIO_RAW is not set\n" "+# CONFIG_GAMEPORT is not set\n" - "+CONFIG_SOUND_GAMEPORT=3Dy\n" + "+CONFIG_SOUND_GAMEPORT=y\n" "+\n" "+#\n" " # Character devices\n" " #\n" " # CONFIG_VT is not set\n" - "@@ -590,6 +596,7 @@ CONFIG_SERIAL_CPM_SCC2=3Dy\n" + "@@ -590,6 +596,7 @@ CONFIG_SERIAL_CPM_SCC2=y\n" " # CONFIG_SERIAL_CPM_SCC4 is not set\n" " # CONFIG_SERIAL_CPM_SMC1 is not set\n" " # CONFIG_SERIAL_CPM_SMC2 is not set\n" "+# CONFIG_SERIAL_JSM is not set\n" - " CONFIG_UNIX98_PTYS=3Dy\n" - " CONFIG_LEGACY_PTYS=3Dy\n" - " CONFIG_LEGACY_PTY_COUNT=3D256\n" - "@@ -626,6 +633,11 @@ CONFIG_DRM=3Dm\n" + " CONFIG_UNIX98_PTYS=y\n" + " CONFIG_LEGACY_PTYS=y\n" + " CONFIG_LEGACY_PTY_COUNT=256\n" + "@@ -626,6 +633,11 @@ CONFIG_DRM=m\n" " # CONFIG_RAW_DRIVER is not set\n" - "=20\n" + " \n" " #\n" "+# TPM devices\n" "+#\n" @@ -243,8 +242,8 @@ "+#\n" " # I2C support\n" " #\n" - " CONFIG_I2C=3Dm\n" - "@@ -648,12 +660,12 @@ CONFIG_I2C_ALGOBIT=3Dm\n" + " CONFIG_I2C=m\n" + "@@ -648,12 +660,12 @@ CONFIG_I2C_ALGOBIT=m\n" " # CONFIG_I2C_AMD8111 is not set\n" " # CONFIG_I2C_I801 is not set\n" " # CONFIG_I2C_I810 is not set\n" @@ -258,7 +257,7 @@ " # CONFIG_I2C_PROSAVAGE is not set\n" " # CONFIG_I2C_SAVAGE4 is not set\n" " # CONFIG_SCx200_ACB is not set\n" - "@@ -677,7 +689,9 @@ CONFIG_I2C_ALGOBIT=3Dm\n" + "@@ -677,7 +689,9 @@ CONFIG_I2C_ALGOBIT=m\n" " # CONFIG_SENSORS_ASB100 is not set\n" " # CONFIG_SENSORS_DS1621 is not set\n" " # CONFIG_SENSORS_FSCHER is not set\n" @@ -268,7 +267,7 @@ " # CONFIG_SENSORS_IT87 is not set\n" " # CONFIG_SENSORS_LM63 is not set\n" " # CONFIG_SENSORS_LM75 is not set\n" - "@@ -688,9 +702,11 @@ CONFIG_I2C_ALGOBIT=3Dm\n" + "@@ -688,9 +702,11 @@ CONFIG_I2C_ALGOBIT=m\n" " # CONFIG_SENSORS_LM85 is not set\n" " # CONFIG_SENSORS_LM87 is not set\n" " # CONFIG_SENSORS_LM90 is not set\n" @@ -280,7 +279,7 @@ " # CONFIG_SENSORS_SMSC47M1 is not set\n" " # CONFIG_SENSORS_VIA686A is not set\n" " # CONFIG_SENSORS_W83781D is not set\n" - "@@ -700,10 +716,12 @@ CONFIG_I2C_ALGOBIT=3Dm\n" + "@@ -700,10 +716,12 @@ CONFIG_I2C_ALGOBIT=m\n" " #\n" " # Other I2C Chip support\n" " #\n" @@ -293,32 +292,31 @@ " # CONFIG_I2C_DEBUG_CORE is not set\n" " # CONFIG_I2C_DEBUG_ALGO is not set\n" " # CONFIG_I2C_DEBUG_BUS is not set\n" - "@@ -732,7 +750,6 @@ CONFIG_I2C_ALGOBIT=3Dm\n" + "@@ -732,7 +750,6 @@ CONFIG_I2C_ALGOBIT=m\n" " # Graphics support\n" " #\n" " # CONFIG_FB is not set\n" "-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set\n" - "=20\n" + " \n" " #\n" " # Sound\n" - "@@ -752,13 +769,9 @@ CONFIG_SOUND=3Dm\n" + "@@ -752,13 +769,9 @@ CONFIG_SOUND=m\n" " #\n" " # USB support\n" " #\n" "-# CONFIG_USB is not set\n" - " CONFIG_USB_ARCH_HAS_HCD=3Dy\n" - " CONFIG_USB_ARCH_HAS_OHCI=3Dy\n" + " CONFIG_USB_ARCH_HAS_HCD=y\n" + " CONFIG_USB_ARCH_HAS_OHCI=y\n" "-\n" "-#\n" - "-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be need=\n" - "ed; see USB_STORAGE Help for more information\n" + "-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information\n" "-#\n" "+# CONFIG_USB is not set\n" - "=20\n" + " \n" " #\n" " # USB Gadget Support\n" - "@@ -789,6 +802,10 @@ CONFIG_JBD_DEBUG=3Dy\n" - " CONFIG_FS_MBCACHE=3Dy\n" + "@@ -789,6 +802,10 @@ CONFIG_JBD_DEBUG=y\n" + " CONFIG_FS_MBCACHE=y\n" " # CONFIG_REISERFS_FS is not set\n" " # CONFIG_JFS_FS is not set\n" "+\n" @@ -328,36 +326,36 @@ " # CONFIG_XFS_FS is not set\n" " # CONFIG_MINIX_FS is not set\n" " # CONFIG_ROMFS_FS is not set\n" - "@@ -859,7 +876,6 @@ CONFIG_NFS_V3=3Dy\n" - " CONFIG_ROOT_NFS=3Dy\n" - " CONFIG_LOCKD=3Dy\n" - " CONFIG_LOCKD_V4=3Dy\n" + "@@ -859,7 +876,6 @@ CONFIG_NFS_V3=y\n" + " CONFIG_ROOT_NFS=y\n" + " CONFIG_LOCKD=y\n" + " CONFIG_LOCKD_V4=y\n" "-# CONFIG_EXPORTFS is not set\n" - " CONFIG_SUNRPC=3Dy\n" + " CONFIG_SUNRPC=y\n" " # CONFIG_RPCSEC_GSS_KRB5 is not set\n" " # CONFIG_RPCSEC_GSS_SPKM3 is not set\n" - "@@ -942,8 +958,10 @@ CONFIG_ZLIB_INFLATE=3Dm\n" + "@@ -942,8 +958,10 @@ CONFIG_ZLIB_INFLATE=m\n" " #\n" " # Kernel hacking\n" " #\n" "+# CONFIG_PRINTK_TIME is not set\n" - " CONFIG_DEBUG_KERNEL=3Dy\n" + " CONFIG_DEBUG_KERNEL=y\n" " # CONFIG_MAGIC_SYSRQ is not set\n" - "+CONFIG_LOG_BUF_SHIFT=3D14\n" + "+CONFIG_LOG_BUF_SHIFT=14\n" " # CONFIG_SCHEDSTATS is not set\n" " # CONFIG_DEBUG_SLAB is not set\n" " # CONFIG_DEBUG_SPINLOCK is not set\n" "diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile\n" "--- a/arch/ppc/kernel/Makefile\n" "+++ b/arch/ppc/kernel/Makefile\n" - "@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4)\t\t+=3D cpu_setup_power\n" - " obj-$(CONFIG_MODULES)\t\t+=3D module.o ppc_ksyms.o\n" - " obj-$(CONFIG_NOT_COHERENT_CACHE)\t+=3D dma-mapping.o\n" - " obj-$(CONFIG_PCI)\t\t+=3D pci.o\n" - "+obj-$(CONFIG_RAPIDIO)\t\t+=3D rio.o\n" - " obj-$(CONFIG_KGDB)\t\t+=3D ppc-stub.o\n" - " obj-$(CONFIG_SMP)\t\t+=3D smp.o smp-tbsync.o\n" - " obj-$(CONFIG_TAU)\t\t+=3D temp.o\n" + "@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4)\t\t+= cpu_setup_power\n" + " obj-$(CONFIG_MODULES)\t\t+= module.o ppc_ksyms.o\n" + " obj-$(CONFIG_NOT_COHERENT_CACHE)\t+= dma-mapping.o\n" + " obj-$(CONFIG_PCI)\t\t+= pci.o\n" + "+obj-$(CONFIG_RAPIDIO)\t\t+= rio.o\n" + " obj-$(CONFIG_KGDB)\t\t+= ppc-stub.o\n" + " obj-$(CONFIG_SMP)\t\t+= smp.o smp-tbsync.o\n" + " obj-$(CONFIG_TAU)\t\t+= temp.o\n" "diff --git a/arch/ppc/kernel/rio.c b/arch/ppc/kernel/rio.c\n" "new file mode 100644\n" "--- /dev/null\n" @@ -415,8 +413,7 @@ "+}\n" "+\n" "+subsys_initcall(ppc_rio_init);\n" - "diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/st=\n" - "x_gp3.c\n" + "diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c\n" "--- a/arch/ppc/platforms/85xx/stx_gp3.c\n" "+++ b/arch/ppc/platforms/85xx/stx_gp3.c\n" "@@ -38,6 +38,7 @@\n" @@ -424,29 +421,29 @@ " #include <linux/fsl_devices.h>\n" " #include <linux/interrupt.h>\n" "+#include <linux/rio.h>\n" - "=20\n" + " \n" " #include <asm/system.h>\n" " #include <asm/pgtable.h>\n" "@@ -59,6 +60,7 @@\n" - "=20\n" + " \n" " #include <syslib/cpm2_pic.h>\n" " #include <syslib/ppc85xx_common.h>\n" "+#include <syslib/ppc85xx_rio.h>\n" - "=20\n" + " \n" " extern void cpm2_reset(void);\n" - "=20\n" - "@@ -200,7 +202,6 @@ static struct irqaction cpm2_irqaction =3D\n" + " \n" + "@@ -200,7 +202,6 @@ static struct irqaction cpm2_irqaction =\n" " static void __init\n" " gp3_init_IRQ(void)\n" " {\n" "-\tint i;\n" - " \tbd_t *binfo =3D (bd_t *) __res;\n" - "=20\n" + " \tbd_t *binfo = (bd_t *) __res;\n" + " \n" " \t/*\n" "@@ -297,6 +298,18 @@ int mpc85xx_exclude_device(u_char bus, u\n" " }\n" " #endif /* CONFIG_PCI */\n" - "=20\n" + " \n" "+#ifdef CONFIG_RAPIDIO\n" "+void\n" "+platform_rio_init(void)\n" @@ -465,13 +462,13 @@ "diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile\n" "--- a/arch/ppc/syslib/Makefile\n" "+++ b/arch/ppc/syslib/Makefile\n" - "@@ -101,6 +101,7 @@ obj-$(CONFIG_85xx)\t\t+=3D open_pic.o ppc85x\n" + "@@ -101,6 +101,7 @@ obj-$(CONFIG_85xx)\t\t+= open_pic.o ppc85x\n" " \t\t\t\t\tmpc85xx_devices.o\n" " ifeq ($(CONFIG_85xx),y)\n" - " obj-$(CONFIG_PCI)\t\t+=3D indirect_pci.o pci_auto.o\n" - "+obj-$(CONFIG_RAPIDIO)\t\t+=3D ppc85xx_rio.o\n" + " obj-$(CONFIG_PCI)\t\t+= indirect_pci.o pci_auto.o\n" + "+obj-$(CONFIG_RAPIDIO)\t\t+= ppc85xx_rio.o\n" " endif\n" - " obj-$(CONFIG_83xx)\t\t+=3D ipic.o ppc83xx_setup.o ppc_sys.o \\\n" + " obj-$(CONFIG_83xx)\t\t+= ipic.o ppc83xx_setup.o ppc_sys.o \\\n" " \t\t\t\t\tmpc83xx_sys.o mpc83xx_devices.o\n" "diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c\n" "new file mode 100644\n" @@ -539,7 +536,7 @@ "+#define DBELL_TID(x)\t\t(*(u8 *)(x + DOORBELL_TID_OFFSET))\n" "+#define DBELL_INF(x)\t\t(*(u16 *)(x + DOORBELL_INFO_OFFSET))\n" "+\n" - "+#define is_power_of_2(x)\t(((x) & ((x) - 1)) =3D=3D 0)\n" + "+#define is_power_of_2(x)\t(((x) & ((x) - 1)) == 0)\n" "+\n" "+struct rio_atmu_regs {\n" "+\tu32 rowtar;\n" @@ -653,12 +650,11 @@ "+ * Generates a MPC85xx local configuration space read. Returns %0 on\n" "+ * success or %-EINVAL on failure.\n" "+ */\n" - "+static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 *=\n" - " data)\n" + "+static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 * data)\n" "+{\n" "+\tpr_debug(\"mpc85xx_local_config_read: index %d offset %8.8x\\n\", index,\n" "+\t\t offset);\n" - "+\t*data =3D in_be32((void *)(regs_win + offset));\n" + "+\t*data = in_be32((void *)(regs_win + offset));\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -673,8 +669,7 @@ "+ * Generates a MPC85xx local configuration space write. Returns %0 on\n" "+ * success or %-EINVAL on failure.\n" "+ */\n" - "+static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 =\n" - "data)\n" + "+static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 data)\n" "+{\n" "+\tpr_debug\n" "+\t (\"mpc85xx_local_config_write: index %d offset %8.8x data %8.8x\\n\",\n" @@ -685,8 +680,7 @@ "+}\n" "+\n" "+/**\n" - "+ * mpc85xx_rio_config_read - Generate a MPC85xx read maintenance transacti=\n" - "on\n" + "+ * mpc85xx_rio_config_read - Generate a MPC85xx read maintenance transaction\n" "+ * @index: ID of RapdiIO interface\n" "+ * @destid: Destination ID of transaction\n" "+ * @hopcount: Number of hops to target device\n" @@ -698,29 +692,27 @@ "+ * success or %-EINVAL on failure.\n" "+ */\n" "+static int\n" - "+mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, in=\n" - "t len,\n" + "+mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, int len,\n" "+\t\t\tu32 * val)\n" "+{\n" "+\tu8 *data;\n" "+\n" "+\tpr_debug\n" - "+\t (\"mpc85xx_rio_config_read: index %d destid %d hopcount %d offset %8.8=\n" - "x len %d\\n\",\n" + "+\t (\"mpc85xx_rio_config_read: index %d destid %d hopcount %d offset %8.8x len %d\\n\",\n" "+\t index, destid, hopcount, offset, len);\n" "+\tout_be32((void *)&maint_atmu_regs->rowtar,\n" "+\t\t (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9));\n" "+\n" - "+\tdata =3D (u8 *) maint_win + offset;\n" + "+\tdata = (u8 *) maint_win + offset;\n" "+\tswitch (len) {\n" "+\tcase 1:\n" - "+\t\t*val =3D in_8((u8 *) data);\n" + "+\t\t*val = in_8((u8 *) data);\n" "+\t\tbreak;\n" "+\tcase 2:\n" - "+\t\t*val =3D in_be16((u16 *) data);\n" + "+\t\t*val = in_be16((u16 *) data);\n" "+\t\tbreak;\n" "+\tdefault:\n" - "+\t\t*val =3D in_be32((u32 *) data);\n" + "+\t\t*val = in_be32((u32 *) data);\n" "+\t\tbreak;\n" "+\t}\n" "+\n" @@ -728,8 +720,7 @@ "+}\n" "+\n" "+/**\n" - "+ * mpc85xx_rio_config_write - Generate a MPC85xx write maintenance transac=\n" - "tion\n" + "+ * mpc85xx_rio_config_write - Generate a MPC85xx write maintenance transaction\n" "+ * @index: ID of RapdiIO interface\n" "+ * @destid: Destination ID of transaction\n" "+ * @hopcount: Number of hops to target device\n" @@ -746,13 +737,12 @@ "+{\n" "+\tu8 *data;\n" "+\tpr_debug\n" - "+\t (\"mpc85xx_rio_config_write: index %d destid %d hopcount %d offset %8.=\n" - "8x len %d val %8.8x\\n\",\n" + "+\t (\"mpc85xx_rio_config_write: index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\\n\",\n" "+\t index, destid, hopcount, offset, len, val);\n" "+\tout_be32((void *)&maint_atmu_regs->rowtar,\n" "+\t\t (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9));\n" "+\n" - "+\tdata =3D (u8 *) maint_win + offset;\n" + "+\tdata = (u8 *) maint_win + offset;\n" "+\tswitch (len) {\n" "+\tcase 1:\n" "+\t\tout_8((u8 *) data, val);\n" @@ -769,8 +759,7 @@ "+}\n" "+\n" "+/**\n" - "+ * rio_hw_add_outb_message - Add message to the MPC85xx outbound message q=\n" - "ueue\n" + "+ * rio_hw_add_outb_message - Add message to the MPC85xx outbound message queue\n" "+ * @mport: Master port with outbound message queue\n" "+ * @rdev: Target of outbound message\n" "+ * @mbox: Outbound mailbox\n" @@ -781,22 +770,20 @@ "+ * %0 on success or %-EINVAL on failure.\n" "+ */\n" "+int\n" - "+rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int=\n" - " mbox,\n" + "+rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,\n" "+\t\t\tvoid *buffer, size_t len)\n" "+{\n" "+\tu32 omr;\n" - "+\tstruct rio_tx_desc *desc =3D\n" + "+\tstruct rio_tx_desc *desc =\n" "+\t (struct rio_tx_desc *)msg_tx_ring.virt + msg_tx_ring.tx_slot;\n" - "+\tint ret =3D 0;\n" + "+\tint ret = 0;\n" "+\n" "+\tpr_debug(KERN_INFO\n" - "+\t\t \"RIO: rio_hw_add_outb_message(): destid %4.4x mbox %d buffer %8.8x len =\n" - "%8.8x\\n\",\n" + "+\t\t \"RIO: rio_hw_add_outb_message(): destid %4.4x mbox %d buffer %8.8x len %8.8x\\n\",\n" "+\t\t rdev->destid, mbox, (int)buffer, len);\n" "+\n" "+\tif ((len < 8) || (len > RIO_MAX_MSG_SIZE)) {\n" - "+\t\tret =3D -EINVAL;\n" + "+\t\tret = -EINVAL;\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" @@ -808,24 +795,24 @@ "+\t\t RIO_MAX_MSG_SIZE - len);\n" "+\n" "+\t/* Set mbox field for message */\n" - "+\tdesc->dport =3D mbox & 0x3;\n" + "+\tdesc->dport = mbox & 0x3;\n" "+\n" "+\t/* Enable EOMI interrupt, set priority, and set destid */\n" - "+\tdesc->dattr =3D 0x28000000 | (rdev->destid << 2);\n" + "+\tdesc->dattr = 0x28000000 | (rdev->destid << 2);\n" "+\n" "+\t/* Set transfer size aligned to next power of 2 (in double words) */\n" - "+\tdesc->dwcnt =3D is_power_of_2(len) ? len : 1 << get_bitmask_order(len);\n" + "+\tdesc->dwcnt = is_power_of_2(len) ? len : 1 << get_bitmask_order(len);\n" "+\n" "+\t/* Set snooping and source buffer address */\n" - "+\tdesc->saddr =3D 0x00000004 | msg_tx_ring.phys_buffer[msg_tx_ring.tx_slot];\n" + "+\tdesc->saddr = 0x00000004 | msg_tx_ring.phys_buffer[msg_tx_ring.tx_slot];\n" "+\n" "+\t/* Increment enqueue pointer */\n" - "+\tomr =3D in_be32((void *)&msg_regs->omr);\n" + "+\tomr = in_be32((void *)&msg_regs->omr);\n" "+\tout_be32((void *)&msg_regs->omr, omr | RIO_MSG_OMR_MUI);\n" "+\n" "+\t/* Go to next descriptor */\n" - "+\tif (++msg_tx_ring.tx_slot =3D=3D msg_tx_ring.size)\n" - "+\t\tmsg_tx_ring.tx_slot =3D 0;\n" + "+\tif (++msg_tx_ring.tx_slot == msg_tx_ring.size)\n" + "+\t\tmsg_tx_ring.tx_slot = 0;\n" "+\n" "+ out:\n" "+\treturn ret;\n" @@ -846,9 +833,9 @@ "+mpc85xx_rio_tx_handler(int irq, void *dev_instance, struct pt_regs *regs)\n" "+{\n" "+\tint osr;\n" - "+\tstruct rio_mport *port =3D (struct rio_mport *)dev_instance;\n" + "+\tstruct rio_mport *port = (struct rio_mport *)dev_instance;\n" "+\n" - "+\tosr =3D in_be32((void *)&msg_regs->osr);\n" + "+\tosr = in_be32((void *)&msg_regs->osr);\n" "+\n" "+\tif (osr & RIO_MSG_OSR_TE) {\n" "+\t\tprintk(KERN_INFO \"RIO: outbound message transmission error\\n\");\n" @@ -863,8 +850,8 @@ "+\t}\n" "+\n" "+\tif (osr & RIO_MSG_OSR_EOMI) {\n" - "+\t\tu32 dqp =3D in_be32((void *)&msg_regs->odqdpar);\n" - "+\t\tint slot =3D (dqp - msg_tx_ring.phys) >> 5;\n" + "+\t\tu32 dqp = in_be32((void *)&msg_regs->odqdpar);\n" + "+\t\tint slot = (dqp - msg_tx_ring.phys) >> 5;\n" "+\t\tport->outb_msg[0].mcback(port, -1, slot);\n" "+\n" "+\t\t/* Ack the end-of-message interrupt */\n" @@ -887,31 +874,31 @@ "+ */\n" "+int rio_open_outb_mbox(struct rio_mport *mport, int mbox, int entries)\n" "+{\n" - "+\tint i, rc =3D 0;\n" + "+\tint i, rc = 0;\n" "+\n" "+\tif ((entries < RIO_MIN_TX_RING_SIZE) ||\n" "+\t (entries > RIO_MAX_TX_RING_SIZE) || (!is_power_of_2(entries))) {\n" - "+\t\trc =3D -EINVAL;\n" + "+\t\trc = -EINVAL;\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" "+\t/* Initialize shadow copy ring */\n" - "+\tmsg_tx_ring.size =3D entries;\n" + "+\tmsg_tx_ring.size = entries;\n" "+\n" - "+\tfor (i =3D 0; i < msg_tx_ring.size; i++) {\n" - "+\t\tmsg_tx_ring.virt_buffer[i] =3D\n" + "+\tfor (i = 0; i < msg_tx_ring.size; i++) {\n" + "+\t\tmsg_tx_ring.virt_buffer[i] =\n" "+\t\t (void *)__get_free_page(GFP_KERNEL);\n" - "+\t\tmsg_tx_ring.phys_buffer[i] =3D\n" + "+\t\tmsg_tx_ring.phys_buffer[i] =\n" "+\t\t (dma_addr_t) __pa(msg_tx_ring.virt_buffer[i]);\n" "+\t}\n" "+\n" "+\t/* Initialize outbound message descriptor ring */\n" - "+\tmsg_tx_ring.virt =3D dma_alloc_coherent(NULL,\n" + "+\tmsg_tx_ring.virt = dma_alloc_coherent(NULL,\n" "+\t\t\t\t\t msg_tx_ring.size *\n" "+\t\t\t\t\t RIO_MSG_DESC_SIZE,\n" "+\t\t\t\t\t &msg_tx_ring.phys, GFP_KERNEL);\n" "+\tmemset(msg_tx_ring.virt, 0, msg_tx_ring.size * RIO_MSG_DESC_SIZE);\n" - "+\tmsg_tx_ring.tx_slot =3D 0;\n" + "+\tmsg_tx_ring.tx_slot = 0;\n" "+\n" "+\t/* Point dequeue/enqueue pointers at first entry in ring */\n" "+\tout_be32((void *)&msg_regs->odqdpar, msg_tx_ring.phys);\n" @@ -982,9 +969,9 @@ "+mpc85xx_rio_rx_handler(int irq, void *dev_instance, struct pt_regs *regs)\n" "+{\n" "+\tint isr;\n" - "+\tstruct rio_mport *port =3D (struct rio_mport *)dev_instance;\n" + "+\tstruct rio_mport *port = (struct rio_mport *)dev_instance;\n" "+\n" - "+\tisr =3D in_be32((void *)&msg_regs->isr);\n" + "+\tisr = in_be32((void *)&msg_regs->isr);\n" "+\n" "+\tif (isr & RIO_MSG_ISR_TE) {\n" "+\t\tprintk(KERN_INFO \"RIO: inbound message reception error\\n\");\n" @@ -1022,22 +1009,22 @@ "+ */\n" "+int rio_open_inb_mbox(struct rio_mport *mport, int mbox, int entries)\n" "+{\n" - "+\tint i, rc =3D 0;\n" + "+\tint i, rc = 0;\n" "+\n" "+\tif ((entries < RIO_MIN_RX_RING_SIZE) ||\n" "+\t (entries > RIO_MAX_RX_RING_SIZE) || (!is_power_of_2(entries))) {\n" - "+\t\trc =3D -EINVAL;\n" + "+\t\trc = -EINVAL;\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" "+\t/* Initialize client buffer ring */\n" - "+\tmsg_rx_ring.size =3D entries;\n" - "+\tmsg_rx_ring.rx_slot =3D 0;\n" - "+\tfor (i =3D 0; i < msg_rx_ring.size; i++)\n" - "+\t\tmsg_rx_ring.virt_buffer[i] =3D NULL;\n" + "+\tmsg_rx_ring.size = entries;\n" + "+\tmsg_rx_ring.rx_slot = 0;\n" + "+\tfor (i = 0; i < msg_rx_ring.size; i++)\n" + "+\t\tmsg_rx_ring.virt_buffer[i] = NULL;\n" "+\n" "+\t/* Initialize inbound message ring */\n" - "+\tmsg_rx_ring.virt =3D dma_alloc_coherent(NULL,\n" + "+\tmsg_rx_ring.virt = dma_alloc_coherent(NULL,\n" "+\t\t\t\t\t msg_rx_ring.size *\n" "+\t\t\t\t\t RIO_MAX_MSG_SIZE,\n" "+\t\t\t\t\t &msg_rx_ring.phys, GFP_KERNEL);\n" @@ -1106,7 +1093,7 @@ "+ */\n" "+int rio_hw_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)\n" "+{\n" - "+\tint rc =3D 0;\n" + "+\tint rc = 0;\n" "+\n" "+\tpr_debug(\"RIO: rio_hw_add_inb_buffer(), msg_rx_ring.rx_slot %d\\n\",\n" "+\t\t msg_rx_ring.rx_slot);\n" @@ -1115,13 +1102,13 @@ "+\t\tprintk(KERN_ERR\n" "+\t\t \"RIO: error adding inbound buffer %d, buffer exists\\n\",\n" "+\t\t msg_rx_ring.rx_slot);\n" - "+\t\trc =3D -EINVAL;\n" + "+\t\trc = -EINVAL;\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" - "+\tmsg_rx_ring.virt_buffer[msg_rx_ring.rx_slot] =3D buf;\n" - "+\tif (++msg_rx_ring.rx_slot =3D=3D msg_rx_ring.size)\n" - "+\t\tmsg_rx_ring.rx_slot =3D 0;\n" + "+\tmsg_rx_ring.virt_buffer[msg_rx_ring.rx_slot] = buf;\n" + "+\tif (++msg_rx_ring.rx_slot == msg_rx_ring.size)\n" + "+\t\tmsg_rx_ring.rx_slot = 0;\n" "+\n" "+ out:\n" "+\treturn rc;\n" @@ -1130,8 +1117,7 @@ "+EXPORT_SYMBOL_GPL(rio_hw_add_inb_buffer);\n" "+\n" "+/**\n" - "+ * rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message=\n" - " unit\n" + "+ * rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message unit\n" "+ * @mport: Master port implementing the inbound message unit\n" "+ * @mbox: Inbound mailbox number\n" "+ *\n" @@ -1142,18 +1128,18 @@ "+{\n" "+\tu32 imr;\n" "+\tu32 phys_buf, virt_buf;\n" - "+\tvoid *buf =3D NULL;\n" + "+\tvoid *buf = NULL;\n" "+\tint buf_idx;\n" "+\n" - "+\tphys_buf =3D in_be32((void *)&msg_regs->ifqdpar);\n" + "+\tphys_buf = in_be32((void *)&msg_regs->ifqdpar);\n" "+\n" "+\t/* If no more messages, then bail out */\n" - "+\tif (phys_buf =3D=3D in_be32((void *)&msg_regs->ifqepar))\n" + "+\tif (phys_buf == in_be32((void *)&msg_regs->ifqepar))\n" "+\t\tgoto out2;\n" "+\n" - "+\tvirt_buf =3D (u32) msg_rx_ring.virt + (phys_buf - msg_rx_ring.phys);\n" - "+\tbuf_idx =3D (phys_buf - msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;\n" - "+\tbuf =3D msg_rx_ring.virt_buffer[buf_idx];\n" + "+\tvirt_buf = (u32) msg_rx_ring.virt + (phys_buf - msg_rx_ring.phys);\n" + "+\tbuf_idx = (phys_buf - msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;\n" + "+\tbuf = msg_rx_ring.virt_buffer[buf_idx];\n" "+\n" "+\tif (!buf) {\n" "+\t\tpr_debug(KERN_ERR\n" @@ -1165,10 +1151,10 @@ "+\tmemcpy(buf, (void *)virt_buf, RIO_MAX_MSG_SIZE);\n" "+\n" "+\t/* Clear the available buffer */\n" - "+\tmsg_rx_ring.virt_buffer[buf_idx] =3D NULL;\n" + "+\tmsg_rx_ring.virt_buffer[buf_idx] = NULL;\n" "+\n" "+ out1:\n" - "+\timr =3D in_be32((void *)&msg_regs->imr);\n" + "+\timr = in_be32((void *)&msg_regs->imr);\n" "+\tout_be32((void *)&msg_regs->imr, imr | RIO_MSG_IMR_MI);\n" "+\n" "+ out2:\n" @@ -1187,13 +1173,12 @@ "+ * doorbell event handlers and executes a matching event handler.\n" "+ */\n" "+static irqreturn_t\n" - "+mpc85xx_rio_dbell_handler(int irq, void *dev_instance, struct pt_regs *reg=\n" - "s)\n" + "+mpc85xx_rio_dbell_handler(int irq, void *dev_instance, struct pt_regs *regs)\n" "+{\n" "+\tint dsr;\n" - "+\tstruct rio_mport *port =3D (struct rio_mport *)dev_instance;\n" + "+\tstruct rio_mport *port = (struct rio_mport *)dev_instance;\n" "+\n" - "+\tdsr =3D in_be32((void *)&msg_regs->dsr);\n" + "+\tdsr = in_be32((void *)&msg_regs->dsr);\n" "+\n" "+\tif (dsr & DOORBELL_DSR_TE) {\n" "+\t\tprintk(KERN_INFO \"RIO: doorbell reception error\\n\");\n" @@ -1209,21 +1194,21 @@ "+\n" "+\t/* XXX Need to check/dispatch until queue empty */\n" "+\tif (dsr & DOORBELL_DSR_DIQI) {\n" - "+\t\tu32 dmsg =3D\n" + "+\t\tu32 dmsg =\n" "+\t\t (u32) dbell_ring.virt +\n" "+\t\t (in_be32((void *)&msg_regs->dqdpar) & 0xfff);\n" "+\t\tu32 dmr;\n" "+\t\tstruct rio_dbell *dbell;\n" - "+\t\tint found =3D 0;\n" + "+\t\tint found = 0;\n" "+\n" "+\t\tpr_debug(KERN_INFO\n" "+\t\t\t \"RIO: processing doorbell, sid %2.2x tid %2.2x info %4.4x\\n\",\n" "+\t\t\t DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg));\n" "+\n" "+\t\tlist_for_each_entry(dbell, &port->dbells, node) {\n" - "+\t\t\tif ((dbell->res->start <=3D DBELL_INF(dmsg)) &&\n" - "+\t\t\t (dbell->res->end >=3D DBELL_INF(dmsg))) {\n" - "+\t\t\t\tfound =3D 1;\n" + "+\t\t\tif ((dbell->res->start <= DBELL_INF(dmsg)) &&\n" + "+\t\t\t (dbell->res->end >= DBELL_INF(dmsg))) {\n" + "+\t\t\t\tfound = 1;\n" "+\t\t\t\tbreak;\n" "+\t\t\t}\n" "+\t\t}\n" @@ -1236,7 +1221,7 @@ "+\t\t\t\t DBELL_SID(dmsg), DBELL_TID(dmsg),\n" "+\t\t\t\t DBELL_INF(dmsg));\n" "+\t\t}\n" - "+\t\tdmr =3D in_be32((void *)&msg_regs->dmr);\n" + "+\t\tdmr = in_be32((void *)&msg_regs->dmr);\n" "+\t\tout_be32((void *)&msg_regs->dmr, dmr | DOORBELL_DMR_DI);\n" "+\t\tout_be32((void *)&msg_regs->dsr, DOORBELL_DSR_DIQI);\n" "+\t}\n" @@ -1255,12 +1240,12 @@ "+static void mpc85xx_rio_doorbell_init(struct rio_mport *mport)\n" "+{\n" "+\t/* Map outbound doorbell window immediately after maintenance window */\n" - "+\tdbell_win =3D\n" + "+\tdbell_win =\n" "+\t (u32) ioremap(mport->iores.start + RIO_MAINT_WIN_SIZE,\n" "+\t\t\t RIO_DBELL_WIN_SIZE);\n" "+\n" "+\t/* Initialize inbound doorbells */\n" - "+\tdbell_ring.virt =3D dma_alloc_coherent(NULL,\n" + "+\tdbell_ring.virt = dma_alloc_coherent(NULL,\n" "+\t\t\t\t\t 512 * DOORBELL_MESSAGE_SIZE,\n" "+\t\t\t\t\t &dbell_ring.phys, GFP_KERNEL);\n" "+\n" @@ -1279,7 +1264,7 @@ "+\tout_be32((void *)&msg_regs->dmr, 0x00108161);\n" "+}\n" "+\n" - "+static char *cmdline =3D NULL;\n" + "+static char *cmdline = NULL;\n" "+\n" "+static int mpc85xx_rio_get_hdid(int index)\n" "+{\n" @@ -1295,11 +1280,11 @@ "+\tif (!s)\n" "+\t\treturn 0;\n" "+\n" - "+\tcmdline =3D s;\n" + "+\tcmdline = s;\n" "+\treturn 1;\n" "+}\n" "+\n" - "+__setup(\"riohdid=3D\", mpc85xx_rio_get_cmdline);\n" + "+__setup(\"riohdid=\", mpc85xx_rio_get_cmdline);\n" "+\n" "+/**\n" "+ * mpc85xx_rio_setup - Setup MPC85xx RapidIO interface\n" @@ -1315,42 +1300,42 @@ "+\tstruct rio_ops *ops;\n" "+\tstruct rio_mport *port;\n" "+\n" - "+\tops =3D kmalloc(sizeof(struct rio_ops), GFP_KERNEL);\n" - "+\tops->lcread =3D mpc85xx_local_config_read;\n" - "+\tops->lcwrite =3D mpc85xx_local_config_write;\n" - "+\tops->cread =3D mpc85xx_rio_config_read;\n" - "+\tops->cwrite =3D mpc85xx_rio_config_write;\n" - "+\tops->dsend =3D mpc85xx_rio_doorbell_send;\n" + "+\tops = kmalloc(sizeof(struct rio_ops), GFP_KERNEL);\n" + "+\tops->lcread = mpc85xx_local_config_read;\n" + "+\tops->lcwrite = mpc85xx_local_config_write;\n" + "+\tops->cread = mpc85xx_rio_config_read;\n" + "+\tops->cwrite = mpc85xx_rio_config_write;\n" + "+\tops->dsend = mpc85xx_rio_doorbell_send;\n" "+\n" - "+\tport =3D kmalloc(sizeof(struct rio_mport), GFP_KERNEL);\n" - "+\tport->id =3D 0;\n" - "+\tport->index =3D 0;\n" + "+\tport = kmalloc(sizeof(struct rio_mport), GFP_KERNEL);\n" + "+\tport->id = 0;\n" + "+\tport->index = 0;\n" "+\tINIT_LIST_HEAD(&port->dbells);\n" - "+\tport->iores.start =3D law_start;\n" - "+\tport->iores.end =3D law_start + law_size;\n" - "+\tport->iores.flags =3D IORESOURCE_MEM;\n" + "+\tport->iores.start = law_start;\n" + "+\tport->iores.end = law_start + law_size;\n" + "+\tport->iores.flags = IORESOURCE_MEM;\n" "+\n" "+\trio_init_dbell_res(&port->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);\n" "+\trio_init_mbox_res(&port->riores[RIO_INB_MBOX_RESOURCE], 0, 0);\n" "+\trio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);\n" "+\tstrcpy(port->name, \"RIO0 mport\");\n" "+\n" - "+\tport->ops =3D ops;\n" - "+\tport->host_deviceid =3D mpc85xx_rio_get_hdid(port->id);\n" + "+\tport->ops = ops;\n" + "+\tport->host_deviceid = mpc85xx_rio_get_hdid(port->id);\n" "+\n" "+\trio_register_mport(port);\n" "+\n" - "+\tregs_win =3D (u32) ioremap(RIO_REGS_BASE, 0x20000);\n" - "+\tatmu_regs =3D (struct rio_atmu_regs *)(regs_win + RIO_ATMU_REGS_OFFSET);\n" - "+\tmaint_atmu_regs =3D atmu_regs + 1;\n" - "+\tdbell_atmu_regs =3D atmu_regs + 2;\n" - "+\tmsg_regs =3D (struct rio_msg_regs *)(regs_win + RIO_MSG_REGS_OFFSET);\n" + "+\tregs_win = (u32) ioremap(RIO_REGS_BASE, 0x20000);\n" + "+\tatmu_regs = (struct rio_atmu_regs *)(regs_win + RIO_ATMU_REGS_OFFSET);\n" + "+\tmaint_atmu_regs = atmu_regs + 1;\n" + "+\tdbell_atmu_regs = atmu_regs + 2;\n" + "+\tmsg_regs = (struct rio_msg_regs *)(regs_win + RIO_MSG_REGS_OFFSET);\n" "+\n" "+\t/* Configure maintenance transaction window */\n" "+\tout_be32((void *)&maint_atmu_regs->rowbar, 0x000c0000);\n" "+\tout_be32((void *)&maint_atmu_regs->rowar, 0x80077015);\n" "+\n" - "+\tmaint_win =3D (u32) ioremap(law_start, RIO_MAINT_WIN_SIZE);\n" + "+\tmaint_win = (u32) ioremap(law_start, RIO_MAINT_WIN_SIZE);\n" "+\n" "+\t/* Configure outbound doorbell window */\n" "+\tout_be32((void *)&dbell_atmu_regs->rowbar, 0x000c0400);\n" @@ -1407,4 +1392,4 @@ "+\n" "+#endif\t\t\t\t/* ASM_PPC_RIO_H */" -1ab6aaf85120032df7eb80245910f3af8532180e7d0c195c2e6f26c9b6965848 +2c7edbad745ae97bde50b1500828f9d1771960f18e92131e6c2a37b655970ce9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.