Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 cd66a2df 编写于 作者: V Vikram Narayanan 提交者： Artem Bityutskiy
浏览文件
操作

mtd: tests: mtd_subpagetest: replace printk with pr_{info,crit,err} 

Use pr_fmt instead of PRINT_PREF macro
Signed-off-by: NVikram Narayanan <vikram186@gmail.com>
Signed-off-by: NArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
上级 2c70d292
隐藏空白更改
内联 并排
Showing with 62 addition and 62 deletion
drivers/mtd/tests/mtd_subpagetest.c
浏览文件 @ cd66a2df
......@@ -19,6 +19,8 @@
*
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
......@@ -27,8 +29,6 @@
#include <linux/slab.h>
#include <linux/sched.h>
#define PRINT_PREF KERN_INFO "mtd_subpagetest: "
static int dev = -EINVAL;
module_param(dev, int, S_IRUGO);
MODULE_PARM_DESC(dev, "MTD device number to use");
......@@ -82,12 +82,12 @@ static int erase_eraseblock(int ebnum)
err = mtd_erase(mtd, &ei);
if (err) {
printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);
pr_err("error %d while erasing EB %d\n", err, ebnum);
return err;
}
if (ei.state == MTD_ERASE_FAILED) {
printk(PRINT_PREF "some erase error occurred at EB %d\n",
pr_err("some erase error occurred at EB %d\n",
ebnum);
return -EIO;
}
......@@ -100,7 +100,7 @@ static int erase_whole_device(void)
int err;
unsigned int i;
printk(PRINT_PREF "erasing whole device\n");
pr_info("erasing whole device\n");
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
continue;
......@@ -109,7 +109,7 @@ static int erase_whole_device(void)
return err;
cond_resched();
}
printk(PRINT_PREF "erased %u eraseblocks\n", i);
pr_info("erased %u eraseblocks\n", i);
return 0;
}
......@@ -122,11 +122,11 @@ static int write_eraseblock(int ebnum)
set_random_data(writebuf, subpgsize);
err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
if (unlikely(err || written != subpgsize)) {
printk(PRINT_PREF "error: write failed at %#llx\n",
pr_err("error: write failed at %#llx\n",
(long long)addr);
if (written != subpgsize) {
printk(PRINT_PREF " write size: %#x\n", subpgsize);
printk(PRINT_PREF " written: %#zx\n", written);
pr_err(" write size: %#x\n", subpgsize);
pr_err(" written: %#zx\n", written);
}
return err ? err : -1;
}
......@@ -136,11 +136,11 @@ static int write_eraseblock(int ebnum)
set_random_data(writebuf, subpgsize);
err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
if (unlikely(err || written != subpgsize)) {
printk(PRINT_PREF "error: write failed at %#llx\n",
pr_err("error: write failed at %#llx\n",
(long long)addr);
if (written != subpgsize) {
printk(PRINT_PREF " write size: %#x\n", subpgsize);
printk(PRINT_PREF " written: %#zx\n", written);
pr_err(" write size: %#x\n", subpgsize);
pr_err(" written: %#zx\n", written);
}
return err ? err : -1;
}
......@@ -160,12 +160,12 @@ static int write_eraseblock2(int ebnum)
set_random_data(writebuf, subpgsize * k);
err = mtd_write(mtd, addr, subpgsize * k, &written, writebuf);
if (unlikely(err || written != subpgsize * k)) {
printk(PRINT_PREF "error: write failed at %#llx\n",
pr_err("error: write failed at %#llx\n",
(long long)addr);
if (written != subpgsize) {
printk(PRINT_PREF " write size: %#x\n",
pr_err(" write size: %#x\n",
subpgsize * k);
printk(PRINT_PREF " written: %#08zx\n",
pr_err(" written: %#08zx\n",
written);
}
return err ? err : -1;
......@@ -198,23 +198,23 @@ static int verify_eraseblock(int ebnum)
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
printk(PRINT_PREF "ECC correction at %#llx\n",
pr_info("ECC correction at %#llx\n",
(long long)addr);
err = 0;
} else {
printk(PRINT_PREF "error: read failed at %#llx\n",
pr_err("error: read failed at %#llx\n",
(long long)addr);
return err ? err : -1;
}
}
if (unlikely(memcmp(readbuf, writebuf, subpgsize))) {
printk(PRINT_PREF "error: verify failed at %#llx\n",
pr_err("error: verify failed at %#llx\n",
(long long)addr);
printk(PRINT_PREF "------------- written----------------\n");
pr_info("------------- written----------------\n");
print_subpage(writebuf);
printk(PRINT_PREF "------------- read ------------------\n");
pr_info("------------- read ------------------\n");
print_subpage(readbuf);
printk(PRINT_PREF "-------------------------------------\n");
pr_info("-------------------------------------\n");
errcnt += 1;
}
......@@ -225,23 +225,23 @@ static int verify_eraseblock(int ebnum)
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
printk(PRINT_PREF "ECC correction at %#llx\n",
pr_info("ECC correction at %#llx\n",
(long long)addr);
err = 0;
} else {
printk(PRINT_PREF "error: read failed at %#llx\n",
pr_err("error: read failed at %#llx\n",
(long long)addr);
return err ? err : -1;
}
}
if (unlikely(memcmp(readbuf, writebuf, subpgsize))) {
printk(PRINT_PREF "error: verify failed at %#llx\n",
pr_info("error: verify failed at %#llx\n",
(long long)addr);
printk(PRINT_PREF "------------- written----------------\n");
pr_info("------------- written----------------\n");
print_subpage(writebuf);
printk(PRINT_PREF "------------- read ------------------\n");
pr_info("------------- read ------------------\n");
print_subpage(readbuf);
printk(PRINT_PREF "-------------------------------------\n");
pr_info("-------------------------------------\n");
errcnt += 1;
}
......@@ -262,17 +262,17 @@ static int verify_eraseblock2(int ebnum)
err = mtd_read(mtd, addr, subpgsize * k, &read, readbuf);
if (unlikely(err || read != subpgsize * k)) {
if (mtd_is_bitflip(err) && read == subpgsize * k) {
printk(PRINT_PREF "ECC correction at %#llx\n",
pr_info("ECC correction at %#llx\n",
(long long)addr);
err = 0;
} else {
printk(PRINT_PREF "error: read failed at "
pr_err("error: read failed at "
"%#llx\n", (long long)addr);
return err ? err : -1;
}
}
if (unlikely(memcmp(readbuf, writebuf, subpgsize * k))) {
printk(PRINT_PREF "error: verify failed at %#llx\n",
pr_err("error: verify failed at %#llx\n",
(long long)addr);
errcnt += 1;
}
......@@ -295,17 +295,17 @@ static int verify_eraseblock_ff(int ebnum)
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
printk(PRINT_PREF "ECC correction at %#llx\n",
pr_info("ECC correction at %#llx\n",
(long long)addr);
err = 0;
} else {
printk(PRINT_PREF "error: read failed at "
pr_err("error: read failed at "
"%#llx\n", (long long)addr);
return err ? err : -1;
}
}
if (unlikely(memcmp(readbuf, writebuf, subpgsize))) {
printk(PRINT_PREF "error: verify 0xff failed at "
pr_err("error: verify 0xff failed at "
"%#llx\n", (long long)addr);
errcnt += 1;
}
......@@ -320,7 +320,7 @@ static int verify_all_eraseblocks_ff(void)
int err;
unsigned int i;
printk(PRINT_PREF "verifying all eraseblocks for 0xff\n");
pr_info("verifying all eraseblocks for 0xff\n");
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
continue;
......@@ -328,10 +328,10 @@ static int verify_all_eraseblocks_ff(void)
if (err)
return err;
if (i % 256 == 0)
printk(PRINT_PREF "verified up to eraseblock %u\n", i);
pr_info("verified up to eraseblock %u\n", i);
cond_resched();
}
printk(PRINT_PREF "verified %u eraseblocks\n", i);
pr_info("verified %u eraseblocks\n", i);
return 0;
}
......@@ -342,7 +342,7 @@ static int is_block_bad(int ebnum)
ret = mtd_block_isbad(mtd, addr);
if (ret)
printk(PRINT_PREF "block %d is bad\n", ebnum);
pr_info("block %d is bad\n", ebnum);
return ret;
}
......@@ -352,18 +352,18 @@ static int scan_for_bad_eraseblocks(void)
bbt = kzalloc(ebcnt, GFP_KERNEL);
if (!bbt) {
printk(PRINT_PREF "error: cannot allocate memory\n");
pr_err("error: cannot allocate memory\n");
return -ENOMEM;
}
printk(PRINT_PREF "scanning for bad eraseblocks\n");
pr_info("scanning for bad eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
bbt[i] = is_block_bad(i) ? 1 : 0;
if (bbt[i])
bad += 1;
cond_resched();
}
printk(PRINT_PREF "scanned %d eraseblocks, %d are bad\n", i, bad);
pr_info("scanned %d eraseblocks, %d are bad\n", i, bad);
return 0;
}
......@@ -377,22 +377,22 @@ static int __init mtd_subpagetest_init(void)
printk(KERN_INFO "=================================================\n");
if (dev < 0) {
printk(PRINT_PREF "Please specify a valid mtd-device via module paramter\n");
printk(KERN_CRIT "CAREFUL: This test wipes all data on the specified MTD device!\n");
pr_info("Please specify a valid mtd-device via module paramter\n");
pr_crit("CAREFUL: This test wipes all data on the specified MTD device!\n");
return -EINVAL;
}
printk(PRINT_PREF "MTD device: %d\n", dev);
pr_info("MTD device: %d\n", dev);
mtd = get_mtd_device(NULL, dev);
if (IS_ERR(mtd)) {
err = PTR_ERR(mtd);
printk(PRINT_PREF "error: cannot get MTD device\n");
pr_err("error: cannot get MTD device\n");
return err;
}
if (mtd->type != MTD_NANDFLASH) {
printk(PRINT_PREF "this test requires NAND flash\n");
pr_info("this test requires NAND flash\n");
goto out;
}
......@@ -402,7 +402,7 @@ static int __init mtd_subpagetest_init(void)
ebcnt = tmp;
pgcnt = mtd->erasesize / mtd->writesize;
printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "
pr_info("MTD device size %llu, eraseblock size %u, "
"page size %u, subpage size %u, count of eraseblocks %u, "
"pages per eraseblock %u, OOB size %u\n",
(unsigned long long)mtd->size, mtd->erasesize,
......@@ -412,12 +412,12 @@ static int __init mtd_subpagetest_init(void)
bufsize = subpgsize * 32;
writebuf = kmalloc(bufsize, GFP_KERNEL);
if (!writebuf) {
printk(PRINT_PREF "error: cannot allocate memory\n");
pr_info("error: cannot allocate memory\n");
goto out;
}
readbuf = kmalloc(bufsize, GFP_KERNEL);
if (!readbuf) {
printk(PRINT_PREF "error: cannot allocate memory\n");
pr_info("error: cannot allocate memory\n");
goto out;
}
......@@ -429,7 +429,7 @@ static int __init mtd_subpagetest_init(void)
if (err)
goto out;
printk(PRINT_PREF "writing whole device\n");
pr_info("writing whole device\n");
simple_srand(1);
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
......@@ -438,13 +438,13 @@ static int __init mtd_subpagetest_init(void)
if (unlikely(err))
goto out;
if (i % 256 == 0)
printk(PRINT_PREF "written up to eraseblock %u\n", i);
pr_info("written up to eraseblock %u\n", i);
cond_resched();
}
printk(PRINT_PREF "written %u eraseblocks\n", i);
pr_info("written %u eraseblocks\n", i);
simple_srand(1);
printk(PRINT_PREF "verifying all eraseblocks\n");
pr_info("verifying all eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
continue;
......@@ -452,10 +452,10 @@ static int __init mtd_subpagetest_init(void)
if (unlikely(err))
goto out;
if (i % 256 == 0)
printk(PRINT_PREF "verified up to eraseblock %u\n", i);
pr_info("verified up to eraseblock %u\n", i);
cond_resched();
}
printk(PRINT_PREF "verified %u eraseblocks\n", i);
pr_info("verified %u eraseblocks\n", i);
err = erase_whole_device();
if (err)
......@@ -467,7 +467,7 @@ static int __init mtd_subpagetest_init(void)
/* Write all eraseblocks */
simple_srand(3);
printk(PRINT_PREF "writing whole device\n");
pr_info("writing whole device\n");
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
continue;
......@@ -475,14 +475,14 @@ static int __init mtd_subpagetest_init(void)
if (unlikely(err))
goto out;
if (i % 256 == 0)
printk(PRINT_PREF "written up to eraseblock %u\n", i);
pr_info("written up to eraseblock %u\n", i);
cond_resched();
}
printk(PRINT_PREF "written %u eraseblocks\n", i);
pr_info("written %u eraseblocks\n", i);
/* Check all eraseblocks */
simple_srand(3);
printk(PRINT_PREF "verifying all eraseblocks\n");
pr_info("verifying all eraseblocks\n");
for (i = 0; i < ebcnt; ++i) {
if (bbt[i])
continue;
......@@ -490,10 +490,10 @@ static int __init mtd_subpagetest_init(void)
if (unlikely(err))
goto out;
if (i % 256 == 0)
printk(PRINT_PREF "verified up to eraseblock %u\n", i);
pr_info("verified up to eraseblock %u\n", i);
cond_resched();
}
printk(PRINT_PREF "verified %u eraseblocks\n", i);
pr_info("verified %u eraseblocks\n", i);
err = erase_whole_device();
if (err)
......@@ -503,7 +503,7 @@ static int __init mtd_subpagetest_init(void)
if (err)
goto out;
printk(PRINT_PREF "finished with %d errors\n", errcnt);
pr_info("finished with %d errors\n", errcnt);
out:
kfree(bbt);
......@@ -511,7 +511,7 @@ static int __init mtd_subpagetest_init(void)
kfree(writebuf);
put_mtd_device(mtd);
if (err)
printk(PRINT_PREF "error %d occurred\n", err);
pr_info("error %d occurred\n", err);
printk(KERN_INFO "=================================================\n");
return err;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或