[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/6] hw/arm/raspi: Get board version from board revision code
From: |
Igor Mammedov |
Subject: |
Re: [PATCH 2/6] hw/arm/raspi: Get board version from board revision code |
Date: |
Mon, 3 Feb 2020 10:57:46 +0100 |
On Mon, 3 Feb 2020 09:26:15 +0100
Philippe Mathieu-Daudé <address@hidden> wrote:
> The chip ID is encoded in the board revision, and the board version
> is simply 'chip_id + 1'.
> We want to support more boards which follow the same scheme.
> Introduce a new RaspiBoardInfo structure which we'll extend in the
> following commits.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/arm/raspi.c | 45 +++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 39 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index ef76a27f33..eaa8c49009 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -36,6 +36,39 @@ typedef struct RasPiState {
> MemoryRegion ram;
> } RasPiState;
>
> +typedef struct RaspiBoardInfo {
> + /*
> + * Board revision codes:
> + * www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/
> + */
> + uint32_t board_rev;
> +} RaspiBoardInfo;
> +
> +enum { BOARD_PI2, BOARD_PI3 };
> +
> +static const RaspiBoardInfo raspi_boards[] = {
> + [BOARD_PI2] =
> + {
> + .board_rev = 0xa21041,
> + },
> +#ifdef TARGET_AARCH64
> + [BOARD_PI3] =
> + {
> + .board_rev = 0xa02082,
> + },
> +#endif
> +};
This patter was(is) used widely by embed boards before QOM
(I mean introducing various structures to keep boards configs
and then passing them around). Which I found were cumbersome
to deal with with working on ram refactoring.
But have you considered using machine classes which
perfectly feet the task, instead of repeating old pattern?
> +static int board_chip_id(const RaspiBoardInfo *config)
> +{
> + return extract32(config->board_rev, 12, 4);
> +}
> +
> +static int board_version(const RaspiBoardInfo *config)
> +{
> + return board_chip_id(config) + 1;
> +}
> +
> static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
> {
> static const uint32_t smpboot[] = {
> @@ -163,9 +196,10 @@ static void setup_boot(MachineState *machine, int
> version, size_t ram_size)
> arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
> }
>
> -static void raspi_init(MachineState *machine, int version)
> +static void raspi_init(MachineState *machine, const RaspiBoardInfo *config)
> {
> RasPiState *s = g_new0(RasPiState, 1);
> + int version = board_version(config);
> uint32_t vcram_size;
> DriveInfo *di;
> BlockBackend *blk;
> @@ -191,9 +225,8 @@ static void raspi_init(MachineState *machine, int version)
> /* Setup the SOC */
> object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
> &error_abort);
> - int board_rev = version == 3 ? 0xa02082 : 0xa21041;
> - object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
> - &error_abort);
> + object_property_set_int(OBJECT(&s->soc), config->board_rev,
> + "board-rev", &error_abort);
> object_property_set_bool(OBJECT(&s->soc), true, "realized",
> &error_abort);
>
> /* Create and plug in the SD cards */
> @@ -215,7 +248,7 @@ static void raspi_init(MachineState *machine, int version)
>
> static void raspi2_init(MachineState *machine)
> {
> - raspi_init(machine, 2);
> + raspi_init(machine, &raspi_boards[BOARD_PI2]);
> }
>
> static void raspi2_machine_init(MachineClass *mc)
> @@ -237,7 +270,7 @@ DEFINE_MACHINE("raspi2", raspi2_machine_init)
> #ifdef TARGET_AARCH64
> static void raspi3_init(MachineState *machine)
> {
> - raspi_init(machine, 3);
> + raspi_init(machine, &raspi_boards[BOARD_PI3]);
> }
>
> static void raspi3_machine_init(MachineClass *mc)
- [PATCH 0/6] hw/arm/raspi: Dynamically create machines based on the board revision, Philippe Mathieu-Daudé, 2020/02/03
- [PATCH 2/6] hw/arm/raspi: Get board version from board revision code, Philippe Mathieu-Daudé, 2020/02/03
- Re: [PATCH 2/6] hw/arm/raspi: Get board version from board revision code,
Igor Mammedov <=
- [PATCH 3/6] hw/arm/raspi: Get the SoC type name from the revision code, Philippe Mathieu-Daudé, 2020/02/03
- [PATCH 1/6] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels, Philippe Mathieu-Daudé, 2020/02/03
- [PATCH 4/6] hw/arm/raspi: Get board RAM size from board revision code, Philippe Mathieu-Daudé, 2020/02/03
- [PATCH 6/6] hw/arm/raspi: Get the CPU core count from the revision code, Philippe Mathieu-Daudé, 2020/02/03
- [PATCH 5/6] hw/arm/raspi: Dynamically create machines based on the board revision, Philippe Mathieu-Daudé, 2020/02/03
- Re: [PATCH 0/6] hw/arm/raspi: Dynamically create machines based on the board revision, no-reply, 2020/02/03