nvram: Move the remaining CHRP NVRAM related code to chrp_nvram.[ch]
Everything that is related to CHRP NVRAM should rather reside in chrp_nvram.c / chrp_nvram.h instead of openbios_firmware_abi.h. Signed-off-by: Thomas Huth <thuth@redhat.com> Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Thomas Huth
David Gibson
parent
2024c01421
commit
ad723fe5a0
|
|
@ -23,26 +23,35 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/nvram/chrp_nvram.h"
|
||||
#include "hw/nvram/openbios_firmware_abi.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
|
||||
static int chrp_nvram_set_var(uint8_t *nvram, int addr, const char *str)
|
||||
{
|
||||
int len;
|
||||
|
||||
len = strlen(str) + 1;
|
||||
memcpy(&nvram[addr], str, len);
|
||||
|
||||
return addr + len;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a "system partition", used for the Open Firmware
|
||||
* environment variables.
|
||||
*/
|
||||
int chrp_nvram_create_system_partition(uint8_t *data, int min_len)
|
||||
{
|
||||
struct OpenBIOS_nvpart_v1 *part_header;
|
||||
ChrpNvramPartHdr *part_header;
|
||||
unsigned int i;
|
||||
int end;
|
||||
|
||||
part_header = (struct OpenBIOS_nvpart_v1 *)data;
|
||||
part_header->signature = OPENBIOS_PART_SYSTEM;
|
||||
part_header = (ChrpNvramPartHdr *)data;
|
||||
part_header->signature = CHRP_NVPART_SYSTEM;
|
||||
pstrcpy(part_header->name, sizeof(part_header->name), "system");
|
||||
|
||||
end = sizeof(struct OpenBIOS_nvpart_v1);
|
||||
end = sizeof(ChrpNvramPartHdr);
|
||||
for (i = 0; i < nb_prom_envs; i++) {
|
||||
end = OpenBIOS_set_var(data, end, prom_envs[i]);
|
||||
end = chrp_nvram_set_var(data, end, prom_envs[i]);
|
||||
}
|
||||
|
||||
/* End marker */
|
||||
|
|
@ -54,7 +63,7 @@ int chrp_nvram_create_system_partition(uint8_t *data, int min_len)
|
|||
if (end < min_len) {
|
||||
end = min_len;
|
||||
}
|
||||
OpenBIOS_finish_partition(part_header, end);
|
||||
chrp_nvram_finish_partition(part_header, end);
|
||||
|
||||
return end;
|
||||
}
|
||||
|
|
@ -64,13 +73,13 @@ int chrp_nvram_create_system_partition(uint8_t *data, int min_len)
|
|||
*/
|
||||
int chrp_nvram_create_free_partition(uint8_t *data, int len)
|
||||
{
|
||||
struct OpenBIOS_nvpart_v1 *part_header;
|
||||
ChrpNvramPartHdr *part_header;
|
||||
|
||||
part_header = (struct OpenBIOS_nvpart_v1 *)data;
|
||||
part_header->signature = OPENBIOS_PART_FREE;
|
||||
part_header = (ChrpNvramPartHdr *)data;
|
||||
part_header->signature = CHRP_NVPART_FREE;
|
||||
pstrcpy(part_header->name, sizeof(part_header->name), "free");
|
||||
|
||||
OpenBIOS_finish_partition(part_header, len);
|
||||
chrp_nvram_finish_partition(part_header, len);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/nvram/openbios_firmware_abi.h"
|
||||
#include "hw/nvram/chrp_nvram.h"
|
||||
#include "hw/ppc/mac.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
|
@ -163,15 +162,15 @@ static void pmac_format_nvram_partition_osx(MacIONVRAMState *nvr, int off,
|
|||
int len)
|
||||
{
|
||||
uint32_t start = off;
|
||||
struct OpenBIOS_nvpart_v1 *part_header;
|
||||
ChrpNvramPartHdr *part_header;
|
||||
unsigned char *data = &nvr->data[start];
|
||||
|
||||
/* empty partition */
|
||||
part_header = (struct OpenBIOS_nvpart_v1 *)data;
|
||||
part_header = (ChrpNvramPartHdr *)data;
|
||||
part_header->signature = OSX_NVRAM_SIGNATURE;
|
||||
pstrcpy(part_header->name, sizeof(part_header->name), "wwwwwwwwwwww");
|
||||
|
||||
OpenBIOS_finish_partition(part_header, len);
|
||||
chrp_nvram_finish_partition(part_header, len);
|
||||
|
||||
/* Generation */
|
||||
stl_be_p(&data[20], 2);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,36 @@
|
|||
#ifndef CHRP_NVRAM_H
|
||||
#define CHRP_NVRAM_H
|
||||
|
||||
/* OpenBIOS NVRAM partition */
|
||||
typedef struct {
|
||||
uint8_t signature;
|
||||
uint8_t checksum;
|
||||
uint16_t len; /* Big endian, length divided by 16 */
|
||||
char name[12];
|
||||
} ChrpNvramPartHdr;
|
||||
|
||||
#define CHRP_NVPART_SYSTEM 0x70
|
||||
#define CHRP_NVPART_FREE 0x7f
|
||||
|
||||
static inline void
|
||||
chrp_nvram_finish_partition(ChrpNvramPartHdr *header, uint32_t size)
|
||||
{
|
||||
unsigned int i, sum;
|
||||
uint8_t *tmpptr;
|
||||
|
||||
/* Length divided by 16 */
|
||||
header->len = cpu_to_be16(size >> 4);
|
||||
|
||||
/* Checksum */
|
||||
tmpptr = (uint8_t *)header;
|
||||
sum = *tmpptr;
|
||||
for (i = 0; i < 14; i++) {
|
||||
sum += tmpptr[2 + i];
|
||||
sum = (sum + ((sum & 0xff00) >> 8)) & 0xff;
|
||||
}
|
||||
header->checksum = sum & 0xff;
|
||||
}
|
||||
|
||||
int chrp_nvram_create_system_partition(uint8_t *data, int min_len);
|
||||
int chrp_nvram_create_free_partition(uint8_t *data, int len);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,47 +1,6 @@
|
|||
#ifndef OPENBIOS_FIRMWARE_ABI_H
|
||||
#define OPENBIOS_FIRMWARE_ABI_H
|
||||
|
||||
/* OpenBIOS NVRAM partition */
|
||||
struct OpenBIOS_nvpart_v1 {
|
||||
uint8_t signature;
|
||||
uint8_t checksum;
|
||||
uint16_t len; // BE, length divided by 16
|
||||
char name[12];
|
||||
};
|
||||
|
||||
#define OPENBIOS_PART_SYSTEM 0x70
|
||||
#define OPENBIOS_PART_FREE 0x7f
|
||||
|
||||
static inline void
|
||||
OpenBIOS_finish_partition(struct OpenBIOS_nvpart_v1 *header, uint32_t size)
|
||||
{
|
||||
unsigned int i, sum;
|
||||
uint8_t *tmpptr;
|
||||
|
||||
// Length divided by 16
|
||||
header->len = cpu_to_be16(size >> 4);
|
||||
|
||||
// Checksum
|
||||
tmpptr = (uint8_t *)header;
|
||||
sum = *tmpptr;
|
||||
for (i = 0; i < 14; i++) {
|
||||
sum += tmpptr[2 + i];
|
||||
sum = (sum + ((sum & 0xff00) >> 8)) & 0xff;
|
||||
}
|
||||
header->checksum = sum & 0xff;
|
||||
}
|
||||
|
||||
static inline uint32_t
|
||||
OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const char *str)
|
||||
{
|
||||
uint32_t len;
|
||||
|
||||
len = strlen(str) + 1;
|
||||
memcpy(&nvram[addr], str, len);
|
||||
|
||||
return addr + len;
|
||||
}
|
||||
|
||||
/* Sun IDPROM structure at the end of NVRAM */
|
||||
/* from http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html */
|
||||
struct Sun_nvram {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "qemu/sockets.h"
|
||||
#include "sysemu/char.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "hw/nvram/openbios_firmware_abi.h"
|
||||
#include "hw/nvram/chrp_nvram.h"
|
||||
|
||||
#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
|
||||
|
||||
|
|
@ -137,15 +137,15 @@ static void init_bootfile_ppc(const char *bootpath)
|
|||
{
|
||||
FILE *bootfile;
|
||||
char buf[MIN_NVRAM_SIZE];
|
||||
struct OpenBIOS_nvpart_v1 *header = (struct OpenBIOS_nvpart_v1 *)buf;
|
||||
ChrpNvramPartHdr *header = (ChrpNvramPartHdr *)buf;
|
||||
|
||||
memset(buf, 0, MIN_NVRAM_SIZE);
|
||||
|
||||
/* Create a "common" partition in nvram to store boot-command property */
|
||||
|
||||
header->signature = OPENBIOS_PART_SYSTEM;
|
||||
header->signature = CHRP_NVPART_SYSTEM;
|
||||
memcpy(header->name, "common", 6);
|
||||
OpenBIOS_finish_partition(header, MIN_NVRAM_SIZE);
|
||||
chrp_nvram_finish_partition(header, MIN_NVRAM_SIZE);
|
||||
|
||||
/* FW_MAX_SIZE is 4MB, but slof.bin is only 900KB,
|
||||
* so let's modify memory between 1MB and 100MB
|
||||
|
|
|
|||
Loading…
Reference in New Issue