From: Niek Linnenbank <nieklinnenbank@gmail.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-arm <qemu-arm@nongnu.org>,
QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PATCH v3 02/17] hw/arm: add Xunlong Orange Pi PC machine
Date: Fri, 10 Jan 2020 22:20:56 +0100 [thread overview]
Message-ID: <CAPan3WohW3fPFvGT62c_+3XmP59Zps74=32=5w4GFu9BVxNDCA@mail.gmail.com> (raw)
In-Reply-To: <c41068dc-7684-3da2-e53e-649e3e4aded1@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 6543 bytes --]
On Wed, Jan 8, 2020 at 11:44 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:
> On 1/8/20 9:00 PM, Niek Linnenbank wrote:
> > The Xunlong Orange Pi PC is an Allwinner H3 System on Chip
> > based embedded computer with mainline support in both U-Boot
> > and Linux. The board comes with a Quad Core Cortex A7 @ 1.3GHz,
> > 512MB RAM, 100Mbit ethernet, USB, SD/MMC, USB, HDMI and
> > various other I/O. This commit add support for the Xunlong
> > Orange Pi PC machine.
> >
> > Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>
> > Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
> > ---
> > hw/arm/orangepi.c | 93 ++++++++++++++++++++++++++++++++++++++++++++
> > MAINTAINERS | 1 +
> > hw/arm/Makefile.objs | 2 +-
> > 3 files changed, 95 insertions(+), 1 deletion(-)
> > create mode 100644 hw/arm/orangepi.c
> >
> > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> > new file mode 100644
> > index 0000000000..051184f14f
> > --- /dev/null
> > +++ b/hw/arm/orangepi.c
> > @@ -0,0 +1,93 @@
> > +/*
> > + * Orange Pi emulation
> > + *
> > + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation, either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program. If not, see <http://www.gnu.org/licenses/
> >.
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "exec/address-spaces.h"
> > +#include "qapi/error.h"
> > +#include "cpu.h"
> > +#include "hw/sysbus.h"
> > +#include "hw/boards.h"
> > +#include "hw/qdev-properties.h"
> > +#include "hw/arm/allwinner-h3.h"
> > +#include "sysemu/sysemu.h"
> > +
> > +static struct arm_boot_info orangepi_binfo = {
> > + .board_id = -1,
>
> Since you use a dtb, I suppose Linux ignores this board_id.
>
> Nitpick, you can set this here:
>
> .nb_cpus = AW_H3_NUM_CPUS,
>
> > +};
> > +
> > +typedef struct OrangePiState {
> > + AwH3State *h3;
> > + MemoryRegion sdram;
> > +} OrangePiState;
> > +
> > +static void orangepi_init(MachineState *machine)
> > +{
> > + OrangePiState *s = g_new(OrangePiState, 1);
> > +
>
> I'd do the bios check first, as it is cheap and avoid allocating RAM + H3:
>
> /* Load target kernel or start using BootROM */
> if (bios_name) {
> error_report("BIOS not supported for this machine");
> exit(1);
> }
>
> > + /* Only allow Cortex-A7 for this board */
> > + if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a7")) != 0)
> {
> > + error_report("This board can only be used with cortex-a7 CPU");
> > + exit(1);
> > + }
> > +
> > + s->h3 = AW_H3(object_new(TYPE_AW_H3));
> > +
> > + /* Setup timer properties */
> > + object_property_set_int(OBJECT(s->h3), 32768, "clk0-freq",
> > + &error_abort);
> > + object_property_set_int(OBJECT(s->h3), 24000000, "clk1-freq",
>
> I find 24 * 1000 * 1000 easier to review.
>
> > + &error_abort);
> > +
> > + /* Mark H3 object realized */
> > + object_property_set_bool(OBJECT(s->h3), true, "realized",
> &error_abort);
> > +
> > + /* SDRAM */
> > + if (machine->ram_size != 1 * GiB) {
> > + error_report("Requested ram size is not supported for this
> machine: "
> > + "restricted to 1GiB");
>
> Maybe easier as "This machine can only be used with 1GiB of RAM"
>
> > + exit(1);
> > + }
> > + memory_region_allocate_system_memory(&s->sdram, NULL, "sdram",
> > + machine->ram_size);
> > + memory_region_add_subregion(get_system_memory(),
> s->h3->memmap[AW_H3_SDRAM],
> > + &s->sdram);
> > +
> > + /* Load target kernel or start using BootROM */
> > + if (bios_name) {
> > + error_report("BIOS not supported for this machine");
> > + exit(1);
> > + }
> > + orangepi_binfo.loader_start = s->h3->memmap[AW_H3_SDRAM];
> > + orangepi_binfo.ram_size = machine->ram_size;
> > + orangepi_binfo.nb_cpus = AW_H3_NUM_CPUS;
> > + arm_load_kernel(ARM_CPU(first_cpu), machine, &orangepi_binfo);
> > +}
> > +
> > +static void orangepi_machine_init(MachineClass *mc)
> > +{
> > + mc->desc = "Orange Pi PC";
> > + mc->init = orangepi_init;
> > + mc->min_cpus = AW_H3_NUM_CPUS;
> > + mc->max_cpus = AW_H3_NUM_CPUS;
> > + mc->default_cpus = AW_H3_NUM_CPUS;
> > + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
> > + mc->default_ram_size = 1 * GiB;
> > +}
> > +
> > +DEFINE_MACHINE("orangepi-pc", orangepi_machine_init)
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index dc2d7991bf..6e1b92b5fa 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -487,6 +487,7 @@ L: qemu-arm@nongnu.org
> > S: Maintained
> > F: hw/*/allwinner-h3*
> > F: include/hw/*/allwinner-h3*
> > +F: hw/arm/orangepi.c
> >
> > ARM PrimeCell and CMSDK devices
> > M: Peter Maydell <peter.maydell@linaro.org>
> > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> > index 956e496052..8d5ea453d5 100644
> > --- a/hw/arm/Makefile.objs
> > +++ b/hw/arm/Makefile.objs
> > @@ -34,7 +34,7 @@ obj-$(CONFIG_DIGIC) += digic.o
> > obj-$(CONFIG_OMAP) += omap1.o omap2.o
> > obj-$(CONFIG_STRONGARM) += strongarm.o
> > obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
> > -obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3.o
> > +obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3.o orangepi.o
> > obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
> > obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
> > obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o
> >
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Thanks Philippe! I will update the file with your comments and add the
reviewed by.
Regards
Niek
--
Niek Linnenbank
[-- Attachment #2: Type: text/html, Size: 8769 bytes --]
next prev parent reply other threads:[~2020-01-10 21:21 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 20:00 [PATCH v3 00/17] Add Allwinner H3 SoC and Orange Pi PC Machine Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 01/17] hw/arm: add Allwinner H3 System-on-Chip Niek Linnenbank
2020-01-08 23:13 ` Philippe Mathieu-Daudé
2020-01-11 20:45 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 02/17] hw/arm: add Xunlong Orange Pi PC machine Niek Linnenbank
2020-01-08 22:44 ` Philippe Mathieu-Daudé
2020-01-10 21:20 ` Niek Linnenbank [this message]
2020-01-08 20:00 ` [PATCH v3 03/17] hw/arm/allwinner-h3: add Clock Control Unit Niek Linnenbank
2020-01-13 19:18 ` Niek Linnenbank
2020-01-18 15:37 ` Philippe Mathieu-Daudé
2020-01-18 23:28 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 04/17] hw/arm/allwinner-h3: add USB host controller Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 05/17] hw/arm/allwinner-h3: add System Control module Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 06/17] hw/arm/allwinner: add CPU Configuration module Niek Linnenbank
2020-01-13 23:14 ` Philippe Mathieu-Daudé
2020-01-14 23:04 ` Niek Linnenbank
2020-01-18 9:06 ` Philippe Mathieu-Daudé
2020-01-18 22:17 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device Niek Linnenbank
2020-01-18 15:25 ` Philippe Mathieu-Daudé
2020-01-20 17:59 ` Corey Minyard
2020-02-02 21:27 ` Niek Linnenbank
2020-02-03 13:10 ` Corey Minyard
2020-02-06 21:09 ` Niek Linnenbank
2020-02-12 21:31 ` Niek Linnenbank
2020-02-12 22:47 ` Philippe Mathieu-Daudé
2020-02-17 19:34 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 08/17] hw/arm/allwinner: add SD/MMC host controller Niek Linnenbank
2020-01-18 15:39 ` Philippe Mathieu-Daudé
2020-01-08 20:00 ` [PATCH v3 09/17] hw/arm/allwinner-h3: add EMAC ethernet device Niek Linnenbank
2020-01-18 15:17 ` Philippe Mathieu-Daudé
2020-01-08 20:00 ` [PATCH v3 10/17] hw/arm/allwinner-h3: add Boot ROM support Niek Linnenbank
2020-01-13 23:28 ` Philippe Mathieu-Daudé
2020-01-14 23:10 ` Niek Linnenbank
2020-01-18 9:09 ` Philippe Mathieu-Daudé
2020-01-18 22:28 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 11/17] hw/arm/allwinner-h3: add SDRAM controller device Niek Linnenbank
2020-01-18 15:22 ` Philippe Mathieu-Daudé
2020-01-08 20:00 ` [PATCH v3 12/17] hw/arm/allwinner: add RTC device support Niek Linnenbank
2020-01-13 22:57 ` Philippe Mathieu-Daudé
2020-01-14 22:52 ` Niek Linnenbank
2020-01-14 22:57 ` Niek Linnenbank
2020-01-18 15:05 ` Philippe Mathieu-Daudé
2020-01-18 22:52 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 13/17] tests/boot_linux_console: Add a quick test for the OrangePi PC board Niek Linnenbank
2020-01-18 11:22 ` Philippe Mathieu-Daudé
2020-01-18 23:04 ` Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 14/17] tests/boot_linux_console: Add initrd test for the Orange Pi " Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 15/17] tests/boot_linux_console: Add a SD card test for the OrangePi " Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 16/17] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC Niek Linnenbank
2020-01-08 20:00 ` [PATCH v3 17/17] docs: add Orange Pi PC document Niek Linnenbank
2020-01-18 9:37 ` Philippe Mathieu-Daudé
2020-01-18 22:38 ` Niek Linnenbank
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='CAPan3WohW3fPFvGT62c_+3XmP59Zps74=32=5w4GFu9BVxNDCA@mail.gmail.com' \
--to=nieklinnenbank@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).