From patchwork Thu Mar 12 16:44:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184475 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp777669ile; Thu, 12 Mar 2020 09:51:07 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuF214H1wD0zmc51uFLkwQHDyHxoR72p4biscrX2Y3FB2oDTdJDum9aT+IaCHEG5oFIsxdP X-Received: by 2002:ac8:7410:: with SMTP id p16mr8078756qtq.70.1584031867814; Thu, 12 Mar 2020 09:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584031867; cv=none; d=google.com; s=arc-20160816; b=vK81c3xLmVc3eLxoWYR8DC+qA2db3y4wI/+xE83d9tpzrRdktmIQ3uuRUT5xWFiKx9 yLF1sCGiCRncjeldn9kEWBKIH3b0zHi0wPFwiahVccjfOQCdCR9SGz2T/pOio64D+/pd egbqvu1r4C4C5GSDVAwneJuVVfHNbM4OaE/5DGcK05CFUzemY6KApuNqNMWWtisODYK4 68yuhLZ1r8ADTSGlQC/pfGy3MaOrQbAsgFobCjkoRGJldLCcy+AvoRDOKZFFc0xSdE1K KD19A1h8r7WuHWdo1+v9i+FLrd3DmY9O3Jn53ZpG1SaDDzrDHraBMCIR4IiXaHtmkhaX m+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Cf67v8iVsz5NRtg3LDjbFwVL498OUf7DASE7uAfE+tc=; b=c0lG4DGeVc1o7CPFYy8yOuFXfJ/KZbZKdIbL6GD1GbtADc/lvZm+cyceDuiN7AUxO9 0F2zOxa3S77xh3QSm3kgQd8XGlcb+SGSetKiPbmQC+liu79upA6RFDyTCbPsgZwVkLhA fmtfICf3yFPY9Sf6CLHLi6shT9eumRyEqgSFsZyvm9dC1RqLF8da0BF+GixYy6zPHUJd iF7Ulf56Ao9OpGTYIFpa6Hs43i497C4JwYJFbUtGxuVql9zyHdTaB3RHfMUic0qJgUky AODDMamUmJgy3FRZfemuULIB7vamw/vQnR0Fn7n+FbwQabKTQo7aM4i5+6+5f+TMNE0B borQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NV1HsJGV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 77si3301686qkh.30.2020.03.12.09.51.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Mar 2020 09:51:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NV1HsJGV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCR35-0005s1-8r for patch@linaro.org; Thu, 12 Mar 2020 12:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35676) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCQxU-0008SX-6c for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCQxS-00058h-KM for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:20 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCQxS-00058M-Ch for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:18 -0400 Received: by mail-wr1-x435.google.com with SMTP id z15so8381451wrl.1 for ; Thu, 12 Mar 2020 09:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cf67v8iVsz5NRtg3LDjbFwVL498OUf7DASE7uAfE+tc=; b=NV1HsJGVCAE1YYBz2pr9M3laJAvNxmT5WCPkDfueCz4YoDLvVqunp3dgRH4bgdaGXL svrRSTm6dOh9CMRFnVenxd6tUwDCyVeYjGEnhmQ8iFdlKarYYFE2Gkf1J54APuRnXx26 o1zEGZ609MaiphRRtapn2+BrkQK3dS4+EOaheNELsz3ho+IxHfyUf72nNfaFO0bk958Z FZmK/HzBzlsHPbl+VJUy6eTgKVBpGMEpm7oH7pk1ne4ZFB7JqUqcEJGXDps68yq2DXV5 L8sKn1fvU9BQkvmO0CzHcDU/D+oKTVg5Cr8eg1IbHxjGiK89GwJt+DVZmcNAMULhqmlM h2iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cf67v8iVsz5NRtg3LDjbFwVL498OUf7DASE7uAfE+tc=; b=S6ZATKhOUtwpwKv9Zori6r/3qxD1ve9RXBWA8/wIJRKQZfvuZpl0t+k36ofYhAaEDQ Jhpj7GWO2CWC+tYGJkxzPSgnBP/8Bmuwbu/QlufOs135g5HyLI44Cl1DNrXEHf8SiVju 6bCn+Vs1eWWabBnN555m8Xv/yXsl1FZoPeytUKmJP+p6Hzb2h8ZNAoCI/lSIxTycrpXt gJsovgUt5yYTKrIifvgpwCOnSQnUQORTL6WAHUo3W4/1iMWWoseUiFURbo6T5LCOHnum NNG9Mw3Tyv4GyWQoXYwxAqR7GRonhv0tes+XYqN2m8Jf0XV7TmgO2/OSmk3Rr1y6DNK+ L5Eg== X-Gm-Message-State: ANhLgQ0mqRFjMeO8OjDr/XxDUFAXuYq93bOxiEnCFcTGzCpbSIpZaHcM wwUi0kf+CQ0AGu7KnpuyAghCU1NofoNvQQ== X-Received: by 2002:a5d:6a0e:: with SMTP id m14mr12079819wru.202.1584031517072; Thu, 12 Mar 2020 09:45:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j15sm36838640wrp.85.2020.03.12.09.45.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 09:45:16 -0700 (PDT) From: Peter Maydell 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 Message-Id: <20200312164459.25924-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312164459.25924-1-peter.maydell@linaro.org> References: <20200312164459.25924-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Niek Linnenbank 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 Tested-by: KONRAD Frederic Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Acked-by: Igor Mammedov Message-id: 20200311221854.30370-3-nieklinnenbank@gmail.com Signed-off-by: Peter Maydell --- 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 -- 2.20.1 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 + * + * 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 . + */ + +#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