aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikram Narayanan <vikram186@gmail.com>2012-10-10 13:40:02 -0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-15 08:37:49 -0500
commit2c70d292825df639d7ac765424098bdc1882bd49 (patch)
tree621e3fd5137a7749c645e6db763fc1196a4b9455
parentae0086cfeef14ec2b5aef625cb9be1d625aac33b (diff)
mtd: tests: mtd_speedtest: Replace printk with pr_{info,crit,err}
Use pr_fmt instead of PRINT_PREF macro Signed-off-by: Vikram Narayanan <vikram186@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat
-rw-r--r--drivers/mtd/tests/mtd_speedtest.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 42b0f7456fc4..8a5803b1724c 100644
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -19,6 +19,8 @@
19 * Author: Adrian Hunter <adrian.hunter@nokia.com> 19 * Author: Adrian Hunter <adrian.hunter@nokia.com>
20 */ 20 */
21 21
22#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
23
22#include <linux/init.h> 24#include <linux/init.h>
23#include <linux/module.h> 25#include <linux/module.h>
24#include <linux/moduleparam.h> 26#include <linux/moduleparam.h>
@@ -28,8 +30,6 @@
28#include <linux/sched.h> 30#include <linux/sched.h>
29#include <linux/random.h> 31#include <linux/random.h>
30 32
31#define PRINT_PREF KERN_INFO "mtd_speedtest: "
32
33static int dev = -EINVAL; 33static int dev = -EINVAL;
34module_param(dev, int, S_IRUGO); 34module_param(dev, int, S_IRUGO);
35MODULE_PARM_DESC(dev, "MTD device number to use"); 35MODULE_PARM_DESC(dev, "MTD device number to use");
@@ -70,12 +70,12 @@ static int erase_eraseblock(int ebnum)
70 70
71 err = mtd_erase(mtd, &ei); 71 err = mtd_erase(mtd, &ei);
72 if (err) { 72 if (err) {
73 printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum); 73 pr_err("error %d while erasing EB %d\n", err, ebnum);
74 return err; 74 return err;
75 } 75 }
76 76
77 if (ei.state == MTD_ERASE_FAILED) { 77 if (ei.state == MTD_ERASE_FAILED) {
78 printk(PRINT_PREF "some erase error occurred at EB %d\n", 78 pr_err("some erase error occurred at EB %d\n",
79 ebnum); 79 ebnum);
80 return -EIO; 80 return -EIO;
81 } 81 }
@@ -96,13 +96,13 @@ static int multiblock_erase(int ebnum, int blocks)
96 96
97 err = mtd_erase(mtd, &ei); 97 err = mtd_erase(mtd, &ei);
98 if (err) { 98 if (err) {
99 printk(PRINT_PREF "error %d while erasing EB %d, blocks %d\n", 99 pr_err("error %d while erasing EB %d, blocks %d\n",
100 err, ebnum, blocks); 100 err, ebnum, blocks);
101 return err; 101 return err;
102 } 102 }
103 103
104 if (ei.state == MTD_ERASE_FAILED) { 104 if (ei.state == MTD_ERASE_FAILED) {
105 printk(PRINT_PREF "some erase error occurred at EB %d," 105 pr_err("some erase error occurred at EB %d,"
106 "blocks %d\n", ebnum, blocks); 106 "blocks %d\n", ebnum, blocks);
107 return -EIO; 107 return -EIO;
108 } 108 }
@@ -134,7 +134,7 @@ static int write_eraseblock(int ebnum)
134 134
135 err = mtd_write(mtd, addr, mtd->erasesize, &written, iobuf); 135 err = mtd_write(mtd, addr, mtd->erasesize, &written, iobuf);
136 if (err || written != mtd->erasesize) { 136 if (err || written != mtd->erasesize) {
137 printk(PRINT_PREF "error: write failed at %#llx\n", addr); 137 pr_err("error: write failed at %#llx\n", addr);
138 if (!err) 138 if (!err)
139 err = -EINVAL; 139 err = -EINVAL;
140 } 140 }
@@ -152,7 +152,7 @@ static int write_eraseblock_by_page(int ebnum)
152 for (i = 0; i < pgcnt; i++) { 152 for (i = 0; i < pgcnt; i++) {
153 err = mtd_write(mtd, addr, pgsize, &written, buf); 153 err = mtd_write(mtd, addr, pgsize, &written, buf);
154 if (err || written != pgsize) { 154 if (err || written != pgsize) {
155 printk(PRINT_PREF "error: write failed at %#llx\n", 155 pr_err("error: write failed at %#llx\n",
156 addr); 156 addr);
157 if (!err) 157 if (!err)
158 err = -EINVAL; 158 err = -EINVAL;
@@ -175,7 +175,7 @@ static int write_eraseblock_by_2pages(int ebnum)
175 for (i = 0; i < n; i++) { 175 for (i = 0; i < n; i++) {
176 err = mtd_write(mtd, addr, sz, &written, buf); 176 err = mtd_write(mtd, addr, sz, &written, buf);
177 if (err || written != sz) { 177 if (err || written != sz) {
178 printk(PRINT_PREF "error: write failed at %#llx\n", 178 pr_err("error: write failed at %#llx\n",
179 addr); 179 addr);
180 if (!err) 180 if (!err)
181 err = -EINVAL; 181 err = -EINVAL;
@@ -187,7 +187,7 @@ static int write_eraseblock_by_2pages(int ebnum)
187 if (pgcnt % 2) { 187 if (pgcnt % 2) {
188 err = mtd_write(mtd, addr, pgsize, &written, buf); 188 err = mtd_write(mtd, addr, pgsize, &written, buf);
189 if (err || written != pgsize) { 189 if (err || written != pgsize) {
190 printk(PRINT_PREF "error: write failed at %#llx\n", 190 pr_err("error: write failed at %#llx\n",
191 addr); 191 addr);
192 if (!err) 192 if (!err)
193 err = -EINVAL; 193 err = -EINVAL;
@@ -208,7 +208,7 @@ static int read_eraseblock(int ebnum)
208 if (mtd_is_bitflip(err)) 208 if (mtd_is_bitflip(err))
209 err = 0; 209 err = 0;
210 if (err || read != mtd->erasesize) { 210 if (err || read != mtd->erasesize) {
211 printk(PRINT_PREF "error: read failed at %#llx\n", addr); 211 pr_err("error: read failed at %#llx\n", addr);
212 if (!err) 212 if (!err)
213 err = -EINVAL; 213 err = -EINVAL;
214 } 214 }
@@ -229,7 +229,7 @@ static int read_eraseblock_by_page(int ebnum)
229 if (mtd_is_bitflip(err)) 229 if (mtd_is_bitflip(err))
230 err = 0; 230 err = 0;
231 if (err || read != pgsize) { 231 if (err || read != pgsize) {
232 printk(PRINT_PREF "error: read failed at %#llx\n", 232 pr_err("error: read failed at %#llx\n",
233 addr); 233 addr);
234 if (!err) 234 if (!err)
235 err = -EINVAL; 235 err = -EINVAL;
@@ -255,7 +255,7 @@ static int read_eraseblock_by_2pages(int ebnum)
255 if (mtd_is_bitflip(err)) 255 if (mtd_is_bitflip(err))
256 err = 0; 256 err = 0;
257 if (err || read != sz) { 257 if (err || read != sz) {
258 printk(PRINT_PREF "error: read failed at %#llx\n", 258 pr_err("error: read failed at %#llx\n",
259 addr); 259 addr);
260 if (!err) 260 if (!err)
261 err = -EINVAL; 261 err = -EINVAL;
@@ -270,7 +270,7 @@ static int read_eraseblock_by_2pages(int ebnum)
270 if (mtd_is_bitflip(err)) 270 if (mtd_is_bitflip(err))
271 err = 0; 271 err = 0;
272 if (err || read != pgsize) { 272 if (err || read != pgsize) {
273 printk(PRINT_PREF "error: read failed at %#llx\n", 273 pr_err("error: read failed at %#llx\n",
274 addr); 274 addr);
275 if (!err) 275 if (!err)
276 err = -EINVAL; 276 err = -EINVAL;
@@ -287,7 +287,7 @@ static int is_block_bad(int ebnum)
287 287
288 ret = mtd_block_isbad(mtd, addr); 288 ret = mtd_block_isbad(mtd, addr);
289 if (ret) 289 if (ret)
290 printk(PRINT_PREF "block %d is bad\n", ebnum); 290 pr_info("block %d is bad\n", ebnum);
291 return ret; 291 return ret;
292} 292}
293 293
@@ -321,21 +321,21 @@ static int scan_for_bad_eraseblocks(void)
321 321
322 bbt = kzalloc(ebcnt, GFP_KERNEL); 322 bbt = kzalloc(ebcnt, GFP_KERNEL);
323 if (!bbt) { 323 if (!bbt) {
324 printk(PRINT_PREF "error: cannot allocate memory\n"); 324 pr_err("error: cannot allocate memory\n");
325 return -ENOMEM; 325 return -ENOMEM;
326 } 326 }
327 327
328 if (!mtd_can_have_bb(mtd)) 328 if (!mtd_can_have_bb(mtd))
329 goto out; 329 goto out;
330 330
331 printk(PRINT_PREF "scanning for bad eraseblocks\n"); 331 pr_info("scanning for bad eraseblocks\n");
332 for (i = 0; i < ebcnt; ++i) { 332 for (i = 0; i < ebcnt; ++i) {
333 bbt[i] = is_block_bad(i) ? 1 : 0; 333 bbt[i] = is_block_bad(i) ? 1 : 0;
334 if (bbt[i]) 334 if (bbt[i])
335 bad += 1; 335 bad += 1;
336 cond_resched(); 336 cond_resched();
337 } 337 }
338 printk(PRINT_PREF "scanned %d eraseblocks, %d are bad\n", i, bad); 338 pr_info("scanned %d eraseblocks, %d are bad\n", i, bad);
339out: 339out:
340 goodebcnt = ebcnt - bad; 340 goodebcnt = ebcnt - bad;
341 return 0; 341 return 0;
@@ -351,25 +351,25 @@ static int __init mtd_speedtest_init(void)
351 printk(KERN_INFO "=================================================\n"); 351 printk(KERN_INFO "=================================================\n");
352 352
353 if (dev < 0) { 353 if (dev < 0) {
354 printk(PRINT_PREF "Please specify a valid mtd-device via module paramter\n"); 354 pr_info("Please specify a valid mtd-device via module paramter\n");
355 printk(KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n"); 355 pr_crit("CAREFUL: This test wipes all data on the specified MTD device!\n");
356 return -EINVAL; 356 return -EINVAL;
357 } 357 }
358 358
359 if (count) 359 if (count)
360 printk(PRINT_PREF "MTD device: %d count: %d\n", dev, count); 360 pr_info("MTD device: %d count: %d\n", dev, count);
361 else 361 else
362 printk(PRINT_PREF "MTD device: %d\n", dev); 362 pr_info("MTD device: %d\n", dev);
363 363
364 mtd = get_mtd_device(NULL, dev); 364 mtd = get_mtd_device(NULL, dev);
365 if (IS_ERR(mtd)) { 365 if (IS_ERR(mtd)) {
366 err = PTR_ERR(mtd); 366 err = PTR_ERR(mtd);
367 printk(PRINT_PREF "error: cannot get MTD device\n"); 367 pr_err("error: cannot get MTD device\n");
368 return err; 368 return err;
369 } 369 }
370 370
371 if (mtd->writesize == 1) { 371 if (mtd->writesize == 1) {
372 printk(PRINT_PREF "not NAND flash, assume page size is 512 " 372 pr_info("not NAND flash, assume page size is 512 "
373 "bytes.\n"); 373 "bytes.\n");
374 pgsize = 512; 374 pgsize = 512;
375 } else 375 } else
@@ -380,7 +380,7 @@ static int __init mtd_speedtest_init(void)
380 ebcnt = tmp; 380 ebcnt = tmp;
381 pgcnt = mtd->erasesize / pgsize; 381 pgcnt = mtd->erasesize / pgsize;
382 382
383 printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " 383 pr_info("MTD device size %llu, eraseblock size %u, "
384 "page size %u, count of eraseblocks %u, pages per " 384 "page size %u, count of eraseblocks %u, pages per "
385 "eraseblock %u, OOB size %u\n", 385 "eraseblock %u, OOB size %u\n",
386 (unsigned long long)mtd->size, mtd->erasesize, 386 (unsigned long long)mtd->size, mtd->erasesize,
@@ -392,7 +392,7 @@ static int __init mtd_speedtest_init(void)
392 err = -ENOMEM; 392 err = -ENOMEM;
393 iobuf = kmalloc(mtd->erasesize, GFP_KERNEL); 393 iobuf = kmalloc(mtd->erasesize, GFP_KERNEL);
394 if (!iobuf) { 394 if (!iobuf) {
395 printk(PRINT_PREF "error: cannot allocate memory\n"); 395 pr_err("error: cannot allocate memory\n");
396 goto out; 396 goto out;
397 } 397 }
398 398
@@ -407,7 +407,7 @@ static int __init mtd_speedtest_init(void)
407 goto out; 407 goto out;
408 408
409 /* Write all eraseblocks, 1 eraseblock at a time */ 409 /* Write all eraseblocks, 1 eraseblock at a time */
410 printk(PRINT_PREF "testing eraseblock write speed\n"); 410 pr_info("testing eraseblock write speed\n");
411 start_timing(); 411 start_timing();
412 for (i = 0; i < ebcnt; ++i) { 412 for (i = 0; i < ebcnt; ++i) {
413 if (bbt[i]) 413 if (bbt[i])
@@ -419,10 +419,10 @@ static int __init mtd_speedtest_init(void)
419 } 419 }
420 stop_timing(); 420 stop_timing();
421 speed = calc_speed(); 421 speed = calc_speed();
422 printk(PRINT_PREF "eraseblock write speed is %ld KiB/s\n", speed); 422 pr_info("eraseblock write speed is %ld KiB/s\n", speed);
423 423
424 /* Read all eraseblocks, 1 eraseblock at a time */ 424 /* Read all eraseblocks, 1 eraseblock at a time */
425 printk(PRINT_PREF "testing eraseblock read speed\n"); 425 pr_info("testing eraseblock read speed\n");
426 start_timing(); 426 start_timing();
427 for (i = 0; i < ebcnt; ++i) { 427 for (i = 0; i < ebcnt; ++i) {
428 if (bbt[i]) 428 if (bbt[i])
@@ -434,14 +434,14 @@ static int __init mtd_speedtest_init(void)
434 } 434 }
435 stop_timing(); 435 stop_timing();
436 speed = calc_speed(); 436 speed = calc_speed();
437 printk(PRINT_PREF "eraseblock read speed is %ld KiB/s\n", speed); 437 pr_info("eraseblock read speed is %ld KiB/s\n", speed);
438 438
439 err = erase_whole_device(); 439 err = erase_whole_device();
440 if (err) 440 if (err)
441 goto out; 441 goto out;
442 442
443 /* Write all eraseblocks, 1 page at a time */ 443 /* Write all eraseblocks, 1 page at a time */
444 printk(PRINT_PREF "testing page write speed\n"); 444 pr_info("testing page write speed\n");
445 start_timing(); 445 start_timing();
446 for (i = 0; i < ebcnt; ++i) { 446 for (i = 0; i < ebcnt; ++i) {
447 if (bbt[i]) 447 if (bbt[i])
@@ -453,10 +453,10 @@ static int __init mtd_speedtest_init(void)
453 } 453 }
454 stop_timing(); 454 stop_timing();
455 speed = calc_speed(); 455 speed = calc_speed();
456 printk(PRINT_PREF "page write speed is %ld KiB/s\n", speed); 456 pr_info("page write speed is %ld KiB/s\n", speed);
457 457
458 /* Read all eraseblocks, 1 page at a time */ 458 /* Read all eraseblocks, 1 page at a time */
459 printk(PRINT_PREF "testing page read speed\n"); 459 pr_info("testing page read speed\n");
460 start_timing(); 460 start_timing();
461 for (i = 0; i < ebcnt; ++i) { 461 for (i = 0; i < ebcnt; ++i) {
462 if (bbt[i]) 462 if (bbt[i])
@@ -468,14 +468,14 @@ static int __init mtd_speedtest_init(void)
468 } 468 }
469 stop_timing(); 469 stop_timing();
470 speed = calc_speed(); 470 speed = calc_speed();
471 printk(PRINT_PREF "page read speed is %ld KiB/s\n", speed); 471 pr_info("page read speed is %ld KiB/s\n", speed);
472 472
473 err = erase_whole_device(); 473 err = erase_whole_device();
474 if (err) 474 if (err)
475 goto out; 475 goto out;
476 476
477 /* Write all eraseblocks, 2 pages at a time */ 477 /* Write all eraseblocks, 2 pages at a time */
478 printk(PRINT_PREF "testing 2 page write speed\n"); 478 pr_info("testing 2 page write speed\n");
479 start_timing(); 479 start_timing();
480 for (i = 0; i < ebcnt; ++i) { 480 for (i = 0; i < ebcnt; ++i) {
481 if (bbt[i]) 481 if (bbt[i])
@@ -487,10 +487,10 @@ static int __init mtd_speedtest_init(void)
487 } 487 }
488 stop_timing(); 488 stop_timing();
489 speed = calc_speed(); 489 speed = calc_speed();
490 printk(PRINT_PREF "2 page write speed is %ld KiB/s\n", speed); 490 pr_info("2 page write speed is %ld KiB/s\n", speed);
491 491
492 /* Read all eraseblocks, 2 pages at a time */ 492 /* Read all eraseblocks, 2 pages at a time */
493 printk(PRINT_PREF "testing 2 page read speed\n"); 493 pr_info("testing 2 page read speed\n");
494 start_timing(); 494 start_timing();
495 for (i = 0; i < ebcnt; ++i) { 495 for (i = 0; i < ebcnt; ++i) {
496 if (bbt[i]) 496 if (bbt[i])
@@ -502,10 +502,10 @@ static int __init mtd_speedtest_init(void)
502 } 502 }
503 stop_timing(); 503 stop_timing();
504 speed = calc_speed(); 504 speed = calc_speed();
505 printk(PRINT_PREF "2 page read speed is %ld KiB/s\n", speed); 505 pr_info("2 page read speed is %ld KiB/s\n", speed);
506 506
507 /* Erase all eraseblocks */ 507 /* Erase all eraseblocks */
508 printk(PRINT_PREF "Testing erase speed\n"); 508 pr_info("Testing erase speed\n");
509 start_timing(); 509 start_timing();
510 for (i = 0; i < ebcnt; ++i) { 510 for (i = 0; i < ebcnt; ++i) {
511 if (bbt[i]) 511 if (bbt[i])
@@ -517,12 +517,12 @@ static int __init mtd_speedtest_init(void)
517 } 517 }
518 stop_timing(); 518 stop_timing();
519 speed = calc_speed(); 519 speed = calc_speed();
520 printk(PRINT_PREF "erase speed is %ld KiB/s\n", speed); 520 pr_info("erase speed is %ld KiB/s\n", speed);
521 521
522 /* Multi-block erase all eraseblocks */ 522 /* Multi-block erase all eraseblocks */
523 for (k = 1; k < 7; k++) { 523 for (k = 1; k < 7; k++) {
524 blocks = 1 << k; 524 blocks = 1 << k;
525 printk(PRINT_PREF "Testing %dx multi-block erase speed\n", 525 pr_info("Testing %dx multi-block erase speed\n",
526 blocks); 526 blocks);
527 start_timing(); 527 start_timing();
528 for (i = 0; i < ebcnt; ) { 528 for (i = 0; i < ebcnt; ) {
@@ -541,16 +541,16 @@ static int __init mtd_speedtest_init(void)
541 } 541 }
542 stop_timing(); 542 stop_timing();
543 speed = calc_speed(); 543 speed = calc_speed();
544 printk(PRINT_PREF "%dx multi-block erase speed is %ld KiB/s\n", 544 pr_info("%dx multi-block erase speed is %ld KiB/s\n",
545 blocks, speed); 545 blocks, speed);
546 } 546 }
547 printk(PRINT_PREF "finished\n"); 547 pr_info("finished\n");
548out: 548out:
549 kfree(iobuf); 549 kfree(iobuf);
550 kfree(bbt); 550 kfree(bbt);
551 put_mtd_device(mtd); 551 put_mtd_device(mtd);
552 if (err) 552 if (err)
553 printk(PRINT_PREF "error %d occurred\n", err); 553 pr_info("error %d occurred\n", err);
554 printk(KERN_INFO "=================================================\n"); 554 printk(KERN_INFO "=================================================\n");
555 return err; 555 return err;
556} 556}
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-31 13:39:31 -0400