Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fe41947e1aa12e96a50edaee123b4e4de03b668b

Authored by Alexandre Bounine
Committed by Linus Torvalds
1 parent 99b0d365e5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

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>

Showing 2 changed files with 9 additions and 7 deletions Side-by-side Diff

drivers/rapidio/rio-sysfs.c
Diff comments   View file @ fe41947
... ... @@ -77,9 +77,9 @@
77 77  
78 78 /* Several chips lock up trying to read undefined config space */
79 79 if (capable(CAP_SYS_ADMIN))
80   - size = 0x200000;
  80 + size = RIO_MAINT_SPACE_SZ;
81 81  
82   - if (off > size)
  82 + if (off >= size)
83 83 return 0;
84 84 if (off + count > size) {
85 85 size -= off;
86 86  
... ... @@ -147,10 +147,10 @@
147 147 loff_t init_off = off;
148 148 u8 *data = (u8 *) buf;
149 149  
150   - if (off > 0x200000)
  150 + if (off >= RIO_MAINT_SPACE_SZ)
151 151 return 0;
152   - if (off + count > 0x200000) {
153   - size = 0x200000 - off;
  152 + if (off + count > RIO_MAINT_SPACE_SZ) {
  153 + size = RIO_MAINT_SPACE_SZ - off;
154 154 count = size;
155 155 }
156 156  
... ... @@ -200,7 +200,7 @@
200 200 .name = "config",
201 201 .mode = S_IRUGO | S_IWUSR,
202 202 },
203   - .size = 0x200000,
  203 + .size = RIO_MAINT_SPACE_SZ,
204 204 .read = rio_read_config,
205 205 .write = rio_write_config,
206 206 };
include/linux/rio_regs.h
Diff comments   View file @ fe41947
... ... @@ -14,10 +14,12 @@
14 14 #define LINUX_RIO_REGS_H
15 15  
16 16 /*
17   - * In RapidIO, each device has a 2MB configuration space that is
  17 + * In RapidIO, each device has a 16MB configuration space that is
18 18 * accessed via maintenance transactions. Portions of configuration
19 19 * space are standardized and/or reserved.
20 20 */
  21 +#define RIO_MAINT_SPACE_SZ 0x1000000 /* 16MB of RapidIO mainenance space */
  22 +
21 23 #define RIO_DEV_ID_CAR 0x00 /* [I] Device Identity CAR */
22 24 #define RIO_DEV_INFO_CAR 0x04 /* [I] Device Information CAR */
23 25 #define RIO_ASM_ID_CAR 0x08 /* [I] Assembly Identity CAR */