lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/nvram: More flexible nvram_create_partition()

Browse Source 
Replace nvram_create_os_partition() with a variant that takes
the partition name, signature and size as arguments.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2010-07-29 15:28:20 +10:00
parent 74d51d0298
commit 4e7c77a385
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
arch/powerpc/kernel/nvram_64.c
View File

@@ -307,13 +307,15 @@ static int __init nvram_remove_os_partition(void)
return 0; return 0;
} }
/* nvram_create_os_partition /**
* * nvram_create_partition - Create a partition in nvram
* Create a OS linux partition to buffer error logs. * @name: name of the partition to create
* Will create a partition starting at the first free * @sig: signature of the partition to create
* space found if space has enough room. * @req_size: size to allocate preferrably
* @min_size: minimum acceptable size (0 means req_size)
*/ */
static int __init nvram_create_os_partition(void) static int __init nvram_create_partition(const char *name, int sig,
int req_size, int min_size)
{ {
struct nvram_partition *part; struct nvram_partition *part;
struct nvram_partition *new_part; struct nvram_partition *new_part;
@@ -322,20 +324,27 @@ static int __init nvram_create_os_partition(void)
loff_t tmp_index; loff_t tmp_index;
long size = 0; long size = 0;
int rc; int rc;
/* If no minimum size specified, make it the same as the
* requested size
*/
if (min_size == 0)
min_size = req_size;
/* Find a free partition that will give us the maximum needed size /* Find a free partition that will give us the maximum needed size
If can't find one that will give us the minimum size needed */ If can't find one that will give us the minimum size needed */
list_for_each_entry(part, &nvram_part->partition, partition) { list_for_each_entry(part, &nvram_part->partition, partition) {
if (part->header.signature != NVRAM_SIG_FREE) if (part->header.signature != NVRAM_SIG_FREE)
continue; continue;
if (part->header.length >= NVRAM_MAX_REQ) { if (part->header.length >= req_size) {
size = NVRAM_MAX_REQ; size = req_size;
free_part = part; free_part = part;
break; break;
} }
if (!size && part->header.length >= NVRAM_MIN_REQ) { if (part->header.length > size &&
size = NVRAM_MIN_REQ; part->header.length >= min_size) {
size = part->header.length;
free_part = part; free_part = part;
} }
} }
@@ -350,9 +359,9 @@ static int __init nvram_create_os_partition(void)
} }
new_part->index = free_part->index; new_part->index = free_part->index;
new_part->header.signature = NVRAM_SIG_OS; new_part->header.signature = sig;
new_part->header.length = size; new_part->header.length = size;
strcpy(new_part->header.name, "ppc64,linux"); strncpy(new_part->header.name, name, 12);
new_part->header.checksum = nvram_checksum(&new_part->header); new_part->header.checksum = nvram_checksum(&new_part->header);
rc = nvram_write_header(new_part); rc = nvram_write_header(new_part);
@@ -451,10 +460,10 @@ static int __init nvram_setup_partition(void)
} }
/* try creating a partition with the free space we have */ /* try creating a partition with the free space we have */
rc = nvram_create_partition("ppc64,linux", ); rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
if (!rc) { NVRAM_MAX_REQ, NVRAM_MIN_REQ);
if (!rc)
return 0; return 0;
}
/* need to free up some space */ /* need to free up some space */
rc = nvram_remove_os_partition(); rc = nvram_remove_os_partition();
@@ -463,9 +472,10 @@ static int __init nvram_setup_partition(void)
} }
/* create a partition in this new space */ /* create a partition in this new space */
rc = nvram_create_os_partition(); rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
NVRAM_MAX_REQ, NVRAM_MIN_REQ);
if (rc) { if (rc) {
printk(KERN_ERR "nvram_create_os_partition: Could not find a " printk(KERN_ERR "nvram_create_partition: Could not find a "
"NVRAM partition large enough\n"); "NVRAM partition large enough\n");
return rc; return rc;
} }

6
arch/powerpc/platforms/pseries/nvram.c
View File

@@ -22,14 +22,14 @@
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
/* Max bytes to read/write in one go */
#define NVRW_CNT 0x20
static unsigned int nvram_size; static unsigned int nvram_size;
static int nvram_fetch, nvram_store; static int nvram_fetch, nvram_store;
static char nvram_buf[NVRW_CNT]; /* assume this is in the first 4GB */ static char nvram_buf[NVRW_CNT]; /* assume this is in the first 4GB */
static DEFINE_SPINLOCK(nvram_lock); static DEFINE_SPINLOCK(nvram_lock);
/* Max bytes to read/write in one go */
#define NVRW_CNT 0x20
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index) static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
{ {
unsigned int i; unsigned int i;