From: benh@kernel.crashing.org
To: linuxppc-dev@ozlabs.org
Cc: jkensito@us.ibm.com
Subject: [PATCH 05/13] powerpc/nvram: Completely clear a new partition
Date: Tue, 30 Nov 2010 16:47:35 +1100 [thread overview]
Message-ID: <1291096063-14386-5-git-send-email-benh@kernel.crashing.org> (raw)
In-Reply-To: <1291096063-14386-1-git-send-email-benh@kernel.crashing.org>
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
When creating a partition, we clear it entirely rather than
just the first two words since the previous code was rather
specific to the pseries log partition format.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index f753882..02737e6 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -320,7 +320,7 @@ static int __init nvram_create_partition(const char *name, int sig,
struct nvram_partition *part;
struct nvram_partition *new_part;
struct nvram_partition *free_part = NULL;
- int seq_init[2] = { 0, 0 };
+ static char nv_init_vals[16];
loff_t tmp_index;
long size = 0;
int rc;
@@ -379,14 +379,15 @@ static int __init nvram_create_partition(const char *name, int sig,
return rc;
}
- /* make sure and initialize to zero the sequence number and the error
- type logged */
- tmp_index = new_part->index + NVRAM_HEADER_LEN;
- rc = ppc_md.nvram_write((char *)&seq_init, sizeof(seq_init), &tmp_index);
- if (rc <= 0) {
- printk(KERN_ERR "nvram_create_os_partition: nvram_write "
- "failed (%d)\n", rc);
- return rc;
+ /* Clear the partition */
+ for (tmp_index = new_part->index + NVRAM_HEADER_LEN;
+ tmp_index < ((size - 1) * NVRAM_BLOCK_LEN);
+ tmp_index += NVRAM_BLOCK_LEN) {
+ rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index);
+ if (rc <= 0) {
+ pr_err("nvram_create_partition: nvram_write failed (%d)\n", rc);
+ return rc;
+ }
}
nvram_error_log_index = new_part->index + NVRAM_HEADER_LEN;
--
1.7.1
next prev parent reply other threads:[~2010-11-30 5:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-30 5:47 [PATCH 01/13] powerpc/nvram: Move things out of asm/nvram.h benh
2010-11-30 5:47 ` [PATCH 02/13] powerpc/nvram: More flexible nvram_create_partition() benh
2010-11-30 5:47 ` [PATCH 03/13] powerpc/nvram: nvram_create_partitions() now uses bytes benh
2010-11-30 5:47 ` [PATCH 04/13] powerpc/nvram: Ensure that the partition header/block size is right benh
2010-11-30 5:47 ` benh [this message]
2010-11-30 5:47 ` [PATCH 06/13] powerpc/nvram: Shuffle code around in nvram_create_partition() benh
2010-11-30 5:47 ` [PATCH 07/13] powerpc/nvram: Improve partition removal benh
2010-11-30 5:47 ` [PATCH 08/13] powerpc/nvram: Add nvram_find_partition() benh
2010-11-30 5:47 ` [PATCH 09/13] powerpc/nvram: Change nvram_setup_partition() to use new helper benh
2010-11-30 5:47 ` [PATCH 10/13] powerpc/nvram: Move the log partition stuff to pseries benh
2010-11-30 5:47 ` [PATCH 11/13] powerpc/nvram: Rename ppc64, linux partition to ibm, rtas-log benh
2010-11-30 5:47 ` [PATCH 12/13] powerpc/nvram: Fix NVRAM partition list setup benh
2010-11-30 5:47 ` [PATCH 13/13] powerpc/nvram: Handle partition names >= 12 chars benh
2010-12-01 7:24 ` [PATCH 01/13] powerpc/nvram: Move things out of asm/nvram.h Jim Keniston
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291096063-14386-5-git-send-email-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=jkensito@us.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).