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

rapidio: add new sysfs attributes 



Add new sysfs attributes.

1. Routing information required to to reach the RIO device:
destid - device destination ID (real for for endpoint, route for switch)
hopcount - hopcount for maintenance requests (switches only)

2. device linking information:
lprev - name of device that precedes the given device in the enumeration
        or discovery order (displayed along with of the port to which it
        is attached).
lnext - names of devices (with corresponding port numbers) that are
        attached to the given device as next in the enumeration or
        discovery order (switches only)

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>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cfaf346c

drivers/rapidio/rio-sysfs.c

+40 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ rio_config_attr(device_rev, "0x%08x\n"); 
rio_config_attr(asm_did, "0x%04x\n");

rio_config_attr(asm_vid, "0x%04x\n");

rio_config_attr(asm_rev, "0x%04x\n");

rio_config_attr(destid, "0x%04x\n");

rio_config_attr(hopcount, "0x%02x\n");



static ssize_t routes_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -52,6 +54,35 @@ static ssize_t routes_show(struct device *dev, struct device_attribute *attr, ch 
	return (str - buf);

}



static ssize_t lprev_show(struct device *dev,

			  struct device_attribute *attr, char *buf)

{

	struct rio_dev *rdev = to_rio_dev(dev);



	return sprintf(buf, "%s\n",

			(rdev->prev) ? rio_name(rdev->prev) : "root");

}



static ssize_t lnext_show(struct device *dev,

			  struct device_attribute *attr, char *buf)

{

	struct rio_dev *rdev = to_rio_dev(dev);

	char *str = buf;

	int i;



	if (rdev->pef & RIO_PEF_SWITCH) {

		for (i = 0; i < RIO_GET_TOTAL_PORTS(rdev->swpinfo); i++) {

			if (rdev->rswitch->nextdev[i])

				str += sprintf(str, "%s\n",

					rio_name(rdev->rswitch->nextdev[i]));

			else

				str += sprintf(str, "null\n");

		}

	}



	return str - buf;

}



struct device_attribute rio_dev_attrs[] = {

	__ATTR_RO(did),

	__ATTR_RO(vid),
@@ -59,10 +90,14 @@ struct device_attribute rio_dev_attrs[] = { 
	__ATTR_RO(asm_did),

	__ATTR_RO(asm_vid),

	__ATTR_RO(asm_rev),

	__ATTR_RO(lprev),

	__ATTR_RO(destid),

	__ATTR_NULL,

};



static DEVICE_ATTR(routes, S_IRUGO, routes_show, NULL);

static DEVICE_ATTR(lnext, S_IRUGO, lnext_show, NULL);

static DEVICE_ATTR(hopcount, S_IRUGO, hopcount_show, NULL);



static ssize_t

rio_read_config(struct file *filp, struct kobject *kobj,
@@ -218,7 +253,9 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev) 
	err = device_create_bin_file(&rdev->dev, &rio_config_attr);



	if (!err && (rdev->pef & RIO_PEF_SWITCH)) {

		err = device_create_file(&rdev->dev, &dev_attr_routes);

		err |= device_create_file(&rdev->dev, &dev_attr_routes);

		err |= device_create_file(&rdev->dev, &dev_attr_lnext);

		err |= device_create_file(&rdev->dev, &dev_attr_hopcount);

		if (!err && rdev->rswitch->sw_sysfs)

			err = rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_CREATE);

	}
@@ -241,6 +278,8 @@ void rio_remove_sysfs_dev_files(struct rio_dev *rdev) 
	device_remove_bin_file(&rdev->dev, &rio_config_attr);

	if (rdev->pef & RIO_PEF_SWITCH) {

		device_remove_file(&rdev->dev, &dev_attr_routes);

		device_remove_file(&rdev->dev, &dev_attr_lnext);

		device_remove_file(&rdev->dev, &dev_attr_hopcount);

		if (rdev->rswitch->sw_sysfs)

			rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_REMOVE);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE