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

Commit 569fccb6 authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: modify mport ID assignment 



Changes mport ID and host destination ID assignment to implement unified
method common to all mport drivers.  Makes "riohdid=" kernel command line
parameter common for all architectures with support for more that one host
destination ID assignment.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Micha Nelissen <micha@neli.hopto.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f809985

arch/powerpc/sysdev/fsl_rio.c

+0 −25
Original line number Diff line number Diff line
@@ -1288,28 +1288,6 @@ static int fsl_rio_port_write_init(struct rio_mport *mport) 
	return rc;

}



static char *cmdline = NULL;



static int fsl_rio_get_hdid(int index)

{

	/* XXX Need to parse multiple entries in some format */

	if (!cmdline)

		return -1;



	return simple_strtol(cmdline, NULL, 0);

}



static int fsl_rio_get_cmdline(char *s)

{

	if (!s)

		return 0;



	cmdline = s;

	return 1;

}



__setup("riohdid=", fsl_rio_get_cmdline);



static inline void fsl_rio_info(struct device *dev, u32 ccsr)

{

	const char *str;
@@ -1439,7 +1417,6 @@ int fsl_rio_setup(struct platform_device *dev) 
		rc = -ENOMEM;

		goto err_port;

	}

	port->id = 0;

	port->index = 0;



	priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);
@@ -1470,8 +1447,6 @@ int fsl_rio_setup(struct platform_device *dev) 
	priv->dev = &dev->dev;



	port->ops = ops;

	port->host_deviceid = fsl_rio_get_hdid(port->id);



	port->priv = priv;

	port->phys_efptr = 0x100;

	rio_register_mport(port);

drivers/rapidio/rio.c

+26 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "rio.h"



static LIST_HEAD(rio_mports);

static unsigned char next_portid;



/**

 * rio_local_get_device_id - Get the base/extended device id for a port
@@ -1164,8 +1165,33 @@ int __devinit rio_init_mports(void) 


device_initcall_sync(rio_init_mports);



static int hdids[RIO_MAX_MPORTS + 1];



static int rio_get_hdid(int index)

{

	if (!hdids[0] || hdids[0] <= index || index >= RIO_MAX_MPORTS)

		return -1;



	return hdids[index + 1];

}



static int rio_hdid_setup(char *str)

{

	(void)get_options(str, ARRAY_SIZE(hdids), hdids);

	return 1;

}



__setup("riohdid=", rio_hdid_setup);



void rio_register_mport(struct rio_mport *port)

{

	if (next_portid >= RIO_MAX_MPORTS) {

		pr_err("RIO: reached specified max number of mports\n");

		return;

	}



	port->id = next_portid++;

	port->host_deviceid = rio_get_hdid(port->id);

	list_add_tail(&port->node, &rio_mports);

}

include/linux/rio.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define RIO_NO_HOPCOUNT		-1

#define RIO_INVALID_DESTID	0xffff



#define RIO_MAX_MPORTS		8

#define RIO_MAX_MPORT_RESOURCES	16

#define RIO_MAX_DEV_RESOURCES	16