Commit 61f20b9d authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

spapr_nvram: Pre-initialize the NVRAM to support the -prom-env parameter 



In case we do not load the NVRAM contents from a file and the user
specified the "-prom-env" parameter, use the new CHRP NVRAM helper
functions to pre-initialize the NVRAM partitions, so that the SLOF
firmware now can pick up the environment variables from the -prom-env
parameter, too.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent b4ba67d9

hw/nvram/spapr_nvram.c

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/device_tree.h"

#include "hw/sysbus.h"

#include "hw/nvram/chrp_nvram.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_vio.h"
@@ -162,6 +163,11 @@ static void spapr_nvram_realize(VIOsPAPRDevice *dev, Error **errp) 
            error_setg(errp, "can't read spapr-nvram contents");

            return;

        }

    } else if (nb_prom_envs > 0) {

        /* Create a system partition to pass the -prom-env variables */

        chrp_nvram_create_system_partition(nvram->buf, MIN_NVRAM_SIZE / 4);

        chrp_nvram_create_free_partition(&nvram->buf[MIN_NVRAM_SIZE / 4],

                                         nvram->size - MIN_NVRAM_SIZE / 4);

    }



    spapr_rtas_register(RTAS_NVRAM_FETCH, "nvram-fetch", rtas_nvram_fetch);