qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 13/36] hw/arm: add Xunlong Orange Pi PC machine
Date: Thu, 12 Mar 2020 16:44:36 +0000	[thread overview]
Message-ID: <20200312164459.25924-14-peter.maydell@linaro.org> (raw)
In-Reply-To: <20200312164459.25924-1-peter.maydell@linaro.org>

From: Niek Linnenbank <nieklinnenbank@gmail.com>

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,
1GiB 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>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200311221854.30370-3-nieklinnenbank@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/Makefile.objs |  2 +-
 hw/arm/orangepi.c    | 92 ++++++++++++++++++++++++++++++++++++++++++++
 MAINTAINERS          |  1 +
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 hw/arm/orangepi.c

diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index ae577e875fd..534a6a119e5 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -35,7 +35,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_STM32F405_SOC) += stm32f405_soc.o
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
new file mode 100644
index 00000000000..3fcec1944e8
--- /dev/null
+++ b/hw/arm/orangepi.c
@@ -0,0 +1,92 @@
+/*
+ * 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 "qemu/units.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 = {
+    .nb_cpus = AW_H3_NUM_CPUS,
+};
+
+static void orangepi_init(MachineState *machine)
+{
+    AwH3State *h3;
+
+    /* BIOS is not supported by this board */
+    if (bios_name) {
+        error_report("BIOS not supported for this machine");
+        exit(1);
+    }
+
+    /* This board has fixed size RAM */
+    if (machine->ram_size != 1 * GiB) {
+        error_report("This machine can only be used with 1GiB of RAM");
+        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);
+    }
+
+    h3 = AW_H3(object_new(TYPE_AW_H3));
+    object_property_add_child(OBJECT(machine), "soc", OBJECT(h3),
+                              &error_abort);
+    object_unref(OBJECT(h3));
+
+    /* Setup timer properties */
+    object_property_set_int(OBJECT(h3), 32768, "clk0-freq",
+                            &error_abort);
+    object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, "clk1-freq",
+                            &error_abort);
+
+    /* Mark H3 object realized */
+    object_property_set_bool(OBJECT(h3), true, "realized", &error_abort);
+
+    /* SDRAM */
+    memory_region_add_subregion(get_system_memory(), h3->memmap[AW_H3_SDRAM],
+                                machine->ram);
+
+    orangepi_binfo.loader_start = h3->memmap[AW_H3_SDRAM];
+    orangepi_binfo.ram_size = machine->ram_size;
+    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;
+    mc->default_ram_id = "orangepi.ram";
+}
+
+DEFINE_MACHINE("orangepi-pc", orangepi_machine_init)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3efa8e53ec8..d7a26d7171e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -498,6 +498,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>
-- 
2.20.1



  parent reply	other threads:[~2020-03-12 16:50 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 16:44 [PULL 00/36] target-arm queue Peter Maydell
2020-03-12 16:44 ` [PULL 01/36] hw/intc/armv7m_nvic: Rebuild hflags on reset Peter Maydell
2020-03-12 16:44 ` [PULL 02/36] target/arm: Update hflags in trans_CPS_v7m() Peter Maydell
2020-03-12 16:44 ` [PULL 03/36] target/arm: Recalculate hflags correctly after writes to CONTROL Peter Maydell
2020-03-12 16:44 ` [PULL 04/36] target/arm: Fix some comment typos Peter Maydell
2020-03-12 16:44 ` [PULL 05/36] aspeed/smc: Add some tracing Peter Maydell
2020-03-12 16:44 ` [PULL 06/36] aspeed/smc: Fix User mode select/unselect scheme Peter Maydell
2020-03-12 16:44 ` [PULL 07/36] target/arm: Check addresses for disabled regimes Peter Maydell
2020-03-12 16:44 ` [PULL 08/36] target/arm: Disable clean_data_tbi for system mode Peter Maydell
2020-03-12 16:44 ` [PULL 09/36] hw/arm/cubieboard: make sure SOC object isn't leaked Peter Maydell
2020-03-12 16:44 ` [PULL 10/36] hw/arm/fsl-imx25: Wire up eSDHC controllers Peter Maydell
2020-03-12 16:44 ` [PULL 11/36] hw/arm/fsl-imx25: Wire up USB controllers Peter Maydell
2020-03-12 16:44 ` [PULL 12/36] hw/arm: add Allwinner H3 System-on-Chip Peter Maydell
2020-03-12 16:44 ` Peter Maydell [this message]
2020-03-12 16:44 ` [PULL 14/36] hw/arm/allwinner-h3: add Clock Control Unit Peter Maydell
2020-03-12 16:44 ` [PULL 15/36] hw/arm/allwinner-h3: add USB host controller Peter Maydell
2020-03-12 16:44 ` [PULL 16/36] hw/arm/allwinner-h3: add System Control module Peter Maydell
2020-03-12 16:44 ` [PULL 17/36] hw/arm/allwinner: add CPU Configuration module Peter Maydell
2020-03-12 16:44 ` [PULL 18/36] hw/arm/allwinner: add Security Identifier device Peter Maydell
2020-03-12 16:44 ` [PULL 19/36] hw/arm/allwinner: add SD/MMC host controller Peter Maydell
2020-03-12 16:44 ` [PULL 20/36] hw/arm/allwinner-h3: add EMAC ethernet device Peter Maydell
2020-03-12 16:44 ` [PULL 21/36] hw/arm/allwinner-h3: add Boot ROM support Peter Maydell
2020-03-20 12:07   ` Peter Maydell
2020-03-21 17:17     ` Niek Linnenbank
2020-03-21 19:47       ` Peter Maydell
2020-03-12 16:44 ` [PULL 22/36] hw/arm/allwinner-h3: add SDRAM controller device Peter Maydell
2020-03-20 15:46   ` Peter Maydell
2020-03-22 20:23     ` Niek Linnenbank
2020-03-22 21:17       ` Peter Maydell
2020-03-12 16:44 ` [PULL 23/36] hw/arm/allwinner: add RTC device support Peter Maydell
2020-03-12 16:44 ` [PULL 24/36] tests/boot_linux_console: Add a quick test for the OrangePi PC board Peter Maydell
2020-03-12 16:44 ` [PULL 25/36] tests/boot_linux_console: Add initrd test for the Orange Pi " Peter Maydell
2020-03-12 16:44 ` [PULL 26/36] tests/boot_linux_console: Add a SD card test for the OrangePi " Peter Maydell
2020-03-12 16:44 ` [PULL 27/36] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC Peter Maydell
2020-03-12 16:44 ` [PULL 28/36] tests/boot_linux_console: Test booting NetBSD via U-Boot " Peter Maydell
2020-03-12 16:44 ` [PULL 29/36] docs: add Orange Pi PC document Peter Maydell
2020-03-12 16:44 ` [PULL 30/36] hw/arm/virt: Document 'max' value in gic-version property description Peter Maydell
2020-03-12 16:44 ` [PULL 31/36] hw/arm/virt: Introduce VirtGICType enum type Peter Maydell
2020-03-12 16:44 ` [PULL 32/36] hw/arm/virt: Introduce finalize_gic_version() Peter Maydell
2020-03-12 16:44 ` [PULL 33/36] target/arm/kvm: Let kvm_arm_vgic_probe() return a bitmap Peter Maydell
2020-03-12 16:44 ` [PULL 34/36] hw/arm/virt: kvm: Restructure finalize_gic_version() Peter Maydell
2020-03-12 16:44 ` [PULL 35/36] hw/arm/virt: kvm: allow gicv3 by default if v2 cannot work Peter Maydell
2020-03-12 16:44 ` [PULL 36/36] target/arm: kvm: Inject events at the last stage of sync Peter Maydell
2020-03-12 20:32 ` [PULL 00/36] target-arm queue Peter Maydell

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=20200312164459.25924-14-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.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).