powerpc/nvram: Change nvram_setup_partition() to use new helper
This changes the function to use nvram_find_partition() instead of doing the lookup "by hand". It also makes some of the logic clearer and prints out more useful diagnostic information. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Родитель
cf5cbf9f80
Коммит
d9626947f2
|
@ -469,9 +469,8 @@ loff_t nvram_find_partition(const char *name, int sig, int *out_size)
|
||||||
*/
|
*/
|
||||||
static int __init nvram_setup_partition(void)
|
static int __init nvram_setup_partition(void)
|
||||||
{
|
{
|
||||||
struct list_head * p;
|
loff_t p;
|
||||||
struct nvram_partition * part;
|
int size;
|
||||||
int rc;
|
|
||||||
|
|
||||||
/* For now, we don't do any of this on pmac, until I
|
/* For now, we don't do any of this on pmac, until I
|
||||||
* have figured out if it's worth killing some unused stuffs
|
* have figured out if it's worth killing some unused stuffs
|
||||||
|
@ -481,48 +480,42 @@ static int __init nvram_setup_partition(void)
|
||||||
if (machine_is(powermac))
|
if (machine_is(powermac))
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
|
|
||||||
/* see if we have an OS partition that meets our needs.
|
p = nvram_find_partition("ppc64,linux", NVRAM_SIG_OS, &size);
|
||||||
will try getting the max we need. If not we'll delete
|
|
||||||
partitions and try again. */
|
|
||||||
list_for_each(p, &nvram_part->partition) {
|
|
||||||
part = list_entry(p, struct nvram_partition, partition);
|
|
||||||
if (part->header.signature != NVRAM_SIG_OS)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (strcmp(part->header.name, "ppc64,linux"))
|
/* Found one but too small, remove it */
|
||||||
continue;
|
if (p && size < NVRAM_MIN_REQ) {
|
||||||
|
pr_info("nvram: Found too small ppc64,linux partition"
|
||||||
if ((part->header.length - 1) * NVRAM_BLOCK_LEN >= NVRAM_MIN_REQ) {
|
",removing it...");
|
||||||
/* found our partition */
|
|
||||||
nvram_error_log_index = part->index + NVRAM_HEADER_LEN;
|
|
||||||
nvram_error_log_size = ((part->header.length - 1) *
|
|
||||||
NVRAM_BLOCK_LEN) - sizeof(struct err_log_info);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Found one but it's too small, remove it */
|
|
||||||
nvram_remove_partition("ppc64,linux", NVRAM_SIG_OS);
|
nvram_remove_partition("ppc64,linux", NVRAM_SIG_OS);
|
||||||
|
p = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try creating a partition with the free space we have */
|
/* Create one if we didn't find */
|
||||||
rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
|
if (!p) {
|
||||||
NVRAM_MAX_REQ, NVRAM_MIN_REQ);
|
p = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
|
||||||
if (rc < 0) {
|
NVRAM_MAX_REQ, NVRAM_MIN_REQ);
|
||||||
/* need to free up some space, remove any "OS" partition */
|
/* No room for it, try to get rid of any OS partition
|
||||||
nvram_remove_partition(NULL, NVRAM_SIG_OS);
|
* and try again
|
||||||
|
*/
|
||||||
/* Try again */
|
if (p == -ENOSPC) {
|
||||||
rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
|
pr_info("nvram: No room to create ppc64,linux"
|
||||||
NVRAM_MAX_REQ, NVRAM_MIN_REQ);
|
" partition, deleting all OS partitions...");
|
||||||
if (rc < 0) {
|
nvram_remove_partition(NULL, NVRAM_SIG_OS);
|
||||||
pr_err("nvram_create_partition: Could not find"
|
p = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
|
||||||
" enough space in NVRAM for partition\n");
|
NVRAM_MAX_REQ, NVRAM_MIN_REQ);
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (p <= 0) {
|
||||||
|
pr_err("nvram: Failed to find or create ppc64,linux"
|
||||||
|
" partition, err %d\n", (int)p);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvram_error_log_index = p;
|
||||||
|
nvram_error_log_size = nvram_get_partition_size(p) -
|
||||||
|
sizeof(struct err_log_info);
|
||||||
|
|
||||||
nvram_error_log_index = rc;
|
|
||||||
nvram_error_log_size = nvram_get_partition_size(rc) - sizeof(struct err_log_info);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче