lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rapidio: fix sysfs config attribute to access 16MB of maint space

Browse Source 
Fixes sysfs config attribute to allow access to entire 16MB maintenance
space of RapidIO devices.

Signed-off-by: Alexandre 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexandre Bounine
2011-02-25 14:44:31 -08:00
committed by Linus Torvalds
parent 99b0d365e5
commit fe41947e1a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/rapidio/rio-sysfs.c
View File

@@ -77,9 +77,9 @@ rio_read_config(struct file *filp, struct kobject *kobj,
/* Several chips lock up trying to read undefined config space */ /* Several chips lock up trying to read undefined config space */
if (capable(CAP_SYS_ADMIN)) if (capable(CAP_SYS_ADMIN))
size = 0x200000; size = RIO_MAINT_SPACE_SZ;
if (off > size) if (off >= size)
return 0; return 0;
if (off + count > size) { if (off + count > size) {
size -= off; size -= off;
@@ -147,10 +147,10 @@ rio_write_config(struct file *filp, struct kobject *kobj,
loff_t init_off = off; loff_t init_off = off;
u8 *data = (u8 *) buf; u8 *data = (u8 *) buf;
if (off > 0x200000) if (off >= RIO_MAINT_SPACE_SZ)
return 0; return 0;
if (off + count > 0x200000) { if (off + count > RIO_MAINT_SPACE_SZ) {
size = 0x200000 - off; size = RIO_MAINT_SPACE_SZ - off;
count = size; count = size;
} }
@@ -200,7 +200,7 @@ static struct bin_attribute rio_config_attr = {
.name = "config", .name = "config",
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
}, },
.size = 0x200000, .size = RIO_MAINT_SPACE_SZ,
.read = rio_read_config, .read = rio_read_config,
.write = rio_write_config, .write = rio_write_config,
}; };

4
include/linux/rio_regs.h
View File

@@ -14,10 +14,12 @@
#define LINUX_RIO_REGS_H #define LINUX_RIO_REGS_H
/* /*
* In RapidIO, each device has a 2MB configuration space that is * In RapidIO, each device has a 16MB configuration space that is
* accessed via maintenance transactions. Portions of configuration * accessed via maintenance transactions. Portions of configuration
* space are standardized and/or reserved. * space are standardized and/or reserved.
*/ */
#define RIO_MAINT_SPACE_SZ 0x1000000 /* 16MB of RapidIO mainenance space */
#define RIO_DEV_ID_CAR 0x00 /* [I] Device Identity CAR */ #define RIO_DEV_ID_CAR 0x00 /* [I] Device Identity CAR */
#define RIO_DEV_INFO_CAR 0x04 /* [I] Device Information CAR */ #define RIO_DEV_INFO_CAR 0x04 /* [I] Device Information CAR */
#define RIO_ASM_ID_CAR 0x08 /* [I] Assembly Identity CAR */ #define RIO_ASM_ID_CAR 0x08 /* [I] Assembly Identity CAR */