motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

spapr: Fix implementation of Open Firmware client interface

Browse source 
This addresses the comments from v22.

The functional changes are (the VOF ones need retesting with Pegasos2):

(VOF) setprop will start failing if the machine class callback
did not handle it;
(VOF) unit addresses are lowered in path_offset();
(SPAPR) /chosen/bootargs is initialized from kernel_cmdline if
the client did not change it.

Fixes: 5c991e5d4378 ("spapr: Implement Open Firmware client interface")
Cc: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20210708065625.548396-1-aik@ozlabs.ru>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Alexey Kardashevskiy 2021-07-08 16:56:25 +10:00 • committed by David Gibson
parent 89bb5a4dfd
commit 21bde1ecb6
11 changed files with 48 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pc-bios/vof/ci.c
View file

@ -69,7 +69,7 @@ static int call_ci(const char *service, int nargs, int nret, ...)
}
if (ci_entry((uint32_t)(&args)) < 0) {
return PROM_ERROR;
return -1;
}
return (nret > 0) ? args.args[nargs] : 0;

26
pc-bios/vof/libc.c
View file

@ -54,32 +54,6 @@ int memcmp(const void *ptr1, const void *ptr2, size_t n)
return 0;
}
void *memmove(void *dest, const void *src, size_t n)
{
char *cdest;
const char *csrc;
int i;
/* Do the buffers overlap in a bad way? */
if (src < dest && src + n >= dest) {
/* Copy from end to start */
cdest = dest + n - 1;
csrc = src + n - 1;
for (i = 0; i < n; i++) {
*cdest-- = *csrc--;
}
} else {
/* Normal copy is possible */
cdest = dest;
csrc = src;
for (i = 0; i < n; i++) {
*cdest++ = *csrc++;
}
}
return dest;
}
void *memset(void *dest, int c, size_t size)
{
unsigned char *d = (unsigned char *)dest;

2
pc-bios/vof/main.c
View file

@ -6,7 +6,7 @@ void do_boot(unsigned long addr, unsigned long _r3, unsigned long _r4)
register unsigned long r4 __asm__("r4") = _r4;
register unsigned long r5 __asm__("r5") = (unsigned long) _prom_entry;
((client *)(uint32_t)addr)();
((void (*)(void))(uint32_t)addr)();
}
void entry_c(void)

2
pc-bios/vof/vof.h
View file

@ -10,11 +10,9 @@ typedef unsigned short uint16_t;
typedef unsigned long uint32_t;
typedef unsigned long long uint64_t;
#define NULL (0)
#define PROM_ERROR (-1u)
typedef unsigned long ihandle;
typedef unsigned long phandle;
typedef int size_t;
typedef void client(void);
/* globals */
extern void _prom_entry(void); /* OF CI entry point (i.e. this firmware) */