Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"
This reverts commit91a0030295, plus commit0dcd440120("powerpc: Revert CHRP boot wrapper to real-base = 12MB on 32-bit") which depended on it. Commit91a00302was causing NVRAM corruption on some pSeries machines, for as-yet unknown reasons, so this reverts it until the cause is identified. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
Родитель
bfb99f8258
Коммит
5663a1232b
|
|
@ -11,12 +11,7 @@
|
|||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* Usage: addnote [-r realbase] zImage [note.elf]
|
||||
*
|
||||
* If note.elf is supplied, it is the name of an ELF file that contains
|
||||
* an RPA note to use instead of the built-in one. Alternatively, the
|
||||
* note.elf file may be empty, in which case the built-in RPA note is
|
||||
* used (this is to simplify how this is invoked from the wrapper script).
|
||||
* Usage: addnote zImage
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -48,29 +43,27 @@ char rpaname[] = "IBM,RPA-Client-Config";
|
|||
*/
|
||||
#define N_RPA_DESCR 8
|
||||
unsigned int rpanote[N_RPA_DESCR] = {
|
||||
1, /* lparaffinity */
|
||||
128, /* min_rmo_size */
|
||||
0, /* lparaffinity */
|
||||
64, /* min_rmo_size */
|
||||
0, /* min_rmo_percent */
|
||||
46, /* max_pft_size */
|
||||
40, /* max_pft_size */
|
||||
1, /* splpar */
|
||||
-1, /* min_load */
|
||||
1, /* new_mem_def */
|
||||
0, /* ignore_my_client_config */
|
||||
0, /* new_mem_def */
|
||||
1, /* ignore_my_client_config */
|
||||
};
|
||||
|
||||
#define ROUNDUP(len) (((len) + 3) & ~3)
|
||||
|
||||
unsigned char buf[512];
|
||||
unsigned char notebuf[512];
|
||||
|
||||
#define GET_16BE(b, off) (((b)[off] << 8) + ((b)[(off)+1]))
|
||||
#define GET_32BE(b, off) ((GET_16BE((b), (off)) << 16) + \
|
||||
GET_16BE((b), (off)+2))
|
||||
#define GET_16BE(off) ((buf[off] << 8) + (buf[(off)+1]))
|
||||
#define GET_32BE(off) ((GET_16BE(off) << 16) + GET_16BE((off)+2))
|
||||
|
||||
#define PUT_16BE(b, off, v) ((b)[off] = ((v) >> 8) & 0xff, \
|
||||
(b)[(off) + 1] = (v) & 0xff)
|
||||
#define PUT_32BE(b, off, v) (PUT_16BE((b), (off), (v) >> 16), \
|
||||
PUT_16BE((b), (off) + 2, (v)))
|
||||
#define PUT_16BE(off, v) (buf[off] = ((v) >> 8) & 0xff, \
|
||||
buf[(off) + 1] = (v) & 0xff)
|
||||
#define PUT_32BE(off, v) (PUT_16BE((off), (v) >> 16), \
|
||||
PUT_16BE((off) + 2, (v)))
|
||||
|
||||
/* Structure of an ELF file */
|
||||
#define E_IDENT 0 /* ELF header */
|
||||
|
|
@ -95,95 +88,25 @@ unsigned char notebuf[512];
|
|||
|
||||
unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };
|
||||
|
||||
unsigned char *read_rpanote(const char *fname, int *nnp)
|
||||
{
|
||||
int notefd, nr, i;
|
||||
int ph, ps, np;
|
||||
int note, notesize;
|
||||
|
||||
notefd = open(fname, O_RDONLY);
|
||||
if (notefd < 0) {
|
||||
perror(fname);
|
||||
exit(1);
|
||||
}
|
||||
nr = read(notefd, notebuf, sizeof(notebuf));
|
||||
if (nr < 0) {
|
||||
perror("read note");
|
||||
exit(1);
|
||||
}
|
||||
if (nr == 0) /* empty file */
|
||||
return NULL;
|
||||
if (nr < E_HSIZE ||
|
||||
memcmp(¬ebuf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0 ||
|
||||
notebuf[E_IDENT+EI_CLASS] != ELFCLASS32 ||
|
||||
notebuf[E_IDENT+EI_DATA] != ELFDATA2MSB)
|
||||
goto notelf;
|
||||
close(notefd);
|
||||
|
||||
/* now look for the RPA-note */
|
||||
ph = GET_32BE(notebuf, E_PHOFF);
|
||||
ps = GET_16BE(notebuf, E_PHENTSIZE);
|
||||
np = GET_16BE(notebuf, E_PHNUM);
|
||||
if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
|
||||
goto notelf;
|
||||
|
||||
for (i = 0; i < np; ++i, ph += ps) {
|
||||
if (GET_32BE(notebuf, ph + PH_TYPE) != PT_NOTE)
|
||||
continue;
|
||||
note = GET_32BE(notebuf, ph + PH_OFFSET);
|
||||
notesize = GET_32BE(notebuf, ph + PH_FILESZ);
|
||||
if (notesize < 34 || note + notesize > nr)
|
||||
continue;
|
||||
if (GET_32BE(notebuf, note) != strlen(rpaname) + 1 ||
|
||||
GET_32BE(notebuf, note + 8) != 0x12759999 ||
|
||||
strcmp((char *)¬ebuf[note + 12], rpaname) != 0)
|
||||
continue;
|
||||
/* looks like an RPA note, return it */
|
||||
*nnp = notesize;
|
||||
return ¬ebuf[note];
|
||||
}
|
||||
/* no RPA note found */
|
||||
return NULL;
|
||||
|
||||
notelf:
|
||||
fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n", fname);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int
|
||||
main(int ac, char **av)
|
||||
{
|
||||
int fd, n, i, ai;
|
||||
int fd, n, i;
|
||||
int ph, ps, np;
|
||||
int nnote, nnote2, ns;
|
||||
unsigned char *rpap;
|
||||
char *p, *endp;
|
||||
|
||||
ai = 1;
|
||||
if (ac >= ai + 2 && strcmp(av[ai], "-r") == 0) {
|
||||
/* process -r realbase */
|
||||
p = av[ai + 1];
|
||||
descr[1] = strtol(p, &endp, 16);
|
||||
if (endp == p || *endp != 0) {
|
||||
fprintf(stderr, "Can't parse -r argument '%s' as hex\n",
|
||||
p);
|
||||
if (ac != 2) {
|
||||
fprintf(stderr, "Usage: %s elf-file\n", av[0]);
|
||||
exit(1);
|
||||
}
|
||||
ai += 2;
|
||||
}
|
||||
if (ac != ai + 1 && ac != ai + 2) {
|
||||
fprintf(stderr, "Usage: %s [-r realbase] elf-file [rpanote.elf]\n", av[0]);
|
||||
exit(1);
|
||||
}
|
||||
fd = open(av[ai], O_RDWR);
|
||||
fd = open(av[1], O_RDWR);
|
||||
if (fd < 0) {
|
||||
perror(av[ai]);
|
||||
perror(av[1]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);
|
||||
nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote);
|
||||
rpap = NULL;
|
||||
|
||||
n = read(fd, buf, sizeof(buf));
|
||||
if (n < 0) {
|
||||
|
|
@ -197,25 +120,22 @@ main(int ac, char **av)
|
|||
if (buf[E_IDENT+EI_CLASS] != ELFCLASS32
|
||||
|| buf[E_IDENT+EI_DATA] != ELFDATA2MSB) {
|
||||
fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n",
|
||||
av[ai]);
|
||||
av[1]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (ac == ai + 2)
|
||||
rpap = read_rpanote(av[ai + 1], &nnote2);
|
||||
|
||||
ph = GET_32BE(buf, E_PHOFF);
|
||||
ps = GET_16BE(buf, E_PHENTSIZE);
|
||||
np = GET_16BE(buf, E_PHNUM);
|
||||
ph = GET_32BE(E_PHOFF);
|
||||
ps = GET_16BE(E_PHENTSIZE);
|
||||
np = GET_16BE(E_PHNUM);
|
||||
if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
|
||||
goto notelf;
|
||||
if (ph + (np + 2) * ps + nnote + nnote2 > n)
|
||||
goto nospace;
|
||||
|
||||
for (i = 0; i < np; ++i) {
|
||||
if (GET_32BE(buf, ph + PH_TYPE) == PT_NOTE) {
|
||||
if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {
|
||||
fprintf(stderr, "%s already has a note entry\n",
|
||||
av[ai]);
|
||||
av[1]);
|
||||
exit(0);
|
||||
}
|
||||
ph += ps;
|
||||
|
|
@ -228,42 +148,37 @@ main(int ac, char **av)
|
|||
|
||||
/* fill in the program header entry */
|
||||
ns = ph + 2 * ps;
|
||||
PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);
|
||||
PUT_32BE(buf, ph + PH_OFFSET, ns);
|
||||
PUT_32BE(buf, ph + PH_FILESZ, nnote);
|
||||
PUT_32BE(ph + PH_TYPE, PT_NOTE);
|
||||
PUT_32BE(ph + PH_OFFSET, ns);
|
||||
PUT_32BE(ph + PH_FILESZ, nnote);
|
||||
|
||||
/* fill in the note area we point to */
|
||||
/* XXX we should probably make this a proper section */
|
||||
PUT_32BE(buf, ns, strlen(arch) + 1);
|
||||
PUT_32BE(buf, ns + 4, N_DESCR * 4);
|
||||
PUT_32BE(buf, ns + 8, 0x1275);
|
||||
PUT_32BE(ns, strlen(arch) + 1);
|
||||
PUT_32BE(ns + 4, N_DESCR * 4);
|
||||
PUT_32BE(ns + 8, 0x1275);
|
||||
strcpy((char *) &buf[ns + 12], arch);
|
||||
ns += 12 + strlen(arch) + 1;
|
||||
for (i = 0; i < N_DESCR; ++i, ns += 4)
|
||||
PUT_32BE(buf, ns, descr[i]);
|
||||
PUT_32BE(ns, descr[i]);
|
||||
|
||||
/* fill in the second program header entry and the RPA note area */
|
||||
ph += ps;
|
||||
PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);
|
||||
PUT_32BE(buf, ph + PH_OFFSET, ns);
|
||||
PUT_32BE(buf, ph + PH_FILESZ, nnote2);
|
||||
PUT_32BE(ph + PH_TYPE, PT_NOTE);
|
||||
PUT_32BE(ph + PH_OFFSET, ns);
|
||||
PUT_32BE(ph + PH_FILESZ, nnote2);
|
||||
|
||||
/* fill in the note area we point to */
|
||||
if (rpap) {
|
||||
/* RPA note supplied in file, just copy the whole thing over */
|
||||
memcpy(buf + ns, rpap, nnote2);
|
||||
} else {
|
||||
PUT_32BE(buf, ns, strlen(rpaname) + 1);
|
||||
PUT_32BE(buf, ns + 4, sizeof(rpanote));
|
||||
PUT_32BE(buf, ns + 8, 0x12759999);
|
||||
PUT_32BE(ns, strlen(rpaname) + 1);
|
||||
PUT_32BE(ns + 4, sizeof(rpanote));
|
||||
PUT_32BE(ns + 8, 0x12759999);
|
||||
strcpy((char *) &buf[ns + 12], rpaname);
|
||||
ns += 12 + ROUNDUP(strlen(rpaname) + 1);
|
||||
for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
|
||||
PUT_32BE(buf, ns, rpanote[i]);
|
||||
}
|
||||
PUT_32BE(ns, rpanote[i]);
|
||||
|
||||
/* Update the number of program headers */
|
||||
PUT_16BE(buf, E_PHNUM, np + 2);
|
||||
PUT_16BE(E_PHNUM, np + 2);
|
||||
|
||||
/* write back */
|
||||
lseek(fd, (long) 0, SEEK_SET);
|
||||
|
|
@ -273,18 +188,18 @@ main(int ac, char **av)
|
|||
exit(1);
|
||||
}
|
||||
if (i < n) {
|
||||
fprintf(stderr, "%s: write truncated\n", av[ai]);
|
||||
fprintf(stderr, "%s: write truncated\n", av[1]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
exit(0);
|
||||
|
||||
notelf:
|
||||
fprintf(stderr, "%s does not appear to be an ELF file\n", av[ai]);
|
||||
fprintf(stderr, "%s does not appear to be an ELF file\n", av[1]);
|
||||
exit(1);
|
||||
|
||||
nospace:
|
||||
fprintf(stderr, "sorry, I can't find space in %s to put the note\n",
|
||||
av[ai]);
|
||||
av[1]);
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,13 +306,8 @@ fi
|
|||
|
||||
# post-processing needed for some platforms
|
||||
case "$platform" in
|
||||
pseries)
|
||||
${CROSS}objcopy -O binary -j .fakeelf "$kernel" "$ofile".rpanote
|
||||
$objbin/addnote "$ofile" "$ofile".rpanote
|
||||
rm -r "$ofile".rpanote
|
||||
;;
|
||||
chrp)
|
||||
$objbin/addnote -r c00000 "$ofile"
|
||||
pseries|chrp)
|
||||
$objbin/addnote "$ofile"
|
||||
;;
|
||||
coff)
|
||||
${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ static struct fake_elf {
|
|||
u32 ignore_me;
|
||||
} rpadesc;
|
||||
} rpanote;
|
||||
} fake_elf __section(.fakeelf) = {
|
||||
} fake_elf = {
|
||||
.elfhdr = {
|
||||
.e_ident = { 0x7f, 'E', 'L', 'F',
|
||||
ELFCLASS32, ELFDATA2MSB, EV_CURRENT },
|
||||
|
|
@ -713,13 +713,13 @@ static struct fake_elf {
|
|||
.type = 0x12759999,
|
||||
.name = "IBM,RPA-Client-Config",
|
||||
.rpadesc = {
|
||||
.lpar_affinity = 1,
|
||||
.min_rmo_size = 128, /* in megabytes */
|
||||
.lpar_affinity = 0,
|
||||
.min_rmo_size = 64, /* in megabytes */
|
||||
.min_rmo_percent = 0,
|
||||
.max_pft_size = 46, /* 2^46 bytes max PFT size */
|
||||
.max_pft_size = 48, /* 2^48 bytes max PFT size */
|
||||
.splpar = 1,
|
||||
.min_load = ~0U,
|
||||
.new_mem_def = 1
|
||||
.new_mem_def = 0
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -205,9 +205,6 @@ SECTIONS
|
|||
}
|
||||
#endif
|
||||
|
||||
/* Fake ELF header containing RPA note; for addnote */
|
||||
.fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) }
|
||||
|
||||
/* freed after init ends here */
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__init_end = .;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче