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

Commit 6ec4bedb authored by Liu Gang's avatar Liu Gang Committed by Kumar Gala
Browse files

fsl-rio: Split rio driver into two parts, RapidIO endpoint and message unit 



The Freescale PowerPC RapidIO controller consists of a RapidIO endpoint and
a RapidIO message unit(RMU). Or use RapidIO message manager(RMan) to
replace the RMU in DPAA architecture. Therefore, we should split the code
into two function modules according to the hardware architecture. Add new
struct for RMU module, and new initialization function to set up RMU
module. This policy is very conducive to adding new module like RMan, or
adding multi-ports or message units support.

Signed-off-by: default avatarLian Minghuan <Minghuan.Lian@freescale.com>
Signed-off-by: default avatarLiu Gang <Gang.Liu@freescale.com>
Acked-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 91610d83

arch/powerpc/sysdev/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ obj-$(CONFIG_FSL_LBC) += fsl_lbc.o 
obj-$(CONFIG_FSL_GTM)		+= fsl_gtm.o

obj-$(CONFIG_FSL_85XX_CACHE_SRAM)	+= fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o

obj-$(CONFIG_SIMPLE_GPIO)	+= simple_gpio.o

obj-$(CONFIG_FSL_RIO)		+= fsl_rio.o

obj-$(CONFIG_FSL_RIO)		+= fsl_rio.o fsl_rmu.o

obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o

obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/

obj-$(CONFIG_PPC_BESTCOMM)	+= bestcomm/

arch/powerpc/sysdev/fsl_rio.c

+25 −1127

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/sysdev/fsl_rio.h

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

 * Freescale MPC85xx/MPC86xx RapidIO support

 *

 * Copyright 2009 Sysgo AG

 * Thomas Moll <thomas.moll@sysgo.com>

 * - fixed maintenance access routines, check for aligned access

 *

 * Copyright 2009 Integrated Device Technology, Inc.

 * Alex Bounine <alexandre.bounine@idt.com>

 * - Added Port-Write message handling

 * - Added Machine Check exception handling

 *

 * Copyright (C) 2007, 2008, 2010, 2011 Freescale Semiconductor, Inc.

 * Zhang Wei <wei.zhang@freescale.com>

 * Lian Minghuan-B31939 <Minghuan.Lian@freescale.com>

 * Liu Gang <Gang.Liu@freescale.com>

 *

 * 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.

 */



#ifndef __FSL_RIO_H

#define __FSL_RIO_H



#include <linux/rio.h>

#include <linux/rio_drv.h>

#include <linux/kfifo.h>



#define RIO_REGS_WIN(mport)	(((struct rio_priv *)(mport->priv))->regs_win)



#define RIO_MAINT_WIN_SIZE	0x400000

#define RIO_LTLEDCSR		0x0608



struct rio_atmu_regs {

	 u32 rowtar;

	 u32 rowtear;

	 u32 rowbar;

	 u32 pad2;

	 u32 rowar;

	 u32 pad3[3];

};



struct rio_port_write_msg {

	 void *virt;

	 dma_addr_t phys;

	 u32 msg_count;

	 u32 err_count;

	 u32 discard_count;

};



struct rio_priv {

	struct device *dev;

	void __iomem *regs_win;

	struct rio_atmu_regs __iomem *atmu_regs;

	struct rio_atmu_regs __iomem *maint_atmu_regs;

	void __iomem *maint_win;

	struct rio_port_write_msg port_write_msg;

	int pwirq;

	struct work_struct pw_work;

	struct kfifo pw_fifo;

	spinlock_t pw_fifo_lock;

	void *rmm_handle; /* RapidIO message manager(unit) Handle */

};



extern void __iomem *rio_regs_win;



extern int fsl_rio_setup_rmu(struct rio_mport *mport,

	struct device_node *node);

extern int fsl_rio_port_write_init(struct rio_mport *mport);

extern int fsl_rio_pw_enable(struct rio_mport *mport, int enable);

extern void fsl_rio_port_error_handler(struct rio_mport *port, int offset);



#endif

arch/powerpc/sysdev/fsl_rmu.c

0 → 100644
+1163 −0

File added.

Preview size limit exceeded, changes collapsed.