From: Luc Michel <luc.michel@greensocs.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org,
Andrew Baumann <Andrew.Baumann@microsoft.com>,
Paul Zimmerman <pauldzim@gmail.com>
Subject: Re: [PATCH v3 3/8] hw/arm/raspi: Move arm_boot_info structure to RaspiMachineState
Date: Mon, 21 Sep 2020 21:55:59 +0200 [thread overview]
Message-ID: <08b7576d-a8d5-f2f1-fa98-a363ec3b7ac3@greensocs.com> (raw)
In-Reply-To: <20200921075628.466506-4-f4bug@amsat.org>
On 9/21/20 9:56 AM, Philippe Mathieu-Daudé wrote:
> The arm_boot_info structure belong to the machine,
> move it to RaspiMachineState.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
> ---
> hw/arm/raspi.c | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index 8716a80a75e..16e6c83c925 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -41,6 +41,7 @@ struct RaspiMachineState {
> MachineState parent_obj;
> /*< public >*/
> BCM283XState soc;
> + struct arm_boot_info binfo;
> };
> typedef struct RaspiMachineState RaspiMachineState;
>
> @@ -206,12 +207,11 @@ static void reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
> static void setup_boot(MachineState *machine, int version, size_t ram_size)
> {
> RaspiMachineState *s = RASPI_MACHINE(machine);
> - static struct arm_boot_info binfo;
> int r;
>
> - binfo.board_id = MACH_TYPE_BCM2708;
> - binfo.ram_size = ram_size;
> - binfo.nb_cpus = machine->smp.cpus;
> + s->binfo.board_id = MACH_TYPE_BCM2708;
> + s->binfo.ram_size = ram_size;
> + s->binfo.nb_cpus = machine->smp.cpus;
>
> if (version <= 2) {
> /* The rpi1 and 2 require some custom setup code to run in Secure
> @@ -220,21 +220,21 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
> * firmware for some cache maintenance operations.
> * The rpi3 doesn't need this.
> */
> - binfo.board_setup_addr = BOARDSETUP_ADDR;
> - binfo.write_board_setup = write_board_setup;
> - binfo.secure_board_setup = true;
> - binfo.secure_boot = true;
> + s->binfo.board_setup_addr = BOARDSETUP_ADDR;
> + s->binfo.write_board_setup = write_board_setup;
> + s->binfo.secure_board_setup = true;
> + s->binfo.secure_boot = true;
> }
>
> /* Pi2 and Pi3 requires SMP setup */
> if (version >= 2) {
> - binfo.smp_loader_start = SMPBOOT_ADDR;
> + s->binfo.smp_loader_start = SMPBOOT_ADDR;
> if (version == 2) {
> - binfo.write_secondary_boot = write_smpboot;
> + s->binfo.write_secondary_boot = write_smpboot;
> } else {
> - binfo.write_secondary_boot = write_smpboot64;
> + s->binfo.write_secondary_boot = write_smpboot64;
> }
> - binfo.secondary_cpu_reset_hook = reset_secondary;
> + s->binfo.secondary_cpu_reset_hook = reset_secondary;
> }
>
> /* If the user specified a "firmware" image (e.g. UEFI), we bypass
> @@ -250,11 +250,11 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
> exit(1);
> }
>
> - binfo.entry = firmware_addr;
> - binfo.firmware_loaded = true;
> + s->binfo.entry = firmware_addr;
> + s->binfo.firmware_loaded = true;
> }
>
> - arm_load_kernel(&s->soc.cpu[0].core, machine, &binfo);
> + arm_load_kernel(&s->soc.cpu[0].core, machine, &s->binfo);
> }
>
> static void raspi_machine_init(MachineState *machine)
>
next prev parent reply other threads:[~2020-09-21 19:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 7:56 [PATCH v3 0/8] hw/arm/raspi: QOM housekeeping to be able to add more machines Philippe Mathieu-Daudé
2020-09-21 7:56 ` [PATCH v3 1/8] hw/arm/raspi: Display the board revision in the machine description Philippe Mathieu-Daudé
2020-09-21 19:53 ` Luc Michel
2020-09-21 7:56 ` [PATCH v3 2/8] hw/arm/raspi: Load the firmware on the first core Philippe Mathieu-Daudé
2020-09-21 19:55 ` Luc Michel
2020-09-21 7:56 ` [PATCH v3 3/8] hw/arm/raspi: Move arm_boot_info structure to RaspiMachineState Philippe Mathieu-Daudé
2020-09-21 19:55 ` Luc Michel [this message]
2020-09-21 7:56 ` [PATCH v3 4/8] hw/arm/raspi: Avoid using TypeInfo::class_data pointer Philippe Mathieu-Daudé
2020-09-21 7:56 ` [PATCH v3 5/8] hw/arm/raspi: Use more specific machine names Philippe Mathieu-Daudé
2020-09-21 7:56 ` [PATCH v3 6/8] hw/arm/raspi: Introduce RaspiProcessorId enum Philippe Mathieu-Daudé
2020-09-21 7:56 ` [PATCH v3 7/8] hw/arm/raspi: Use RaspiProcessorId to set the firmware load address Philippe Mathieu-Daudé
2020-09-21 16:41 ` Philippe Mathieu-Daudé
2020-09-21 19:59 ` Luc Michel
2020-09-21 7:56 ` [PATCH v3 8/8] hw/arm/raspi: Remove use of the 'version' value in the board code Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08b7576d-a8d5-f2f1-fa98-a363ec3b7ac3@greensocs.com \
--to=luc.michel@greensocs.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=f4bug@amsat.org \
--cc=pauldzim@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).