Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 176967
b: refs/heads/master
c: a15b124
h: refs/heads/master
i:
  176965: b262f52
  176963: 754c178
  176959: 804ae30
v: v3
  • Loading branch information
Artem Bityutskiy authored and David Woodhouse committed Nov 30, 2009
1 parent 633fe47 commit bcb5e59
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 456b565cc52fbcdaa2e19ffdf40d9dd3b726d603
refs/heads/master: a15b124fc4f15b2c4fc51669c936a30ce179d1f7
81 changes: 40 additions & 41 deletions trunk/drivers/mtd/mtdoops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ static int mtdoops_erase_block(struct mtd_info *mtd, int offset)
if (ret) {
set_current_state(TASK_RUNNING);
remove_wait_queue(&wait_q, &wait);
printk (KERN_WARNING "mtdoops: erase of region [0x%llx, 0x%llx] "
"on \"%s\" failed\n",
(unsigned long long)erase.addr, (unsigned long long)erase.len, mtd->name);
printk(KERN_WARNING "mtdoops: erase of region [0x%llx, 0x%llx] on \"%s\" failed\n",
(unsigned long long)erase.addr,
(unsigned long long)erase.len, mtd->name);
return ret;
}

Expand All @@ -109,10 +109,9 @@ static void mtdoops_inc_counter(struct mtdoops_context *cxt)

ret = mtd->read(mtd, cxt->nextpage * OOPS_PAGE_SIZE, 4,
&retlen, (u_char *) &count);
if ((retlen != 4) || ((ret < 0) && (ret != -EUCLEAN))) {
printk(KERN_ERR "mtdoops: Read failure at %d (%td of 4 read)"
", err %d.\n", cxt->nextpage * OOPS_PAGE_SIZE,
retlen, ret);
if (retlen != 4 || (ret < 0 && ret != -EUCLEAN)) {
printk(KERN_ERR "mtdoops: read failure at %d (%td of 4 read), err %d\n",
cxt->nextpage * OOPS_PAGE_SIZE, retlen, ret);
schedule_work(&cxt->work_erase);
return;
}
Expand All @@ -123,8 +122,8 @@ static void mtdoops_inc_counter(struct mtdoops_context *cxt)
return;
}

printk(KERN_DEBUG "mtdoops: Ready %d, %d (no erase)\n",
cxt->nextpage, cxt->nextcount);
printk(KERN_DEBUG "mtdoops: ready %d, %d (no erase)\n",
cxt->nextpage, cxt->nextcount);
cxt->ready = 1;
}

Expand Down Expand Up @@ -152,18 +151,18 @@ static void mtdoops_workfunc_erase(struct work_struct *work)
if (!ret)
break;
if (ret < 0) {
printk(KERN_ERR "mtdoops: block_isbad failed, aborting.\n");
printk(KERN_ERR "mtdoops: block_isbad failed, aborting\n");
return;
}
badblock:
printk(KERN_WARNING "mtdoops: Bad block at %08x\n",
cxt->nextpage * OOPS_PAGE_SIZE);
printk(KERN_WARNING "mtdoops: bad block at %08x\n",
cxt->nextpage * OOPS_PAGE_SIZE);
i++;
cxt->nextpage = cxt->nextpage + (mtd->erasesize / OOPS_PAGE_SIZE);
if (cxt->nextpage >= cxt->oops_pages)
cxt->nextpage = 0;
if (i == (cxt->oops_pages / (mtd->erasesize / OOPS_PAGE_SIZE))) {
printk(KERN_ERR "mtdoops: All blocks bad!\n");
if (i == cxt->oops_pages / (mtd->erasesize / OOPS_PAGE_SIZE)) {
printk(KERN_ERR "mtdoops: all blocks bad!\n");
return;
}
}
Expand All @@ -172,15 +171,16 @@ static void mtdoops_workfunc_erase(struct work_struct *work)
ret = mtdoops_erase_block(mtd, cxt->nextpage * OOPS_PAGE_SIZE);

if (ret >= 0) {
printk(KERN_DEBUG "mtdoops: Ready %d, %d \n", cxt->nextpage, cxt->nextcount);
printk(KERN_DEBUG "mtdoops: ready %d, %d\n",
cxt->nextpage, cxt->nextcount);
cxt->ready = 1;
return;
}

if (mtd->block_markbad && (ret == -EIO)) {
if (mtd->block_markbad && ret == -EIO) {
ret = mtd->block_markbad(mtd, cxt->nextpage * OOPS_PAGE_SIZE);
if (ret < 0) {
printk(KERN_ERR "mtdoops: block_markbad failed, aborting.\n");
printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");
return;
}
}
Expand All @@ -206,9 +206,9 @@ static void mtdoops_write(struct mtdoops_context *cxt, int panic)

cxt->writecount = 0;

if ((retlen != OOPS_PAGE_SIZE) || (ret < 0))
printk(KERN_ERR "mtdoops: Write failure at %d (%td of %d written), err %d.\n",
cxt->nextpage * OOPS_PAGE_SIZE, retlen, OOPS_PAGE_SIZE, ret);
if (retlen != OOPS_PAGE_SIZE || ret < 0)
printk(KERN_ERR "mtdoops: write failure at %d (%td of %d written), error %d\n",
cxt->nextpage * OOPS_PAGE_SIZE, retlen, OOPS_PAGE_SIZE, ret);

mtdoops_inc_counter(cxt);
}
Expand All @@ -220,7 +220,7 @@ static void mtdoops_workfunc_write(struct work_struct *work)
container_of(work, struct mtdoops_context, work_write);

mtdoops_write(cxt, 0);
}
}

static void find_next_position(struct mtdoops_context *cxt)
{
Expand All @@ -231,9 +231,9 @@ static void find_next_position(struct mtdoops_context *cxt)

for (page = 0; page < cxt->oops_pages; page++) {
ret = mtd->read(mtd, page * OOPS_PAGE_SIZE, 8, &retlen, (u_char *) &count[0]);
if ((retlen != 8) || ((ret < 0) && (ret != -EUCLEAN))) {
printk(KERN_ERR "mtdoops: Read failure at %d (%td of 8 read)"
", err %d.\n", page * OOPS_PAGE_SIZE, retlen, ret);
if (retlen != 8 || (ret < 0 && ret != -EUCLEAN)) {
printk(KERN_ERR "mtdoops: read failure at %d (%td of 8 read), err %d\n",
page * OOPS_PAGE_SIZE, retlen, ret);
continue;
}

Expand All @@ -244,14 +244,14 @@ static void find_next_position(struct mtdoops_context *cxt)
if (maxcount == 0xffffffff) {
maxcount = count[0];
maxpos = page;
} else if ((count[0] < 0x40000000) && (maxcount > 0xc0000000)) {
} else if (count[0] < 0x40000000 && maxcount > 0xc0000000) {
maxcount = count[0];
maxpos = page;
} else if ((count[0] > maxcount) && (count[0] < 0xc0000000)) {
} else if (count[0] > maxcount && count[0] < 0xc0000000) {
maxcount = count[0];
maxpos = page;
} else if ((count[0] > maxcount) && (count[0] > 0xc0000000)
&& (maxcount > 0x80000000)) {
} else if (count[0] > maxcount && count[0] > 0xc0000000
&& maxcount > 0x80000000) {
maxcount = count[0];
maxpos = page;
}
Expand All @@ -277,18 +277,18 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
if (cxt->name && !strcmp(mtd->name, cxt->name))
cxt->mtd_index = mtd->index;

if ((mtd->index != cxt->mtd_index) || cxt->mtd_index < 0)
if (mtd->index != cxt->mtd_index || cxt->mtd_index < 0)
return;

if (mtd->size < (mtd->erasesize * 2)) {
printk(KERN_ERR "MTD partition %d not big enough for mtdoops\n",
mtd->index);
if (mtd->size < mtd->erasesize * 2) {
printk(KERN_ERR "mtdoops: MTD partition %d not big enough for mtdoops\n",
mtd->index);
return;
}

if (mtd->erasesize < OOPS_PAGE_SIZE) {
printk(KERN_ERR "Eraseblock size of MTD partition %d too small\n",
mtd->index);
printk(KERN_ERR "mtdoops: eraseblock size of MTD partition %d too small\n",
mtd->index);
return;
}

Expand All @@ -307,7 +307,7 @@ static void mtdoops_notify_remove(struct mtd_info *mtd)
{
struct mtdoops_context *cxt = &oops_cxt;

if ((mtd->index != cxt->mtd_index) || cxt->mtd_index < 0)
if (mtd->index != cxt->mtd_index || cxt->mtd_index < 0)
return;

cxt->mtd = NULL;
Expand All @@ -323,8 +323,8 @@ static void mtdoops_console_sync(void)
if (!cxt->ready || !mtd || cxt->writecount == 0)
return;

/*
* Once ready is 0 and we've held the lock no further writes to the
/*
* Once ready is 0 and we've held the lock no further writes to the
* buffer will happen
*/
spin_lock_irqsave(&cxt->writecount_lock, flags);
Expand Down Expand Up @@ -373,7 +373,7 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
cxt->writecount = 8;
}

if ((count + cxt->writecount) > OOPS_PAGE_SIZE)
if (count + cxt->writecount > OOPS_PAGE_SIZE)
count = OOPS_PAGE_SIZE - cxt->writecount;

memcpy(cxt->oops_buf + cxt->writecount, s, count);
Expand Down Expand Up @@ -422,13 +422,12 @@ static int __init mtdoops_console_init(void)

cxt->mtd_index = -1;
cxt->oops_buf = vmalloc(OOPS_PAGE_SIZE);
spin_lock_init(&cxt->writecount_lock);

if (!cxt->oops_buf) {
printk(KERN_ERR "Failed to allocate mtdoops buffer workspace\n");
printk(KERN_ERR "mtdoops: failed to allocate buffer workspace\n");
return -ENOMEM;
}

spin_lock_init(&cxt->writecount_lock);
INIT_WORK(&cxt->work_erase, mtdoops_workfunc_erase);
INIT_WORK(&cxt->work_write, mtdoops_workfunc_write);

Expand Down

0 comments on commit bcb5e59

Please sign in to comment.