| Message ID | 20210331025123.29310-1-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
| Series | [qemu] spapr: Rename RTAS_MAX_ADDR to FDT_MAX_ADDR | expand |
On Wed, 31 Mar 2021 13:51:23 +1100 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > SLOF instantiates RTAS since > 744a928ccee9 ("spapr: Stop providing RTAS blob") > so the max address applies to the FDT only. > > This renames the macro and fixes up the comment. > > This should not cause any behavioral change. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 73a06df3b1b1..1e18a0a62839 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -100,7 +100,7 @@ > * > * We load our kernel at 4M, leaving space for SLOF initial image > */ > -#define RTAS_MAX_ADDR 0x80000000 /* RTAS must stay below that */ > +#define FDT_MAX_ADDR 0x80000000 /* FDT must stay below that */ > #define FW_MAX_SIZE 0x400000 > #define FW_FILE_NAME "slof.bin" > #define FW_OVERHEAD 0x2800000 > @@ -1617,11 +1617,11 @@ static void spapr_machine_reset(MachineState *machine) > spapr_clear_pending_events(spapr); > > /* > - * We place the device tree and RTAS just below either the top of the RMA, > + * We place the device tree just below either the top of the RMA, > * or just below 2GB, whichever is lower, so that it can be > * processed with 32-bit real mode code if necessary > */ > - fdt_addr = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FDT_MAX_SIZE; > + fdt_addr = MIN(spapr->rma_size, FDT_MAX_ADDR) - FDT_MAX_SIZE; > > fdt = spapr_build_fdt(spapr, true, FDT_MAX_SIZE); > > @@ -2694,7 +2694,7 @@ static void spapr_machine_init(MachineState *machine) > spapr->rma_size = spapr_rma_size(spapr, &error_fatal); > > /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ > - load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; > + load_limit = MIN(spapr->rma_size, FDT_MAX_ADDR) - FW_OVERHEAD; > > /* > * VSMT must be set in order to be able to compute VCPU ids, ie to
On Wed, Mar 31, 2021 at 01:51:23PM +1100, Alexey Kardashevskiy wrote: > SLOF instantiates RTAS since > 744a928ccee9 ("spapr: Stop providing RTAS blob") > so the max address applies to the FDT only. > > This renames the macro and fixes up the comment. > > This should not cause any behavioral change. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to ppc-for-6.1, thanks. > --- > hw/ppc/spapr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 73a06df3b1b1..1e18a0a62839 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -100,7 +100,7 @@ > * > * We load our kernel at 4M, leaving space for SLOF initial image > */ > -#define RTAS_MAX_ADDR 0x80000000 /* RTAS must stay below that */ > +#define FDT_MAX_ADDR 0x80000000 /* FDT must stay below that */ > #define FW_MAX_SIZE 0x400000 > #define FW_FILE_NAME "slof.bin" > #define FW_OVERHEAD 0x2800000 > @@ -1617,11 +1617,11 @@ static void spapr_machine_reset(MachineState *machine) > spapr_clear_pending_events(spapr); > > /* > - * We place the device tree and RTAS just below either the top of the RMA, > + * We place the device tree just below either the top of the RMA, > * or just below 2GB, whichever is lower, so that it can be > * processed with 32-bit real mode code if necessary > */ > - fdt_addr = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FDT_MAX_SIZE; > + fdt_addr = MIN(spapr->rma_size, FDT_MAX_ADDR) - FDT_MAX_SIZE; > > fdt = spapr_build_fdt(spapr, true, FDT_MAX_SIZE); > > @@ -2694,7 +2694,7 @@ static void spapr_machine_init(MachineState *machine) > spapr->rma_size = spapr_rma_size(spapr, &error_fatal); > > /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ > - load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; > + load_limit = MIN(spapr->rma_size, FDT_MAX_ADDR) - FW_OVERHEAD; > > /* > * VSMT must be set in order to be able to compute VCPU ids, ie to
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 73a06df3b1b1..1e18a0a62839 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -100,7 +100,7 @@ * * We load our kernel at 4M, leaving space for SLOF initial image */ -#define RTAS_MAX_ADDR 0x80000000 /* RTAS must stay below that */ +#define FDT_MAX_ADDR 0x80000000 /* FDT must stay below that */ #define FW_MAX_SIZE 0x400000 #define FW_FILE_NAME "slof.bin" #define FW_OVERHEAD 0x2800000 @@ -1617,11 +1617,11 @@ static void spapr_machine_reset(MachineState *machine) spapr_clear_pending_events(spapr); /* - * We place the device tree and RTAS just below either the top of the RMA, + * We place the device tree just below either the top of the RMA, * or just below 2GB, whichever is lower, so that it can be * processed with 32-bit real mode code if necessary */ - fdt_addr = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FDT_MAX_SIZE; + fdt_addr = MIN(spapr->rma_size, FDT_MAX_ADDR) - FDT_MAX_SIZE; fdt = spapr_build_fdt(spapr, true, FDT_MAX_SIZE); @@ -2694,7 +2694,7 @@ static void spapr_machine_init(MachineState *machine) spapr->rma_size = spapr_rma_size(spapr, &error_fatal); /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ - load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; + load_limit = MIN(spapr->rma_size, FDT_MAX_ADDR) - FW_OVERHEAD; /* * VSMT must be set in order to be able to compute VCPU ids, ie to
SLOF instantiates RTAS since 744a928ccee9 ("spapr: Stop providing RTAS blob") so the max address applies to the FDT only. This renames the macro and fixes up the comment. This should not cause any behavioral change. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- hw/ppc/spapr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)