From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514061; cv=none; d=zohomail.com; s=zohoarc; b=crGdwWfgEn2hp1N2Cr1rndXbJC8ibfGca4FW5J+zQh5vgT9WxptjdDbmFpHF6usc73Ea3bjLwCJN0uY+3ronESeV3bOtl1vkIZXywgjoM0sweptptDEMCfP1UR5Po15UrD8T4y07Gs+vbsZ/4yNb31icF/U8sDw/zFZjARqi808= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514061; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kPXqcCPJtRQyt8GSCKatgPtUrzsI5xU5eBHmljV4qS8=; b=AGwXI5fxbad4L+Mn9p9dD9l8fxvQJichNE1PgQ4ZryBkhR8Ck8rrbDHvlQr/EymCOgS3am+ZVyhAdp62qyxOrTc6jmyZ2ASnrS8PV5Kss9mdir9/7YxvjWFQCcD4CIE3T8zTtLBcdtzuIp03KLVFZAzid8ZsqhmnK9w4cDvhNH4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514061311944.4119663501499; Wed, 8 Jan 2020 12:07:41 -0800 (PST) Received: from localhost ([::1]:48740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHcB-0000QO-IA for importer@patchew.org; Wed, 08 Jan 2020 15:07:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35344) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVT-0001Hy-47 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVP-0002UK-FI for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:42 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34278) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVP-0002Sm-5p; Wed, 08 Jan 2020 15:00:39 -0500 Received: by mail-wr1-x442.google.com with SMTP id t2so4808829wrr.1; Wed, 08 Jan 2020 12:00:38 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kPXqcCPJtRQyt8GSCKatgPtUrzsI5xU5eBHmljV4qS8=; b=OF+23ZuasZUpRk9xwjXrbrc2HitljbTrTJ1zytdZn7S3c4ciTOIWcwkLL/3GxR6VBZ QOF9c979aEucBmVcRASwYM/rKgbkFOEM9eyBhXsWZOo92iNFsuG9t/DyHpYeD0bF7rx7 IfdXTZ6jQq5oUbkS625xfo0tkCNkggIRkKdEvskpnsKrYyKAxgvlzAGfi1s6lqmxTv5I akNfXfa8IOe0SIPECVNqOQGGzh5ZYIWhMfQJHB4bvdsVSRyKHopgWipc0BKQVPbFD2P4 ddoRy/DoPddFRRa9BqdWaZBLmeVOAs7DV2Vp+tsnEbpcdBbDtZsva2aF5K4jzDiovJu1 RlPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kPXqcCPJtRQyt8GSCKatgPtUrzsI5xU5eBHmljV4qS8=; b=gHQieuXIbIq83uha8UT0IJbrtuB16RSKegdwpabfkVquhGMC8e1BZXHKBqkEWN22lg kjt/uaCarUUSVJqQqnW/R4o54P7bPex7EAmwAQigO7vLFxvyHZzz74NKJ5+HoAt8A2xv 188uOr8rEtW1Kl//9UwWg0OeFj97jNY9hp7N5fejefWqolALvXUYaK3WxztSqaTaAbRA Hd9ljrFWtjJGnIydszbcyvwIq4kpGvCHVFKx5OzVW7kaca7S3X/lyKIX3Xbv5n+Spkf2 /ykgHRRHPoG9lp/nljGNyv3jQPhP7lJDHeYf+bLdi8ra6Ib3wwC6uNj9GwclPaefxw5D AuUA== X-Gm-Message-State: APjAAAXDzkSFjQoX1vopRkAZF7kEUyAIP6KSi+nEgkiHwriIqzzRfiPQ 5F1vlfwDsP6EHz3/UoihfQFZ31J4 X-Google-Smtp-Source: APXvYqyWKziBTihr2bOOKbfFYYRXNBdu0nb99kaQtmbEGOkncbItfISbMmtszcVR7YeO9YP2OqNstA== X-Received: by 2002:adf:ca07:: with SMTP id o7mr6780335wrh.49.1578513635794; Wed, 08 Jan 2020 12:00:35 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 01/17] hw/arm: add Allwinner H3 System-on-Chip Date: Wed, 8 Jan 2020 21:00:04 +0100 Message-Id: <20200108200020.4745-2-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Allwinner H3 is a System on Chip containing four ARM Cortex A7 processor cores. Features and specifications include DDR2/DDR3 memory, SD/MMC storage cards, 10/100/1000Mbit ethernet, USB 2.0, HDMI and various I/O modules. This commit adds support for the Allwinner H3 System on Chip. Signed-off-by: Niek Linnenbank --- default-configs/arm-softmmu.mak | 1 + include/hw/arm/allwinner-h3.h | 107 +++++++++++ hw/arm/allwinner-h3.c | 328 ++++++++++++++++++++++++++++++++ MAINTAINERS | 7 + hw/arm/Kconfig | 8 + hw/arm/Makefile.objs | 1 + 6 files changed, 452 insertions(+) create mode 100644 include/hw/arm/allwinner-h3.h create mode 100644 hw/arm/allwinner-h3.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 1f2e0e7fde..d75a239c2c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -40,3 +40,4 @@ CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy CONFIG_SEMIHOSTING=3Dy +CONFIG_ALLWINNER_H3=3Dy diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h new file mode 100644 index 0000000000..4e2e6202a9 --- /dev/null +++ b/include/hw/arm/allwinner-h3.h @@ -0,0 +1,107 @@ +/* + * Allwinner H3 System on Chip 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 . + */ + +/* + * The Allwinner H3 is a System on Chip containing four ARM Cortex A7 + * processor cores. Features and specifications include DDR2/DDR3 memory, + * SD/MMC storage cards, 10/100/1000Mbit ethernet, USB 2.0, HDMI and + * various I/O modules. + * + * This implementation is based on the following datasheet: + * + * https://linux-sunxi.org/File:Allwinner_H3_Datasheet_V1.2.pdf + * + * The latest datasheet and more info can be found on the Linux Sunxi wiki: + * + * https://linux-sunxi.org/H3 + */ + +#ifndef HW_ARM_ALLWINNER_H3_H +#define HW_ARM_ALLWINNER_H3_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "qemu/error-report.h" +#include "qemu/units.h" +#include "hw/qdev-core.h" +#include "hw/arm/boot.h" +#include "hw/timer/allwinner-a10-pit.h" +#include "hw/intc/arm_gic.h" +#include "target/arm/cpu.h" + +/** + * Allwinner H3 device list + * + * This enumeration is can be used refer to a particular device in the + * Allwinner H3 SoC. For example, the physical memory base address for + * each device can be found in the AwH3State object in the memmap member + * using the device enum value as index. + * + * @see AwH3State + */ +enum { + AW_H3_SRAM_A1, + AW_H3_SRAM_A2, + AW_H3_SRAM_C, + AW_H3_PIT, + AW_H3_UART0, + AW_H3_UART1, + AW_H3_UART2, + AW_H3_UART3, + AW_H3_GIC_DIST, + AW_H3_GIC_CPU, + AW_H3_GIC_HYP, + AW_H3_GIC_VCPU, + AW_H3_SDRAM +}; + +/** Total number of CPU cores in the SoC */ +#define AW_H3_NUM_CPUS (4) + +/** + * Allwinner H3 object model + * @{ + */ + +/** Object type for the Allwinner H3 SoC */ +#define TYPE_AW_H3 "allwinner-h3" + +/** Convert input object to Allwinner H3 state object */ +#define AW_H3(obj) OBJECT_CHECK(AwH3State, (obj), TYPE_AW_H3) + +/** @} */ + +/** + * Allwinner H3 object instance state + */ +typedef struct AwH3State { + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + + ARMCPU cpus[AW_H3_NUM_CPUS]; + const hwaddr *memmap; + AwA10PITState timer; + GICState gic; + MemoryRegion sram_a1; + MemoryRegion sram_a2; + MemoryRegion sram_c; +} AwH3State; + +#endif /* HW_ARM_ALLWINNER_H3_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c new file mode 100644 index 0000000000..c1ef31e875 --- /dev/null +++ b/hw/arm/allwinner-h3.c @@ -0,0 +1,328 @@ +/* + * Allwinner H3 System on Chip 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 "exec/address-spaces.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "qemu/units.h" +#include "cpu.h" +#include "hw/sysbus.h" +#include "hw/char/serial.h" +#include "hw/misc/unimp.h" +#include "sysemu/sysemu.h" +#include "hw/arm/allwinner-h3.h" + +/* Memory map */ +const hwaddr allwinner_h3_memmap[] =3D { + [AW_H3_SRAM_A1] =3D 0x00000000, + [AW_H3_SRAM_A2] =3D 0x00044000, + [AW_H3_SRAM_C] =3D 0x00010000, + [AW_H3_PIT] =3D 0x01c20c00, + [AW_H3_UART0] =3D 0x01c28000, + [AW_H3_UART1] =3D 0x01c28400, + [AW_H3_UART2] =3D 0x01c28800, + [AW_H3_UART3] =3D 0x01c28c00, + [AW_H3_GIC_DIST] =3D 0x01c81000, + [AW_H3_GIC_CPU] =3D 0x01c82000, + [AW_H3_GIC_HYP] =3D 0x01c84000, + [AW_H3_GIC_VCPU] =3D 0x01c86000, + [AW_H3_SDRAM] =3D 0x40000000 +}; + +/* List of unimplemented devices */ +struct AwH3Unimplemented { + const char *device_name; + hwaddr base; + hwaddr size; +} unimplemented[] =3D { + { "d-engine", 0x01000000, 4 * MiB }, + { "d-inter", 0x01400000, 128 * KiB }, + { "syscon", 0x01c00000, 4 * KiB }, + { "dma", 0x01c02000, 4 * KiB }, + { "nfdc", 0x01c03000, 4 * KiB }, + { "ts", 0x01c06000, 4 * KiB }, + { "keymem", 0x01c0b000, 4 * KiB }, + { "lcd0", 0x01c0c000, 4 * KiB }, + { "lcd1", 0x01c0d000, 4 * KiB }, + { "ve", 0x01c0e000, 4 * KiB }, + { "mmc0", 0x01c0f000, 4 * KiB }, + { "mmc1", 0x01c10000, 4 * KiB }, + { "mmc2", 0x01c11000, 4 * KiB }, + { "sid", 0x01c14000, 1 * KiB }, + { "crypto", 0x01c15000, 4 * KiB }, + { "msgbox", 0x01c17000, 4 * KiB }, + { "spinlock", 0x01c18000, 4 * KiB }, + { "usb0-otg", 0x01c19000, 4 * KiB }, + { "usb0", 0x01c1a000, 4 * KiB }, + { "usb1", 0x01c1b000, 4 * KiB }, + { "usb2", 0x01c1c000, 4 * KiB }, + { "usb3", 0x01c1d000, 4 * KiB }, + { "smc", 0x01c1e000, 4 * KiB }, + { "ccu", 0x01c20000, 1 * KiB }, + { "pio", 0x01c20800, 1 * KiB }, + { "owa", 0x01c21000, 1 * KiB }, + { "pwm", 0x01c21400, 1 * KiB }, + { "keyadc", 0x01c21800, 1 * KiB }, + { "pcm0", 0x01c22000, 1 * KiB }, + { "pcm1", 0x01c22400, 1 * KiB }, + { "pcm2", 0x01c22800, 1 * KiB }, + { "audio", 0x01c22c00, 2 * KiB }, + { "smta", 0x01c23400, 1 * KiB }, + { "ths", 0x01c25000, 1 * KiB }, + { "uart0", 0x01c28000, 1 * KiB }, + { "uart1", 0x01c28400, 1 * KiB }, + { "uart2", 0x01c28800, 1 * KiB }, + { "uart3", 0x01c28c00, 1 * KiB }, + { "twi0", 0x01c2ac00, 1 * KiB }, + { "twi1", 0x01c2b000, 1 * KiB }, + { "twi2", 0x01c2b400, 1 * KiB }, + { "scr", 0x01c2c400, 1 * KiB }, + { "emac", 0x01c30000, 64 * KiB }, + { "gpu", 0x01c40000, 64 * KiB }, + { "hstmr", 0x01c60000, 4 * KiB }, + { "dramcom", 0x01c62000, 4 * KiB }, + { "dramctl0", 0x01c63000, 4 * KiB }, + { "dramphy0", 0x01c65000, 4 * KiB }, + { "spi0", 0x01c68000, 4 * KiB }, + { "spi1", 0x01c69000, 4 * KiB }, + { "csi", 0x01cb0000, 320 * KiB }, + { "tve", 0x01e00000, 64 * KiB }, + { "hdmi", 0x01ee0000, 128 * KiB }, + { "rtc", 0x01f00000, 1 * KiB }, + { "r_timer", 0x01f00800, 1 * KiB }, + { "r_intc", 0x01f00c00, 1 * KiB }, + { "r_wdog", 0x01f01000, 1 * KiB }, + { "r_prcm", 0x01f01400, 1 * KiB }, + { "r_twd", 0x01f01800, 1 * KiB }, + { "r_cpucfg", 0x01f01c00, 1 * KiB }, + { "r_cir-rx", 0x01f02000, 1 * KiB }, + { "r_twi", 0x01f02400, 1 * KiB }, + { "r_uart", 0x01f02800, 1 * KiB }, + { "r_pio", 0x01f02c00, 1 * KiB }, + { "r_pwm", 0x01f03800, 1 * KiB }, + { "core-dbg", 0x3f500000, 128 * KiB }, + { "tsgen-ro", 0x3f506000, 4 * KiB }, + { "tsgen-ctl", 0x3f507000, 4 * KiB }, + { "ddr-mem", 0x40000000, 2 * GiB }, + { "n-brom", 0xffff0000, 32 * KiB }, + { "s-brom", 0xffff0000, 64 * KiB } +}; + +/* Per Processor Interrupts */ +enum { + AW_H3_GIC_PPI_MAINT =3D 9, + AW_H3_GIC_PPI_HYPTIMER =3D 10, + AW_H3_GIC_PPI_VIRTTIMER =3D 11, + AW_H3_GIC_PPI_SECTIMER =3D 13, + AW_H3_GIC_PPI_PHYSTIMER =3D 14 +}; + +/* Shared Processor Interrupts */ +enum { + AW_H3_GIC_SPI_UART0 =3D 0, + AW_H3_GIC_SPI_UART1 =3D 1, + AW_H3_GIC_SPI_UART2 =3D 2, + AW_H3_GIC_SPI_UART3 =3D 3, + AW_H3_GIC_SPI_TIMER0 =3D 18, + AW_H3_GIC_SPI_TIMER1 =3D 19, +}; + +/* Allwinner H3 constants */ +enum { + AW_H3_GIC_NUM_SPI =3D 128 +}; + +static void allwinner_h3_init(Object *obj) +{ + AwH3State *s =3D AW_H3(obj); + + s->memmap =3D allwinner_h3_memmap; + + for (int i =3D 0; i < AW_H3_NUM_CPUS; i++) { + object_initialize_child(obj, "cpu[*]", &s->cpus[i], sizeof(s->cpus= [i]), + ARM_CPU_TYPE_NAME("cortex-a7"), + &error_abort, NULL); + } + + sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic), + TYPE_ARM_GIC); + + sysbus_init_child_obj(obj, "timer", &s->timer, sizeof(s->timer), + TYPE_AW_A10_PIT); + object_property_add_alias(obj, "clk0-freq", OBJECT(&s->timer), + "clk0-freq", &error_abort); + object_property_add_alias(obj, "clk1-freq", OBJECT(&s->timer), + "clk1-freq", &error_abort); +} + +static void allwinner_h3_realize(DeviceState *dev, Error **errp) +{ + AwH3State *s =3D AW_H3(dev); + unsigned i =3D 0; + + /* CPUs */ + for (i =3D 0; i < AW_H3_NUM_CPUS; i++) { + + /* Provide Power State Coordination Interface */ + object_property_set_int(OBJECT(&s->cpus[i]), QEMU_PSCI_CONDUIT_HVC, + "psci-conduit", &error_abort); + + /* Disable secondary CPUs */ + object_property_set_bool(OBJECT(&s->cpus[i]), i > 0, + "start-powered-off", &error_abort); + + /* All exception levels required */ + object_property_set_bool(OBJECT(&s->cpus[i]), + true, "has_el3", &error_abort); + + object_property_set_bool(OBJECT(&s->cpus[i]), + true, "has_el2", &error_abort); + + /* Mark realized */ + qdev_init_nofail(DEVICE(&s->cpus[i])); + } + + /* Generic Interrupt Controller */ + qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", AW_H3_GIC_NUM_SPI + + GIC_INTERNAL); + qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2); + qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", AW_H3_NUM_CPUS); + qdev_prop_set_bit(DEVICE(&s->gic), "has-security-extensions", false); + qdev_prop_set_bit(DEVICE(&s->gic), "has-virtualization-extensions", tr= ue); + qdev_init_nofail(DEVICE(&s->gic)); + + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 0, s->memmap[AW_H3_GIC_DIST]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 1, s->memmap[AW_H3_GIC_CPU]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 2, s->memmap[AW_H3_GIC_HYP]); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gic), 3, s->memmap[AW_H3_GIC_VCPU]); + + /* + * Wire the outputs from each CPU's generic timer and the GICv3 + * maintenance interrupt signal to the appropriate GIC PPI inputs, + * and the GIC's IRQ/FIQ/VIRQ/VFIQ interrupt outputs to the CPU's inpu= ts. + */ + for (i =3D 0; i < AW_H3_NUM_CPUS; i++) { + DeviceState *cpudev =3D DEVICE(qemu_get_cpu(i)); + int ppibase =3D AW_H3_GIC_NUM_SPI + i * GIC_INTERNAL + GIC_NR_SGIS; + int irq; + /* + * Mapping from the output timer irq lines from the CPU to the + * GIC PPI inputs used for this board. + */ + const int timer_irq[] =3D { + [GTIMER_PHYS] =3D AW_H3_GIC_PPI_PHYSTIMER, + [GTIMER_VIRT] =3D AW_H3_GIC_PPI_VIRTTIMER, + [GTIMER_HYP] =3D AW_H3_GIC_PPI_HYPTIMER, + [GTIMER_SEC] =3D AW_H3_GIC_PPI_SECTIMER, + }; + + /* Connect CPU timer outputs to GIC PPI inputs */ + for (irq =3D 0; irq < ARRAY_SIZE(timer_irq); irq++) { + qdev_connect_gpio_out(cpudev, irq, + qdev_get_gpio_in(DEVICE(&s->gic), + ppibase + timer_irq[irq= ])); + } + + /* Connect GIC outputs to CPU interrupt inputs */ + sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i, + qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i + AW_H3_NUM_CPUS, + qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i + (2 * AW_H3_NUM_CPU= S), + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i + (3 * AW_H3_NUM_CPU= S), + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); + + /* GIC maintenance signal */ + sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i + (4 * AW_H3_NUM_CPU= S), + qdev_get_gpio_in(DEVICE(&s->gic), + ppibase + AW_H3_GIC_PPI_MAINT)= ); + } + + /* Timer */ + qdev_init_nofail(DEVICE(&s->timer)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->timer), 0, s->memmap[AW_H3_PIT]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer), 0, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_TIM= ER0)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer), 1, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_TIM= ER1)); + + /* SRAM */ + memory_region_init_ram(&s->sram_a1, OBJECT(dev), "sram A1", + 64 * KiB, &error_abort); + memory_region_init_ram(&s->sram_a2, OBJECT(dev), "sram A2", + 32 * KiB, &error_abort); + memory_region_init_ram(&s->sram_c, OBJECT(dev), "sram C", + 44 * KiB, &error_abort); + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= A1], + &s->sram_a1); + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= A2], + &s->sram_a2); + memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= C], + &s->sram_c); + + /* UART0 */ + serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART0], 2, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0), + 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); + /* UART1 */ + serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART1], 2, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART1), + 115200, serial_hd(1), DEVICE_NATIVE_ENDIAN); + /* UART2 */ + serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART2], 2, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART2), + 115200, serial_hd(2), DEVICE_NATIVE_ENDIAN); + /* UART3 */ + serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART3], 2, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART3), + 115200, serial_hd(3), DEVICE_NATIVE_ENDIAN); + + /* Unimplemented devices */ + for (int i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { + create_unimplemented_device(unimplemented[i].device_name, + unimplemented[i].base, + unimplemented[i].size); + } +} + +static void allwinner_h3_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D allwinner_h3_realize; + /* Reason: uses serial_hds and nd_table */ + dc->user_creatable =3D false; +} + +static const TypeInfo allwinner_h3_type_info =3D { + .name =3D TYPE_AW_H3, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(AwH3State), + .instance_init =3D allwinner_h3_init, + .class_init =3D allwinner_h3_class_init, +}; + +static void allwinner_h3_register_types(void) +{ + type_register_static(&allwinner_h3_type_info); +} + +type_init(allwinner_h3_register_types) diff --git a/MAINTAINERS b/MAINTAINERS index cd2dc137a3..dc2d7991bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -481,6 +481,13 @@ F: hw/*/allwinner* F: include/hw/*/allwinner* F: hw/arm/cubieboard.c =20 +Allwinner-h3 +M: Niek Linnenbank +L: qemu-arm@nongnu.org +S: Maintained +F: hw/*/allwinner-h3* +F: include/hw/*/allwinner-h3* + ARM PrimeCell and CMSDK devices M: Peter Maydell L: qemu-arm@nongnu.org diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c6e7782580..ebf8d2325f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -291,6 +291,14 @@ config ALLWINNER_A10 select SERIAL select UNIMP =20 +config ALLWINNER_H3 + bool + select ALLWINNER_A10_PIT + select SERIAL + select ARM_TIMER + select ARM_GIC + select UNIMP + config RASPI bool select FRAMEBUFFER diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fe749f65fd..956e496052 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -34,6 +34,7 @@ obj-$(CONFIG_DIGIC) +=3D digic.o obj-$(CONFIG_OMAP) +=3D omap1.o omap2.o obj-$(CONFIG_STRONGARM) +=3D strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o +obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zynqmp.o xlnx-zcu102.o --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578513808; cv=none; d=zohomail.com; s=zohoarc; b=fTcMdELChWXFSj1SiSdvO19OxBtJYK3jhozN0FOdwQ3di9WVSN+i8+zZXIQheAdL36l3GwKz7pnKVWHreCfMxQb4vJGDCQB8MUTbZf0fKdpPJ8QIwFJ2zAdbWc+bNZHk1sgoLAhF9dL57PEGTaD8gj8zK25YnrPkRiCzbUSLQ1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578513808; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wEwUmWS5JaObqwEn2QUlic12SeuUFGYPKWTbzt7a8is=; b=Hz3nBnY/HaMprV6RuRJLrUpBfyfBBZQ2Co3R/t9iVc+3pXhjkcC/fotlpFlWTMqIP1pM2XgcKn30VhBcGRoWjMX81kauQguFnSmQ589QhsBJSXGCNz0oVB9OFF18Fvnf3sPN3TwqWZd71rmI1SastIcAoK64CCj17aEWWAKDihs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578513808373597.4299595797199; Wed, 8 Jan 2020 12:03:28 -0800 (PST) Received: from localhost ([::1]:48684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHY6-0003Oe-KH for importer@patchew.org; Wed, 08 Jan 2020 15:03:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35315) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVR-0001Hd-AC for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVP-0002UC-Dh for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:41 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVP-0002TA-6s; Wed, 08 Jan 2020 15:00:39 -0500 Received: by mail-wr1-x444.google.com with SMTP id y17so4776445wrh.5; Wed, 08 Jan 2020 12:00:38 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wEwUmWS5JaObqwEn2QUlic12SeuUFGYPKWTbzt7a8is=; b=OiIhZB3M1LbJHhT/QCM5LtlbgsyrknA5Pin/taANT3QVc1Mc3udbaZNtUOKIBxC2M9 3DOrt6vwyUPlo0RmvqRY75cw+BG1yFhUAMP3SHHwI2CrGKFrxrdsIesCPCP3oLyG6i6m O/By4itoVpP8uFyZkDy5avi0q1/P+CiOS3YpNkqxTdsYpJn21SEaqvXDk86aijwibxl7 6gV5ZY0AnOjet3P7G/Urs/ta+1sQmgx3rjukB5q03o9GO4JBx5GQd5aKExf8V982HsdH NDYp3FG9wX1BXChZs3HgU0EJwxWMD5AmktScBhaFuod5yGmuStcnil1gdb0zYk1Dq4kN WGzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wEwUmWS5JaObqwEn2QUlic12SeuUFGYPKWTbzt7a8is=; b=AaBUaPn7d5Q9le9MNjZywSqXT7QUJkQVV/0F6XDduU7k3uUZrN2k4FQsxRV1Ngv6EG VVQ2T2xyhf1MWyToqXGDtxFkpo2OWdjg1Z3Hsashc6JA+DIp5/RcIxSIC6g2BXHi5NTx IkNosMk1aoAPrRo8ot4ahrG38RfLWULDkAf2pOSGAG9R44xJfO2f93UJEaT8pODiH3Uc 38HvsUCOaUXlrJ2W3pPfuTsJTo82HlJZedAMV4sxqfOq6Qm/E4TsNcD2jPVH87LL/cx1 fpN8/TYnF6iQB576lMs0qMinGSV2vFR0sHN3IMmFtZ88idpwbhYCCLXN6sApYEIQQgpn QPkw== X-Gm-Message-State: APjAAAVzIim1J+usw2ePzGXTTAhiEB3L4k3NhcTtD+oS9xIEjJROId0b oIOA/5MvLXMLHu9lwdlgkhP96DME X-Google-Smtp-Source: APXvYqxw6yrRvj1Tep0WUKQPa1bmsBlWr9lBui0EcGpSwHn0ALHrKaGfJzdOycoezSINfH6yIZn8Gw== X-Received: by 2002:adf:e2cf:: with SMTP id d15mr6501600wrj.225.1578513636924; Wed, 08 Jan 2020 12:00:36 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 02/17] hw/arm: add Xunlong Orange Pi PC machine Date: Wed, 8 Jan 2020 21:00:05 +0100 Message-Id: <20200108200020.4745-3-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Tested-by: KONRAD Frederic Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 + * + * 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 "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 =3D { + .board_id =3D -1, +}; + +typedef struct OrangePiState { + AwH3State *h3; + MemoryRegion sdram; +} OrangePiState; + +static void orangepi_init(MachineState *machine) +{ + OrangePiState *s =3D g_new(OrangePiState, 1); + + /* Only allow Cortex-A7 for this board */ + if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a7")) !=3D 0) { + error_report("This board can only be used with cortex-a7 CPU"); + exit(1); + } + + s->h3 =3D 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", + &error_abort); + + /* Mark H3 object realized */ + object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort= ); + + /* SDRAM */ + if (machine->ram_size !=3D 1 * GiB) { + error_report("Requested ram size is not supported for this machine= : " + "restricted to 1GiB"); + 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_S= DRAM], + &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 =3D s->h3->memmap[AW_H3_SDRAM]; + orangepi_binfo.ram_size =3D machine->ram_size; + orangepi_binfo.nb_cpus =3D AW_H3_NUM_CPUS; + arm_load_kernel(ARM_CPU(first_cpu), machine, &orangepi_binfo); +} + +static void orangepi_machine_init(MachineClass *mc) +{ + mc->desc =3D "Orange Pi PC"; + mc->init =3D orangepi_init; + mc->min_cpus =3D AW_H3_NUM_CPUS; + mc->max_cpus =3D AW_H3_NUM_CPUS; + mc->default_cpus =3D AW_H3_NUM_CPUS; + mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a7"); + mc->default_ram_size =3D 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 =20 ARM PrimeCell and CMSDK devices M: Peter Maydell 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) +=3D digic.o obj-$(CONFIG_OMAP) +=3D omap1.o omap2.o obj-$(CONFIG_STRONGARM) +=3D strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o -obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3.o +obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3.o orangepi.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zynqmp.o xlnx-zcu102.o --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514038; cv=none; d=zohomail.com; s=zohoarc; b=oHvHTaFTQVtZln1H0LYHX6aygpnvHvTqANUzoMDnaC+AdVfMXYLQj49OX/j4jkFvF5u6/h4OcSotaGhwzM54P+a4JENwfrE+00csrMwviZSP/9lUi1zMiyJAweNr1O4WAPXvIjUtcfcf43azMRseFzLm/9pnEFuX1WNFU2g1Buc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514038; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=4QLUuZ5WNgTIhPfyiIRv9tkqJpb6erRNsu9ro78s09c=; b=h/FEXsI7mh6q9N3ul9BRftz7c4JZe95ZINT+OTNzW2bX3/T/1eF6ZgzhApMpilXMm4N83vEtb3A+5wiRj2AM+3IkAqflTdoTRyDOynURFJL135rcx1qNSDNygBHNued29WTaiCkjh74GER0blZ8ffX7mEbJ3h/OP/P/st5H8uDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514038182860.5140234547661; Wed, 8 Jan 2020 12:07:18 -0800 (PST) Received: from localhost ([::1]:48738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHbo-0000AK-L1 for importer@patchew.org; Wed, 08 Jan 2020 15:07:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVT-0001ID-SO for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVR-0002Vo-A0 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:43 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVQ-0002UX-C2; Wed, 08 Jan 2020 15:00:41 -0500 Received: by mail-wr1-x42d.google.com with SMTP id z3so4781548wru.3; Wed, 08 Jan 2020 12:00:40 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4QLUuZ5WNgTIhPfyiIRv9tkqJpb6erRNsu9ro78s09c=; b=CeWR/4gOcekq4bedSHE7wQCatKmgHJaxaD6LnG5WsXcuhWT5nSIA8XZs+XmQccsRWL dae+UykRZWTlbwuoRnXA/7Gl+YdJ7N/I17chYmUYRUh3UMzJssmNO+DGJuZ7BpoKVyN7 6vQ1YnOHWncDb77sG0NdOYn+ZUZfDYDz77oqFtpPMDcxI7b0A+MMrcDPWC66YRi7mwEe JotikuwtK74021gpg3HJTg2bMQlCYnlmRKYwdzSL3qYUc3CeRG9l7vzd768tunyZ02gm IT4UTbKGcZ5tTva5IL1NfkblO6nZa+r3/vgpuNEUiiQ6ZbZu22ZGIJ2kGal+epvt0/pa YR0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4QLUuZ5WNgTIhPfyiIRv9tkqJpb6erRNsu9ro78s09c=; b=Bd3OEf5q9Wv0yw/t8qaxn1vqBTYIqyN9snGqhwuqo3JayfbVJARBb28PHP7tcUwc+M 2MxaNeGtz2sJgJOjTrUrWMm1q9EEBj+Kg7jm9xlpbTgllxFPzESQO9lA7WZja4u7tOGt rXA7kecwz0GuR02pg51xlpNX14BuNE0Te/Moip9Rcle3jwOnnYp+1Mt+2XFKTsdwAAlc GKqQvQVrSy09eTSLn+Co9HOpDkSyJ0Ba3wuY04PLGrD1GiZGWsjL48Ofm2CVQSeEbWzS XJruUL40dHqqq59ObME/7zXIKtGzYvP+OT2jWUANzbKOFnp/qvVLE+1hYhFElZbFEqw9 pLcQ== X-Gm-Message-State: APjAAAVc1SQl49kcFcKUn5CX7imuFWw+crS6TzyxVCo7kCf4vM+bh7fw cRVcptmRYz1oUKIp6eEPAf478X67 X-Google-Smtp-Source: APXvYqzWSdOoAanZh7sHWenHOpJBosa8tx1fWHN8J9ksCaEmgtSnFZV3QvIfNgsV/Sh1IIBJADDXDg== X-Received: by 2002:adf:fe12:: with SMTP id n18mr6377344wrr.158.1578513638926; Wed, 08 Jan 2020 12:00:38 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 03/17] hw/arm/allwinner-h3: add Clock Control Unit Date: Wed, 8 Jan 2020 21:00:06 +0100 Message-Id: <20200108200020.4745-4-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Clock Control Unit is responsible for clock signal generation, configuration and distribution in the Allwinner H3 System on Chip. This commit adds support for the Clock Control Unit which emulates a simple read/write register interface. Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 3 + include/hw/misc/allwinner-h3-ccu.h | 67 ++++++++ hw/arm/allwinner-h3.c | 9 +- hw/misc/allwinner-h3-ccu.c | 243 +++++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + 5 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/allwinner-h3-ccu.h create mode 100644 hw/misc/allwinner-h3-ccu.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 4e2e6202a9..0dc18b927a 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -43,6 +43,7 @@ #include "hw/arm/boot.h" #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/arm_gic.h" +#include "hw/misc/allwinner-h3-ccu.h" #include "target/arm/cpu.h" =20 /** @@ -59,6 +60,7 @@ enum { AW_H3_SRAM_A1, AW_H3_SRAM_A2, AW_H3_SRAM_C, + AW_H3_CCU, AW_H3_PIT, AW_H3_UART0, AW_H3_UART1, @@ -98,6 +100,7 @@ typedef struct AwH3State { ARMCPU cpus[AW_H3_NUM_CPUS]; const hwaddr *memmap; AwA10PITState timer; + AwH3ClockCtlState ccu; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/misc/allwinner-h3-ccu.h b/include/hw/misc/allwinner= -h3-ccu.h new file mode 100644 index 0000000000..0dcb08ecd1 --- /dev/null +++ b/include/hw/misc/allwinner-h3-ccu.h @@ -0,0 +1,67 @@ +/* + * Allwinner H3 Clock Control Unit 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 . + */ + +#ifndef HW_MISC_ALLWINNER_H3_CCU_H +#define HW_MISC_ALLWINNER_H3_CCU_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" + +/** + * @name Constants + * @{ + */ + +/** Highest register address used by CCU device */ +#define AW_H3_CCU_REGS_MAXADDR (0x304) + +/** Total number of known registers */ +#define AW_H3_CCU_REGS_NUM (AW_H3_CCU_REGS_MAXADDR / sizeof(uint32_t)) + +/** @} */ + +/** + * @name Object model + * @{ + */ + +#define TYPE_AW_H3_CCU "allwinner-h3-ccu" +#define AW_H3_CCU(obj) \ + OBJECT_CHECK(AwH3ClockCtlState, (obj), TYPE_AW_H3_CCU) + +/** @} */ + +/** + * Allwinner H3 CCU object instance state. + */ +typedef struct AwH3ClockCtlState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Array of hardware registers */ + uint32_t regs[AW_H3_CCU_REGS_NUM]; + +} AwH3ClockCtlState; + +#endif /* HW_MISC_ALLWINNER_H3_CCU_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index c1ef31e875..b85edaea85 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -34,6 +34,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_SRAM_A1] =3D 0x00000000, [AW_H3_SRAM_A2] =3D 0x00044000, [AW_H3_SRAM_C] =3D 0x00010000, + [AW_H3_CCU] =3D 0x01c20000, [AW_H3_PIT] =3D 0x01c20c00, [AW_H3_UART0] =3D 0x01c28000, [AW_H3_UART1] =3D 0x01c28400, @@ -75,7 +76,6 @@ struct AwH3Unimplemented { { "usb2", 0x01c1c000, 4 * KiB }, { "usb3", 0x01c1d000, 4 * KiB }, { "smc", 0x01c1e000, 4 * KiB }, - { "ccu", 0x01c20000, 1 * KiB }, { "pio", 0x01c20800, 1 * KiB }, { "owa", 0x01c21000, 1 * KiB }, { "pwm", 0x01c21400, 1 * KiB }, @@ -170,6 +170,9 @@ static void allwinner_h3_init(Object *obj) "clk0-freq", &error_abort); object_property_add_alias(obj, "clk1-freq", OBJECT(&s->timer), "clk1-freq", &error_abort); + + sysbus_init_child_obj(obj, "ccu", &s->ccu, sizeof(s->ccu), + TYPE_AW_H3_CCU); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -278,6 +281,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) memory_region_add_subregion(get_system_memory(), s->memmap[AW_H3_SRAM_= C], &s->sram_c); =20 + /* Clock Control Unit */ + qdev_init_nofail(DEVICE(&s->ccu)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]); + /* UART0 */ serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART0], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0), diff --git a/hw/misc/allwinner-h3-ccu.c b/hw/misc/allwinner-h3-ccu.c new file mode 100644 index 0000000000..ccf58ccdf2 --- /dev/null +++ b/hw/misc/allwinner-h3-ccu.c @@ -0,0 +1,243 @@ +/* + * Allwinner H3 Clock Control Unit 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/misc/allwinner-h3-ccu.h" + +/* CCU register offsets */ +enum { + REG_PLL_CPUX =3D 0x0000, /* PLL CPUX Control */ + REG_PLL_AUDIO =3D 0x0008, /* PLL Audio Control */ + REG_PLL_VIDEO =3D 0x0010, /* PLL Video Control */ + REG_PLL_VE =3D 0x0018, /* PLL VE Control */ + REG_PLL_DDR =3D 0x0020, /* PLL DDR Control */ + REG_PLL_PERIPH0 =3D 0x0028, /* PLL Peripherals 0 Control */ + REG_PLL_GPU =3D 0x0038, /* PLL GPU Control */ + REG_PLL_PERIPH1 =3D 0x0044, /* PLL Peripherals 1 Control */ + REG_PLL_DE =3D 0x0048, /* PLL Display Engine Control */ + REG_CPUX_AXI =3D 0x0050, /* CPUX/AXI Configuration */ + REG_APB1 =3D 0x0054, /* ARM Peripheral Bus 1 Config */ + REG_APB2 =3D 0x0058, /* ARM Peripheral Bus 2 Config */ + REG_DRAM_CFG =3D 0x00F4, /* DRAM Configuration */ + REG_MBUS =3D 0x00FC, /* MBUS Reset */ + REG_PLL_TIME0 =3D 0x0200, /* PLL Stable Time 0 */ + REG_PLL_TIME1 =3D 0x0204, /* PLL Stable Time 1 */ + REG_PLL_CPUX_BIAS =3D 0x0220, /* PLL CPUX Bias */ + REG_PLL_AUDIO_BIAS =3D 0x0224, /* PLL Audio Bias */ + REG_PLL_VIDEO_BIAS =3D 0x0228, /* PLL Video Bias */ + REG_PLL_VE_BIAS =3D 0x022C, /* PLL VE Bias */ + REG_PLL_DDR_BIAS =3D 0x0230, /* PLL DDR Bias */ + REG_PLL_PERIPH0_BIAS =3D 0x0234, /* PLL Peripherals 0 Bias */ + REG_PLL_GPU_BIAS =3D 0x023C, /* PLL GPU Bias */ + REG_PLL_PERIPH1_BIAS =3D 0x0244, /* PLL Peripherals 1 Bias */ + REG_PLL_DE_BIAS =3D 0x0248, /* PLL Display Engine Bias */ + REG_PLL_CPUX_TUNING =3D 0x0250, /* PLL CPUX Tuning */ + REG_PLL_DDR_TUNING =3D 0x0260, /* PLL DDR Tuning */ +}; + +#define REG_INDEX(offset) (offset / sizeof(uint32_t)) + +/* CCU register flags */ +enum { + REG_DRAM_CFG_UPDATE =3D (1 << 16), +}; + +enum { + REG_PLL_ENABLE =3D (1 << 31), + REG_PLL_LOCK =3D (1 << 28), +}; + + +/* CCU register reset values */ +enum { + REG_PLL_CPUX_RST =3D 0x00001000, + REG_PLL_AUDIO_RST =3D 0x00035514, + REG_PLL_VIDEO_RST =3D 0x03006207, + REG_PLL_VE_RST =3D 0x03006207, + REG_PLL_DDR_RST =3D 0x00001000, + REG_PLL_PERIPH0_RST =3D 0x00041811, + REG_PLL_GPU_RST =3D 0x03006207, + REG_PLL_PERIPH1_RST =3D 0x00041811, + REG_PLL_DE_RST =3D 0x03006207, + REG_CPUX_AXI_RST =3D 0x00010000, + REG_APB1_RST =3D 0x00001010, + REG_APB2_RST =3D 0x01000000, + REG_DRAM_CFG_RST =3D 0x00000000, + REG_MBUS_RST =3D 0x80000000, + REG_PLL_TIME0_RST =3D 0x000000FF, + REG_PLL_TIME1_RST =3D 0x000000FF, + REG_PLL_CPUX_BIAS_RST =3D 0x08100200, + REG_PLL_AUDIO_BIAS_RST =3D 0x10100000, + REG_PLL_VIDEO_BIAS_RST =3D 0x10100000, + REG_PLL_VE_BIAS_RST =3D 0x10100000, + REG_PLL_DDR_BIAS_RST =3D 0x81104000, + REG_PLL_PERIPH0_BIAS_RST =3D 0x10100010, + REG_PLL_GPU_BIAS_RST =3D 0x10100000, + REG_PLL_PERIPH1_BIAS_RST =3D 0x10100010, + REG_PLL_DE_BIAS_RST =3D 0x10100000, + REG_PLL_CPUX_TUNING_RST =3D 0x0A101000, + REG_PLL_DDR_TUNING_RST =3D 0x14880000, +}; + +static uint64_t allwinner_h3_ccu_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwH3ClockCtlState *s =3D AW_H3_CCU(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_CCU_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + return s->regs[idx]; +} + +static void allwinner_h3_ccu_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwH3ClockCtlState *s =3D AW_H3_CCU(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_CCU_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + switch (offset) { + case REG_DRAM_CFG: /* DRAM Configuration */ + val &=3D ~REG_DRAM_CFG_UPDATE; + break; + case REG_PLL_CPUX: /* PLL CPUX Control */ + case REG_PLL_AUDIO: /* PLL Audio Control */ + case REG_PLL_VIDEO: /* PLL Video Control */ + case REG_PLL_VE: /* PLL VE Control */ + case REG_PLL_DDR: /* PLL DDR Control */ + case REG_PLL_PERIPH0: /* PLL Peripherals 0 Control */ + case REG_PLL_GPU: /* PLL GPU Control */ + case REG_PLL_PERIPH1: /* PLL Peripherals 1 Control */ + case REG_PLL_DE: /* PLL Display Engine Control */ + if (val & REG_PLL_ENABLE) { + val |=3D REG_PLL_LOCK; + } + break; + default: + qemu_log_mask(LOG_UNIMP, "%s: unimplemented write offset 0x%04x\n", + __func__, (uint32_t)offset); + break; + } + + s->regs[idx] =3D (uint32_t) val; +} + +static const MemoryRegionOps allwinner_h3_ccu_ops =3D { + .read =3D allwinner_h3_ccu_read, + .write =3D allwinner_h3_ccu_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_h3_ccu_reset(DeviceState *dev) +{ + AwH3ClockCtlState *s =3D AW_H3_CCU(dev); + + /* Set default values for registers */ + s->regs[REG_INDEX(REG_PLL_CPUX)] =3D REG_PLL_CPUX_RST; + s->regs[REG_INDEX(REG_PLL_AUDIO)] =3D REG_PLL_AUDIO_RST; + s->regs[REG_INDEX(REG_PLL_VIDEO)] =3D REG_PLL_VIDEO_RST; + s->regs[REG_INDEX(REG_PLL_VE)] =3D REG_PLL_VE_RST; + s->regs[REG_INDEX(REG_PLL_DDR)] =3D REG_PLL_DDR_RST; + s->regs[REG_INDEX(REG_PLL_PERIPH0)] =3D REG_PLL_PERIPH0_RST; + s->regs[REG_INDEX(REG_PLL_GPU)] =3D REG_PLL_GPU_RST; + s->regs[REG_INDEX(REG_PLL_PERIPH1)] =3D REG_PLL_PERIPH1_RST; + s->regs[REG_INDEX(REG_PLL_DE)] =3D REG_PLL_DE_RST; + s->regs[REG_INDEX(REG_CPUX_AXI)] =3D REG_CPUX_AXI_RST; + s->regs[REG_INDEX(REG_APB1)] =3D REG_APB1_RST; + s->regs[REG_INDEX(REG_APB2)] =3D REG_APB2_RST; + s->regs[REG_INDEX(REG_DRAM_CFG)] =3D REG_DRAM_CFG_RST; + s->regs[REG_INDEX(REG_MBUS)] =3D REG_MBUS_RST; + s->regs[REG_INDEX(REG_PLL_TIME0)] =3D REG_PLL_TIME0_RST; + s->regs[REG_INDEX(REG_PLL_TIME1)] =3D REG_PLL_TIME1_RST; + s->regs[REG_INDEX(REG_PLL_CPUX_BIAS)] =3D REG_PLL_CPUX_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_AUDIO_BIAS)] =3D REG_PLL_AUDIO_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_VIDEO_BIAS)] =3D REG_PLL_VIDEO_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_VE_BIAS)] =3D REG_PLL_VE_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_DDR_BIAS)] =3D REG_PLL_DDR_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_PERIPH0_BIAS)] =3D REG_PLL_PERIPH0_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_GPU_BIAS)] =3D REG_PLL_GPU_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_PERIPH1_BIAS)] =3D REG_PLL_PERIPH1_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_DE_BIAS)] =3D REG_PLL_DE_BIAS_RST; + s->regs[REG_INDEX(REG_PLL_CPUX_TUNING)] =3D REG_PLL_CPUX_TUNING_RST; + s->regs[REG_INDEX(REG_PLL_DDR_TUNING)] =3D REG_PLL_DDR_TUNING_RST; +} + +static void allwinner_h3_ccu_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwH3ClockCtlState *s =3D AW_H3_CCU(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_h3_ccu_ops, s, + TYPE_AW_H3_CCU, 1 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static const VMStateDescription allwinner_h3_ccu_vmstate =3D { + .name =3D "allwinner-h3-ccu", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, AwH3ClockCtlState, AW_H3_CCU_REGS_NUM), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_h3_ccu_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_h3_ccu_reset; + dc->vmsd =3D &allwinner_h3_ccu_vmstate; +} + +static const TypeInfo allwinner_h3_ccu_info =3D { + .name =3D TYPE_AW_H3_CCU, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_h3_ccu_init, + .instance_size =3D sizeof(AwH3ClockCtlState), + .class_init =3D allwinner_h3_ccu_class_init, +}; + +static void allwinner_h3_ccu_register(void) +{ + type_register_static(&allwinner_h3_ccu_info); +} + +type_init(allwinner_h3_ccu_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index ba898a5781..4abd92dcee 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -28,6 +28,7 @@ common-obj-$(CONFIG_MACIO) +=3D macio/ =20 common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o =20 +common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o common-obj-$(CONFIG_NSERIES) +=3D cbus.o common-obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514215; cv=none; d=zohomail.com; s=zohoarc; b=ZlPInXnYbcKwZRYdzDtq702XP5Ef4sgcb3clWBX5F2WyUBDMVcrFOH3l2z6bEI1sv8cPxWKXV0vWvvkAD4rwaeIgasaVvYZN8tF9QW4ahhUQEAFIsbda5F/HUGctpViq2emmQ2x/suzQ+cNS1R8Ry+oLB+aDh/7v3EJtacAT3sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514215; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fHH6DgmLJkiSaZwTfEnCvDBqi+9qRJn0N0Z2l2a/qS4=; b=Qb2OUGEgAJx70vQQfB/yWySsqRq/ceX7o8pRjFjFbbGovpERm2xXb24TEx/7gmYPLQ8YVXCMTr4A0E4I4cWswlQY++MmMG0G38UiaYs31maL7k6PHo0LQ5MnWS5gi+ALofLNpt6EklUBfFs55XDQjHD5ipV1o2J16VQCTPyTXPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514215349381.18715848285945; Wed, 8 Jan 2020 12:10:15 -0800 (PST) Received: from localhost ([::1]:48784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHef-0003xm-JM for importer@patchew.org; Wed, 08 Jan 2020 15:10:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVV-0001IS-52 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVT-0002XI-30 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:44 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44699) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVR-0002V9-9R; Wed, 08 Jan 2020 15:00:42 -0500 Received: by mail-wr1-x441.google.com with SMTP id q10so4722844wrm.11; Wed, 08 Jan 2020 12:00:41 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fHH6DgmLJkiSaZwTfEnCvDBqi+9qRJn0N0Z2l2a/qS4=; b=Y9wIpcHFF7lzGNAtPVv1J5pzctmoIcFJvub9HPskz4zHpmBatGsrwZB7I1RS7U5suS 53kvI/qadmH+pSSPOqrRdKEbONBYx4c0m28XytnTUJrdOFhbExreWSDEwaSZvXy+VRRD iRoLa72D0Cuo/bnUL2zCBT9Kd2yLge9D83RDktRaSLz/cxCm/DGl90oeG4jdaWtPGUqk iRujNdhWbiGq16Mj4VAZ2Bn/WHnkq85gUiVOVM932BRyNMqJ4AR0KtuqAoTZUYEZo6jU uCLigF26Xp2iXuLrLC3MuPjaI0ZhjwkRDMqo2IPDsnEUbaWEEGLl/c7f/1fT3wQv/uoM tEEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fHH6DgmLJkiSaZwTfEnCvDBqi+9qRJn0N0Z2l2a/qS4=; b=ucujr+gGIetigt7GKjh6Ye01OujteukC9/GmcaMXHOUzPyjSU/zoGKSUbofMR5I0d3 /gbakrlugnEILTnnv6BidDNEUy9Xp0GbsW2i0VRlxnr7559MRAN9WyXAOsIy8sE8qZLL RhM+niIZBM8ioB5x9vuiAzdzeoocIDB/8gLLbwXtDWMn289N06Obm2z3YYOrkSyIwdYn bTsbPL0bryCblUH3+CNJjo9yKHWdPSS2tyeBRAz3bx6m5KzegjLH6dSm4jUoc5LPGG5A CX4DARdRuSkNDBnubtop/ob+V/vNBMQ+/NN5sxgbJQ6RgzUxWl3KgeyG7AYl0S8Ow9AG 1eSg== X-Gm-Message-State: APjAAAXRJbRdlWU5E/yCuNnpWoMLpfeSVJfYHXnsiO7fdHdCxWypAs7/ AXQP6GA/lkSO+w+NGaIrqFh7LzT/ X-Google-Smtp-Source: APXvYqxJBTucIGkTWVYPiQeznA6Wf6Mjqand58cnh+86LEOwmXzK932OtiKFKb1gf3jHkGY3qsM9ig== X-Received: by 2002:adf:e5ce:: with SMTP id a14mr6416050wrn.214.1578513639948; Wed, 08 Jan 2020 12:00:39 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 04/17] hw/arm/allwinner-h3: add USB host controller Date: Wed, 8 Jan 2020 21:00:07 +0100 Message-Id: <20200108200020.4745-5-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Allwinner H3 System on Chip contains multiple USB 2.0 bus connections which provide software access using the Enhanced Host Controller Interface (EHCI) and Open Host Controller Interface (OHCI) interfaces. This commit adds support for both interfaces in the Allwinner H3 System on Chip. Signed-off-by: Niek Linnenbank Reviewed-by: Gerd Hoffmann --- hw/usb/hcd-ehci.h | 1 + include/hw/arm/allwinner-h3.h | 8 ++++++ hw/arm/allwinner-h3.c | 52 ++++++++++++++++++++++++++++++++--- hw/usb/hcd-ehci-sysbus.c | 17 ++++++++++++ 4 files changed, 74 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 0298238f0b..edb59311c4 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -342,6 +342,7 @@ typedef struct EHCIPCIState { #define TYPE_SYS_BUS_EHCI "sysbus-ehci-usb" #define TYPE_PLATFORM_EHCI "platform-ehci-usb" #define TYPE_EXYNOS4210_EHCI "exynos4210-ehci-usb" +#define TYPE_AW_H3_EHCI "aw-h3-ehci-usb" #define TYPE_TEGRA2_EHCI "tegra2-ehci-usb" #define TYPE_PPC4xx_EHCI "ppc4xx-ehci-usb" #define TYPE_FUSBH200_EHCI "fusbh200-ehci-usb" diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 0dc18b927a..e03d3f318f 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -60,6 +60,14 @@ enum { AW_H3_SRAM_A1, AW_H3_SRAM_A2, AW_H3_SRAM_C, + AW_H3_EHCI0, + AW_H3_OHCI0, + AW_H3_EHCI1, + AW_H3_OHCI1, + AW_H3_EHCI2, + AW_H3_OHCI2, + AW_H3_EHCI3, + AW_H3_OHCI3, AW_H3_CCU, AW_H3_PIT, AW_H3_UART0, diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index b85edaea85..1dc3209c03 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "hw/char/serial.h" #include "hw/misc/unimp.h" +#include "hw/usb/hcd-ehci.h" #include "sysemu/sysemu.h" #include "hw/arm/allwinner-h3.h" =20 @@ -34,6 +35,14 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_SRAM_A1] =3D 0x00000000, [AW_H3_SRAM_A2] =3D 0x00044000, [AW_H3_SRAM_C] =3D 0x00010000, + [AW_H3_EHCI0] =3D 0x01c1a000, + [AW_H3_OHCI0] =3D 0x01c1a400, + [AW_H3_EHCI1] =3D 0x01c1b000, + [AW_H3_OHCI1] =3D 0x01c1b400, + [AW_H3_EHCI2] =3D 0x01c1c000, + [AW_H3_OHCI2] =3D 0x01c1c400, + [AW_H3_EHCI3] =3D 0x01c1d000, + [AW_H3_OHCI3] =3D 0x01c1d400, [AW_H3_CCU] =3D 0x01c20000, [AW_H3_PIT] =3D 0x01c20c00, [AW_H3_UART0] =3D 0x01c28000, @@ -71,10 +80,10 @@ struct AwH3Unimplemented { { "msgbox", 0x01c17000, 4 * KiB }, { "spinlock", 0x01c18000, 4 * KiB }, { "usb0-otg", 0x01c19000, 4 * KiB }, - { "usb0", 0x01c1a000, 4 * KiB }, - { "usb1", 0x01c1b000, 4 * KiB }, - { "usb2", 0x01c1c000, 4 * KiB }, - { "usb3", 0x01c1d000, 4 * KiB }, + { "usb0-phy", 0x01c1a000, 4 * KiB }, + { "usb1-phy", 0x01c1b000, 4 * KiB }, + { "usb2-phy", 0x01c1c000, 4 * KiB }, + { "usb3-phy", 0x01c1d000, 4 * KiB }, { "smc", 0x01c1e000, 4 * KiB }, { "pio", 0x01c20800, 1 * KiB }, { "owa", 0x01c21000, 1 * KiB }, @@ -142,6 +151,14 @@ enum { AW_H3_GIC_SPI_UART3 =3D 3, AW_H3_GIC_SPI_TIMER0 =3D 18, AW_H3_GIC_SPI_TIMER1 =3D 19, + AW_H3_GIC_SPI_EHCI0 =3D 72, + AW_H3_GIC_SPI_OHCI0 =3D 73, + AW_H3_GIC_SPI_EHCI1 =3D 74, + AW_H3_GIC_SPI_OHCI1 =3D 75, + AW_H3_GIC_SPI_EHCI2 =3D 76, + AW_H3_GIC_SPI_OHCI2 =3D 77, + AW_H3_GIC_SPI_EHCI3 =3D 78, + AW_H3_GIC_SPI_OHCI3 =3D 79, }; =20 /* Allwinner H3 constants */ @@ -285,6 +302,33 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_init_nofail(DEVICE(&s->ccu)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]); =20 + /* Universal Serial Bus */ + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_EHCI0)); + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI1], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_EHCI1)); + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI2], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_EHCI2)); + sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI3], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_EHCI3)); + + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI0], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_OHCI0)); + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI1], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_OHCI1)); + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI2], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_OHCI2)); + sysbus_create_simple("sysbus-ohci", s->memmap[AW_H3_OHCI3], + qdev_get_gpio_in(DEVICE(&s->gic), + AW_H3_GIC_SPI_OHCI3)); + /* UART0 */ serial_mm_init(get_system_memory(), s->memmap[AW_H3_UART0], 2, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0), diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 020211fd10..174c3446ef 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -145,6 +145,22 @@ static const TypeInfo ehci_exynos4210_type_info =3D { .class_init =3D ehci_exynos4210_class_init, }; =20 +static void ehci_aw_h3_class_init(ObjectClass *oc, void *data) +{ + SysBusEHCIClass *sec =3D SYS_BUS_EHCI_CLASS(oc); + DeviceClass *dc =3D DEVICE_CLASS(oc); + + sec->capsbase =3D 0x0; + sec->opregbase =3D 0x10; + set_bit(DEVICE_CATEGORY_USB, dc->categories); +} + +static const TypeInfo ehci_aw_h3_type_info =3D { + .name =3D TYPE_AW_H3_EHCI, + .parent =3D TYPE_SYS_BUS_EHCI, + .class_init =3D ehci_aw_h3_class_init, +}; + static void ehci_tegra2_class_init(ObjectClass *oc, void *data) { SysBusEHCIClass *sec =3D SYS_BUS_EHCI_CLASS(oc); @@ -267,6 +283,7 @@ static void ehci_sysbus_register_types(void) type_register_static(&ehci_platform_type_info); type_register_static(&ehci_xlnx_type_info); type_register_static(&ehci_exynos4210_type_info); + type_register_static(&ehci_aw_h3_type_info); type_register_static(&ehci_tegra2_type_info); type_register_static(&ehci_ppc4xx_type_info); type_register_static(&ehci_fusbh200_type_info); --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514206; cv=none; d=zohomail.com; s=zohoarc; b=kxasxeMAKgIZNnpEgFEvY5gED4vzvQBVSp9yf8qstpLyrD1pVqAuxCGeUzHoyamUN1Q9z5inmGspMV6gJk0Z+qG2vzFsY0z1tQYJIKdxfK4nUhHwOGdY9rwRDKuEPcqno888BLio19eWA5PVVKn6UOpkkHlnSKVYWd1sxXEImKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514206; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UipVhQnGToIvBs6HWEW+2NxLBIAsKeGOVR5aBQdUr/4=; b=KI7XD2b1rwerejBOpL/IStlIjkj/CWrunaJEfHwyB36o+soD65NNDiQX2BTsZWXcfaKTNtwrP9Onq6sJWJihXIYy5i6+nU0+VUHQ1yee9jI/rlVkOgyx4Nmw0XEBUyXPmguScCulxsJQ5i9fvzzguClCHvaULYzDDJd3qnEKnvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514206487924.5010998788883; Wed, 8 Jan 2020 12:10:06 -0800 (PST) Received: from localhost ([::1]:48778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHeW-0003ob-Fe for importer@patchew.org; Wed, 08 Jan 2020 15:10:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35411) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVV-0001J5-Li for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVT-0002Y3-Li for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:45 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34280) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVT-0002Wd-2W; Wed, 08 Jan 2020 15:00:43 -0500 Received: by mail-wr1-x443.google.com with SMTP id t2so4809058wrr.1; Wed, 08 Jan 2020 12:00:42 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UipVhQnGToIvBs6HWEW+2NxLBIAsKeGOVR5aBQdUr/4=; b=O3n01yerlwSqHsDnlHVZH9PJeHcB/T/41QmvRIdtpftrWUCuk4FRMChWF9d999SnFJ rgf9rBsoBi6mEsDfA+6D4LqJawRh28h3jHVEYhC0B51mpdiRJwMOctCMy2T192Z5HhEw vPbO6HgffkIDu1+b3rzpVBJGKTc6mJLmVsyBt5ycJsDOU5gHlvjSEp6Lfkvsq+XhudBb fstJZWpLbxbonMh2EYHB8HKBBrQyxClx/8A6WMUf3+oGo08rJBRseYzRPQoDz0YUgBa7 6WD3EJhYktQt5PLhkXAts+Y6PEdYnJ8JdD/8wRz5IPy5yo2XEYv6W8wQeOlKdTIS1NTd eYbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UipVhQnGToIvBs6HWEW+2NxLBIAsKeGOVR5aBQdUr/4=; b=CxpmoCYUyzlNYyPk42Hjpot1X6sFplVOdT3QAoYoWc1w5N1Z2Zxo+V4B1y7l+m78f8 LL18D9f0cQXQZRRf+gAsANj0a3vZHSNa+l5Nl/WcW1JqkK2IS8uNSr3iZeqkqX1bC8iv SjqM0zHSneTN0wtWf4n1OBdFm1O1XDmY9p2xtMLlWN4FbLHAUHoE1AJPR0/beqSK+OgV hk38pv8zIme6STxdCcQUC6+DRjIj/w85brg/647oC+XGQVMM72u6jC8ahb1zUv2iTGxF 45UgRpwBrY4yLoBxDzrjGUgj0BI60N7+nKVvtH6Im94IdghYnsRrCnB7hMEZfqPwDtWW KRfQ== X-Gm-Message-State: APjAAAUQPW9hno4AXLB7+ZLOy9NFtWMEYaoexwlErGocyi7MyWcZFyGb +Hp5sNzgcuu4nXlKHhJm9ZJO2a2B X-Google-Smtp-Source: APXvYqxxeQxsFkK/ztubCdUEYWPYNhEQmBi3ODZZLMce39tUG8i+wkAv01Z7fUvqGsPN1JoUJ8qyzw== X-Received: by 2002:adf:eb46:: with SMTP id u6mr6714629wrn.239.1578513641519; Wed, 08 Jan 2020 12:00:41 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 05/17] hw/arm/allwinner-h3: add System Control module Date: Wed, 8 Jan 2020 21:00:08 +0100 Message-Id: <20200108200020.4745-6-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Allwinner H3 System on Chip has an System Control module that provides system wide generic controls and device information. This commit adds support for the Allwinner H3 System Control module. Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 3 + include/hw/misc/allwinner-h3-sysctrl.h | 68 ++++++++++++ hw/arm/allwinner-h3.c | 9 +- hw/misc/allwinner-h3-sysctrl.c | 140 +++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + 5 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/allwinner-h3-sysctrl.h create mode 100644 hw/misc/allwinner-h3-sysctrl.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index e03d3f318f..26706f4fa6 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -44,6 +44,7 @@ #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/arm_gic.h" #include "hw/misc/allwinner-h3-ccu.h" +#include "hw/misc/allwinner-h3-sysctrl.h" #include "target/arm/cpu.h" =20 /** @@ -60,6 +61,7 @@ enum { AW_H3_SRAM_A1, AW_H3_SRAM_A2, AW_H3_SRAM_C, + AW_H3_SYSCTRL, AW_H3_EHCI0, AW_H3_OHCI0, AW_H3_EHCI1, @@ -109,6 +111,7 @@ typedef struct AwH3State { const hwaddr *memmap; AwA10PITState timer; AwH3ClockCtlState ccu; + AwH3SysCtrlState sysctrl; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/misc/allwinner-h3-sysctrl.h b/include/hw/misc/allwi= nner-h3-sysctrl.h new file mode 100644 index 0000000000..cd0f3f5ce1 --- /dev/null +++ b/include/hw/misc/allwinner-h3-sysctrl.h @@ -0,0 +1,68 @@ +/* + * Allwinner H3 System Control 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 . + */ + +#ifndef HW_MISC_ALLWINNER_H3_SYSCTRL_H +#define HW_MISC_ALLWINNER_H3_SYSCTRL_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" + +/** + * @name Constants + * @{ + */ + +/** Highest register address used by System Control device */ +#define AW_H3_SYSCTRL_REGS_MAXADDR (0x30) + +/** Total number of known registers */ +#define AW_H3_SYSCTRL_REGS_NUM ((AW_H3_SYSCTRL_REGS_MAXADDR / \ + sizeof(uint32_t)) + 1) + +/** @} */ + +/** + * @name Object model + * @{ + */ + +#define TYPE_AW_H3_SYSCTRL "allwinner-h3-sysctrl" +#define AW_H3_SYSCTRL(obj) \ + OBJECT_CHECK(AwH3SysCtrlState, (obj), TYPE_AW_H3_SYSCTRL) + +/** @} */ + +/** + * Allwinner H3 System Control object instance state + */ +typedef struct AwH3SysCtrlState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Array of hardware registers */ + uint32_t regs[AW_H3_SYSCTRL_REGS_NUM]; + +} AwH3SysCtrlState; + +#endif /* HW_MISC_ALLWINNER_H3_SYSCTRL_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 1dc3209c03..d261d7b2be 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -35,6 +35,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_SRAM_A1] =3D 0x00000000, [AW_H3_SRAM_A2] =3D 0x00044000, [AW_H3_SRAM_C] =3D 0x00010000, + [AW_H3_SYSCTRL] =3D 0x01c00000, [AW_H3_EHCI0] =3D 0x01c1a000, [AW_H3_OHCI0] =3D 0x01c1a400, [AW_H3_EHCI1] =3D 0x01c1b000, @@ -64,7 +65,6 @@ struct AwH3Unimplemented { } unimplemented[] =3D { { "d-engine", 0x01000000, 4 * MiB }, { "d-inter", 0x01400000, 128 * KiB }, - { "syscon", 0x01c00000, 4 * KiB }, { "dma", 0x01c02000, 4 * KiB }, { "nfdc", 0x01c03000, 4 * KiB }, { "ts", 0x01c06000, 4 * KiB }, @@ -190,6 +190,9 @@ static void allwinner_h3_init(Object *obj) =20 sysbus_init_child_obj(obj, "ccu", &s->ccu, sizeof(s->ccu), TYPE_AW_H3_CCU); + + sysbus_init_child_obj(obj, "sysctrl", &s->sysctrl, sizeof(s->sysctrl), + TYPE_AW_H3_SYSCTRL); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -302,6 +305,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_init_nofail(DEVICE(&s->ccu)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccu), 0, s->memmap[AW_H3_CCU]); =20 + /* System Control */ + qdev_init_nofail(DEVICE(&s->sysctrl)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctrl), 0, s->memmap[AW_H3_SYSCTR= L]); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/misc/allwinner-h3-sysctrl.c b/hw/misc/allwinner-h3-sysctrl.c new file mode 100644 index 0000000000..1d07efa880 --- /dev/null +++ b/hw/misc/allwinner-h3-sysctrl.c @@ -0,0 +1,140 @@ +/* + * Allwinner H3 System Control 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/misc/allwinner-h3-sysctrl.h" + +/* System Control register offsets */ +enum { + REG_VER =3D 0x24, /* Version */ + REG_EMAC_PHY_CLK =3D 0x30, /* EMAC PHY Clock */ +}; + +#define REG_INDEX(offset) (offset / sizeof(uint32_t)) + +/* System Control register reset values */ +enum { + REG_VER_RST =3D 0x0, + REG_EMAC_PHY_CLK_RST =3D 0x58000, +}; + +static uint64_t allwinner_h3_sysctrl_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_SYSCTRL_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + return s->regs[idx]; +} + +static void allwinner_h3_sysctrl_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_SYSCTRL_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + switch (offset) { + case REG_VER: /* Version */ + break; + default: + s->regs[idx] =3D (uint32_t) val; + break; + } +} + +static const MemoryRegionOps allwinner_h3_sysctrl_ops =3D { + .read =3D allwinner_h3_sysctrl_read, + .write =3D allwinner_h3_sysctrl_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_h3_sysctrl_reset(DeviceState *dev) +{ + AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(dev); + + /* Set default values for registers */ + s->regs[REG_INDEX(REG_VER)] =3D REG_VER_RST; + s->regs[REG_INDEX(REG_EMAC_PHY_CLK)] =3D REG_EMAC_PHY_CLK_RST; +} + +static void allwinner_h3_sysctrl_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwH3SysCtrlState *s =3D AW_H3_SYSCTRL(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_h3_sysctrl_ops,= s, + TYPE_AW_H3_SYSCTRL, 4 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static const VMStateDescription allwinner_h3_sysctrl_vmstate =3D { + .name =3D "allwinner-h3-sysctrl", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, AwH3SysCtrlState, AW_H3_SYSCTRL_REGS_NU= M), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_h3_sysctrl_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_h3_sysctrl_reset; + dc->vmsd =3D &allwinner_h3_sysctrl_vmstate; +} + +static const TypeInfo allwinner_h3_sysctrl_info =3D { + .name =3D TYPE_AW_H3_SYSCTRL, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_h3_sysctrl_init, + .instance_size =3D sizeof(AwH3SysCtrlState), + .class_init =3D allwinner_h3_sysctrl_class_init, +}; + +static void allwinner_h3_sysctrl_register(void) +{ + type_register_static(&allwinner_h3_sysctrl_info); +} + +type_init(allwinner_h3_sysctrl_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 4abd92dcee..2d6b1a4257 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -29,6 +29,7 @@ common-obj-$(CONFIG_MACIO) +=3D macio/ common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o =20 common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o +common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o common-obj-$(CONFIG_NSERIES) +=3D cbus.o common-obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514017; cv=none; d=zohomail.com; s=zohoarc; b=H0xpqZUtHDXHpqHM5ztRacG8US8U8yCeTSExwlPvoCFJLDgWDf+GAvSZx8RlFg1lHAIiNdg2794sGUSXwyhODKYQ+kcaItUW7mpY20TxY6lmEVNjmftfFfogoHt6OpIIZgirBa9B7Aylt7i2Wk2FI8VBYGu9M8a13teIMVoQlCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514017; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fNYUuz0mgFtwPh2tLYOsH+fNNunhmOF9a7dklOB6TPo=; b=bMUDU2XA9DyCSCaXTQgua+6kWejeTJcXwCpTZFt2ES5PXii/wxr8PKh79HlcZxFpBZJqF07gznhfJvfIyWVRtnY5bVap/VDH8p16BnB7HBrNVk4b02ZfGZjfppBH1kcpx1j81/mbI/HrI+8TfMvc+jsXqbp5qRh72l6tmuKtYUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157851401700412.995270003542373; Wed, 8 Jan 2020 12:06:57 -0800 (PST) Received: from localhost ([::1]:48736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHbT-00084q-6U for importer@patchew.org; Wed, 08 Jan 2020 15:06:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35461) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVX-0001Ld-TN for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVV-0002ZQ-5M for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:47 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:54713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVU-0002YG-EI; Wed, 08 Jan 2020 15:00:45 -0500 Received: by mail-wm1-x333.google.com with SMTP id b19so233533wmj.4; Wed, 08 Jan 2020 12:00:44 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fNYUuz0mgFtwPh2tLYOsH+fNNunhmOF9a7dklOB6TPo=; b=NYujIN/XJgJ7UleT14IfEm4skfAUYb5w1pE9X4Wwt/rclYSTdPCY7qgi8u4GfJNv1x 24F4k8yRNnJ5YXGFOaGE/NxSed7CfNMDgHx4QPA7eOsqqUa6jOiYZ1aMfhIr7iCogGPE Y8VtoqIYIQT0FDzz+zoRA48pRk+8mbiN0FF4kHC2quEH4BgU7yLPlKW9nIRO6RqmpwiR tsh8TFbNI+jj8QeZJBtb9B9D+6pQ4BXfedV9141aDHJUCEWMpcn5/1IZAAMEanYbjw+d t22PeghB5AfK18gL6qeyev3HDvk55d+qZbwPqOoqKTPQs4ukMwZ0UTLWHZq7O0v5q22c 1hdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fNYUuz0mgFtwPh2tLYOsH+fNNunhmOF9a7dklOB6TPo=; b=N8jDc98H5fqdLgYtYZp88RHsNV+tcgBP/0Yh9TQSmCGLoefYfg9psaabPx5an0SQyR SL3gTDAw5zyyJ2btNHjtofjqZnrrYeGqHoflxId3SMOinKK7VkGpKIHqq7J4gkVdy82N rDPo15isqTHp7Vpm8tNpzWmy5zQ6JfOMV4yUfWgznyRT7gxV3fyBh06NfSutff0VWzqX zvbbQDFjASICpJ2G2rGBsv5ntzy291dhGfc2y9oob0qAqsDGYoUiOkM3yXAlqoRAQEID wHg2TZ8JvXh66jAs0eKglVgSZouRNaueAFgPd5cMA727qWnEjA/u8WeDd53tiNRZDtQQ c84Q== X-Gm-Message-State: APjAAAWTz1+wWtGl5w99CR+F5Q1gKOFvP3aliz/tzYtYzkhC0WV6QmId 1d+oRLi34wJ9CpzR7xsgqTuAvvRq X-Google-Smtp-Source: APXvYqxsdJ4R5eyNdCSX0V7pI6LBZZUFcJjLONBNGW5u6PhvD8Qmss/Z+ioD4jlwR5XfPLIMykn/nQ== X-Received: by 2002:a1c:9e4c:: with SMTP id h73mr295756wme.177.1578513642790; Wed, 08 Jan 2020 12:00:42 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 06/17] hw/arm/allwinner: add CPU Configuration module Date: Wed, 8 Jan 2020 21:00:09 +0100 Message-Id: <20200108200020.4745-7-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Various Allwinner System on Chip designs contain multiple processors that can be configured and reset using the generic CPU Configuration module interface. This commit adds support for the Allwinner CPU configuration interface which emulates the following features: * CPU reset * CPU status * Shared 64-bit timer Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 3 + include/hw/misc/allwinner-cpucfg.h | 54 ++++++ hw/arm/allwinner-h3.c | 9 +- hw/misc/allwinner-cpucfg.c | 282 +++++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 5 + 6 files changed, 353 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/allwinner-cpucfg.h create mode 100644 hw/misc/allwinner-cpucfg.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 26706f4fa6..5a25a92eae 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -44,6 +44,7 @@ #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/arm_gic.h" #include "hw/misc/allwinner-h3-ccu.h" +#include "hw/misc/allwinner-cpucfg.h" #include "hw/misc/allwinner-h3-sysctrl.h" #include "target/arm/cpu.h" =20 @@ -80,6 +81,7 @@ enum { AW_H3_GIC_CPU, AW_H3_GIC_HYP, AW_H3_GIC_VCPU, + AW_H3_CPUCFG, AW_H3_SDRAM }; =20 @@ -111,6 +113,7 @@ typedef struct AwH3State { const hwaddr *memmap; AwA10PITState timer; AwH3ClockCtlState ccu; + AwCpuCfgState cpucfg; AwH3SysCtrlState sysctrl; GICState gic; MemoryRegion sram_a1; diff --git a/include/hw/misc/allwinner-cpucfg.h b/include/hw/misc/allwinner= -cpucfg.h new file mode 100644 index 0000000000..2c0e5b7e03 --- /dev/null +++ b/include/hw/misc/allwinner-cpucfg.h @@ -0,0 +1,54 @@ +/* + * Allwinner CPU Configuration Module 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 . + */ + +#ifndef HW_MISC_ALLWINNER_CPUCFG_H +#define HW_MISC_ALLWINNER_CPUCFG_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" + +/** + * Object model + * @{ + */ + +#define TYPE_AW_CPUCFG "allwinner-cpucfg" +#define AW_CPUCFG(obj) \ + OBJECT_CHECK(AwCpuCfgState, (obj), TYPE_AW_CPUCFG) + +/** @} */ + +/** + * Allwinner CPU Configuration Module instance state + */ +typedef struct AwCpuCfgState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + MemoryRegion iomem; + uint32_t gen_ctrl; + uint32_t super_standby; + uint32_t entry_addr; + uint32_t counter_ctrl; + +} AwCpuCfgState; + +#endif /* HW_MISC_ALLWINNER_CPUCFG_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index d261d7b2be..e9ad6d23df 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -54,6 +54,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_GIC_CPU] =3D 0x01c82000, [AW_H3_GIC_HYP] =3D 0x01c84000, [AW_H3_GIC_VCPU] =3D 0x01c86000, + [AW_H3_CPUCFG] =3D 0x01f01c00, [AW_H3_SDRAM] =3D 0x40000000 }; =20 @@ -120,7 +121,6 @@ struct AwH3Unimplemented { { "r_wdog", 0x01f01000, 1 * KiB }, { "r_prcm", 0x01f01400, 1 * KiB }, { "r_twd", 0x01f01800, 1 * KiB }, - { "r_cpucfg", 0x01f01c00, 1 * KiB }, { "r_cir-rx", 0x01f02000, 1 * KiB }, { "r_twi", 0x01f02400, 1 * KiB }, { "r_uart", 0x01f02800, 1 * KiB }, @@ -193,6 +193,9 @@ static void allwinner_h3_init(Object *obj) =20 sysbus_init_child_obj(obj, "sysctrl", &s->sysctrl, sizeof(s->sysctrl), TYPE_AW_H3_SYSCTRL); + + sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), + TYPE_AW_CPUCFG); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -309,6 +312,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_init_nofail(DEVICE(&s->sysctrl)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctrl), 0, s->memmap[AW_H3_SYSCTR= L]); =20 + /* CPU Configuration */ + qdev_init_nofail(DEVICE(&s->cpucfg)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_CPUCFG]= ); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/misc/allwinner-cpucfg.c b/hw/misc/allwinner-cpucfg.c new file mode 100644 index 0000000000..58c7a1448d --- /dev/null +++ b/hw/misc/allwinner-cpucfg.c @@ -0,0 +1,282 @@ +/* + * Allwinner CPU Configuration Module 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "qemu/timer.h" +#include "hw/core/cpu.h" +#include "arm-powerctl.h" +#include "hw/misc/allwinner-cpucfg.h" +#include "trace.h" + +/* CPUCFG register offsets */ +enum { + REG_CPUS_RST_CTRL =3D 0x0000, /* CPUs Reset Control */ + REG_CPU0_RST_CTRL =3D 0x0040, /* CPU#0 Reset Control */ + REG_CPU0_CTRL =3D 0x0044, /* CPU#0 Control */ + REG_CPU0_STATUS =3D 0x0048, /* CPU#0 Status */ + REG_CPU1_RST_CTRL =3D 0x0080, /* CPU#1 Reset Control */ + REG_CPU1_CTRL =3D 0x0084, /* CPU#1 Control */ + REG_CPU1_STATUS =3D 0x0088, /* CPU#1 Status */ + REG_CPU2_RST_CTRL =3D 0x00C0, /* CPU#2 Reset Control */ + REG_CPU2_CTRL =3D 0x00C4, /* CPU#2 Control */ + REG_CPU2_STATUS =3D 0x00C8, /* CPU#2 Status */ + REG_CPU3_RST_CTRL =3D 0x0100, /* CPU#3 Reset Control */ + REG_CPU3_CTRL =3D 0x0104, /* CPU#3 Control */ + REG_CPU3_STATUS =3D 0x0108, /* CPU#3 Status */ + REG_CPU_SYS_RST =3D 0x0140, /* CPU System Reset */ + REG_CLK_GATING =3D 0x0144, /* CPU Clock Gating */ + REG_GEN_CTRL =3D 0x0184, /* General Control */ + REG_SUPER_STANDBY =3D 0x01A0, /* Super Standby Flag */ + REG_ENTRY_ADDR =3D 0x01A4, /* Reset Entry Address */ + REG_DBG_EXTERN =3D 0x01E4, /* Debug External */ + REG_CNT64_CTRL =3D 0x0280, /* 64-bit Counter Control */ + REG_CNT64_LOW =3D 0x0284, /* 64-bit Counter Low */ + REG_CNT64_HIGH =3D 0x0288, /* 64-bit Counter High */ +}; + +/* CPUCFG register flags */ +enum { + CPUX_RESET_RELEASED =3D ((1 << 1) | (1 << 0)), + CPUX_STATUS_SMP =3D (1 << 0), + CPU_SYS_RESET_RELEASED =3D (1 << 0), + CLK_GATING_ENABLE =3D ((1 << 8) | 0xF), +}; + +/* CPUCFG register reset values */ +enum { + REG_CLK_GATING_RST =3D 0x0000010F, + REG_GEN_CTRL_RST =3D 0x00000020, + REG_SUPER_STANDBY_RST =3D 0x0, + REG_CNT64_CTRL_RST =3D 0x0, +}; + +static void allwinner_cpucfg_cpu_reset(AwCpuCfgState *s, uint8_t cpu_id) +{ + int ret; + + trace_allwinner_cpucfg_cpu_reset(cpu_id, s->entry_addr); + + ret =3D arm_set_cpu_on(cpu_id, s->entry_addr, 0, 3, false); + if (ret !=3D QEMU_ARM_POWERCTL_RET_SUCCESS) { + error_report("%s: failed to bring up CPU %d: err %d", + __func__, cpu_id, ret); + return; + } +} + +static uint64_t allwinner_cpucfg_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwCpuCfgState *s =3D AW_CPUCFG(opaque); + uint64_t val =3D 0; + + switch (offset) { + case REG_CPUS_RST_CTRL: /* CPUs Reset Control */ + case REG_CPU_SYS_RST: /* CPU System Reset */ + val =3D CPU_SYS_RESET_RELEASED; + break; + case REG_CPU0_RST_CTRL: /* CPU#0 Reset Control */ + case REG_CPU1_RST_CTRL: /* CPU#1 Reset Control */ + case REG_CPU2_RST_CTRL: /* CPU#2 Reset Control */ + case REG_CPU3_RST_CTRL: /* CPU#3 Reset Control */ + val =3D CPUX_RESET_RELEASED; + break; + case REG_CPU0_CTRL: /* CPU#0 Control */ + case REG_CPU1_CTRL: /* CPU#1 Control */ + case REG_CPU2_CTRL: /* CPU#2 Control */ + case REG_CPU3_CTRL: /* CPU#3 Control */ + val =3D 0; + break; + case REG_CPU0_STATUS: /* CPU#0 Status */ + case REG_CPU1_STATUS: /* CPU#1 Status */ + case REG_CPU2_STATUS: /* CPU#2 Status */ + case REG_CPU3_STATUS: /* CPU#3 Status */ + val =3D CPUX_STATUS_SMP; + break; + case REG_CLK_GATING: /* CPU Clock Gating */ + val =3D CLK_GATING_ENABLE; + break; + case REG_GEN_CTRL: /* General Control */ + val =3D s->gen_ctrl; + break; + case REG_SUPER_STANDBY: /* Super Standby Flag */ + val =3D s->super_standby; + break; + case REG_ENTRY_ADDR: /* Reset Entry Address */ + val =3D s->entry_addr; + break; + case REG_DBG_EXTERN: /* Debug External */ + break; + case REG_CNT64_CTRL: /* 64-bit Counter Control */ + val =3D s->counter_ctrl; + break; + case REG_CNT64_LOW: /* 64-bit Counter Low */ + val =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) & 0xffffffff; + break; + case REG_CNT64_HIGH: /* 64-bit Counter High */ + val =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 32; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_cpucfg_read(offset, val, size); + + return val; +} + +static void allwinner_cpucfg_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwCpuCfgState *s =3D AW_CPUCFG(opaque); + + trace_allwinner_cpucfg_write(offset, val, size); + + switch (offset) { + case REG_CPUS_RST_CTRL: /* CPUs Reset Control */ + case REG_CPU_SYS_RST: /* CPU System Reset */ + break; + case REG_CPU0_RST_CTRL: /* CPU#0 Reset Control */ + if (val) { + allwinner_cpucfg_cpu_reset(s, 0); + } + break; + case REG_CPU1_RST_CTRL: /* CPU#1 Reset Control */ + if (val) { + allwinner_cpucfg_cpu_reset(s, 1); + } + break; + case REG_CPU2_RST_CTRL: /* CPU#2 Reset Control */ + if (val) { + allwinner_cpucfg_cpu_reset(s, 2); + } + break; + case REG_CPU3_RST_CTRL: /* CPU#3 Reset Control */ + if (val) { + allwinner_cpucfg_cpu_reset(s, 3); + } + break; + case REG_CPU0_CTRL: /* CPU#0 Control */ + case REG_CPU1_CTRL: /* CPU#1 Control */ + case REG_CPU2_CTRL: /* CPU#2 Control */ + case REG_CPU3_CTRL: /* CPU#3 Control */ + case REG_CPU0_STATUS: /* CPU#0 Status */ + case REG_CPU1_STATUS: /* CPU#1 Status */ + case REG_CPU2_STATUS: /* CPU#2 Status */ + case REG_CPU3_STATUS: /* CPU#3 Status */ + case REG_CLK_GATING: /* CPU Clock Gating */ + case REG_GEN_CTRL: /* General Control */ + s->gen_ctrl =3D val; + break; + case REG_SUPER_STANDBY: /* Super Standby Flag */ + s->super_standby =3D val; + break; + case REG_ENTRY_ADDR: /* Reset Entry Address */ + s->entry_addr =3D val; + break; + case REG_DBG_EXTERN: /* Debug External */ + break; + case REG_CNT64_CTRL: /* 64-bit Counter Control */ + s->counter_ctrl =3D val; + break; + case REG_CNT64_LOW: /* 64-bit Counter Low */ + case REG_CNT64_HIGH: /* 64-bit Counter High */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } +} + +static const MemoryRegionOps allwinner_cpucfg_ops =3D { + .read =3D allwinner_cpucfg_read, + .write =3D allwinner_cpucfg_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_cpucfg_reset(DeviceState *dev) +{ + AwCpuCfgState *s =3D AW_CPUCFG(dev); + + /* Set default values for registers */ + s->gen_ctrl =3D REG_GEN_CTRL_RST; + s->super_standby =3D REG_SUPER_STANDBY_RST; + s->entry_addr =3D 0; + s->counter_ctrl =3D REG_CNT64_CTRL_RST; +} + +static void allwinner_cpucfg_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwCpuCfgState *s =3D AW_CPUCFG(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_cpucfg_ops, s, + TYPE_AW_CPUCFG, 1 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static const VMStateDescription allwinner_cpucfg_vmstate =3D { + .name =3D "allwinner-cpucfg", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(gen_ctrl, AwCpuCfgState), + VMSTATE_UINT32(super_standby, AwCpuCfgState), + VMSTATE_UINT32(counter_ctrl, AwCpuCfgState), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_cpucfg_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_cpucfg_reset; + dc->vmsd =3D &allwinner_cpucfg_vmstate; +} + +static const TypeInfo allwinner_cpucfg_info =3D { + .name =3D TYPE_AW_CPUCFG, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_cpucfg_init, + .instance_size =3D sizeof(AwCpuCfgState), + .class_init =3D allwinner_cpucfg_class_init, +}; + +static void allwinner_cpucfg_register(void) +{ + type_register_static(&allwinner_cpucfg_info); +} + +type_init(allwinner_cpucfg_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 2d6b1a4257..12c2c306b5 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -29,6 +29,7 @@ common-obj-$(CONFIG_MACIO) +=3D macio/ common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o =20 common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o +obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-cpucfg.o common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o common-obj-$(CONFIG_NSERIES) +=3D cbus.o diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 2e0c820834..d3e0952429 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -1,5 +1,10 @@ # See docs/devel/tracing.txt for syntax documentation. =20 +# allwinner-cpucfg.c +allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, re= set_addr 0x%" PRIu32 +allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offs= et 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "off= set 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 + # eccmemctl.c ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x" ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x" --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514418; cv=none; d=zohomail.com; s=zohoarc; b=aBI9w1p1yGRDIBIMuotaV87XvrH9ONOrv8nHCSvkt1HdxrmeK7FVv++GIUqyxvvGQVagpQ3a7aSpGZgMDpzVLuw46aILwESonKhphrRcPHelokfdfHC1BzCCWlIqJs5qSMSRJGuV4cG2YUS7rFo1iDnumeWAa7mVlt/xHJf7NWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514418; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=jnzyxCtpoXK8Bo4FMa05JcDgueBi3yPI2xfR3PhzF18=; b=F3Djq7T+VSN/jMk3YyYvRvKDI+W6PLj/v2G+sUxO2ZU1djsBQL2mMdvYh/ZVBPzpmWuYuRGFJmxgNYUI8CNIv3On5+QzqEo7gWCvFyskLGNEP9KZleImIio2DTPvatxh38zlT8DrF5xvmzsgJpQk8OC/P6sFRwPseuMclke1dGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514418076521.776472635344; Wed, 8 Jan 2020 12:13:38 -0800 (PST) Received: from localhost ([::1]:48848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHhw-000144-QB for importer@patchew.org; Wed, 08 Jan 2020 15:13:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35463) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVX-0001Lf-Uw for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVV-0002Zg-AV for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:47 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVV-0002Yg-3C; Wed, 08 Jan 2020 15:00:45 -0500 Received: by mail-wm1-x341.google.com with SMTP id t14so204981wmi.5; Wed, 08 Jan 2020 12:00:44 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jnzyxCtpoXK8Bo4FMa05JcDgueBi3yPI2xfR3PhzF18=; b=GUEJdYxSLEQHuK13qbTgBv07irLSXuNleam+9du6ZK5sJqSZ/GKFG9+DwAebE4kfsp PvNKGD+BwC6i27h1O9BPoFmsn4wedht0rn8KS76l8k/R3hg7ARvDN8pfhCIF9U+yN4xS ESolBpFPGkkVZq34XOTPjIDACZC/6OGeGCVm3bvmtPU4ZmsF4vHHAFM0N8nsS1ahJvOv xVDlrx0hyn4SwwVvLpDG8i+peYkNUqbKW+m8MLOXViRZIpwIEL2VEe1QqQIYZhjnTrFH Zz+E/AyqEBcjAcrvNxrPSb90kHY337drfzZdzXN2oaYkbtZBbQXeQIaCk5WO96lfZe+u GbiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jnzyxCtpoXK8Bo4FMa05JcDgueBi3yPI2xfR3PhzF18=; b=sCzCarZk34Xg6QooNilmQ+MILCFluTIKjpZ3NloaYq7NtB1Ww9EHvf/3XssfokcDby rlI/N6okWBNcQCTOCdIRkNcpQ6JbXlVtzz+RyXHReaxPwpMrj8g/BpHWntjC5Ax30/xC iOtUpmnRkIPp0W2QvLstaQnxAhJeSE3rTVynNfX3qFSqogU/6Ye8VsFNYqHH8y66A/qP Pdwl2bc12ZOMY4iRjHYqzmTjdi0dVenR8y/FCQQOCfG6CqoWFmyLMwsIFA4OAuyG0k4h DEfx3g6HvZPR9Ay2sAMTr6rALa4ULcWWHh4GYcS5TVXAXUEzxUzsHLq+F9rNwdKEP7Ts ap9w== X-Gm-Message-State: APjAAAWjteLcP9J/3bOhfTrrcWV2zXwam45KB+JG/3ZoZodq3SLXB7+g fih0a2sjKTuuy6CpL/4T8vb0l9DJ X-Google-Smtp-Source: APXvYqwfdELyaqLJVhRKGMA3LKCkyhDZW65r0ikF86FwQ9GpJKu+FbesA3T7/4kmtPo/IMKa/LyrWw== X-Received: by 2002:a1c:8055:: with SMTP id b82mr313169wmd.127.1578513643615; Wed, 08 Jan 2020 12:00:43 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device Date: Wed, 8 Jan 2020 21:00:10 +0100 Message-Id: <20200108200020.4745-8-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Security Identifier device found in various Allwinner System on Chip designs gives applications a per-board unique identifier. This commit adds support for the Allwinner Security Identifier using a 128-bit UUID value as input. Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 3 + include/hw/misc/allwinner-sid.h | 61 ++++++++++++ hw/arm/allwinner-h3.c | 11 ++- hw/arm/orangepi.c | 4 + hw/misc/allwinner-sid.c | 170 ++++++++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 4 + 7 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/allwinner-sid.h create mode 100644 hw/misc/allwinner-sid.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 5a25a92eae..9ed365507c 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -46,6 +46,7 @@ #include "hw/misc/allwinner-h3-ccu.h" #include "hw/misc/allwinner-cpucfg.h" #include "hw/misc/allwinner-h3-sysctrl.h" +#include "hw/misc/allwinner-sid.h" #include "target/arm/cpu.h" =20 /** @@ -63,6 +64,7 @@ enum { AW_H3_SRAM_A2, AW_H3_SRAM_C, AW_H3_SYSCTRL, + AW_H3_SID, AW_H3_EHCI0, AW_H3_OHCI0, AW_H3_EHCI1, @@ -115,6 +117,7 @@ typedef struct AwH3State { AwH3ClockCtlState ccu; AwCpuCfgState cpucfg; AwH3SysCtrlState sysctrl; + AwSidState sid; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-si= d.h new file mode 100644 index 0000000000..41189967e2 --- /dev/null +++ b/include/hw/misc/allwinner-sid.h @@ -0,0 +1,61 @@ +/* + * Allwinner Security ID 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 . + */ + +#ifndef HW_MISC_ALLWINNER_SID_H +#define HW_MISC_ALLWINNER_SID_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" +#include "qemu/uuid.h" + +/** + * Object model + * @{ + */ + +#define TYPE_AW_SID "allwinner-sid" +#define AW_SID(obj) \ + OBJECT_CHECK(AwSidState, (obj), TYPE_AW_SID) + +/** @} */ + +/** + * Allwinner Security ID object instance state + */ +typedef struct AwSidState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Control register defines how and what to read */ + uint32_t control; + + /** RdKey register contains the data retrieved by the device */ + uint32_t rdkey; + + /** Stores the emulated device identifier */ + QemuUUID identifier; + +} AwSidState; + +#endif /* HW_MISC_ALLWINNER_SID_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index e9ad6d23df..af7317e86a 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -36,6 +36,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_SRAM_A2] =3D 0x00044000, [AW_H3_SRAM_C] =3D 0x00010000, [AW_H3_SYSCTRL] =3D 0x01c00000, + [AW_H3_SID] =3D 0x01c14000, [AW_H3_EHCI0] =3D 0x01c1a000, [AW_H3_OHCI0] =3D 0x01c1a400, [AW_H3_EHCI1] =3D 0x01c1b000, @@ -76,7 +77,6 @@ struct AwH3Unimplemented { { "mmc0", 0x01c0f000, 4 * KiB }, { "mmc1", 0x01c10000, 4 * KiB }, { "mmc2", 0x01c11000, 4 * KiB }, - { "sid", 0x01c14000, 1 * KiB }, { "crypto", 0x01c15000, 4 * KiB }, { "msgbox", 0x01c17000, 4 * KiB }, { "spinlock", 0x01c18000, 4 * KiB }, @@ -196,6 +196,11 @@ static void allwinner_h3_init(Object *obj) =20 sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), TYPE_AW_CPUCFG); + + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), + TYPE_AW_SID); + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), + "identifier", &error_abort); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -316,6 +321,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_init_nofail(DEVICE(&s->cpucfg)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_CPUCFG]= ); =20 + /* Security Identifier */ + qdev_init_nofail(DEVICE(&s->sid)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 051184f14f..a7f870c88b 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -54,6 +54,10 @@ static void orangepi_init(MachineState *machine) object_property_set_int(OBJECT(s->h3), 24000000, "clk1-freq", &error_abort); =20 + /* Setup SID properties */ + qdev_prop_set_string(DEVICE(s->h3), "identifier", + "8100c002-0001-0002-0003-000044556677"); + /* Mark H3 object realized */ object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort= ); =20 diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c new file mode 100644 index 0000000000..954de935bc --- /dev/null +++ b/hw/misc/allwinner-sid.c @@ -0,0 +1,170 @@ +/* + * Allwinner Security ID 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/guest-random.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "hw/misc/allwinner-sid.h" +#include "trace.h" + +/* SID register offsets */ +enum { + REG_PRCTL =3D 0x40, /* Control */ + REG_RDKEY =3D 0x60, /* Read Key */ +}; + +/* SID register flags */ +enum { + REG_PRCTL_WRITE =3D 0x0002, /* Unknown write flag */ + REG_PRCTL_OP_LOCK =3D 0xAC00, /* Lock operation */ +}; + +static uint64_t allwinner_sid_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwSidState *s =3D AW_SID(opaque); + uint64_t val =3D 0; + + switch (offset) { + case REG_PRCTL: /* Control */ + val =3D s->control; + break; + case REG_RDKEY: /* Read Key */ + val =3D s->rdkey; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_sid_read(offset, val, size); + + return val; +} + +static void allwinner_sid_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwSidState *s =3D AW_SID(opaque); + + trace_allwinner_sid_write(offset, val, size); + + switch (offset) { + case REG_PRCTL: /* Control */ + s->control =3D val; + + if ((s->control & REG_PRCTL_OP_LOCK) && + (s->control & REG_PRCTL_WRITE)) { + uint32_t id =3D s->control >> 16; + + if (id < sizeof(QemuUUID)) { + s->rdkey =3D (s->identifier.data[id]) | + (s->identifier.data[id + 1] << 8) | + (s->identifier.data[id + 2] << 16) | + (s->identifier.data[id + 3] << 24); + } + } + s->control &=3D ~REG_PRCTL_WRITE; + break; + case REG_RDKEY: /* Read Key */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + break; + } +} + +static const MemoryRegionOps allwinner_sid_ops =3D { + .read =3D allwinner_sid_read, + .write =3D allwinner_sid_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_sid_reset(DeviceState *dev) +{ + AwSidState *s =3D AW_SID(dev); + + /* Set default values for registers */ + s->control =3D 0; + s->rdkey =3D 0; +} + +static void allwinner_sid_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwSidState *s =3D AW_SID(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_sid_ops, s, + TYPE_AW_SID, 1 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static Property allwinner_sid_properties[] =3D { + DEFINE_PROP_UUID_NODEFAULT("identifier", AwSidState, identifier), + DEFINE_PROP_END_OF_LIST() +}; + +static const VMStateDescription allwinner_sid_vmstate =3D { + .name =3D "allwinner-sid", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(control, AwSidState), + VMSTATE_UINT32(rdkey, AwSidState), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_sid_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_sid_reset; + dc->vmsd =3D &allwinner_sid_vmstate; + dc->props =3D allwinner_sid_properties; +} + +static const TypeInfo allwinner_sid_info =3D { + .name =3D TYPE_AW_SID, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_sid_init, + .instance_size =3D sizeof(AwSidState), + .class_init =3D allwinner_sid_class_init, +}; + +static void allwinner_sid_register(void) +{ + type_register_static(&allwinner_sid_info); +} + +type_init(allwinner_sid_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 12c2c306b5..59500d5681 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -31,6 +31,7 @@ common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-cpucfg.o common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o +common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-sid.o common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o common-obj-$(CONFIG_NSERIES) +=3D cbus.o common-obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o diff --git a/hw/misc/trace-events b/hw/misc/trace-events index d3e0952429..67d8bf493c 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -5,6 +5,10 @@ allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_= addr) "id %u, reset_ad allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offs= et 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "off= set 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 =20 +# allwinner-sid.c +allwinner_sid_read(uint64_t offset, uint64_t data, unsigned size) "offset = 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_sid_write(uint64_t offset, uint64_t data, unsigned size) "offset= 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 + # eccmemctl.c ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x" ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x" --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514412; cv=none; d=zohomail.com; s=zohoarc; b=BGqrWugzBOYTAHLp7yWhGH9WJTPpfFJHLs99QVisIgQjNxZIkuUBWArrVEV8opLjxiF9pZuy4/kh3Mjpw7CnnyjfPt/r+3S6p8hqpybgLpOfw0iUz1XcpAYs8wLA/1oFpA2S5Alk752IcfCrOkIL27U127bHPXEllJ6dbaejT4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514412; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=uQvnPbwyfcqcMBdjO9UL89qAPdbJ7wW8mcmav37JK3Y=; b=I2/Vk3JWra19/U2iwfLbPBuRpXNOAY+O0Oake6/NTbKikpBSXVizkXrzB4RpcQQNhwELg5fT1c1O7+vLKr/tR3T3rRkjv8d6fRwvDNJgOQxQ0fZqwdtR+UqPTfqJvGXwdDY7Moj1j6xIBAOzOpdEEZ/gI7KeBTh55YiCnPY/QXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514412268295.72939683940376; Wed, 8 Jan 2020 12:13:32 -0800 (PST) Received: from localhost ([::1]:48846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHhq-0000qc-PL for importer@patchew.org; Wed, 08 Jan 2020 15:13:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVd-0001S5-8b for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVW-0002bb-VA for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:53 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVW-0002aM-J3; Wed, 08 Jan 2020 15:00:46 -0500 Received: by mail-wr1-x42f.google.com with SMTP id w15so4776553wru.4; Wed, 08 Jan 2020 12:00:46 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uQvnPbwyfcqcMBdjO9UL89qAPdbJ7wW8mcmav37JK3Y=; b=DbRwogmAkawAEd8cC/d332SNUr7zkd2dmsst31U6Q4fhg9IJ6StmnuVuR66sYXJ+Dl Sc1CFJyDDpfBqKt0f3xEj6MB3r1vgVx/pRIK5qzEtHPCW5b8HX5Ag4yrXKztLuPtO9ze oKEVW2PP1NzFu2/eTOkedkoXkASKZ8duHPPS17/mxHTtbvhqWXVcWcHiTsHHtHtWDewN fUd3v2i/aeO1Th2axKKNImrmW7XKo3XVvYw83KYwqFzUjAdqyBpETifg2DLVfRwMdSEO jaEmqwBuGjyrBFyVO3B5a26vpmk8ZjTG0fyp3suzw89rhIrvyQGOFUcb8lhN/VWjbKC/ ZUYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uQvnPbwyfcqcMBdjO9UL89qAPdbJ7wW8mcmav37JK3Y=; b=GFeDSgorMiphFDLnriAvm3ItOZ3oF0MapH9rdXM8o4SY1K/fupmENkQv86PA9srzi9 w7NazGU1qqMTfMnts0NzL7ReJHZlLy6WvpT/zrNnGmqOmvHNRUscporL1SVEoL9ry2Fy woKjfVDquyUDgugQSc5JzHZN3mLGWqT/VlRoIU9wSjv11v4ttiAFFQ+JiLnL8BCSfS9Y U7mf8tmzySRncKknmec95ZSEIbb9kdbz0bQVnQkIeyzqmvL6Hr+vXz0GIlH0lHvgJZpy /4SBnJxwznnpzY+ueeXb2l9YN7diW+8HJoPGGLrxcCr8NnfRXKzqL0Y8hNuzLoRT04eo Y1DA== X-Gm-Message-State: APjAAAUT5dQXoe3RT+D39D0yfPppW8fc3h1WQQHY0j0hbp5aleHtCSqQ 3DYn/BiuCCgrKmCrwdCdxQWL3cj4 X-Google-Smtp-Source: APXvYqwIdCBoNAljnipmmiKjJZ6ovClVIZ1pmkxdt5jh7E7aZ0vj6JsPPQgsYrqh2Fqx0d9NJnLDMg== X-Received: by 2002:adf:fd87:: with SMTP id d7mr6584354wrr.226.1578513644507; Wed, 08 Jan 2020 12:00:44 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 08/17] hw/arm/allwinner: add SD/MMC host controller Date: Wed, 8 Jan 2020 21:00:11 +0100 Message-Id: <20200108200020.4745-9-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Allwinner System on Chip families sun4i and above contain an integrated storage controller for Secure Digital (SD) and Multi Media Card (MMC) interfaces. This commit adds support for the Allwinner SD/MMC storage controller with the following emulated features: * DMA transfers * Direct FIFO I/O * Short/Long format command responses * Auto-Stop command (CMD12) * Insert & remove card detection The following boards are extended with the SD host controller: * Cubieboard (hw/arm/cubieboard.c) * Orange Pi PC (hw/arm/orangepi.c) Signed-off-by: Niek Linnenbank Tested-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/allwinner-a10.h | 4 +- include/hw/arm/allwinner-h3.h | 3 + include/hw/sd/allwinner-sdhost.h | 136 +++++ hw/arm/allwinner-a10.c | 10 + hw/arm/allwinner-h3.c | 15 +- hw/arm/cubieboard.c | 15 + hw/arm/orangepi.c | 16 + hw/sd/allwinner-sdhost.c | 848 +++++++++++++++++++++++++++++++ hw/sd/Makefile.objs | 1 + hw/sd/trace-events | 7 + 10 files changed, 1053 insertions(+), 2 deletions(-) create mode 100644 include/hw/sd/allwinner-sdhost.h create mode 100644 hw/sd/allwinner-sdhost.c diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 7d2d215630..0e8250b244 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -7,11 +7,12 @@ #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/net/allwinner_emac.h" +#include "hw/sd/allwinner-sdhost.h" #include "hw/ide/ahci.h" =20 #include "target/arm/cpu.h" =20 - +#define AW_A10_MMC0_BASE 0x01c0f000 #define AW_A10_PIC_REG_BASE 0x01c20400 #define AW_A10_PIT_REG_BASE 0x01c20c00 #define AW_A10_UART0_REG_BASE 0x01c28000 @@ -34,6 +35,7 @@ typedef struct AwA10State { AwA10PICState intc; AwEmacState emac; AllwinnerAHCIState sata; + AwSdHostState mmc0; MemoryRegion sram_a; } AwA10State; =20 diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 9ed365507c..0ae830e461 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -47,6 +47,7 @@ #include "hw/misc/allwinner-cpucfg.h" #include "hw/misc/allwinner-h3-sysctrl.h" #include "hw/misc/allwinner-sid.h" +#include "hw/sd/allwinner-sdhost.h" #include "target/arm/cpu.h" =20 /** @@ -64,6 +65,7 @@ enum { AW_H3_SRAM_A2, AW_H3_SRAM_C, AW_H3_SYSCTRL, + AW_H3_MMC0, AW_H3_SID, AW_H3_EHCI0, AW_H3_OHCI0, @@ -118,6 +120,7 @@ typedef struct AwH3State { AwCpuCfgState cpucfg; AwH3SysCtrlState sysctrl; AwSidState sid; + AwSdHostState mmc0; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/sd/allwinner-sdhost.h b/include/hw/sd/allwinner-sdh= ost.h new file mode 100644 index 0000000000..2274ec81b1 --- /dev/null +++ b/include/hw/sd/allwinner-sdhost.h @@ -0,0 +1,136 @@ +/* + * Allwinner (sun4i and above) SD Host Controller 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 . + */ + +#ifndef HW_SD_ALLWINNER_SDHOST_H +#define HW_SD_ALLWINNER_SDHOST_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" +#include "hw/sd/sd.h" + +/** + * Object model types + * @{ + */ + +/** Generic Allwinner SD Host Controller (abstract) */ +#define TYPE_AW_SDHOST "allwinner-sdhost" + +/** Allwinner sun4i family (A10, A12) */ +#define TYPE_AW_SDHOST_SUN4I TYPE_AW_SDHOST "-sun4i" + +/** Allwinner sun5i family and newer (A13, H2+, H3, etc) */ +#define TYPE_AW_SDHOST_SUN5I TYPE_AW_SDHOST "-sun5i" + +/** @} */ + +/** + * Object model macros + * @{ + */ + +#define AW_SDHOST(obj) \ + OBJECT_CHECK(AwSdHostState, (obj), TYPE_AW_SDHOST) +#define AW_SDHOST_CLASS(klass) \ + OBJECT_CLASS_CHECK(AwSdHostClass, (klass), TYPE_AW_SDHOST) +#define AW_SDHOST_GET_CLASS(obj) \ + OBJECT_GET_CLASS(AwSdHostClass, (obj), TYPE_AW_SDHOST) + +/** @} */ + +/** + * Allwinner SD Host Controller object instance state. + */ +typedef struct AwSdHostState { + /*< private >*/ + SysBusDevice busdev; + /*< public >*/ + + /** Secure Digital (SD) bus, which connects to SD card (if present) */ + SDBus sdbus; + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Interrupt output signal to notify CPU */ + qemu_irq irq; + + /** Number of bytes left in current DMA transfer */ + uint32_t transfer_cnt; + + /** + * @name Hardware Registers + * @{ + */ + + uint32_t global_ctl; /**< Global Control */ + uint32_t clock_ctl; /**< Clock Control */ + uint32_t timeout; /**< Timeout */ + uint32_t bus_width; /**< Bus Width */ + uint32_t block_size; /**< Block Size */ + uint32_t byte_count; /**< Byte Count */ + + uint32_t command; /**< Command */ + uint32_t command_arg; /**< Command Argument */ + uint32_t response[4]; /**< Command Response */ + + uint32_t irq_mask; /**< Interrupt Mask */ + uint32_t irq_status; /**< Raw Interrupt Status */ + uint32_t status; /**< Status */ + + uint32_t fifo_wlevel; /**< FIFO Water Level */ + uint32_t fifo_func_sel; /**< FIFO Function Select */ + uint32_t debug_enable; /**< Debug Enable */ + uint32_t auto12_arg; /**< Auto Command 12 Argument */ + uint32_t newtiming_set; /**< SD New Timing Set */ + uint32_t newtiming_debug; /**< SD New Timing Debug */ + uint32_t hardware_rst; /**< Hardware Reset */ + uint32_t dmac; /**< Internal DMA Controller Control */ + uint32_t desc_base; /**< Descriptor List Base Address */ + uint32_t dmac_status; /**< Internal DMA Controller Status */ + uint32_t dmac_irq; /**< Internal DMA Controller IRQ Enable */ + uint32_t card_threshold; /**< Card Threshold Control */ + uint32_t startbit_detect; /**< eMMC DDR Start Bit Detection Control = */ + uint32_t response_crc; /**< Response CRC */ + uint32_t data_crc[8]; /**< Data CRC */ + uint32_t status_crc; /**< Status CRC */ + + /** @} */ + +} AwSdHostState; + +/** + * Allwinner SD Host Controller class-level struct. + * + * This struct is filled by each sunxi device specific code + * such that the generic code can use this struct to support + * all devices. + */ +typedef struct AwSdHostClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + /** Maximum buffer size in bytes per DMA descriptor */ + size_t max_desc_size; + +} AwSdHostClass; + +#endif /* HW_SD_ALLWINNER_SDHOST_H */ diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 118032c8c7..61cf3550a6 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -43,6 +43,9 @@ static void aw_a10_init(Object *obj) =20 sysbus_init_child_obj(obj, "sata", &s->sata, sizeof(s->sata), TYPE_ALLWINNER_AHCI); + + sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0), + TYPE_AW_SDHOST_SUN4I); } =20 static void aw_a10_realize(DeviceState *dev, Error **errp) @@ -118,6 +121,13 @@ static void aw_a10_realize(DeviceState *dev, Error **e= rrp) /* FIXME use a qdev chardev prop instead of serial_hd() */ serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1= ], 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); + + /* SD/MMC */ + qdev_init_nofail(DEVICE(&s->mmc0)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, AW_A10_MMC0_BASE); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, s->irq[32]); + object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), + "sd-bus", &error_abort); } =20 static void aw_a10_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index af7317e86a..55e7c5841c 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -36,6 +36,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_SRAM_A2] =3D 0x00044000, [AW_H3_SRAM_C] =3D 0x00010000, [AW_H3_SYSCTRL] =3D 0x01c00000, + [AW_H3_MMC0] =3D 0x01c0f000, [AW_H3_SID] =3D 0x01c14000, [AW_H3_EHCI0] =3D 0x01c1a000, [AW_H3_OHCI0] =3D 0x01c1a400, @@ -74,7 +75,6 @@ struct AwH3Unimplemented { { "lcd0", 0x01c0c000, 4 * KiB }, { "lcd1", 0x01c0d000, 4 * KiB }, { "ve", 0x01c0e000, 4 * KiB }, - { "mmc0", 0x01c0f000, 4 * KiB }, { "mmc1", 0x01c10000, 4 * KiB }, { "mmc2", 0x01c11000, 4 * KiB }, { "crypto", 0x01c15000, 4 * KiB }, @@ -151,6 +151,7 @@ enum { AW_H3_GIC_SPI_UART3 =3D 3, AW_H3_GIC_SPI_TIMER0 =3D 18, AW_H3_GIC_SPI_TIMER1 =3D 19, + AW_H3_GIC_SPI_MMC0 =3D 60, AW_H3_GIC_SPI_EHCI0 =3D 72, AW_H3_GIC_SPI_OHCI0 =3D 73, AW_H3_GIC_SPI_EHCI1 =3D 74, @@ -201,6 +202,9 @@ static void allwinner_h3_init(Object *obj) TYPE_AW_SID); object_property_add_alias(obj, "identifier", OBJECT(&s->sid), "identifier", &error_abort); + + sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0), + TYPE_AW_SDHOST_SUN5I); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -325,6 +329,15 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_init_nofail(DEVICE(&s->sid)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); =20 + /* SD/MMC */ + qdev_init_nofail(DEVICE(&s->mmc0)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, s->memmap[AW_H3_MMC0]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_MMC= 0)); + + object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), + "sd-bus", &error_abort); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 6dc2f1d6b6..2286bd7ef7 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "hw/sysbus.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "hw/arm/allwinner-a10.h" =20 static struct arm_boot_info cubieboard_binfo =3D { @@ -37,6 +38,10 @@ static void cubieboard_init(MachineState *machine) { CubieBoardState *s =3D g_new(CubieBoardState, 1); Error *err =3D NULL; + DriveInfo *di; + BlockBackend *blk; + BusState *bus; + DeviceState *carddev; =20 s->a10 =3D AW_A10(object_new(TYPE_AW_A10)); =20 @@ -65,6 +70,16 @@ static void cubieboard_init(MachineState *machine) exit(1); } =20 + /* Retrieve SD bus */ + di =3D drive_get_next(IF_SD); + blk =3D di ? blk_by_legacy_dinfo(di) : NULL; + bus =3D qdev_get_child_bus(DEVICE(s->a10), "sd-bus"); + + /* Plug in SD card */ + carddev =3D qdev_create(bus, TYPE_SD_CARD); + qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); + object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); + memory_region_allocate_system_memory(&s->sdram, NULL, "cubieboard.ram", machine->ram_size); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE, diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index a7f870c88b..c203fc3b99 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -39,6 +39,10 @@ typedef struct OrangePiState { static void orangepi_init(MachineState *machine) { OrangePiState *s =3D g_new(OrangePiState, 1); + DriveInfo *di; + BlockBackend *blk; + BusState *bus; + DeviceState *carddev; =20 /* Only allow Cortex-A7 for this board */ if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a7")) !=3D 0) { @@ -61,6 +65,16 @@ static void orangepi_init(MachineState *machine) /* Mark H3 object realized */ object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort= ); =20 + /* Retrieve SD bus */ + di =3D drive_get_next(IF_SD); + blk =3D di ? blk_by_legacy_dinfo(di) : NULL; + bus =3D qdev_get_child_bus(DEVICE(s->h3), "sd-bus"); + + /* Plug in SD card */ + carddev =3D qdev_create(bus, TYPE_SD_CARD); + qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); + object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); + /* SDRAM */ if (machine->ram_size !=3D 1 * GiB) { error_report("Requested ram size is not supported for this machine= : " @@ -87,6 +101,8 @@ static void orangepi_machine_init(MachineClass *mc) { mc->desc =3D "Orange Pi PC"; mc->init =3D orangepi_init; + mc->block_default_type =3D IF_SD; + mc->units_per_default_bus =3D 1; mc->min_cpus =3D AW_H3_NUM_CPUS; mc->max_cpus =3D AW_H3_NUM_CPUS; mc->default_cpus =3D AW_H3_NUM_CPUS; diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c new file mode 100644 index 0000000000..65222180a9 --- /dev/null +++ b/hw/sd/allwinner-sdhost.c @@ -0,0 +1,848 @@ +/* + * Allwinner (sun4i and above) SD Host Controller 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/log.h" +#include "qemu/module.h" +#include "qemu/units.h" +#include "sysemu/blockdev.h" +#include "hw/irq.h" +#include "hw/sd/allwinner-sdhost.h" +#include "migration/vmstate.h" +#include "trace.h" + +#define TYPE_AW_SDHOST_BUS "allwinner-sdhost-bus" +#define AW_SDHOST_BUS(obj) \ + OBJECT_CHECK(SDBus, (obj), TYPE_AW_SDHOST_BUS) + +/* SD Host register offsets */ +enum { + REG_SD_GCTL =3D 0x00, /* Global Control */ + REG_SD_CKCR =3D 0x04, /* Clock Control */ + REG_SD_TMOR =3D 0x08, /* Timeout */ + REG_SD_BWDR =3D 0x0C, /* Bus Width */ + REG_SD_BKSR =3D 0x10, /* Block Size */ + REG_SD_BYCR =3D 0x14, /* Byte Count */ + REG_SD_CMDR =3D 0x18, /* Command */ + REG_SD_CAGR =3D 0x1C, /* Command Argument */ + REG_SD_RESP0 =3D 0x20, /* Response Zero */ + REG_SD_RESP1 =3D 0x24, /* Response One */ + REG_SD_RESP2 =3D 0x28, /* Response Two */ + REG_SD_RESP3 =3D 0x2C, /* Response Three */ + REG_SD_IMKR =3D 0x30, /* Interrupt Mask */ + REG_SD_MISR =3D 0x34, /* Masked Interrupt Status */ + REG_SD_RISR =3D 0x38, /* Raw Interrupt Status */ + REG_SD_STAR =3D 0x3C, /* Status */ + REG_SD_FWLR =3D 0x40, /* FIFO Water Level */ + REG_SD_FUNS =3D 0x44, /* FIFO Function Select */ + REG_SD_DBGC =3D 0x50, /* Debug Enable */ + REG_SD_A12A =3D 0x58, /* Auto command 12 argument */ + REG_SD_NTSR =3D 0x5C, /* SD NewTiming Set */ + REG_SD_SDBG =3D 0x60, /* SD newTiming Set Debug */ + REG_SD_HWRST =3D 0x78, /* Hardware Reset Register */ + REG_SD_DMAC =3D 0x80, /* Internal DMA Controller Control */ + REG_SD_DLBA =3D 0x84, /* Descriptor List Base Address */ + REG_SD_IDST =3D 0x88, /* Internal DMA Controller Status */ + REG_SD_IDIE =3D 0x8C, /* Internal DMA Controller IRQ Enable */ + REG_SD_THLDC =3D 0x100, /* Card Threshold Control */ + REG_SD_DSBD =3D 0x10C, /* eMMC DDR Start Bit Detection Control */ + REG_SD_RES_CRC =3D 0x110, /* Response CRC from card/eMMC */ + REG_SD_DATA7_CRC =3D 0x114, /* CRC Data 7 from card/eMMC */ + REG_SD_DATA6_CRC =3D 0x118, /* CRC Data 6 from card/eMMC */ + REG_SD_DATA5_CRC =3D 0x11C, /* CRC Data 5 from card/eMMC */ + REG_SD_DATA4_CRC =3D 0x120, /* CRC Data 4 from card/eMMC */ + REG_SD_DATA3_CRC =3D 0x124, /* CRC Data 3 from card/eMMC */ + REG_SD_DATA2_CRC =3D 0x128, /* CRC Data 2 from card/eMMC */ + REG_SD_DATA1_CRC =3D 0x12C, /* CRC Data 1 from card/eMMC */ + REG_SD_DATA0_CRC =3D 0x130, /* CRC Data 0 from card/eMMC */ + REG_SD_CRC_STA =3D 0x134, /* CRC status from card/eMMC during write= */ + REG_SD_FIFO =3D 0x200, /* Read/Write FIFO */ +}; + +/* SD Host register flags */ +enum { + SD_GCTL_FIFO_AC_MOD =3D (1 << 31), + SD_GCTL_DDR_MOD_SEL =3D (1 << 10), + SD_GCTL_CD_DBC_ENB =3D (1 << 8), + SD_GCTL_DMA_ENB =3D (1 << 5), + SD_GCTL_INT_ENB =3D (1 << 4), + SD_GCTL_DMA_RST =3D (1 << 2), + SD_GCTL_FIFO_RST =3D (1 << 1), + SD_GCTL_SOFT_RST =3D (1 << 0), +}; + +enum { + SD_CMDR_LOAD =3D (1 << 31), + SD_CMDR_CLKCHANGE =3D (1 << 21), + SD_CMDR_WRITE =3D (1 << 10), + SD_CMDR_AUTOSTOP =3D (1 << 12), + SD_CMDR_DATA =3D (1 << 9), + SD_CMDR_RESPONSE_LONG =3D (1 << 7), + SD_CMDR_RESPONSE =3D (1 << 6), + SD_CMDR_CMDID_MASK =3D (0x3f), +}; + +enum { + SD_RISR_CARD_REMOVE =3D (1 << 31), + SD_RISR_CARD_INSERT =3D (1 << 30), + SD_RISR_AUTOCMD_DONE =3D (1 << 14), + SD_RISR_DATA_COMPLETE =3D (1 << 3), + SD_RISR_CMD_COMPLETE =3D (1 << 2), + SD_RISR_NO_RESPONSE =3D (1 << 1), +}; + +enum { + SD_STAR_CARD_PRESENT =3D (1 << 8), +}; + +enum { + SD_IDST_SUM_RECEIVE_IRQ =3D (1 << 8), + SD_IDST_RECEIVE_IRQ =3D (1 << 1), + SD_IDST_TRANSMIT_IRQ =3D (1 << 0), + SD_IDST_IRQ_MASK =3D (1 << 1) | (1 << 0) | (1 << 8), + SD_IDST_WR_MASK =3D (0x3ff), +}; + +/* SD Host register reset values */ +enum { + REG_SD_GCTL_RST =3D 0x00000300, + REG_SD_CKCR_RST =3D 0x0, + REG_SD_TMOR_RST =3D 0xFFFFFF40, + REG_SD_BWDR_RST =3D 0x0, + REG_SD_BKSR_RST =3D 0x00000200, + REG_SD_BYCR_RST =3D 0x00000200, + REG_SD_CMDR_RST =3D 0x0, + REG_SD_CAGR_RST =3D 0x0, + REG_SD_RESP_RST =3D 0x0, + REG_SD_IMKR_RST =3D 0x0, + REG_SD_MISR_RST =3D 0x0, + REG_SD_RISR_RST =3D 0x0, + REG_SD_STAR_RST =3D 0x00000100, + REG_SD_FWLR_RST =3D 0x000F0000, + REG_SD_FUNS_RST =3D 0x0, + REG_SD_DBGC_RST =3D 0x0, + REG_SD_A12A_RST =3D 0x0000FFFF, + REG_SD_NTSR_RST =3D 0x00000001, + REG_SD_SDBG_RST =3D 0x0, + REG_SD_HWRST_RST =3D 0x00000001, + REG_SD_DMAC_RST =3D 0x0, + REG_SD_DLBA_RST =3D 0x0, + REG_SD_IDST_RST =3D 0x0, + REG_SD_IDIE_RST =3D 0x0, + REG_SD_THLDC_RST =3D 0x0, + REG_SD_DSBD_RST =3D 0x0, + REG_SD_RES_CRC_RST =3D 0x0, + REG_SD_DATA_CRC_RST =3D 0x0, + REG_SD_CRC_STA_RST =3D 0x0, + REG_SD_FIFO_RST =3D 0x0, +}; + +/* Data transfer descriptor for DMA */ +typedef struct TransferDescriptor { + uint32_t status; /* Status flags */ + uint32_t size; /* Data buffer size */ + uint32_t addr; /* Data buffer address */ + uint32_t next; /* Physical address of next descriptor */ +} TransferDescriptor; + +/* Data transfer descriptor flags */ +enum { + DESC_STATUS_HOLD =3D (1 << 31), /* Set when descriptor is in use by = DMA */ + DESC_STATUS_ERROR =3D (1 << 30), /* Set when DMA transfer error occur= red */ + DESC_STATUS_CHAIN =3D (1 << 4), /* Indicates chained descriptor. */ + DESC_STATUS_FIRST =3D (1 << 3), /* Set on the first descriptor */ + DESC_STATUS_LAST =3D (1 << 2), /* Set on the last descriptor */ + DESC_STATUS_NOIRQ =3D (1 << 1), /* Skip raising interrupt after tran= sfer */ + DESC_SIZE_MASK =3D (0xfffffffc) +}; + +static void allwinner_sdhost_update_irq(AwSdHostState *s) +{ + uint32_t irq; + + if (s->global_ctl & SD_GCTL_INT_ENB) { + irq =3D s->irq_status & s->irq_mask; + } else { + irq =3D 0; + } + + trace_allwinner_sdhost_update_irq(irq); + qemu_set_irq(s->irq, irq); +} + +static void allwinner_sdhost_update_transfer_cnt(AwSdHostState *s, + uint32_t bytes) +{ + if (s->transfer_cnt > bytes) { + s->transfer_cnt -=3D bytes; + } else { + s->transfer_cnt =3D 0; + } + + if (!s->transfer_cnt) { + s->irq_status |=3D SD_RISR_DATA_COMPLETE | SD_RISR_AUTOCMD_DONE; + } +} + +static void allwinner_sdhost_set_inserted(DeviceState *dev, bool inserted) +{ + AwSdHostState *s =3D AW_SDHOST(dev); + + trace_allwinner_sdhost_set_inserted(inserted); + + if (inserted) { + s->irq_status |=3D SD_RISR_CARD_INSERT; + s->irq_status &=3D ~SD_RISR_CARD_REMOVE; + s->status |=3D SD_STAR_CARD_PRESENT; + } else { + s->irq_status &=3D ~SD_RISR_CARD_INSERT; + s->irq_status |=3D SD_RISR_CARD_REMOVE; + s->status &=3D ~SD_STAR_CARD_PRESENT; + } + + allwinner_sdhost_update_irq(s); +} + +static void allwinner_sdhost_send_command(AwSdHostState *s) +{ + SDRequest request; + uint8_t resp[16]; + int rlen; + + /* Auto clear load flag */ + s->command &=3D ~SD_CMDR_LOAD; + + /* Clock change does not actually interact with the SD bus */ + if (!(s->command & SD_CMDR_CLKCHANGE)) { + + /* Prepare request */ + request.cmd =3D s->command & SD_CMDR_CMDID_MASK; + request.arg =3D s->command_arg; + + /* Send request to SD bus */ + rlen =3D sdbus_do_command(&s->sdbus, &request, resp); + if (rlen < 0) { + goto error; + } + + /* If the command has a response, store it in the response registe= rs */ + if ((s->command & SD_CMDR_RESPONSE)) { + if (rlen =3D=3D 4 && !(s->command & SD_CMDR_RESPONSE_LONG)) { + s->response[0] =3D ldl_be_p(&resp[0]); + s->response[1] =3D s->response[2] =3D s->response[3] =3D 0; + + } else if (rlen =3D=3D 16 && (s->command & SD_CMDR_RESPONSE_LO= NG)) { + s->response[0] =3D ldl_be_p(&resp[12]); + s->response[1] =3D ldl_be_p(&resp[8]); + s->response[2] =3D ldl_be_p(&resp[4]); + s->response[3] =3D ldl_be_p(&resp[0]); + } else { + goto error; + } + } + } + + /* Set interrupt status bits */ + s->irq_status |=3D SD_RISR_CMD_COMPLETE; + return; + +error: + s->irq_status |=3D SD_RISR_NO_RESPONSE; +} + +static void allwinner_sdhost_auto_stop(AwSdHostState *s) +{ + /* + * The stop command (CMD12) ensures the SD bus + * returns to the transfer state. + */ + if ((s->command & SD_CMDR_AUTOSTOP) && (s->transfer_cnt =3D=3D 0)) { + /* First save current command registers */ + uint32_t saved_cmd =3D s->command; + uint32_t saved_arg =3D s->command_arg; + + /* Prepare stop command (CMD12) */ + s->command &=3D ~SD_CMDR_CMDID_MASK; + s->command |=3D 12; /* CMD12 */ + s->command_arg =3D 0; + + /* Put the command on SD bus */ + allwinner_sdhost_send_command(s); + + /* Restore command values */ + s->command =3D saved_cmd; + s->command_arg =3D saved_arg; + } +} + +static uint32_t allwinner_sdhost_process_desc(AwSdHostState *s, + hwaddr desc_addr, + TransferDescriptor *desc, + bool is_write, uint32_t max_= bytes) +{ + AwSdHostClass *klass =3D AW_SDHOST_GET_CLASS(s); + uint32_t num_done =3D 0; + uint32_t num_bytes =3D max_bytes; + uint8_t buf[1024]; + + /* Read descriptor */ + cpu_physical_memory_read(desc_addr, desc, sizeof(*desc)); + if (desc->size =3D=3D 0) { + desc->size =3D klass->max_desc_size; + } else if (desc->size > klass->max_desc_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: DMA descriptor buffer size " + " is out-of-bounds: %" PRIu32 " > %zu", + __func__, desc->size, klass->max_desc_size); + desc->size =3D klass->max_desc_size; + } + if (desc->size < num_bytes) { + num_bytes =3D desc->size; + } + + trace_allwinner_sdhost_process_desc(desc_addr, desc->size, + is_write, max_bytes); + + while (num_done < num_bytes) { + /* Try to completely fill the local buffer */ + uint32_t buf_bytes =3D num_bytes - num_done; + if (buf_bytes > sizeof(buf)) { + buf_bytes =3D sizeof(buf); + } + + /* Write to SD bus */ + if (is_write) { + cpu_physical_memory_read((desc->addr & DESC_SIZE_MASK) + num_d= one, + buf, buf_bytes); + + for (uint32_t i =3D 0; i < buf_bytes; i++) { + sdbus_write_data(&s->sdbus, buf[i]); + } + + /* Read from SD bus */ + } else { + for (uint32_t i =3D 0; i < buf_bytes; i++) { + buf[i] =3D sdbus_read_data(&s->sdbus); + } + cpu_physical_memory_write((desc->addr & DESC_SIZE_MASK) + num_= done, + buf, buf_bytes); + } + num_done +=3D buf_bytes; + } + + /* Clear hold flag and flush descriptor */ + desc->status &=3D ~DESC_STATUS_HOLD; + cpu_physical_memory_write(desc_addr, desc, sizeof(*desc)); + + return num_done; +} + +static void allwinner_sdhost_dma(AwSdHostState *s) +{ + TransferDescriptor desc; + hwaddr desc_addr =3D s->desc_base; + bool is_write =3D (s->command & SD_CMDR_WRITE); + uint32_t bytes_done =3D 0; + + /* Check if DMA can be performed */ + if (s->byte_count =3D=3D 0 || s->block_size =3D=3D 0 || + !(s->global_ctl & SD_GCTL_DMA_ENB)) { + return; + } + + /* + * For read operations, data must be available on the SD bus + * If not, it is an error and we should not act at all + */ + if (!is_write && !sdbus_data_ready(&s->sdbus)) { + return; + } + + /* Process the DMA descriptors until all data is copied */ + while (s->byte_count > 0) { + bytes_done =3D allwinner_sdhost_process_desc(s, desc_addr, &desc, + is_write, s->byte_count= ); + allwinner_sdhost_update_transfer_cnt(s, bytes_done); + + if (bytes_done <=3D s->byte_count) { + s->byte_count -=3D bytes_done; + } else { + s->byte_count =3D 0; + } + + if (desc.status & DESC_STATUS_LAST) { + break; + } else { + desc_addr =3D desc.next; + } + } + + /* Raise IRQ to signal DMA is completed */ + s->irq_status |=3D SD_RISR_DATA_COMPLETE | SD_RISR_AUTOCMD_DONE; + + /* Update DMAC bits */ + if (is_write) { + s->dmac_status |=3D SD_IDST_TRANSMIT_IRQ; + } else { + s->dmac_status |=3D (SD_IDST_SUM_RECEIVE_IRQ | SD_IDST_RECEIVE_IRQ= ); + } +} + +static uint64_t allwinner_sdhost_read(void *opaque, hwaddr offset, + unsigned size) +{ + AwSdHostState *s =3D AW_SDHOST(opaque); + uint32_t res =3D 0; + + switch (offset) { + case REG_SD_GCTL: /* Global Control */ + res =3D s->global_ctl; + break; + case REG_SD_CKCR: /* Clock Control */ + res =3D s->clock_ctl; + break; + case REG_SD_TMOR: /* Timeout */ + res =3D s->timeout; + break; + case REG_SD_BWDR: /* Bus Width */ + res =3D s->bus_width; + break; + case REG_SD_BKSR: /* Block Size */ + res =3D s->block_size; + break; + case REG_SD_BYCR: /* Byte Count */ + res =3D s->byte_count; + break; + case REG_SD_CMDR: /* Command */ + res =3D s->command; + break; + case REG_SD_CAGR: /* Command Argument */ + res =3D s->command_arg; + break; + case REG_SD_RESP0: /* Response Zero */ + res =3D s->response[0]; + break; + case REG_SD_RESP1: /* Response One */ + res =3D s->response[1]; + break; + case REG_SD_RESP2: /* Response Two */ + res =3D s->response[2]; + break; + case REG_SD_RESP3: /* Response Three */ + res =3D s->response[3]; + break; + case REG_SD_IMKR: /* Interrupt Mask */ + res =3D s->irq_mask; + break; + case REG_SD_MISR: /* Masked Interrupt Status */ + res =3D s->irq_status & s->irq_mask; + break; + case REG_SD_RISR: /* Raw Interrupt Status */ + res =3D s->irq_status; + break; + case REG_SD_STAR: /* Status */ + res =3D s->status; + break; + case REG_SD_FWLR: /* FIFO Water Level */ + res =3D s->fifo_wlevel; + break; + case REG_SD_FUNS: /* FIFO Function Select */ + res =3D s->fifo_func_sel; + break; + case REG_SD_DBGC: /* Debug Enable */ + res =3D s->debug_enable; + break; + case REG_SD_A12A: /* Auto command 12 argument */ + res =3D s->auto12_arg; + break; + case REG_SD_NTSR: /* SD NewTiming Set */ + res =3D s->newtiming_set; + break; + case REG_SD_SDBG: /* SD newTiming Set Debug */ + res =3D s->newtiming_debug; + break; + case REG_SD_HWRST: /* Hardware Reset Register */ + res =3D s->hardware_rst; + break; + case REG_SD_DMAC: /* Internal DMA Controller Control */ + res =3D s->dmac; + break; + case REG_SD_DLBA: /* Descriptor List Base Address */ + res =3D s->desc_base; + break; + case REG_SD_IDST: /* Internal DMA Controller Status */ + res =3D s->dmac_status; + break; + case REG_SD_IDIE: /* Internal DMA Controller Interrupt Enable */ + res =3D s->dmac_irq; + break; + case REG_SD_THLDC: /* Card Threshold Control */ + res =3D s->card_threshold; + break; + case REG_SD_DSBD: /* eMMC DDR Start Bit Detection Control */ + res =3D s->startbit_detect; + break; + case REG_SD_RES_CRC: /* Response CRC from card/eMMC */ + res =3D s->response_crc; + break; + case REG_SD_DATA7_CRC: /* CRC Data 7 from card/eMMC */ + case REG_SD_DATA6_CRC: /* CRC Data 6 from card/eMMC */ + case REG_SD_DATA5_CRC: /* CRC Data 5 from card/eMMC */ + case REG_SD_DATA4_CRC: /* CRC Data 4 from card/eMMC */ + case REG_SD_DATA3_CRC: /* CRC Data 3 from card/eMMC */ + case REG_SD_DATA2_CRC: /* CRC Data 2 from card/eMMC */ + case REG_SD_DATA1_CRC: /* CRC Data 1 from card/eMMC */ + case REG_SD_DATA0_CRC: /* CRC Data 0 from card/eMMC */ + res =3D s->data_crc[((offset - REG_SD_DATA7_CRC) / sizeof(uint32_t= ))]; + break; + case REG_SD_CRC_STA: /* CRC status from card/eMMC in write operation= */ + res =3D s->status_crc; + break; + case REG_SD_FIFO: /* Read/Write FIFO */ + if (sdbus_data_ready(&s->sdbus)) { + res =3D sdbus_read_data(&s->sdbus); + res |=3D sdbus_read_data(&s->sdbus) << 8; + res |=3D sdbus_read_data(&s->sdbus) << 16; + res |=3D sdbus_read_data(&s->sdbus) << 24; + allwinner_sdhost_update_transfer_cnt(s, sizeof(uint32_t)); + allwinner_sdhost_auto_stop(s); + allwinner_sdhost_update_irq(s); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "%s: no data ready on SD bus\n", + __func__); + } + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset %" + HWADDR_PRIx"\n", __func__, offset); + res =3D 0; + break; + } + + trace_allwinner_sdhost_read(offset, res, size); + return res; +} + +static void allwinner_sdhost_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + AwSdHostState *s =3D AW_SDHOST(opaque); + + trace_allwinner_sdhost_write(offset, value, size); + + switch (offset) { + case REG_SD_GCTL: /* Global Control */ + s->global_ctl =3D value; + s->global_ctl &=3D ~(SD_GCTL_DMA_RST | SD_GCTL_FIFO_RST | + SD_GCTL_SOFT_RST); + allwinner_sdhost_update_irq(s); + break; + case REG_SD_CKCR: /* Clock Control */ + s->clock_ctl =3D value; + break; + case REG_SD_TMOR: /* Timeout */ + s->timeout =3D value; + break; + case REG_SD_BWDR: /* Bus Width */ + s->bus_width =3D value; + break; + case REG_SD_BKSR: /* Block Size */ + s->block_size =3D value; + break; + case REG_SD_BYCR: /* Byte Count */ + s->byte_count =3D value; + s->transfer_cnt =3D value; + break; + case REG_SD_CMDR: /* Command */ + s->command =3D value; + if (value & SD_CMDR_LOAD) { + allwinner_sdhost_send_command(s); + allwinner_sdhost_dma(s); + allwinner_sdhost_auto_stop(s); + } + allwinner_sdhost_update_irq(s); + break; + case REG_SD_CAGR: /* Command Argument */ + s->command_arg =3D value; + break; + case REG_SD_RESP0: /* Response Zero */ + s->response[0] =3D value; + break; + case REG_SD_RESP1: /* Response One */ + s->response[1] =3D value; + break; + case REG_SD_RESP2: /* Response Two */ + s->response[2] =3D value; + break; + case REG_SD_RESP3: /* Response Three */ + s->response[3] =3D value; + break; + case REG_SD_IMKR: /* Interrupt Mask */ + s->irq_mask =3D value; + allwinner_sdhost_update_irq(s); + break; + case REG_SD_MISR: /* Masked Interrupt Status */ + case REG_SD_RISR: /* Raw Interrupt Status */ + s->irq_status &=3D ~value; + allwinner_sdhost_update_irq(s); + break; + case REG_SD_STAR: /* Status */ + s->status &=3D ~value; + allwinner_sdhost_update_irq(s); + break; + case REG_SD_FWLR: /* FIFO Water Level */ + s->fifo_wlevel =3D value; + break; + case REG_SD_FUNS: /* FIFO Function Select */ + s->fifo_func_sel =3D value; + break; + case REG_SD_DBGC: /* Debug Enable */ + s->debug_enable =3D value; + break; + case REG_SD_A12A: /* Auto command 12 argument */ + s->auto12_arg =3D value; + break; + case REG_SD_NTSR: /* SD NewTiming Set */ + s->newtiming_set =3D value; + break; + case REG_SD_SDBG: /* SD newTiming Set Debug */ + s->newtiming_debug =3D value; + break; + case REG_SD_HWRST: /* Hardware Reset Register */ + s->hardware_rst =3D value; + break; + case REG_SD_DMAC: /* Internal DMA Controller Control */ + s->dmac =3D value; + allwinner_sdhost_update_irq(s); + break; + case REG_SD_DLBA: /* Descriptor List Base Address */ + s->desc_base =3D value; + break; + case REG_SD_IDST: /* Internal DMA Controller Status */ + s->dmac_status &=3D (~SD_IDST_WR_MASK) | (~value & SD_IDST_WR_MASK= ); + allwinner_sdhost_update_irq(s); + break; + case REG_SD_IDIE: /* Internal DMA Controller Interrupt Enable */ + s->dmac_irq =3D value; + allwinner_sdhost_update_irq(s); + break; + case REG_SD_THLDC: /* Card Threshold Control */ + s->card_threshold =3D value; + break; + case REG_SD_DSBD: /* eMMC DDR Start Bit Detection Control */ + s->startbit_detect =3D value; + break; + case REG_SD_FIFO: /* Read/Write FIFO */ + sdbus_write_data(&s->sdbus, value & 0xff); + sdbus_write_data(&s->sdbus, (value >> 8) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 16) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 24) & 0xff); + allwinner_sdhost_update_transfer_cnt(s, sizeof(uint32_t)); + allwinner_sdhost_auto_stop(s); + allwinner_sdhost_update_irq(s); + break; + case REG_SD_RES_CRC: /* Response CRC from card/eMMC */ + case REG_SD_DATA7_CRC: /* CRC Data 7 from card/eMMC */ + case REG_SD_DATA6_CRC: /* CRC Data 6 from card/eMMC */ + case REG_SD_DATA5_CRC: /* CRC Data 5 from card/eMMC */ + case REG_SD_DATA4_CRC: /* CRC Data 4 from card/eMMC */ + case REG_SD_DATA3_CRC: /* CRC Data 3 from card/eMMC */ + case REG_SD_DATA2_CRC: /* CRC Data 2 from card/eMMC */ + case REG_SD_DATA1_CRC: /* CRC Data 1 from card/eMMC */ + case REG_SD_DATA0_CRC: /* CRC Data 0 from card/eMMC */ + case REG_SD_CRC_STA: /* CRC status from card/eMMC in write operation= */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset %" + HWADDR_PRIx"\n", __func__, offset); + break; + } +} + +static const MemoryRegionOps allwinner_sdhost_ops =3D { + .read =3D allwinner_sdhost_read, + .write =3D allwinner_sdhost_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static const VMStateDescription vmstate_allwinner_sdhost =3D { + .name =3D "allwinner-sdhost", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(global_ctl, AwSdHostState), + VMSTATE_UINT32(clock_ctl, AwSdHostState), + VMSTATE_UINT32(timeout, AwSdHostState), + VMSTATE_UINT32(bus_width, AwSdHostState), + VMSTATE_UINT32(block_size, AwSdHostState), + VMSTATE_UINT32(byte_count, AwSdHostState), + VMSTATE_UINT32(transfer_cnt, AwSdHostState), + VMSTATE_UINT32(command, AwSdHostState), + VMSTATE_UINT32(command_arg, AwSdHostState), + VMSTATE_UINT32_ARRAY(response, AwSdHostState, 4), + VMSTATE_UINT32(irq_mask, AwSdHostState), + VMSTATE_UINT32(irq_status, AwSdHostState), + VMSTATE_UINT32(status, AwSdHostState), + VMSTATE_UINT32(fifo_wlevel, AwSdHostState), + VMSTATE_UINT32(fifo_func_sel, AwSdHostState), + VMSTATE_UINT32(debug_enable, AwSdHostState), + VMSTATE_UINT32(auto12_arg, AwSdHostState), + VMSTATE_UINT32(newtiming_set, AwSdHostState), + VMSTATE_UINT32(newtiming_debug, AwSdHostState), + VMSTATE_UINT32(hardware_rst, AwSdHostState), + VMSTATE_UINT32(dmac, AwSdHostState), + VMSTATE_UINT32(desc_base, AwSdHostState), + VMSTATE_UINT32(dmac_status, AwSdHostState), + VMSTATE_UINT32(dmac_irq, AwSdHostState), + VMSTATE_UINT32(card_threshold, AwSdHostState), + VMSTATE_UINT32(startbit_detect, AwSdHostState), + VMSTATE_UINT32(response_crc, AwSdHostState), + VMSTATE_UINT32_ARRAY(data_crc, AwSdHostState, 8), + VMSTATE_UINT32(status_crc, AwSdHostState), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_sdhost_init(Object *obj) +{ + AwSdHostState *s =3D AW_SDHOST(obj); + + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), + TYPE_AW_SDHOST_BUS, DEVICE(s), "sd-bus"); + + memory_region_init_io(&s->iomem, obj, &allwinner_sdhost_ops, s, + TYPE_AW_SDHOST, 4 * KiB); + sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem); + sysbus_init_irq(SYS_BUS_DEVICE(s), &s->irq); +} + +static void allwinner_sdhost_reset(DeviceState *dev) +{ + AwSdHostState *s =3D AW_SDHOST(dev); + + s->global_ctl =3D REG_SD_GCTL_RST; + s->clock_ctl =3D REG_SD_CKCR_RST; + s->timeout =3D REG_SD_TMOR_RST; + s->bus_width =3D REG_SD_BWDR_RST; + s->block_size =3D REG_SD_BKSR_RST; + s->byte_count =3D REG_SD_BYCR_RST; + s->transfer_cnt =3D 0; + + s->command =3D REG_SD_CMDR_RST; + s->command_arg =3D REG_SD_CAGR_RST; + + for (int i =3D 0; i < ARRAY_SIZE(s->response); i++) { + s->response[i] =3D REG_SD_RESP_RST; + } + + s->irq_mask =3D REG_SD_IMKR_RST; + s->irq_status =3D REG_SD_RISR_RST; + s->status =3D REG_SD_STAR_RST; + + s->fifo_wlevel =3D REG_SD_FWLR_RST; + s->fifo_func_sel =3D REG_SD_FUNS_RST; + s->debug_enable =3D REG_SD_DBGC_RST; + s->auto12_arg =3D REG_SD_A12A_RST; + s->newtiming_set =3D REG_SD_NTSR_RST; + s->newtiming_debug =3D REG_SD_SDBG_RST; + s->hardware_rst =3D REG_SD_HWRST_RST; + s->dmac =3D REG_SD_DMAC_RST; + s->desc_base =3D REG_SD_DLBA_RST; + s->dmac_status =3D REG_SD_IDST_RST; + s->dmac_irq =3D REG_SD_IDIE_RST; + s->card_threshold =3D REG_SD_THLDC_RST; + s->startbit_detect =3D REG_SD_DSBD_RST; + s->response_crc =3D REG_SD_RES_CRC_RST; + + for (int i =3D 0; i < ARRAY_SIZE(s->data_crc); i++) { + s->data_crc[i] =3D REG_SD_DATA_CRC_RST; + } + + s->status_crc =3D REG_SD_CRC_STA_RST; +} + +static void allwinner_sdhost_bus_class_init(ObjectClass *klass, void *data) +{ + SDBusClass *sbc =3D SD_BUS_CLASS(klass); + + sbc->set_inserted =3D allwinner_sdhost_set_inserted; +} + +static void allwinner_sdhost_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_sdhost_reset; + dc->vmsd =3D &vmstate_allwinner_sdhost; +} + +static void allwinner_sdhost_sun4i_class_init(ObjectClass *klass, void *da= ta) +{ + AwSdHostClass *sc =3D AW_SDHOST_CLASS(klass); + sc->max_desc_size =3D 8 * KiB; +} + +static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *da= ta) +{ + AwSdHostClass *sc =3D AW_SDHOST_CLASS(klass); + sc->max_desc_size =3D 64 * KiB; +} + +static TypeInfo allwinner_sdhost_info =3D { + .name =3D TYPE_AW_SDHOST, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_sdhost_init, + .instance_size =3D sizeof(AwSdHostState), + .class_init =3D allwinner_sdhost_class_init, + .class_size =3D sizeof(AwSdHostClass), + .abstract =3D true, +}; + +static const TypeInfo allwinner_sdhost_sun4i_info =3D { + .name =3D TYPE_AW_SDHOST_SUN4I, + .parent =3D TYPE_AW_SDHOST, + .class_init =3D allwinner_sdhost_sun4i_class_init, +}; + +static const TypeInfo allwinner_sdhost_sun5i_info =3D { + .name =3D TYPE_AW_SDHOST_SUN5I, + .parent =3D TYPE_AW_SDHOST, + .class_init =3D allwinner_sdhost_sun5i_class_init, +}; + +static const TypeInfo allwinner_sdhost_bus_info =3D { + .name =3D TYPE_AW_SDHOST_BUS, + .parent =3D TYPE_SD_BUS, + .instance_size =3D sizeof(SDBus), + .class_init =3D allwinner_sdhost_bus_class_init, +}; + +static void allwinner_sdhost_register_types(void) +{ + type_register_static(&allwinner_sdhost_info); + type_register_static(&allwinner_sdhost_sun4i_info); + type_register_static(&allwinner_sdhost_sun5i_info); + type_register_static(&allwinner_sdhost_bus_info); +} + +type_init(allwinner_sdhost_register_types) diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs index a884c238df..429c327de8 100644 --- a/hw/sd/Makefile.objs +++ b/hw/sd/Makefile.objs @@ -4,6 +4,7 @@ common-obj-$(CONFIG_SD) +=3D sd.o core.o sdmmc-internal.o common-obj-$(CONFIG_SDHCI) +=3D sdhci.o common-obj-$(CONFIG_SDHCI_PCI) +=3D sdhci-pci.o =20 +obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-sdhost.o obj-$(CONFIG_MILKYMIST) +=3D milkymist-memcard.o obj-$(CONFIG_OMAP) +=3D omap_mmc.o obj-$(CONFIG_PXA2XX) +=3D pxa2xx_mmci.o diff --git a/hw/sd/trace-events b/hw/sd/trace-events index efcff666a2..5f09d32eb2 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -1,5 +1,12 @@ # See docs/devel/tracing.txt for syntax documentation. =20 +# allwinner-sdhost.c +allwinner_sdhost_set_inserted(bool inserted) "inserted %u" +allwinner_sdhost_process_desc(uint64_t desc_addr, uint32_t desc_size, bool= is_write, uint32_t max_bytes) "desc_addr 0x%" PRIx64 " desc_size %" PRIu32= " is_write %u max_bytes %" PRIu32 +allwinner_sdhost_read(uint64_t offset, uint64_t data, unsigned size) "offs= et 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_sdhost_write(uint64_t offset, uint64_t data, unsigned size) "off= set 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_sdhost_update_irq(uint32_t irq) "IRQ bits 0x%" PRIx32 + # bcm2835_sdhost.c bcm2835_sdhost_read(uint64_t offset, uint64_t data, unsigned size) "offset= 0x%" PRIx64 " data 0x%" PRIx64 " size %u" bcm2835_sdhost_write(uint64_t offset, uint64_t data, unsigned size) "offse= t 0x%" PRIx64 " data 0x%" PRIx64 " size %u" --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514892; cv=none; d=zohomail.com; s=zohoarc; b=Nb3DwAJMQ9IX60+QH5W7Epi+4031kWvZ/aUuckPfH5EdcO0SW2hTIPEtT9qB56ClnAYW/y5IRa8q92PJheraFrt8lP6wvGbZuKAOp+kUFzemO6EGQbFLcHz8D1jJ6aS57S5WA582T1o5HdUVVj9k1vzSlNfZ3k8xrc0kQDQBEyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514892; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Dw37HvnHho+Vgq4SPuQypHg0Qf4TXVMxP96FgcEL2hw=; b=HoWvF9Hs1BlA4jNLuNVpkpVIk6L+QVx+St2Lczw+giHvadwzwdt6oPdcgnmCend2Ms5ke8GURa1oDCGCKnkvvWGH9FH+Ukjm9vMKl3EkabGU0ML6S39IlJmj1gaZaNjlghixC9nN9imdGnYVgg45HHTRNNik0EyVFu54MemmW0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514892843954.2017903100724; Wed, 8 Jan 2020 12:21:32 -0800 (PST) Received: from localhost ([::1]:49000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHpb-0003rN-AS for importer@patchew.org; Wed, 08 Jan 2020 15:21:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35611) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVc-0001Ri-UD for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVX-0002bp-Ce for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:52 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVX-0002aw-10; Wed, 08 Jan 2020 15:00:47 -0500 Received: by mail-wm1-x341.google.com with SMTP id t14so205093wmi.5; Wed, 08 Jan 2020 12:00:46 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dw37HvnHho+Vgq4SPuQypHg0Qf4TXVMxP96FgcEL2hw=; b=ml0IAE10F55ARdTqA9VTlooqYYbt8ZzpRcFwWHULTxKHQM3WhOL7+TcwnH3hYUn3eR RCYVI8nnB8VkToZNWBz3TyoUfdhj4njHHoOFFgK6vNXxe9sSJgZ9BtZ6N9cPm0R8YVRj gUkptklI9Bf8x6xSKF3Ar7FgotMZUVoBm/8rWiH1FwPSmqnP5sHz+U2E5vgVPINuuFWF 6oIBXm7vuTxCOLdzYCrI3HpY1g/nfN98VxCVXWUH9jIupmg9k+I+90Hl6uiq67p2M6Mo b9S3cWbNJZbtbMGjiaHocbAYpc7XcbzoTwdhuZSF059k1UDC7/j3/Kdx1YKsXysRd/QB KKeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dw37HvnHho+Vgq4SPuQypHg0Qf4TXVMxP96FgcEL2hw=; b=VlpUEwkvgXu4BGu4KY8i8NrxLRp98SMh/i1Mi2lOO5dQq3/jvyRDYQmCieMk2n6jS0 RnBNs0cx3lBcu1P3J4nAboZiQ5O0HZgHreNPnZxcy5N4dzAyN/I5VTN6l+lfr2NWIsSh ZBL2A8ejL9X356GAGyWfMSZ5GROYSe5Ui23HzK0y3ZXP8LNr3sG7SAehU0U+I+cGKlFf JHS4HVPhpjE9C4aSEIwc59JeAkWL86MhY0hj9IT4DqnwN4/WuDt1d6eDjMBaNHgKn7j8 4eKjb36oB1pZGdaxG/RpTy+Ubk0tDO8NeVbcr7hiVjJJlKFiKkkPJpxRVklUPWLLIKEb suvQ== X-Gm-Message-State: APjAAAX3E2lgLubhFH9snREY0QMc69h850R7UFv0/PU3v6kei06Kxpfs /FylSZ8TKAEs0/KZtnMCabWvyNa2 X-Google-Smtp-Source: APXvYqzxBjXgmn8DQKC2ZiPm1DPLUfRl25rv9yNirs6MUTQaqpXE0DOHcwJSlVscUyHEBi8TR96BjA== X-Received: by 2002:a1c:4857:: with SMTP id v84mr399859wma.8.1578513645317; Wed, 08 Jan 2020 12:00:45 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 09/17] hw/arm/allwinner-h3: add EMAC ethernet device Date: Wed, 8 Jan 2020 21:00:12 +0100 Message-Id: <20200108200020.4745-10-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Allwinner Sun8i System on Chip family includes an Ethernet MAC (EMAC) which provides 10M/100M/1000M Ethernet connectivity. This commit adds support for the Allwinner EMAC from the Sun8i family (H2+, H3, A33, et= c), including emulation for the following functionality: * DMA transfers * MII interface * Transmit CRC calculation Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 3 + include/hw/net/allwinner-sun8i-emac.h | 103 +++ hw/arm/allwinner-h3.c | 16 +- hw/arm/orangepi.c | 3 + hw/net/allwinner-sun8i-emac.c | 871 ++++++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/net/Kconfig | 3 + hw/net/Makefile.objs | 1 + hw/net/trace-events | 10 + 9 files changed, 1010 insertions(+), 1 deletion(-) create mode 100644 include/hw/net/allwinner-sun8i-emac.h create mode 100644 hw/net/allwinner-sun8i-emac.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 0ae830e461..5d74cca28e 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -48,6 +48,7 @@ #include "hw/misc/allwinner-h3-sysctrl.h" #include "hw/misc/allwinner-sid.h" #include "hw/sd/allwinner-sdhost.h" +#include "hw/net/allwinner-sun8i-emac.h" #include "target/arm/cpu.h" =20 /** @@ -81,6 +82,7 @@ enum { AW_H3_UART1, AW_H3_UART2, AW_H3_UART3, + AW_H3_EMAC, AW_H3_GIC_DIST, AW_H3_GIC_CPU, AW_H3_GIC_HYP, @@ -121,6 +123,7 @@ typedef struct AwH3State { AwH3SysCtrlState sysctrl; AwSidState sid; AwSdHostState mmc0; + AwSun8iEmacState emac; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/net/allwinner-sun8i-emac.h b/include/hw/net/allwinn= er-sun8i-emac.h new file mode 100644 index 0000000000..d96b564677 --- /dev/null +++ b/include/hw/net/allwinner-sun8i-emac.h @@ -0,0 +1,103 @@ +/* + * Allwinner Sun8i Ethernet MAC 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 . + */ + +#ifndef HW_NET_ALLWINNER_SUN8I_EMAC_H +#define HW_NET_ALLWINNER_SUN8I_EMAC_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "qemu/units.h" +#include "net/net.h" +#include "qemu/fifo8.h" +#include "hw/net/mii.h" +#include "hw/sysbus.h" + +/** + * Object model + * @{ + */ + +#define TYPE_AW_SUN8I_EMAC "allwinner-sun8i-emac" +#define AW_SUN8I_EMAC(obj) \ + OBJECT_CHECK(AwSun8iEmacState, (obj), TYPE_AW_SUN8I_EMAC) + +/** @} */ + +/** + * Allwinner Sun8i EMAC object instance state + */ +typedef struct AwSun8iEmacState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Interrupt output signal to notify CPU */ + qemu_irq irq; + + /** Generic Network Interface Controller (NIC) for networking API */ + NICState *nic; + + /** Generic Network Interface Controller (NIC) configuration */ + NICConf conf; + + /** + * @name Media Independent Interface (MII) + * @{ + */ + + uint8_t mii_phy_addr; /**< PHY address */ + uint32_t mii_cr; /**< Control */ + uint32_t mii_st; /**< Status */ + uint32_t mii_adv; /**< Advertised Abilities */ + + /** @} */ + + /** + * @name Hardware Registers + * @{ + */ + + uint32_t basic_ctl0; /**< Basic Control 0 */ + uint32_t basic_ctl1; /**< Basic Control 1 */ + uint32_t int_en; /**< Interrupt Enable */ + uint32_t int_sta; /**< Interrupt Status */ + uint32_t frm_flt; /**< Receive Frame Filter */ + + uint32_t rx_ctl0; /**< Receive Control 0 */ + uint32_t rx_ctl1; /**< Receive Control 1 */ + uint32_t rx_desc_head; /**< Receive Descriptor List Address */ + uint32_t rx_desc_curr; /**< Current Receive Descriptor Address */ + + uint32_t tx_ctl0; /**< Transmit Control 0 */ + uint32_t tx_ctl1; /**< Transmit Control 1 */ + uint32_t tx_desc_head; /**< Transmit Descriptor List Address */ + uint32_t tx_desc_curr; /**< Current Transmit Descriptor Address */ + uint32_t tx_flowctl; /**< Transmit Flow Control */ + + uint32_t mii_cmd; /**< Management Interface Command */ + uint32_t mii_data; /**< Management Interface Data */ + + /** @} */ + +} AwSun8iEmacState; + +#endif /* HW_NET_ALLWINNER_SUN8I_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 55e7c5841c..e692432b4e 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -52,6 +52,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_UART1] =3D 0x01c28400, [AW_H3_UART2] =3D 0x01c28800, [AW_H3_UART3] =3D 0x01c28c00, + [AW_H3_EMAC] =3D 0x01c30000, [AW_H3_GIC_DIST] =3D 0x01c81000, [AW_H3_GIC_CPU] =3D 0x01c82000, [AW_H3_GIC_HYP] =3D 0x01c84000, @@ -104,7 +105,6 @@ struct AwH3Unimplemented { { "twi1", 0x01c2b000, 1 * KiB }, { "twi2", 0x01c2b400, 1 * KiB }, { "scr", 0x01c2c400, 1 * KiB }, - { "emac", 0x01c30000, 64 * KiB }, { "gpu", 0x01c40000, 64 * KiB }, { "hstmr", 0x01c60000, 4 * KiB }, { "dramcom", 0x01c62000, 4 * KiB }, @@ -160,6 +160,7 @@ enum { AW_H3_GIC_SPI_OHCI2 =3D 77, AW_H3_GIC_SPI_EHCI3 =3D 78, AW_H3_GIC_SPI_OHCI3 =3D 79, + AW_H3_GIC_SPI_EMAC =3D 82 }; =20 /* Allwinner H3 constants */ @@ -205,6 +206,9 @@ static void allwinner_h3_init(Object *obj) =20 sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0), TYPE_AW_SDHOST_SUN5I); + + sysbus_init_child_obj(obj, "emac", &s->emac, sizeof(s->emac), + TYPE_AW_SUN8I_EMAC); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -338,6 +342,16 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), "sd-bus", &error_abort); =20 + /* EMAC */ + if (nd_table[0].used) { + qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC); + qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); + } + qdev_init_nofail(DEVICE(&s->emac)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_EMAC]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0, + qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EMA= C)); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index c203fc3b99..0eb52eb813 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -62,6 +62,9 @@ static void orangepi_init(MachineState *machine) qdev_prop_set_string(DEVICE(s->h3), "identifier", "8100c002-0001-0002-0003-000044556677"); =20 + /* Setup EMAC properties */ + object_property_set_int(OBJECT(&s->h3->emac), 1, "phy-addr", &error_ab= ort); + /* Mark H3 object realized */ object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort= ); =20 diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c new file mode 100644 index 0000000000..3824ec97c7 --- /dev/null +++ b/hw/net/allwinner-sun8i-emac.c @@ -0,0 +1,871 @@ +/* + * Allwinner Sun8i Ethernet MAC 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "net/net.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "qemu/log.h" +#include "trace.h" +#include "net/checksum.h" +#include "qemu/module.h" +#include "exec/cpu-common.h" +#include "hw/net/allwinner-sun8i-emac.h" + +/* EMAC register offsets */ +enum { + REG_BASIC_CTL_0 =3D 0x0000, /* Basic Control 0 */ + REG_BASIC_CTL_1 =3D 0x0004, /* Basic Control 1 */ + REG_INT_STA =3D 0x0008, /* Interrupt Status */ + REG_INT_EN =3D 0x000C, /* Interrupt Enable */ + REG_TX_CTL_0 =3D 0x0010, /* Transmit Control 0 */ + REG_TX_CTL_1 =3D 0x0014, /* Transmit Control 1 */ + REG_TX_FLOW_CTL =3D 0x001C, /* Transmit Flow Control */ + REG_TX_DMA_DESC_LIST =3D 0x0020, /* Transmit Descriptor List Address= */ + REG_RX_CTL_0 =3D 0x0024, /* Receive Control 0 */ + REG_RX_CTL_1 =3D 0x0028, /* Receive Control 1 */ + REG_RX_DMA_DESC_LIST =3D 0x0034, /* Receive Descriptor List Address = */ + REG_FRM_FLT =3D 0x0038, /* Receive Frame Filter */ + REG_RX_HASH_0 =3D 0x0040, /* Receive Hash Table 0 */ + REG_RX_HASH_1 =3D 0x0044, /* Receive Hash Table 1 */ + REG_MII_CMD =3D 0x0048, /* Management Interface Command */ + REG_MII_DATA =3D 0x004C, /* Management Interface Data */ + REG_ADDR_HIGH =3D 0x0050, /* MAC Address High */ + REG_ADDR_LOW =3D 0x0054, /* MAC Address Low */ + REG_TX_DMA_STA =3D 0x00B0, /* Transmit DMA Status */ + REG_TX_CUR_DESC =3D 0x00B4, /* Transmit Current Descriptor */ + REG_TX_CUR_BUF =3D 0x00B8, /* Transmit Current Buffer */ + REG_RX_DMA_STA =3D 0x00C0, /* Receive DMA Status */ + REG_RX_CUR_DESC =3D 0x00C4, /* Receive Current Descriptor */ + REG_RX_CUR_BUF =3D 0x00C8, /* Receive Current Buffer */ + REG_RGMII_STA =3D 0x00D0, /* RGMII Status */ +}; + +/* EMAC register flags */ +enum { + BASIC_CTL0_100Mbps =3D (0b11 << 2), + BASIC_CTL0_FD =3D (1 << 0), + BASIC_CTL1_SOFTRST =3D (1 << 0), +}; + +enum { + INT_STA_RGMII_LINK =3D (1 << 16), + INT_STA_RX_EARLY =3D (1 << 13), + INT_STA_RX_OVERFLOW =3D (1 << 12), + INT_STA_RX_TIMEOUT =3D (1 << 11), + INT_STA_RX_DMA_STOP =3D (1 << 10), + INT_STA_RX_BUF_UA =3D (1 << 9), + INT_STA_RX =3D (1 << 8), + INT_STA_TX_EARLY =3D (1 << 5), + INT_STA_TX_UNDERFLOW =3D (1 << 4), + INT_STA_TX_TIMEOUT =3D (1 << 3), + INT_STA_TX_BUF_UA =3D (1 << 2), + INT_STA_TX_DMA_STOP =3D (1 << 1), + INT_STA_TX =3D (1 << 0), +}; + +enum { + INT_EN_RX_EARLY =3D (1 << 13), + INT_EN_RX_OVERFLOW =3D (1 << 12), + INT_EN_RX_TIMEOUT =3D (1 << 11), + INT_EN_RX_DMA_STOP =3D (1 << 10), + INT_EN_RX_BUF_UA =3D (1 << 9), + INT_EN_RX =3D (1 << 8), + INT_EN_TX_EARLY =3D (1 << 5), + INT_EN_TX_UNDERFLOW =3D (1 << 4), + INT_EN_TX_TIMEOUT =3D (1 << 3), + INT_EN_TX_BUF_UA =3D (1 << 2), + INT_EN_TX_DMA_STOP =3D (1 << 1), + INT_EN_TX =3D (1 << 0), +}; + +enum { + TX_CTL0_TX_EN =3D (1 << 31), + TX_CTL1_TX_DMA_START =3D (1 << 31), + TX_CTL1_TX_DMA_EN =3D (1 << 30), + TX_CTL1_TX_FLUSH =3D (1 << 0), +}; + +enum { + RX_CTL0_RX_EN =3D (1 << 31), + RX_CTL0_STRIP_FCS =3D (1 << 28), + RX_CTL0_CRC_IPV4 =3D (1 << 27), +}; + +enum { + RX_CTL1_RX_DMA_START =3D (1 << 31), + RX_CTL1_RX_DMA_EN =3D (1 << 30), + RX_CTL1_RX_MD =3D (1 << 1), +}; + +enum { + RX_FRM_FLT_DIS_ADDR =3D (1 << 31), +}; + +enum { + MII_CMD_PHY_ADDR_SHIFT =3D (12), + MII_CMD_PHY_ADDR_MASK =3D (0xf000), + MII_CMD_PHY_REG_SHIFT =3D (4), + MII_CMD_PHY_REG_MASK =3D (0xf0), + MII_CMD_PHY_RW =3D (1 << 1), + MII_CMD_PHY_BUSY =3D (1 << 0), +}; + +enum { + TX_DMA_STA_STOP =3D (0b000), + TX_DMA_STA_RUN_FETCH =3D (0b001), + TX_DMA_STA_WAIT_STA =3D (0b010), +}; + +enum { + RX_DMA_STA_STOP =3D (0b000), + RX_DMA_STA_RUN_FETCH =3D (0b001), + RX_DMA_STA_WAIT_FRM =3D (0b011), +}; + +/* EMAC register reset values */ +enum { + REG_BASIC_CTL_1_RST =3D 0x08000000, +}; + +/* EMAC constants */ +enum { + AW_SUN8I_EMAC_MIN_PKT_SZ =3D 64 +}; + +/* Transmit/receive frame descriptor */ +typedef struct FrameDescriptor { + uint32_t status; + uint32_t status2; + uint32_t addr; + uint32_t next; +} FrameDescriptor; + +/* Frame descriptor flags */ +enum { + DESC_STATUS_CTL =3D (1 << 31), + DESC_STATUS2_BUF_SIZE_MASK =3D (0x7ff), +}; + +/* Transmit frame descriptor flags */ +enum { + TX_DESC_STATUS_LENGTH_ERR =3D (1 << 14), + TX_DESC_STATUS2_FIRST_DESC =3D (1 << 29), + TX_DESC_STATUS2_LAST_DESC =3D (1 << 30), + TX_DESC_STATUS2_CHECKSUM_MASK =3D (0x3 << 27), +}; + +/* Receive frame descriptor flags */ +enum { + RX_DESC_STATUS_FIRST_DESC =3D (1 << 9), + RX_DESC_STATUS_LAST_DESC =3D (1 << 8), + RX_DESC_STATUS_FRM_LEN_MASK =3D (0x3fff0000), + RX_DESC_STATUS_FRM_LEN_SHIFT =3D (16), + RX_DESC_STATUS_NO_BUF =3D (1 << 14), + RX_DESC_STATUS_HEADER_ERR =3D (1 << 7), + RX_DESC_STATUS_LENGTH_ERR =3D (1 << 4), + RX_DESC_STATUS_CRC_ERR =3D (1 << 1), + RX_DESC_STATUS_PAYLOAD_ERR =3D (1 << 0), + RX_DESC_STATUS2_RX_INT_CTL =3D (1 << 31), +}; + +/* MII register offsets */ +enum { + MII_REG_CR =3D (0x0), /* Control */ + MII_REG_ST =3D (0x1), /* Status */ + MII_REG_ID_HIGH =3D (0x2), /* Identifier High */ + MII_REG_ID_LOW =3D (0x3), /* Identifier Low */ + MII_REG_ADV =3D (0x4), /* Advertised abilities */ + MII_REG_LPA =3D (0x5), /* Link partner abilities */ +}; + +/* MII register flags */ +enum { + MII_REG_CR_RESET =3D (1 << 15), + MII_REG_CR_POWERDOWN =3D (1 << 11), + MII_REG_CR_10Mbit =3D (0), + MII_REG_CR_100Mbit =3D (1 << 13), + MII_REG_CR_1000Mbit =3D (1 << 6), + MII_REG_CR_AUTO_NEG =3D (1 << 12), + MII_REG_CR_AUTO_NEG_RESTART =3D (1 << 9), + MII_REG_CR_FULLDUPLEX =3D (1 << 8), +}; + +enum { + MII_REG_ST_100BASE_T4 =3D (1 << 15), + MII_REG_ST_100BASE_X_FD =3D (1 << 14), + MII_REG_ST_100BASE_X_HD =3D (1 << 13), + MII_REG_ST_10_FD =3D (1 << 12), + MII_REG_ST_10_HD =3D (1 << 11), + MII_REG_ST_100BASE_T2_FD =3D (1 << 10), + MII_REG_ST_100BASE_T2_HD =3D (1 << 9), + MII_REG_ST_AUTONEG_COMPLETE =3D (1 << 5), + MII_REG_ST_AUTONEG_AVAIL =3D (1 << 3), + MII_REG_ST_LINK_UP =3D (1 << 2), +}; + +enum { + MII_REG_LPA_10_HD =3D (1 << 5), + MII_REG_LPA_10_FD =3D (1 << 6), + MII_REG_LPA_100_HD =3D (1 << 7), + MII_REG_LPA_100_FD =3D (1 << 8), + MII_REG_LPA_PAUSE =3D (1 << 10), + MII_REG_LPA_ASYMPAUSE =3D (1 << 11), +}; + +/* MII constants */ +enum { + MII_PHY_ID_HIGH =3D 0x0044, + MII_PHY_ID_LOW =3D 0x1400, +}; + +static void allwinner_sun8i_emac_mii_set_link(AwSun8iEmacState *s, + bool link_active) +{ + if (link_active) { + s->mii_st |=3D MII_REG_ST_LINK_UP; + } else { + s->mii_st &=3D ~MII_REG_ST_LINK_UP; + } +} + +static void allwinner_sun8i_emac_mii_reset(AwSun8iEmacState *s, + bool link_active) +{ + s->mii_cr =3D MII_REG_CR_100Mbit | MII_REG_CR_AUTO_NEG | + MII_REG_CR_FULLDUPLEX; + s->mii_st =3D MII_REG_ST_100BASE_T4 | MII_REG_ST_100BASE_X_FD | + MII_REG_ST_100BASE_X_HD | MII_REG_ST_10_FD | MII_REG_ST_10= _HD | + MII_REG_ST_100BASE_T2_FD | MII_REG_ST_100BASE_T2_HD | + MII_REG_ST_AUTONEG_COMPLETE | MII_REG_ST_AUTONEG_AVAIL; + s->mii_adv =3D 0; + + allwinner_sun8i_emac_mii_set_link(s, link_active); +} + +static void allwinner_sun8i_emac_mii_cmd(AwSun8iEmacState *s) +{ + uint8_t addr, reg; + + addr =3D (s->mii_cmd & MII_CMD_PHY_ADDR_MASK) >> MII_CMD_PHY_ADDR_SHIF= T; + reg =3D (s->mii_cmd & MII_CMD_PHY_REG_MASK) >> MII_CMD_PHY_REG_SHIFT; + + if (addr !=3D s->mii_phy_addr) { + return; + } + + /* Read or write a PHY register? */ + if (s->mii_cmd & MII_CMD_PHY_RW) { + trace_allwinner_sun8i_emac_mii_write_reg(reg, s->mii_data); + + switch (reg) { + case MII_REG_CR: + if (s->mii_data & MII_REG_CR_RESET) { + allwinner_sun8i_emac_mii_reset(s, s->mii_st & + MII_REG_ST_LINK_UP); + } else { + s->mii_cr =3D s->mii_data & ~(MII_REG_CR_RESET | + MII_REG_CR_AUTO_NEG_RESTART); + } + break; + case MII_REG_ADV: + s->mii_adv =3D s->mii_data; + break; + case MII_REG_ID_HIGH: + case MII_REG_ID_LOW: + case MII_REG_LPA: + break; + default: + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: write access to " + "unknown MII register 0x%x\n", reg); + break; + } + } else { + switch (reg) { + case MII_REG_CR: + s->mii_data =3D s->mii_cr; + break; + case MII_REG_ST: + s->mii_data =3D s->mii_st; + break; + case MII_REG_ID_HIGH: + s->mii_data =3D MII_PHY_ID_HIGH; + break; + case MII_REG_ID_LOW: + s->mii_data =3D MII_PHY_ID_LOW; + break; + case MII_REG_ADV: + s->mii_data =3D s->mii_adv; + break; + case MII_REG_LPA: + s->mii_data =3D MII_REG_LPA_10_HD | MII_REG_LPA_10_FD | + MII_REG_LPA_100_HD | MII_REG_LPA_100_FD | + MII_REG_LPA_PAUSE | MII_REG_LPA_ASYMPAUSE; + break; + default: + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: read access to " + "unknown MII register 0x%x\n", reg); + s->mii_data =3D 0; + break; + } + + trace_allwinner_sun8i_emac_mii_read_reg(reg, s->mii_data); + } +} + +static void allwinner_sun8i_emac_update_irq(AwSun8iEmacState *s) +{ + qemu_set_irq(s->irq, (s->int_sta & s->int_en) !=3D 0); +} + +static uint32_t allwinner_sun8i_emac_next_desc(FrameDescriptor *desc, + size_t min_size) +{ + uint32_t paddr =3D desc->next; + + cpu_physical_memory_read(paddr, desc, sizeof(*desc)); + + if ((desc->status & DESC_STATUS_CTL) && + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { + return paddr; + } else { + return 0; + } +} + +static uint32_t allwinner_sun8i_emac_get_desc(FrameDescriptor *desc, + uint32_t start_addr, + size_t min_size) +{ + uint32_t desc_addr =3D start_addr; + + /* Note that the list is a cycle. Last entry points back to the head. = */ + while (desc_addr !=3D 0) { + cpu_physical_memory_read(desc_addr, desc, sizeof(*desc)); + + if ((desc->status & DESC_STATUS_CTL) && + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { + return desc_addr; + } else if (desc->next =3D=3D start_addr) { + break; + } else { + desc_addr =3D desc->next; + } + } + + return 0; +} + +static uint32_t allwinner_sun8i_emac_rx_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + size_t min_size) +{ + return allwinner_sun8i_emac_get_desc(desc, s->rx_desc_curr, min_size); +} + +static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + size_t min_size) +{ + return allwinner_sun8i_emac_get_desc(desc, s->tx_desc_head, min_size); +} + +static void allwinner_sun8i_emac_flush_desc(FrameDescriptor *desc, + uint32_t phys_addr) +{ + cpu_physical_memory_write(phys_addr, desc, sizeof(*desc)); +} + +static int allwinner_sun8i_emac_can_receive(NetClientState *nc) +{ + AwSun8iEmacState *s =3D qemu_get_nic_opaque(nc); + FrameDescriptor desc; + + return (s->rx_ctl0 & RX_CTL0_RX_EN) && + (allwinner_sun8i_emac_rx_desc(s, &desc, 0) !=3D 0); +} + +static ssize_t allwinner_sun8i_emac_receive(NetClientState *nc, + const uint8_t *buf, + size_t size) +{ + AwSun8iEmacState *s =3D qemu_get_nic_opaque(nc); + FrameDescriptor desc; + size_t bytes_left =3D size; + size_t desc_bytes =3D 0; + size_t pad_fcs_size =3D 4; + size_t padding =3D 0; + + if (!(s->rx_ctl0 & RX_CTL0_RX_EN)) { + return -1; + } + + s->rx_desc_curr =3D allwinner_sun8i_emac_rx_desc(s, &desc, + AW_SUN8I_EMAC_MIN_PKT_S= Z); + if (!s->rx_desc_curr) { + s->int_sta |=3D INT_STA_RX_BUF_UA; + } + + /* Keep filling RX descriptors until the whole frame is written */ + while (s->rx_desc_curr && bytes_left > 0) { + desc.status &=3D ~DESC_STATUS_CTL; + desc.status &=3D ~RX_DESC_STATUS_FRM_LEN_MASK; + + if (bytes_left =3D=3D size) { + desc.status |=3D RX_DESC_STATUS_FIRST_DESC; + } + + if ((desc.status2 & DESC_STATUS2_BUF_SIZE_MASK) < + (bytes_left + pad_fcs_size)) { + desc_bytes =3D desc.status2 & DESC_STATUS2_BUF_SIZE_MASK; + desc.status |=3D desc_bytes << RX_DESC_STATUS_FRM_LEN_SHIFT; + } else { + padding =3D pad_fcs_size; + if (bytes_left < AW_SUN8I_EMAC_MIN_PKT_SZ) { + padding +=3D (AW_SUN8I_EMAC_MIN_PKT_SZ - bytes_left); + } + + desc_bytes =3D (bytes_left); + desc.status |=3D RX_DESC_STATUS_LAST_DESC; + desc.status |=3D (bytes_left + padding) + << RX_DESC_STATUS_FRM_LEN_SHIFT; + } + + cpu_physical_memory_write(desc.addr, buf, desc_bytes); + allwinner_sun8i_emac_flush_desc(&desc, s->rx_desc_curr); + trace_allwinner_sun8i_emac_receive(s->rx_desc_curr, desc.addr, + desc_bytes); + + /* Check if frame needs to raise the receive interrupt */ + if (!(desc.status2 & RX_DESC_STATUS2_RX_INT_CTL)) { + s->int_sta |=3D INT_STA_RX; + } + + /* Increment variables */ + buf +=3D desc_bytes; + bytes_left -=3D desc_bytes; + + /* Move to the next descriptor */ + s->rx_desc_curr =3D allwinner_sun8i_emac_next_desc(&desc, 64); + if (!s->rx_desc_curr) { + /* Not enough buffer space available */ + s->int_sta |=3D INT_STA_RX_BUF_UA; + s->rx_desc_curr =3D s->rx_desc_head; + break; + } + } + + /* Report receive DMA is finished */ + s->rx_ctl1 &=3D ~RX_CTL1_RX_DMA_START; + allwinner_sun8i_emac_update_irq(s); + + return size; +} + +static void allwinner_sun8i_emac_transmit(AwSun8iEmacState *s) +{ + NetClientState *nc =3D qemu_get_queue(s->nic); + FrameDescriptor desc; + size_t bytes =3D 0; + size_t packet_bytes =3D 0; + size_t transmitted =3D 0; + static uint8_t packet_buf[2048]; + + s->tx_desc_curr =3D allwinner_sun8i_emac_tx_desc(s, &desc, 0); + + /* Read all transmit descriptors */ + while (s->tx_desc_curr !=3D 0) { + + /* Read from physical memory into packet buffer */ + bytes =3D desc.status2 & DESC_STATUS2_BUF_SIZE_MASK; + if (bytes + packet_bytes > sizeof(packet_buf)) { + desc.status |=3D TX_DESC_STATUS_LENGTH_ERR; + break; + } + cpu_physical_memory_read(desc.addr, packet_buf + packet_bytes, byt= es); + packet_bytes +=3D bytes; + desc.status &=3D ~DESC_STATUS_CTL; + allwinner_sun8i_emac_flush_desc(&desc, s->tx_desc_curr); + + /* After the last descriptor, send the packet */ + if (desc.status2 & TX_DESC_STATUS2_LAST_DESC) { + if (desc.status2 & TX_DESC_STATUS2_CHECKSUM_MASK) { + net_checksum_calculate(packet_buf, packet_bytes); + } + + qemu_send_packet(nc, packet_buf, packet_bytes); + trace_allwinner_sun8i_emac_transmit(s->tx_desc_curr, desc.addr, + bytes); + + packet_bytes =3D 0; + transmitted++; + } + s->tx_desc_curr =3D allwinner_sun8i_emac_next_desc(&desc, 0); + } + + /* Raise transmit completed interrupt */ + if (transmitted > 0) { + s->int_sta |=3D INT_STA_TX; + s->tx_ctl1 &=3D ~TX_CTL1_TX_DMA_START; + allwinner_sun8i_emac_update_irq(s); + } +} + +static void allwinner_sun8i_emac_reset(DeviceState *dev) +{ + AwSun8iEmacState *s =3D AW_SUN8I_EMAC(dev); + NetClientState *nc =3D qemu_get_queue(s->nic); + + trace_allwinner_sun8i_emac_reset(); + + s->mii_cmd =3D 0; + s->mii_data =3D 0; + s->basic_ctl0 =3D 0; + s->basic_ctl1 =3D REG_BASIC_CTL_1_RST; + s->int_en =3D 0; + s->int_sta =3D 0; + s->frm_flt =3D 0; + s->rx_ctl0 =3D 0; + s->rx_ctl1 =3D RX_CTL1_RX_MD; + s->rx_desc_head =3D 0; + s->rx_desc_curr =3D 0; + s->tx_ctl0 =3D 0; + s->tx_ctl1 =3D 0; + s->tx_desc_head =3D 0; + s->tx_desc_curr =3D 0; + s->tx_flowctl =3D 0; + + allwinner_sun8i_emac_mii_reset(s, !nc->link_down); +} + +static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, + unsigned size) +{ + AwSun8iEmacState *s =3D AW_SUN8I_EMAC(opaque); + uint64_t value =3D 0; + FrameDescriptor desc; + + switch (offset) { + case REG_BASIC_CTL_0: /* Basic Control 0 */ + value =3D s->basic_ctl0; + break; + case REG_BASIC_CTL_1: /* Basic Control 1 */ + value =3D s->basic_ctl1; + break; + case REG_INT_STA: /* Interrupt Status */ + value =3D s->int_sta; + break; + case REG_INT_EN: /* Interupt Enable */ + value =3D s->int_en; + break; + case REG_TX_CTL_0: /* Transmit Control 0 */ + value =3D s->tx_ctl0; + break; + case REG_TX_CTL_1: /* Transmit Control 1 */ + value =3D s->tx_ctl1; + break; + case REG_TX_FLOW_CTL: /* Transmit Flow Control */ + value =3D s->tx_flowctl; + break; + case REG_TX_DMA_DESC_LIST: /* Transmit Descriptor List Address */ + value =3D s->tx_desc_head; + break; + case REG_RX_CTL_0: /* Receive Control 0 */ + value =3D s->rx_ctl0; + break; + case REG_RX_CTL_1: /* Receive Control 1 */ + value =3D s->rx_ctl1; + break; + case REG_RX_DMA_DESC_LIST: /* Receive Descriptor List Address */ + value =3D s->rx_desc_head; + break; + case REG_FRM_FLT: /* Receive Frame Filter */ + value =3D s->frm_flt; + break; + case REG_RX_HASH_0: /* Receive Hash Table 0 */ + case REG_RX_HASH_1: /* Receive Hash Table 1 */ + break; + case REG_MII_CMD: /* Management Interface Command */ + value =3D s->mii_cmd; + break; + case REG_MII_DATA: /* Management Interface Data */ + value =3D s->mii_data; + break; + case REG_ADDR_HIGH: /* MAC Address High */ + value =3D *(((uint32_t *) (s->conf.macaddr.a)) + 1); + break; + case REG_ADDR_LOW: /* MAC Address Low */ + value =3D *(uint32_t *) (s->conf.macaddr.a); + break; + case REG_TX_DMA_STA: /* Transmit DMA Status */ + break; + case REG_TX_CUR_DESC: /* Transmit Current Descriptor */ + value =3D s->tx_desc_curr; + break; + case REG_TX_CUR_BUF: /* Transmit Current Buffer */ + if (s->tx_desc_curr !=3D 0) { + cpu_physical_memory_read(s->tx_desc_curr, &desc, sizeof(desc)); + value =3D desc.addr; + } else { + value =3D 0; + } + break; + case REG_RX_DMA_STA: /* Receive DMA Status */ + break; + case REG_RX_CUR_DESC: /* Receive Current Descriptor */ + value =3D s->rx_desc_curr; + break; + case REG_RX_CUR_BUF: /* Receive Current Buffer */ + if (s->rx_desc_curr !=3D 0) { + cpu_physical_memory_read(s->rx_desc_curr, &desc, sizeof(desc)); + value =3D desc.addr; + } else { + value =3D 0; + } + break; + case REG_RGMII_STA: /* RGMII Status */ + break; + default: + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: read access to unknow= n " + "EMAC register 0x" TARGET_FMT_plx "\n", + offset); + } + + trace_allwinner_sun8i_emac_read(offset, value); + return value; +} + +static void allwinner_sun8i_emac_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + AwSun8iEmacState *s =3D AW_SUN8I_EMAC(opaque); + NetClientState *nc =3D qemu_get_queue(s->nic); + + trace_allwinner_sun8i_emac_write(offset, value); + + switch (offset) { + case REG_BASIC_CTL_0: /* Basic Control 0 */ + s->basic_ctl0 =3D value; + break; + case REG_BASIC_CTL_1: /* Basic Control 1 */ + if (value & BASIC_CTL1_SOFTRST) { + allwinner_sun8i_emac_reset(DEVICE(s)); + value &=3D ~BASIC_CTL1_SOFTRST; + } + s->basic_ctl1 =3D value; + if (allwinner_sun8i_emac_can_receive(nc)) { + qemu_flush_queued_packets(nc); + } + break; + case REG_INT_STA: /* Interrupt Status */ + s->int_sta &=3D ~value; + allwinner_sun8i_emac_update_irq(s); + break; + case REG_INT_EN: /* Interrupt Enable */ + s->int_en =3D value; + allwinner_sun8i_emac_update_irq(s); + break; + case REG_TX_CTL_0: /* Transmit Control 0 */ + s->tx_ctl0 =3D value; + break; + case REG_TX_CTL_1: /* Transmit Control 1 */ + s->tx_ctl1 =3D value; + if (value & TX_CTL1_TX_DMA_EN) { + allwinner_sun8i_emac_transmit(s); + } + break; + case REG_TX_FLOW_CTL: /* Transmit Flow Control */ + s->tx_flowctl =3D value; + break; + case REG_TX_DMA_DESC_LIST: /* Transmit Descriptor List Address */ + s->tx_desc_head =3D value; + s->tx_desc_curr =3D value; + break; + case REG_RX_CTL_0: /* Receive Control 0 */ + s->rx_ctl0 =3D value; + break; + case REG_RX_CTL_1: /* Receive Control 1 */ + s->rx_ctl1 =3D value | RX_CTL1_RX_MD; + if ((value & RX_CTL1_RX_DMA_EN) && + allwinner_sun8i_emac_can_receive(nc)) { + qemu_flush_queued_packets(nc); + } + break; + case REG_RX_DMA_DESC_LIST: /* Receive Descriptor List Address */ + s->rx_desc_head =3D value; + s->rx_desc_curr =3D value; + break; + case REG_FRM_FLT: /* Receive Frame Filter */ + s->frm_flt =3D value; + break; + case REG_RX_HASH_0: /* Receive Hash Table 0 */ + case REG_RX_HASH_1: /* Receive Hash Table 1 */ + break; + case REG_MII_CMD: /* Management Interface Command */ + s->mii_cmd =3D value & ~MII_CMD_PHY_BUSY; + allwinner_sun8i_emac_mii_cmd(s); + break; + case REG_MII_DATA: /* Management Interface Data */ + s->mii_data =3D value; + break; + case REG_ADDR_HIGH: /* MAC Address High */ + s->conf.macaddr.a[4] =3D (value & 0xff); + s->conf.macaddr.a[5] =3D (value & 0xff00) >> 8; + break; + case REG_ADDR_LOW: /* MAC Address Low */ + s->conf.macaddr.a[0] =3D (value & 0xff); + s->conf.macaddr.a[1] =3D (value & 0xff00) >> 8; + s->conf.macaddr.a[2] =3D (value & 0xff0000) >> 16; + s->conf.macaddr.a[3] =3D (value & 0xff000000) >> 24; + break; + case REG_TX_DMA_STA: /* Transmit DMA Status */ + case REG_TX_CUR_DESC: /* Transmit Current Descriptor */ + case REG_TX_CUR_BUF: /* Transmit Current Buffer */ + case REG_RX_DMA_STA: /* Receive DMA Status */ + case REG_RX_CUR_DESC: /* Receive Current Descriptor */ + case REG_RX_CUR_BUF: /* Receive Current Buffer */ + case REG_RGMII_STA: /* RGMII Status */ + break; + default: + qemu_log_mask(LOG_UNIMP, "allwinner-h3-emac: write access to unkno= wn " + "EMAC register 0x" TARGET_FMT_plx "\n", + offset); + } +} + +static void allwinner_sun8i_emac_set_link(NetClientState *nc) +{ + AwSun8iEmacState *s =3D qemu_get_nic_opaque(nc); + + trace_allwinner_sun8i_emac_set_link(!nc->link_down); + allwinner_sun8i_emac_mii_set_link(s, !nc->link_down); +} + +static const MemoryRegionOps allwinner_sun8i_emac_mem_ops =3D { + .read =3D allwinner_sun8i_emac_read, + .write =3D allwinner_sun8i_emac_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static NetClientInfo net_allwinner_sun8i_emac_info =3D { + .type =3D NET_CLIENT_DRIVER_NIC, + .size =3D sizeof(NICState), + .can_receive =3D allwinner_sun8i_emac_can_receive, + .receive =3D allwinner_sun8i_emac_receive, + .link_status_changed =3D allwinner_sun8i_emac_set_link, +}; + +static void allwinner_sun8i_emac_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwSun8iEmacState *s =3D AW_SUN8I_EMAC(obj); + + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_sun8i_emac_mem_= ops, + s, TYPE_AW_SUN8I_EMAC, 64 * KiB); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); +} + +static void allwinner_sun8i_emac_realize(DeviceState *dev, Error **errp) +{ + AwSun8iEmacState *s =3D AW_SUN8I_EMAC(dev); + + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->nic =3D qemu_new_nic(&net_allwinner_sun8i_emac_info, &s->conf, + object_get_typename(OBJECT(dev)), dev->id, s); + qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); +} + +static Property allwinner_sun8i_emac_properties[] =3D { + DEFINE_NIC_PROPERTIES(AwSun8iEmacState, conf), + DEFINE_PROP_UINT8("phy-addr", AwSun8iEmacState, mii_phy_addr, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static int allwinner_sun8i_emac_post_load(void *opaque, int version_id) +{ + AwSun8iEmacState *s =3D opaque; + + allwinner_sun8i_emac_set_link(qemu_get_queue(s->nic)); + + return 0; +} + +static const VMStateDescription vmstate_aw_emac =3D { + .name =3D "allwinner-sun8i-emac", + .version_id =3D 1, + .minimum_version_id =3D 1, + .post_load =3D allwinner_sun8i_emac_post_load, + .fields =3D (VMStateField[]) { + VMSTATE_UINT8(mii_phy_addr, AwSun8iEmacState), + VMSTATE_UINT32(mii_cmd, AwSun8iEmacState), + VMSTATE_UINT32(mii_data, AwSun8iEmacState), + VMSTATE_UINT32(mii_cr, AwSun8iEmacState), + VMSTATE_UINT32(mii_st, AwSun8iEmacState), + VMSTATE_UINT32(mii_adv, AwSun8iEmacState), + VMSTATE_UINT32(basic_ctl0, AwSun8iEmacState), + VMSTATE_UINT32(basic_ctl1, AwSun8iEmacState), + VMSTATE_UINT32(int_en, AwSun8iEmacState), + VMSTATE_UINT32(int_sta, AwSun8iEmacState), + VMSTATE_UINT32(frm_flt, AwSun8iEmacState), + VMSTATE_UINT32(rx_ctl0, AwSun8iEmacState), + VMSTATE_UINT32(rx_ctl1, AwSun8iEmacState), + VMSTATE_UINT32(rx_desc_head, AwSun8iEmacState), + VMSTATE_UINT32(rx_desc_curr, AwSun8iEmacState), + VMSTATE_UINT32(tx_ctl0, AwSun8iEmacState), + VMSTATE_UINT32(tx_ctl1, AwSun8iEmacState), + VMSTATE_UINT32(tx_desc_head, AwSun8iEmacState), + VMSTATE_UINT32(tx_desc_curr, AwSun8iEmacState), + VMSTATE_UINT32(tx_flowctl, AwSun8iEmacState), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_sun8i_emac_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D allwinner_sun8i_emac_realize; + dc->props =3D allwinner_sun8i_emac_properties; + dc->reset =3D allwinner_sun8i_emac_reset; + dc->vmsd =3D &vmstate_aw_emac; +} + +static const TypeInfo allwinner_sun8i_emac_info =3D { + .name =3D TYPE_AW_SUN8I_EMAC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(AwSun8iEmacState), + .instance_init =3D allwinner_sun8i_emac_init, + .class_init =3D allwinner_sun8i_emac_class_init, +}; + +static void allwinner_sun8i_emac_register_types(void) +{ + type_register_static(&allwinner_sun8i_emac_info); +} + +type_init(allwinner_sun8i_emac_register_types) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ebf8d2325f..1185280244 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -294,6 +294,7 @@ config ALLWINNER_A10 config ALLWINNER_H3 bool select ALLWINNER_A10_PIT + select ALLWINNER_SUN8I_EMAC select SERIAL select ARM_TIMER select ARM_GIC diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 3856417d42..f02f02b2dc 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -74,6 +74,9 @@ config MIPSNET config ALLWINNER_EMAC bool =20 +config ALLWINNER_SUN8I_EMAC + bool + config IMX_FEC bool =20 diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index 7907d2c199..23305b771e 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -23,6 +23,7 @@ common-obj-$(CONFIG_XGMAC) +=3D xgmac.o common-obj-$(CONFIG_MIPSNET) +=3D mipsnet.o common-obj-$(CONFIG_XILINX_AXI) +=3D xilinx_axienet.o common-obj-$(CONFIG_ALLWINNER_EMAC) +=3D allwinner_emac.o +common-obj-$(CONFIG_ALLWINNER_SUN8I_EMAC) +=3D allwinner-sun8i-emac.o common-obj-$(CONFIG_IMX_FEC) +=3D imx_fec.o =20 common-obj-$(CONFIG_CADENCE) +=3D cadence_gem.o diff --git a/hw/net/trace-events b/hw/net/trace-events index e70f12bee1..d7ee9c2563 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -1,5 +1,15 @@ # See docs/devel/tracing.txt for syntax documentation. =20 +# allwinner-sun8i-emac.c +allwinner_sun8i_emac_mii_write_reg(uint32_t reg, uint32_t value) "MII writ= e: reg=3D0x%" PRIx32 " value=3D0x%" PRIx32 +allwinner_sun8i_emac_mii_read_reg(uint32_t reg, uint32_t value) "MII read:= reg=3D0x%" PRIx32 " value=3D0x%" PRIx32 +allwinner_sun8i_emac_receive(uint32_t desc, uint32_t paddr, uint32_t bytes= ) "RX packet: desc=3D0x%" PRIx32 " paddr=3D0x%" PRIx32 " bytes=3D%" PRIu32 +allwinner_sun8i_emac_transmit(uint32_t desc, uint32_t paddr, uint32_t byte= s) "TX packet: desc=3D0x%" PRIx32 " paddr=3D0x%" PRIx32 " bytes=3D%" PRIu32 +allwinner_sun8i_emac_reset(void) "HW reset" +allwinner_sun8i_emac_set_link(bool active) "Set link: active=3D%u" +allwinner_sun8i_emac_read(uint64_t offset, uint64_t val) "MMIO read: offse= t=3D0x%" PRIx64 " value=3D0x%" PRIx64 +allwinner_sun8i_emac_write(uint64_t offset, uint64_t val) "MMIO write: off= set=3D0x%" PRIx64 " value=3D0x%" PRIx64 + # etraxfs_eth.c mdio_phy_read(int regnum, uint16_t value) "read phy_reg:%d value:0x%04x" mdio_phy_write(int regnum, uint16_t value) "write phy_reg:%d value:0x%04x" --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578513813; cv=none; d=zohomail.com; s=zohoarc; b=MX2ivg3Z5zIYmT/dy3kqn/n2LL9uo1KLlyeXUfFiZfFdxP1Km5k4FGoFMkEBMyWODh9fc9xLBpLcY9P1Lau3yyFCnsNSVjaUvFmB3g5O1C8SUiAA8rWc9+IbCOho2B97fSQXthe4Qm0wfKrODZU7u59dW7gWbMC6MaMWUSnuB0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578513813; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0WghLTvRQ8IcOw+NJuPyW+dwIBsiVMYEMjDtLCTg2F4=; b=c/tcY8Qgw59dbEb2cDYPTfRCBU/Hk7g6tCob5CtHAWyHQGYyJGypCfV3Ik63BicBC4PxDHw2MGmFGPwnc39BMb8+Zr+JOyFcwMAUDf1iJzeWoy0X6wNzMeTNoAE3X44rjUrXAz2mtBjAAn+Y13DH6Ht5wLN6yQSTkrd/pWS77GY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578513813394769.3597645524541; Wed, 8 Jan 2020 12:03:33 -0800 (PST) Received: from localhost ([::1]:48686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHYB-0003Xm-FA for importer@patchew.org; Wed, 08 Jan 2020 15:03:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35496) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVZ-0001NP-9p for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVX-0002cI-HZ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:49 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39129) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVX-0002bF-AF; Wed, 08 Jan 2020 15:00:47 -0500 Received: by mail-wm1-x343.google.com with SMTP id 20so209800wmj.4; Wed, 08 Jan 2020 12:00:47 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0WghLTvRQ8IcOw+NJuPyW+dwIBsiVMYEMjDtLCTg2F4=; b=A3cVL/WDUY9DsfaGrEP5KLWWrQxObeQqUjo3DFYnb+FNr9ju7LLU5emV5WIX/dOhfb qaGdQeCHevhFl00w8TccvTblprumxTxI9H+incSNlAFdkyj3bavFGv4MM64JPX7ZBXVM QMM4PGHaQu4SJgzCDNgfhsYy0Th9lodHG08aZ+8CZBzLpoISvLiNMP+0PoI4U3All0w9 djyQIRBpfz8BasmBVGvYI/T2C0N1osw4TgHX41/bnKCK+95AfB1D5N8VfvUZPYI5CLyx LHqhBa5WhdY40rdKEteqqf83gzSiUWcq6Juf6Dx2c+Xn38KDIuWNwYFMMhcrL0EIPmbm 4VSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0WghLTvRQ8IcOw+NJuPyW+dwIBsiVMYEMjDtLCTg2F4=; b=QZm1cy8iiHVREcRlhCQhu7jP1zwHUIIsAEGOufiYG4q8LHWle2RQVPOgTWtuISkwZU sg2jpeLt52mt7uDjxggg6I0SKj5y6ZTjTP/c08F3THLr7pQVHpy3XGCLOsFgtuwjaUfz pM1XHqL/yROhhKmqpgEa2XZ2Rx7da7NkvFLCq7dHu77saQ7F+xMMQLD7dd2NVyba62UV TK6GBHAfCqsGMqj3W7EoWP40ORkDIMkZuR/wks+r2LMwd0r02m3chK4SiR9lGPkUeDX5 cK0f7I7KkWiB2NCr7ER1XhIWaq2Gfm5MdfU+uYxzkgz14DOhugENp/kRl925raVMbV/W bo2Q== X-Gm-Message-State: APjAAAWpQZZY1HFMEwld4d50HocZZgGwttDe9gCkaSMzyac83+1Do8Xv Qgc2urM2OJInSDafdKuc/u/pVN9d X-Google-Smtp-Source: APXvYqxH4/S9qxIAYfV8rqgTGshvr24ly620wfCL3Pae3ZLOkHRhilrx9YGzh0IAl83+4RcMqi2X+w== X-Received: by 2002:a05:600c:108a:: with SMTP id e10mr354753wmd.38.1578513646091; Wed, 08 Jan 2020 12:00:46 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 10/17] hw/arm/allwinner-h3: add Boot ROM support Date: Wed, 8 Jan 2020 21:00:13 +0100 Message-Id: <20200108200020.4745-11-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A real Allwinner H3 SoC contains a Boot ROM which is the first code that runs right after the SoC is powered on. The Boot ROM is responsible for loading user code (e.g. a bootloader) from any of the supported external devices and writing the downloaded code to internal SRAM. After loading the SoC begins executing the code written to SRAM. This commits adds emulation of the Boot ROM firmware setup functionality by loading user code from SD card. Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 23 +++++++++++++++++++++++ hw/arm/allwinner-h3.c | 28 ++++++++++++++++++++++++++++ hw/arm/orangepi.c | 3 +++ 3 files changed, 54 insertions(+) diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 5d74cca28e..4b66227ac4 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -50,6 +50,7 @@ #include "hw/sd/allwinner-sdhost.h" #include "hw/net/allwinner-sun8i-emac.h" #include "target/arm/cpu.h" +#include "sysemu/block-backend.h" =20 /** * Allwinner H3 device list @@ -130,4 +131,26 @@ typedef struct AwH3State { MemoryRegion sram_c; } AwH3State; =20 +/** + * Emulate Boot ROM firmware setup functionality. + * + * A real Allwinner H3 SoC contains a Boot ROM + * which is the first code that runs right after + * the SoC is powered on. The Boot ROM is responsible + * for loading user code (e.g. a bootloader) from any + * of the supported external devices and writing the + * downloaded code to internal SRAM. After loading the SoC + * begins executing the code written to SRAM. + * + * This function emulates the Boot ROM by copying 32 KiB + * of data from the given block device and writes it to + * the start of the first internal SRAM memory. + * + * @s: Allwinner H3 state object pointer + * @blk: Block backend device object pointer + * @errp: Error object pointer for raising errors + */ +void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk, + Error **errp); + #endif /* HW_ARM_ALLWINNER_H3_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index e692432b4e..e7b768ad5b 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -27,6 +27,7 @@ #include "hw/char/serial.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" +#include "hw/loader.h" #include "sysemu/sysemu.h" #include "hw/arm/allwinner-h3.h" =20 @@ -168,6 +169,33 @@ enum { AW_H3_GIC_NUM_SPI =3D 128 }; =20 +void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk, Error **e= rrp) +{ + uint8_t *buffer; + int64_t rom_size =3D 32 * KiB; + + int64_t blk_size =3D blk_getlength(blk); + if (blk_size <=3D 0) { + error_setg(errp, "%s: failed to get BlockBackend size", __func__); + return; + } + + if (rom_size > blk_size) { + rom_size =3D blk_size; + } + + buffer =3D g_new0(uint8_t, rom_size); + if (blk_pread(blk, 8 * KiB, buffer, rom_size) < 0) { + error_setg(errp, "%s: failed to read BlockBackend data", __func__); + return; + } + + rom_add_blob("allwinner-h3.bootrom", buffer, rom_size, + rom_size, s->memmap[AW_H3_SRAM_A1], + NULL, NULL, NULL, NULL, false); + g_free(buffer); +} + static void allwinner_h3_init(Object *obj) { AwH3State *s =3D AW_H3(obj); diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 0eb52eb813..b722f49485 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -93,6 +93,9 @@ static void orangepi_init(MachineState *machine) if (bios_name) { error_report("BIOS not supported for this machine"); exit(1); + } else if (!machine->kernel_filename && blk_is_available(blk)) { + /* Use Boot ROM to copy data from SD card to SRAM */ + allwinner_h3_bootrom_setup(s->h3, blk, &error_fatal); } orangepi_binfo.loader_start =3D s->h3->memmap[AW_H3_SDRAM]; orangepi_binfo.ram_size =3D machine->ram_size; --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514382; cv=none; d=zohomail.com; s=zohoarc; b=l5tZL8sLK1RrTvWVVPotBL+xZ8PQDZzF/BDPpCb3RXwe2VpFrhrknczGMVy9Yd7r/w5vXC4lZvRQRIS6sD3iaEvTJgq5pR2ND1sWUdtRLQHzBA41K+PIzdrqDbYmtxMht1ULshrGON2aKSqcECa+YD2PJtzF7drO/lW8+ebL9aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514382; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=7ysuc6VyY6fGehBi+b6fDK7alQsuZfqgE2IQoYg8KuQ=; b=PaQ4x/pfMOs9dQQY0EP/kq0KecA63nPS2AQnPH85qfraAHA9UpnZQg6m29w1D7iJU7dmwwKhNlLW2VvHhHHafMzDjIDO5JIfiId9njnhrxdUz8vpAfp1RHKMQPrj5e/Jv2SPJRT9X77VKpQ1WmC+lAuEWRNjSKuwNxhl3ZozmXU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514382124654.6678519323783; Wed, 8 Jan 2020 12:13:02 -0800 (PST) Received: from localhost ([::1]:48840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHhM-0000Cu-J9 for importer@patchew.org; Wed, 08 Jan 2020 15:13:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35621) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVd-0001Rx-2h for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVY-0002dn-Rr for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:52 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52519) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVY-0002cs-IB; Wed, 08 Jan 2020 15:00:48 -0500 Received: by mail-wm1-x330.google.com with SMTP id p9so247087wmc.2; Wed, 08 Jan 2020 12:00:48 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7ysuc6VyY6fGehBi+b6fDK7alQsuZfqgE2IQoYg8KuQ=; b=Hjo7uzPc+J4oLgiqLFJyfAtHbhah+PP7cBKmhpcLge447VSZ3Z69JdpJzgukjZtKB6 tr9WIKqwTFWBjebKPLl88PXQni5q0RVPquP8FjHZi857LPcOs0lsdnyc1wzA3Z01n92I +OSGYmjmdnaTwuKqi9OE88o+4g6coCo06tU0BCSqrKc1ugsz/Ztt5aBF7xAUY1B5ZDJW sI9qAOIRkr8GvfqIqVJUebHJcFKCVy35D1js3jHeGF3o+Qei3E3pt8HSovke/U5gD26A MRWvzpOCfmC8wi33K+Lk/cna2Zw2npM9qwQp1ln+jr043hOZpjke1qfleDbSkrt+I37X TEtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7ysuc6VyY6fGehBi+b6fDK7alQsuZfqgE2IQoYg8KuQ=; b=EsnpOt6dhzx0lErouKA7oLiD4NyMdxisMkrtdcNTGZv3jo5ncng2phVli5oM2W8TKo u3H6bP/9Luawz4TDrR2I3lDmTPHWgDreTKXhm0Zsqj/Pjui+lqBPIKk7BSEFZQI4z7OS C9ioxj3Rm0G3IwYzaNf5gCCbYBae1//O/en/9hwCRMzIu/8DF/YyERCPWJAG7AZGmMk6 7s1qpa80EkK6Kec/qsUpJJ1k0qTyRKoycUYiHLfirlYhUA+RcbMb7WN2+yylK+qD2N09 YxYzvS0Hx2eFEDjiLNLsGsxS9CWovMTqLweROvxd2edo+a3StsAJy00V9H/+RbnFWyY0 HYwg== X-Gm-Message-State: APjAAAXChLDWOKjWH00Hc+ojNZ2+PtxKQ3IHirsc9UDU9eaWuNFixHIP ewPyxVNVGPkj4lhQDIQbZXaYNGQ+ X-Google-Smtp-Source: APXvYqz7PYRKkZbkCdKpwC3NUg8xHofV1Sku7gZzPizV+F5/K6dc2bYl9An9xTk0CdaDJ9RtGrsdgg== X-Received: by 2002:a1c:5401:: with SMTP id i1mr303661wmb.99.1578513646980; Wed, 08 Jan 2020 12:00:46 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 11/17] hw/arm/allwinner-h3: add SDRAM controller device Date: Wed, 8 Jan 2020 21:00:14 +0100 Message-Id: <20200108200020.4745-12-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In the Allwinner H3 SoC the SDRAM controller is responsible for interfacing with the external Synchronous Dynamic Random Access Memory (SDRAM). Types of memory that the SDRAM controller supports are DDR2/DDR3 and capacities of up to 2GiB. This commit adds emulation support of the Allwinner H3 SDRAM controller. Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-h3.h | 5 + include/hw/misc/allwinner-h3-dramc.h | 107 ++++++++ hw/arm/allwinner-h3.c | 19 +- hw/arm/orangepi.c | 6 + hw/misc/allwinner-h3-dramc.c | 358 +++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 10 + 7 files changed, 503 insertions(+), 3 deletions(-) create mode 100644 include/hw/misc/allwinner-h3-dramc.h create mode 100644 hw/misc/allwinner-h3-dramc.c diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 4b66227ac4..d1b3d7ca67 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -45,6 +45,7 @@ #include "hw/intc/arm_gic.h" #include "hw/misc/allwinner-h3-ccu.h" #include "hw/misc/allwinner-cpucfg.h" +#include "hw/misc/allwinner-h3-dramc.h" #include "hw/misc/allwinner-h3-sysctrl.h" #include "hw/misc/allwinner-sid.h" #include "hw/sd/allwinner-sdhost.h" @@ -84,6 +85,9 @@ enum { AW_H3_UART2, AW_H3_UART3, AW_H3_EMAC, + AW_H3_DRAMCOM, + AW_H3_DRAMCTL, + AW_H3_DRAMPHY, AW_H3_GIC_DIST, AW_H3_GIC_CPU, AW_H3_GIC_HYP, @@ -121,6 +125,7 @@ typedef struct AwH3State { AwA10PITState timer; AwH3ClockCtlState ccu; AwCpuCfgState cpucfg; + AwH3DramCtlState dramc; AwH3SysCtrlState sysctrl; AwSidState sid; AwSdHostState mmc0; diff --git a/include/hw/misc/allwinner-h3-dramc.h b/include/hw/misc/allwinn= er-h3-dramc.h new file mode 100644 index 0000000000..70ab331081 --- /dev/null +++ b/include/hw/misc/allwinner-h3-dramc.h @@ -0,0 +1,107 @@ +/* + * Allwinner H3 SDRAM Controller 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 . + */ + +#ifndef HW_MISC_ALLWINNER_H3_DRAMC_H +#define HW_MISC_ALLWINNER_H3_DRAMC_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" +#include "exec/hwaddr.h" + +/** + * Constants + * @{ + */ + +/** Highest register address used by DRAMCOM module */ +#define AW_H3_DRAMCOM_REGS_MAXADDR (0x804) + +/** Total number of known DRAMCOM registers */ +#define AW_H3_DRAMCOM_REGS_NUM (AW_H3_DRAMCOM_REGS_MAXADDR / \ + sizeof(uint32_t)) + +/** Highest register address used by DRAMCTL module */ +#define AW_H3_DRAMCTL_REGS_MAXADDR (0x88c) + +/** Total number of known DRAMCTL registers */ +#define AW_H3_DRAMCTL_REGS_NUM (AW_H3_DRAMCTL_REGS_MAXADDR / \ + sizeof(uint32_t)) + +/** Highest register address used by DRAMPHY module */ +#define AW_H3_DRAMPHY_REGS_MAXADDR (0x4) + +/** Total number of known DRAMPHY registers */ +#define AW_H3_DRAMPHY_REGS_NUM (AW_H3_DRAMPHY_REGS_MAXADDR / \ + sizeof(uint32_t)) + +/** @} */ + +/** + * Object model + * @{ + */ + +#define TYPE_AW_H3_DRAMC "allwinner-h3-dramc" +#define AW_H3_DRAMC(obj) \ + OBJECT_CHECK(AwH3DramCtlState, (obj), TYPE_AW_H3_DRAMC) + +/** @} */ + +/** + * Allwinner H3 SDRAM Controller object instance state. + */ +typedef struct AwH3DramCtlState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Physical base address for start of RAM */ + hwaddr ram_addr; + + /** Total RAM size in megabytes */ + uint32_t ram_size; + + /** + * @name Memory Regions + * @{ + */ + + MemoryRegion row_mirror; /**< Simulates rows for RAM size detect= ion */ + MemoryRegion row_mirror_alias; /**< Alias of the row which is mirrored= */ + MemoryRegion dramcom_iomem; /**< DRAMCOM module I/O registers */ + MemoryRegion dramctl_iomem; /**< DRAMCTL module I/O registers */ + MemoryRegion dramphy_iomem; /**< DRAMPHY module I/O registers */ + + /** @} */ + + /** + * @name Hardware Registers + * @{ + */ + + uint32_t dramcom[AW_H3_DRAMCOM_REGS_NUM]; /**< Array of DRAMCOM regist= ers */ + uint32_t dramctl[AW_H3_DRAMCTL_REGS_NUM]; /**< Array of DRAMCTL regist= ers */ + uint32_t dramphy[AW_H3_DRAMPHY_REGS_NUM] ;/**< Array of DRAMPHY regist= ers */ + + /** @} */ + +} AwH3DramCtlState; + +#endif /* HW_MISC_ALLWINNER_H3_DRAMC_H */ diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index e7b768ad5b..77b823e7d8 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -54,6 +54,9 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_UART2] =3D 0x01c28800, [AW_H3_UART3] =3D 0x01c28c00, [AW_H3_EMAC] =3D 0x01c30000, + [AW_H3_DRAMCOM] =3D 0x01c62000, + [AW_H3_DRAMCTL] =3D 0x01c63000, + [AW_H3_DRAMPHY] =3D 0x01c65000, [AW_H3_GIC_DIST] =3D 0x01c81000, [AW_H3_GIC_CPU] =3D 0x01c82000, [AW_H3_GIC_HYP] =3D 0x01c84000, @@ -108,9 +111,6 @@ struct AwH3Unimplemented { { "scr", 0x01c2c400, 1 * KiB }, { "gpu", 0x01c40000, 64 * KiB }, { "hstmr", 0x01c60000, 4 * KiB }, - { "dramcom", 0x01c62000, 4 * KiB }, - { "dramctl0", 0x01c63000, 4 * KiB }, - { "dramphy0", 0x01c65000, 4 * KiB }, { "spi0", 0x01c68000, 4 * KiB }, { "spi1", 0x01c69000, 4 * KiB }, { "csi", 0x01cb0000, 320 * KiB }, @@ -237,6 +237,13 @@ static void allwinner_h3_init(Object *obj) =20 sysbus_init_child_obj(obj, "emac", &s->emac, sizeof(s->emac), TYPE_AW_SUN8I_EMAC); + + sysbus_init_child_obj(obj, "dramc", &s->dramc, sizeof(s->dramc), + TYPE_AW_H3_DRAMC); + object_property_add_alias(obj, "ram-addr", OBJECT(&s->dramc), + "ram-addr", &error_abort); + object_property_add_alias(obj, "ram-size", OBJECT(&s->dramc), + "ram-size", &error_abort); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -424,6 +431,12 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART3), 115200, serial_hd(3), DEVICE_NATIVE_ENDIAN); =20 + /* DRAMC */ + qdev_init_nofail(DEVICE(&s->dramc)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 0, s->memmap[AW_H3_DRAMCOM]= ); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 1, s->memmap[AW_H3_DRAMCTL]= ); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, s->memmap[AW_H3_DRAMPHY]= ); + /* Unimplemented devices */ for (int i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { create_unimplemented_device(unimplemented[i].device_name, diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index b722f49485..6eee40b461 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -65,6 +65,12 @@ static void orangepi_init(MachineState *machine) /* Setup EMAC properties */ object_property_set_int(OBJECT(&s->h3->emac), 1, "phy-addr", &error_ab= ort); =20 + /* DRAMC */ + object_property_set_uint(OBJECT(s->h3), s->h3->memmap[AW_H3_SDRAM], + "ram-addr", &error_abort); + object_property_set_int(OBJECT(s->h3), machine->ram_size / MiB, "ram-s= ize", + &error_abort); + /* Mark H3 object realized */ object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort= ); =20 diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c new file mode 100644 index 0000000000..06ce1d92f5 --- /dev/null +++ b/hw/misc/allwinner-h3-dramc.c @@ -0,0 +1,358 @@ +/* + * Allwinner H3 SDRAM Controller 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 "qemu/error-report.h" +#include "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "exec/address-spaces.h" +#include "hw/qdev-properties.h" +#include "qapi/error.h" +#include "hw/misc/allwinner-h3-dramc.h" +#include "trace.h" + +#define REG_INDEX(offset) (offset / sizeof(uint32_t)) + +/* DRAMCOM register offsets */ +enum { + REG_DRAMCOM_CR =3D 0x0000, /* Control Register */ +}; + +/* DRAMCTL register offsets */ +enum { + REG_DRAMCTL_PIR =3D 0x0000, /* PHY Initialization Register */ + REG_DRAMCTL_PGSR =3D 0x0010, /* PHY General Status Register */ + REG_DRAMCTL_STATR =3D 0x0018, /* Status Register */ +}; + +/* DRAMCTL register flags */ +enum { + REG_DRAMCTL_PGSR_INITDONE =3D (1 << 0), +}; + +enum { + REG_DRAMCTL_STATR_ACTIVE =3D (1 << 0), +}; + +static void allwinner_h3_dramc_map_rows(AwH3DramCtlState *s, uint8_t row_b= its, + uint8_t bank_bits, uint16_t page_s= ize) +{ + /* + * This function simulates row addressing behavior when bootloader + * software attempts to detect the amount of available SDRAM. In U-Boot + * the controller is configured with the widest row addressing availab= le. + * Then a pattern is written to RAM at an offset on the row boundary s= ize. + * If the value read back equals the value read back from the + * start of RAM, the bootloader knows the amount of row bits. + * + * This function inserts a mirrored memory region when the configured = row + * bits are not matching the actual emulated memory, to simulate the + * same behavior on hardware as expected by the bootloader. + */ + uint8_t row_bits_actual =3D 0; + + /* Calculate the actual row bits using the ram_size property */ + for (uint8_t i =3D 8; i < 12; i++) { + if (1 << i =3D=3D s->ram_size) { + row_bits_actual =3D i + 3; + break; + } + } + + if (s->ram_size =3D=3D (1 << (row_bits - 3))) { + /* When row bits is the expected value, remove the mirror */ + memory_region_set_enabled(&s->row_mirror_alias, false); + trace_allwinner_h3_dramc_rowmirror_disable(); + + } else if (row_bits_actual) { + /* Row bits not matching ram_size, install the rows mirror */ + hwaddr row_mirror =3D s->ram_addr + ((1 << (row_bits_actual + + bank_bits)) * page_size); + + memory_region_set_enabled(&s->row_mirror_alias, true); + memory_region_set_address(&s->row_mirror_alias, row_mirror); + + trace_allwinner_h3_dramc_rowmirror_enable(row_mirror); + } +} + +static uint64_t allwinner_h3_dramcom_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_DRAMCOM_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_h3_dramcom_read(offset, s->dramcom[idx], size); + + return s->dramcom[idx]; +} + +static void allwinner_h3_dramcom_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + trace_allwinner_h3_dramcom_write(offset, val, size); + + if (idx >=3D AW_H3_DRAMCOM_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + switch (offset) { + case REG_DRAMCOM_CR: /* Control Register */ + allwinner_h3_dramc_map_rows(s, ((val >> 4) & 0xf) + 1, + ((val >> 2) & 0x1) + 2, + 1 << (((val >> 8) & 0xf) + 3)); + break; + default: + break; + }; + + s->dramcom[idx] =3D (uint32_t) val; +} + +static uint64_t allwinner_h3_dramctl_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_DRAMCTL_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_h3_dramctl_read(offset, s->dramctl[idx], size); + + return s->dramctl[idx]; +} + +static void allwinner_h3_dramctl_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + trace_allwinner_h3_dramctl_write(offset, val, size); + + if (idx >=3D AW_H3_DRAMCTL_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + switch (offset) { + case REG_DRAMCTL_PIR: /* PHY Initialization Register */ + s->dramctl[REG_INDEX(REG_DRAMCTL_PGSR)] |=3D REG_DRAMCTL_PGSR_INIT= DONE; + s->dramctl[REG_INDEX(REG_DRAMCTL_STATR)] |=3D REG_DRAMCTL_STATR_AC= TIVE; + break; + default: + break; + } + + s->dramctl[idx] =3D (uint32_t) val; +} + +static uint64_t allwinner_h3_dramphy_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + if (idx >=3D AW_H3_DRAMPHY_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_h3_dramphy_read(offset, s->dramphy[idx], size); + + return s->dramphy[idx]; +} + +static void allwinner_h3_dramphy_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwH3DramCtlState *s =3D AW_H3_DRAMC(opaque); + const uint32_t idx =3D REG_INDEX(offset); + + trace_allwinner_h3_dramphy_write(offset, val, size); + + if (idx >=3D AW_H3_DRAMPHY_REGS_NUM) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + s->dramphy[idx] =3D (uint32_t) val; +} + +static const MemoryRegionOps allwinner_h3_dramcom_ops =3D { + .read =3D allwinner_h3_dramcom_read, + .write =3D allwinner_h3_dramcom_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static const MemoryRegionOps allwinner_h3_dramctl_ops =3D { + .read =3D allwinner_h3_dramctl_read, + .write =3D allwinner_h3_dramctl_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static const MemoryRegionOps allwinner_h3_dramphy_ops =3D { + .read =3D allwinner_h3_dramphy_read, + .write =3D allwinner_h3_dramphy_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_h3_dramc_reset(DeviceState *dev) +{ + AwH3DramCtlState *s =3D AW_H3_DRAMC(dev); + + /* Set default values for registers */ + memset(&s->dramcom, 0, sizeof(s->dramcom)); + memset(&s->dramctl, 0, sizeof(s->dramctl)); + memset(&s->dramphy, 0, sizeof(s->dramphy)); +} + +static void allwinner_h3_dramc_realize(DeviceState *dev, Error **errp) +{ + AwH3DramCtlState *s =3D AW_H3_DRAMC(dev); + + /* Only power of 2 RAM sizes from 256MiB up to 2048MiB are supported */ + for (uint8_t i =3D 8; i < 13; i++) { + if (1 << i =3D=3D s->ram_size) { + break; + } else if (i =3D=3D 12) { + error_report("%s: ram-size %u MiB is not supported", + __func__, s->ram_size); + exit(1); + } + } + + /* Setup row mirror mappings */ + memory_region_init_ram(&s->row_mirror, OBJECT(s), + "allwinner-h3-dramc.row-mirror", + 4 * KiB, &error_abort); + memory_region_add_subregion_overlap(get_system_memory(), s->ram_addr, + &s->row_mirror, 10); + + memory_region_init_alias(&s->row_mirror_alias, OBJECT(s), + "allwinner-h3-dramc.row-mirror-alias", + &s->row_mirror, 0, 4 * KiB); + memory_region_add_subregion_overlap(get_system_memory(), + s->ram_addr + 1 * MiB, + &s->row_mirror_alias, 10); + memory_region_set_enabled(&s->row_mirror_alias, false); +} + +static void allwinner_h3_dramc_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwH3DramCtlState *s =3D AW_H3_DRAMC(obj); + + /* DRAMCOM registers */ + memory_region_init_io(&s->dramcom_iomem, OBJECT(s), + &allwinner_h3_dramcom_ops, s, + TYPE_AW_H3_DRAMC, 4 * KiB); + sysbus_init_mmio(sbd, &s->dramcom_iomem); + + /* DRAMCTL registers */ + memory_region_init_io(&s->dramctl_iomem, OBJECT(s), + &allwinner_h3_dramctl_ops, s, + TYPE_AW_H3_DRAMC, 4 * KiB); + sysbus_init_mmio(sbd, &s->dramctl_iomem); + + /* DRAMPHY registers */ + memory_region_init_io(&s->dramphy_iomem, OBJECT(s), + &allwinner_h3_dramphy_ops, s, + TYPE_AW_H3_DRAMC, 4 * KiB); + sysbus_init_mmio(sbd, &s->dramphy_iomem); +} + +static Property allwinner_h3_dramc_properties[] =3D { + DEFINE_PROP_UINT64("ram-addr", AwH3DramCtlState, ram_addr, 0x0), + DEFINE_PROP_UINT32("ram-size", AwH3DramCtlState, ram_size, 256 * MiB), + DEFINE_PROP_END_OF_LIST() +}; + +static const VMStateDescription allwinner_h3_dramc_vmstate =3D { + .name =3D "allwinner-h3-dramc", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(dramcom, AwH3DramCtlState, AW_H3_DRAMCOM_REGS= _NUM), + VMSTATE_UINT32_ARRAY(dramctl, AwH3DramCtlState, AW_H3_DRAMCTL_REGS= _NUM), + VMSTATE_UINT32_ARRAY(dramphy, AwH3DramCtlState, AW_H3_DRAMPHY_REGS= _NUM), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_h3_dramc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_h3_dramc_reset; + dc->vmsd =3D &allwinner_h3_dramc_vmstate; + dc->props =3D allwinner_h3_dramc_properties; + dc->realize =3D allwinner_h3_dramc_realize; +} + +static const TypeInfo allwinner_h3_dramc_info =3D { + .name =3D TYPE_AW_H3_DRAMC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_h3_dramc_init, + .instance_size =3D sizeof(AwH3DramCtlState), + .class_init =3D allwinner_h3_dramc_class_init, +}; + +static void allwinner_h3_dramc_register(void) +{ + type_register_static(&allwinner_h3_dramc_info); +} + +type_init(allwinner_h3_dramc_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 59500d5681..b95b9e5296 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -30,6 +30,7 @@ common-obj-$(CONFIG_IVSHMEM_DEVICE) +=3D ivshmem.o =20 common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-ccu.o obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-cpucfg.o +common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-dramc.o common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-h3-sysctrl.o common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-sid.o common-obj-$(CONFIG_REALVIEW) +=3D arm_sysctl.o diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 67d8bf493c..c231b4c194 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -5,6 +5,16 @@ allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_= addr) "id %u, reset_ad allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offs= et 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "off= set 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 =20 +# allwinner-h3-dramc.c +allwinner_h3_dramc_rowmirror_disable(void) "Disable row mirror" +allwinner_h3_dramc_rowmirror_enable(uint64_t addr) "Enable row mirror: add= r 0x%" PRIx64 +allwinner_h3_dramcom_read(uint64_t offset, uint64_t data, unsigned size) "= Read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_h3_dramcom_write(uint64_t offset, uint64_t data, unsigned size) = "Write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_h3_dramctl_read(uint64_t offset, uint64_t data, unsigned size) "= Read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_h3_dramctl_write(uint64_t offset, uint64_t data, unsigned size) = "Write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_h3_dramphy_read(uint64_t offset, uint64_t data, unsigned size) "= Read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_h3_dramphy_write(uint64_t offset, uint64_t data, unsigned size) = "write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 + # allwinner-sid.c allwinner_sid_read(uint64_t offset, uint64_t data, unsigned size) "offset = 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 allwinner_sid_write(uint64_t offset, uint64_t data, unsigned size) "offset= 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514231; cv=none; d=zohomail.com; s=zohoarc; b=GNQAd1jxyHcs6RvycGol/xZQJ+p8Pi52BADsmhhWsON/3vo+LUDDujh+Ky/2y8bSh8G6Z7ZEuWXWlFbGiq8VHzs/J2xXgTR0Jywe5/hCOqpwuXopZrrtf3IV/Y2wh7l12P0eoCstjQxLA+QYNojRq0HWJm5XLaivXhzocrN90d8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514231; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Qmp/VetiNkxb//J2gxaFRdy/OdsG0Vcv2n2tNLLCTTw=; b=Cnva94uyIZCtPlvjD1Cye/PEk9BCeDqeF9v4ORM3pL2RK52UYY7RaRAv80qZXLKyUwj/j8LWWdf0UUt0Wn320/m63ox5oveOVDWqI8iZgSq8nTuHrTDl+5F0wMfdV4AcpDz68fXeGeHLc6aJh38WMs7CsTglizzoikpIEHPub3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514231052761.5531183788883; Wed, 8 Jan 2020 12:10:31 -0800 (PST) Received: from localhost ([::1]:48790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHev-0004Qk-5i for importer@patchew.org; Wed, 08 Jan 2020 15:10:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35665) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVe-0001Ta-81 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVZ-0002fg-OS for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:54 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:56316) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVZ-0002de-DR; Wed, 08 Jan 2020 15:00:49 -0500 Received: by mail-wm1-x32a.google.com with SMTP id q9so229417wmj.5; Wed, 08 Jan 2020 12:00:49 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Qmp/VetiNkxb//J2gxaFRdy/OdsG0Vcv2n2tNLLCTTw=; b=Nk86JzrzOmnzAt+buE3OWbMN55bcx40WsN8hvre80BLZCuyFLlpF1Zuh/jEtEQfvx5 S0ARWxBb/XHP+r32dCC6+0AwKFK/yK2YR4xZ1Uq9igvroARS/XVh+z81EjanDfSAusMF gCcU6WvZWrKJtSWjeNBSJhu6E6uMLctFkH4bNIcty8oB4i3PUm2uO2EzMJZyp3Wa6xhm wmYdJ5V4ZqxGPSwW1NAfc5ym1H2DFWa2exCHsNrTfpm8bv8qPFmUHkYVcIQu19VkTXIs +CcsGrWJ7dAVZyT7HBEE5rrd489ggCgJw2TGUO5uo6aeccg6KEdnU0n47jBOJWa3huS+ +6sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Qmp/VetiNkxb//J2gxaFRdy/OdsG0Vcv2n2tNLLCTTw=; b=pu3o5uatDlgKMt0DogljMHxi+E+KxITcR4JwknW59Lqe9fSs4j1Xiea7RLrBwOPnKr tXkDzcwcQ01REtzW4jPmigQhnr5sKwYIGKEVRYog3ivPHvxfBeyVBqE4FaP9Vhu/IU54 lTiRYO6ck5hHSWxzGtc1o6lFM0WplnPxMqGmtxB/TFmrWC2hw1+8ZqqbcwcDUC1KKMEy o+zxEwVOMLAdoMZFzXJE2N5GrHZji/pZHbkHN7lH4r8q7zx5U/YpeErT9Qb9yKsBtoGO I5NNkifvd9/4dVMH1qNMfUVl0cG6wFJjQnJLStvFIWwn57yVTkmdTBymEM7WuZzH63G+ okUw== X-Gm-Message-State: APjAAAUimBmh96Ep0+T7MEvvlLLySVqrv+M+zFG8GtThOBn65nyxtBSe AqHpTyQ6SySFO9mn3xmZfhCyx1OD X-Google-Smtp-Source: APXvYqxgVWukYVst2rVcPXeJApmNO9ALGxfjKdjiq0oKTGE2uX/8NBA+YEdQPPOTO5XjhE/bl4pZWA== X-Received: by 2002:a1c:2187:: with SMTP id h129mr383209wmh.44.1578513647727; Wed, 08 Jan 2020 12:00:47 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 12/17] hw/arm/allwinner: add RTC device support Date: Wed, 8 Jan 2020 21:00:15 +0100 Message-Id: <20200108200020.4745-13-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Allwinner System-on-Chips usually contain a Real Time Clock (RTC) for non-volatile system date and time keeping. This commit adds a generic Allwinner RTC device that supports the RTC devices found in Allwinner SoC family sun4i (A10), sun7i (A20) and sun6i and newer (A31, H2+, H3, etc). The following RTC functionality and features are implemented: * Year-Month-Day read/write * Hour-Minute-Second read/write * General Purpose storage The following boards are extended with the RTC device: * Cubieboard (hw/arm/cubieboard.c) * Orange Pi PC (hw/arm/orangepi.c) Signed-off-by: Niek Linnenbank --- include/hw/arm/allwinner-a10.h | 4 +- include/hw/arm/allwinner-h3.h | 3 + include/hw/rtc/allwinner-rtc.h | 129 +++++++++++ hw/arm/allwinner-a10.c | 7 + hw/arm/allwinner-h3.c | 9 +- hw/rtc/allwinner-rtc.c | 386 +++++++++++++++++++++++++++++++++ hw/rtc/Makefile.objs | 1 + hw/rtc/trace-events | 4 + 8 files changed, 541 insertions(+), 2 deletions(-) create mode 100644 include/hw/rtc/allwinner-rtc.h create mode 100644 hw/rtc/allwinner-rtc.c diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 0e8250b244..81a16092e7 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -9,6 +9,7 @@ #include "hw/net/allwinner_emac.h" #include "hw/sd/allwinner-sdhost.h" #include "hw/ide/ahci.h" +#include "hw/rtc/allwinner-rtc.h" =20 #include "target/arm/cpu.h" =20 @@ -18,7 +19,7 @@ #define AW_A10_UART0_REG_BASE 0x01c28000 #define AW_A10_EMAC_BASE 0x01c0b000 #define AW_A10_SATA_BASE 0x01c18000 - +#define AW_A10_RTC_BASE 0x01c20d00 #define AW_A10_SDRAM_BASE 0x40000000 =20 #define TYPE_AW_A10 "allwinner-a10" @@ -36,6 +37,7 @@ typedef struct AwA10State { AwEmacState emac; AllwinnerAHCIState sata; AwSdHostState mmc0; + AwRtcState rtc; MemoryRegion sram_a; } AwA10State; =20 diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index d1b3d7ca67..1c275a34ed 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -50,6 +50,7 @@ #include "hw/misc/allwinner-sid.h" #include "hw/sd/allwinner-sdhost.h" #include "hw/net/allwinner-sun8i-emac.h" +#include "hw/rtc/allwinner-rtc.h" #include "target/arm/cpu.h" #include "sysemu/block-backend.h" =20 @@ -92,6 +93,7 @@ enum { AW_H3_GIC_CPU, AW_H3_GIC_HYP, AW_H3_GIC_VCPU, + AW_H3_RTC, AW_H3_CPUCFG, AW_H3_SDRAM }; @@ -130,6 +132,7 @@ typedef struct AwH3State { AwSidState sid; AwSdHostState mmc0; AwSun8iEmacState emac; + AwRtcState rtc; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/include/hw/rtc/allwinner-rtc.h b/include/hw/rtc/allwinner-rtc.h new file mode 100644 index 0000000000..e29dfc775f --- /dev/null +++ b/include/hw/rtc/allwinner-rtc.h @@ -0,0 +1,129 @@ +/* + * Allwinner Real Time Clock 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 . + */ + +#ifndef HW_MISC_ALLWINNER_RTC_H +#define HW_MISC_ALLWINNER_RTC_H + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "hw/sysbus.h" + +/** + * Constants + * @{ + */ + +/** Highest register address used by RTC device */ +#define AW_RTC_REGS_MAXADDR (0x1F4) + +/** Total number of known registers */ +#define AW_RTC_REGS_NUM (AW_RTC_REGS_MAXADDR / sizeof(uint32_t)) + +/** @} */ + +/** + * Object model types + * @{ + */ + +/** Generic Allwinner RTC device (abstract) */ +#define TYPE_AW_RTC "allwinner-rtc" + +/** Allwinner RTC sun4i family (A10, A12) */ +#define TYPE_AW_RTC_SUN4I TYPE_AW_RTC "-sun4i" + +/** Allwinner RTC sun6i family and newer (A31, H2+, H3, etc) */ +#define TYPE_AW_RTC_SUN6I TYPE_AW_RTC "-sun6i" + +/** Allwinner RTC sun7i family (A20) */ +#define TYPE_AW_RTC_SUN7I TYPE_AW_RTC "-sun7i" + +/** @} */ + +/** + * Object model macros + * @{ + */ + +#define AW_RTC(obj) \ + OBJECT_CHECK(AwRtcState, (obj), TYPE_AW_RTC) +#define AW_RTC_CLASS(klass) \ + OBJECT_CLASS_CHECK(AwRtcClass, (klass), TYPE_AW_RTC) +#define AW_RTC_GET_CLASS(obj) \ + OBJECT_GET_CLASS(AwRtcClass, (obj), TYPE_AW_RTC) + +/** @} */ + +/** + * Allwinner RTC per-object instance state. + */ +typedef struct AwRtcState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + /** Maps I/O registers in physical memory */ + MemoryRegion iomem; + + /** Array of hardware registers */ + uint32_t regs[AW_RTC_REGS_NUM]; + +} AwRtcState; + +/** + * Allwinner RTC class-level struct. + * + * This struct is filled by each sunxi device specific code + * such that the generic code can use this struct to support + * all devices. + */ +typedef struct AwRtcClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + /** Defines device specific register map */ + const uint8_t *regmap; + + /** Number of entries in regmap */ + size_t regmap_size; + + /** Device offset in years to 1900, for struct tm.tm_year */ + uint8_t year_offset; + + /** + * Read device specific register + * + * @offset: register offset to read + * @return true if register read successful, false otherwise + */ + bool (*read)(AwRtcState *s, uint32_t offset); + + /** + * Write device specific register + * + * @offset: register offset to write + * @data: value to set in register + * @return true if register write successful, false otherwise + */ + bool (*write)(AwRtcState *s, uint32_t offset, uint32_t data); + +} AwRtcClass; + +#endif /* HW_MISC_ALLWINNER_RTC_H */ diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 61cf3550a6..3f8f9d0d19 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -46,6 +46,9 @@ static void aw_a10_init(Object *obj) =20 sysbus_init_child_obj(obj, "mmc0", &s->mmc0, sizeof(s->mmc0), TYPE_AW_SDHOST_SUN4I); + + sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc), + TYPE_AW_RTC_SUN4I); } =20 static void aw_a10_realize(DeviceState *dev, Error **errp) @@ -128,6 +131,10 @@ static void aw_a10_realize(DeviceState *dev, Error **e= rrp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0, s->irq[32]); object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->mmc0), "sd-bus", &error_abort); + + /* RTC */ + qdev_init_nofail(DEVICE(&s->rtc)); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->rtc), 0, AW_A10_RTC_BASE, 1= 0); } =20 static void aw_a10_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 77b823e7d8..caa4d8b196 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -61,6 +61,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_GIC_CPU] =3D 0x01c82000, [AW_H3_GIC_HYP] =3D 0x01c84000, [AW_H3_GIC_VCPU] =3D 0x01c86000, + [AW_H3_RTC] =3D 0x01f00000, [AW_H3_CPUCFG] =3D 0x01f01c00, [AW_H3_SDRAM] =3D 0x40000000 }; @@ -116,7 +117,6 @@ struct AwH3Unimplemented { { "csi", 0x01cb0000, 320 * KiB }, { "tve", 0x01e00000, 64 * KiB }, { "hdmi", 0x01ee0000, 128 * KiB }, - { "rtc", 0x01f00000, 1 * KiB }, { "r_timer", 0x01f00800, 1 * KiB }, { "r_intc", 0x01f00c00, 1 * KiB }, { "r_wdog", 0x01f01000, 1 * KiB }, @@ -244,6 +244,9 @@ static void allwinner_h3_init(Object *obj) "ram-addr", &error_abort); object_property_add_alias(obj, "ram-size", OBJECT(&s->dramc), "ram-size", &error_abort); + + sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc), + TYPE_AW_RTC_SUN6I); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -437,6 +440,10 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 1, s->memmap[AW_H3_DRAMCTL]= ); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dramc), 2, s->memmap[AW_H3_DRAMPHY]= ); =20 + /* RTC */ + qdev_init_nofail(DEVICE(&s->rtc)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, s->memmap[AW_H3_RTC]); + /* Unimplemented devices */ for (int i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { create_unimplemented_device(unimplemented[i].device_name, diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c new file mode 100644 index 0000000000..812fe7f10b --- /dev/null +++ b/hw/rtc/allwinner-rtc.c @@ -0,0 +1,386 @@ +/* + * Allwinner Real Time Clock 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 "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu-common.h" +#include "hw/rtc/allwinner-rtc.h" +#include "trace.h" + +/* RTC registers */ +enum { + REG_LOSC =3D 1, /* Low Oscillator Control */ + REG_YYMMDD, /* RTC Year-Month-Day */ + REG_HHMMSS, /* RTC Hour-Minute-Second */ + REG_ALARM1_WKHHMMSS, /* Alarm1 Week Hour-Minute-Second */ + REG_ALARM1_EN, /* Alarm1 Enable */ + REG_ALARM1_IRQ_EN, /* Alarm1 IRQ Enable */ + REG_ALARM1_IRQ_STA, /* Alarm1 IRQ Status */ + REG_GP0, /* General Purpose Register 0 */ + REG_GP1, /* General Purpose Register 1 */ + REG_GP2, /* General Purpose Register 2 */ + REG_GP3, /* General Purpose Register 3 */ + + /* sun4i registers */ + REG_ALARM1_DDHHMMSS, /* Alarm1 Day Hour-Minute-Second */ + REG_CPUCFG, /* CPU Configuration Register */ + + /* sun6i registers */ + REG_LOSC_AUTOSTA, /* LOSC Auto Switch Status */ + REG_INT_OSC_PRE, /* Internal OSC Clock Prescaler */ + REG_ALARM0_COUNTER, /* Alarm0 Counter */ + REG_ALARM0_CUR_VLU, /* Alarm0 Counter Current Value */ + REG_ALARM0_ENABLE, /* Alarm0 Enable */ + REG_ALARM0_IRQ_EN, /* Alarm0 IRQ Enable */ + REG_ALARM0_IRQ_STA, /* Alarm0 IRQ Status */ + REG_ALARM_CONFIG, /* Alarm Config */ + REG_LOSC_OUT_GATING, /* LOSC Output Gating Register */ + REG_GP4, /* General Purpose Register 4 */ + REG_GP5, /* General Purpose Register 5 */ + REG_GP6, /* General Purpose Register 6 */ + REG_GP7, /* General Purpose Register 7 */ + REG_RTC_DBG, /* RTC Debug Register */ + REG_GPL_HOLD_OUT, /* GPL Hold Output Register */ + REG_VDD_RTC, /* VDD RTC Regulate Register */ + REG_IC_CHARA, /* IC Characteristics Register */ +}; + +/* RTC register flags */ +enum { + REG_LOSC_YMD =3D (1 << 7), + REG_LOSC_HMS =3D (1 << 8), +}; + +/* RTC sun4i register map (offset to name) */ +const uint8_t allwinner_rtc_sun4i_regmap[] =3D { + [0x0000] =3D REG_LOSC, + [0x0004] =3D REG_YYMMDD, + [0x0008] =3D REG_HHMMSS, + [0x000C] =3D REG_ALARM1_DDHHMMSS, + [0x0010] =3D REG_ALARM1_WKHHMMSS, + [0x0014] =3D REG_ALARM1_EN, + [0x0018] =3D REG_ALARM1_IRQ_EN, + [0x001C] =3D REG_ALARM1_IRQ_STA, + [0x0020] =3D REG_GP0, + [0x0024] =3D REG_GP1, + [0x0028] =3D REG_GP2, + [0x002C] =3D REG_GP3, + [0x003C] =3D REG_CPUCFG, +}; + +/* RTC sun6i register map (offset to name) */ +const uint8_t allwinner_rtc_sun6i_regmap[] =3D { + [0x0000] =3D REG_LOSC, + [0x0004] =3D REG_LOSC_AUTOSTA, + [0x0008] =3D REG_INT_OSC_PRE, + [0x0010] =3D REG_YYMMDD, + [0x0014] =3D REG_HHMMSS, + [0x0020] =3D REG_ALARM0_COUNTER, + [0x0024] =3D REG_ALARM0_CUR_VLU, + [0x0028] =3D REG_ALARM0_ENABLE, + [0x002C] =3D REG_ALARM0_IRQ_EN, + [0x0030] =3D REG_ALARM0_IRQ_STA, + [0x0040] =3D REG_ALARM1_WKHHMMSS, + [0x0044] =3D REG_ALARM1_EN, + [0x0048] =3D REG_ALARM1_IRQ_EN, + [0x004C] =3D REG_ALARM1_IRQ_STA, + [0x0050] =3D REG_ALARM_CONFIG, + [0x0060] =3D REG_LOSC_OUT_GATING, + [0x0100] =3D REG_GP0, + [0x0104] =3D REG_GP1, + [0x0108] =3D REG_GP2, + [0x010C] =3D REG_GP3, + [0x0110] =3D REG_GP4, + [0x0114] =3D REG_GP5, + [0x0118] =3D REG_GP6, + [0x011C] =3D REG_GP7, + [0x0170] =3D REG_RTC_DBG, + [0x0180] =3D REG_GPL_HOLD_OUT, + [0x0190] =3D REG_VDD_RTC, + [0x01F0] =3D REG_IC_CHARA, +}; + +static bool allwinner_rtc_sun4i_read(AwRtcState *s, uint32_t offset) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_rtc_sun4i_write(AwRtcState *s, uint32_t offset, + uint32_t data) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_rtc_sun6i_read(AwRtcState *s, uint32_t offset) +{ + const AwRtcClass *c =3D AW_RTC_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_GP4: /* General Purpose Register 4 */ + case REG_GP5: /* General Purpose Register 5 */ + case REG_GP6: /* General Purpose Register 6 */ + case REG_GP7: /* General Purpose Register 7 */ + return true; + default: + break; + } + return false; +} + +static bool allwinner_rtc_sun6i_write(AwRtcState *s, uint32_t offset, + uint32_t data) +{ + const AwRtcClass *c =3D AW_RTC_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_GP4: /* General Purpose Register 4 */ + case REG_GP5: /* General Purpose Register 5 */ + case REG_GP6: /* General Purpose Register 6 */ + case REG_GP7: /* General Purpose Register 7 */ + return true; + default: + break; + } + return false; +} + +static uint64_t allwinner_rtc_read(void *opaque, hwaddr offset, + unsigned size) +{ + AwRtcState *s =3D AW_RTC(opaque); + const AwRtcClass *c =3D AW_RTC_GET_CLASS(s); + uint64_t val =3D 0; + + if (offset >=3D AW_RTC_REGS_MAXADDR) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + if (!c->regmap[offset]) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid register 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + switch (c->regmap[offset]) { + case REG_LOSC: /* Low Oscillator Control */ + val =3D s->regs[REG_LOSC]; + s->regs[REG_LOSC] &=3D ~(REG_LOSC_YMD | REG_LOSC_HMS); + break; + case REG_YYMMDD: /* RTC Year-Month-Day */ + case REG_HHMMSS: /* RTC Hour-Minute-Second */ + case REG_GP0: /* General Purpose Register 0 */ + case REG_GP1: /* General Purpose Register 1 */ + case REG_GP2: /* General Purpose Register 2 */ + case REG_GP3: /* General Purpose Register 3 */ + val =3D s->regs[c->regmap[offset]]; + break; + default: + if (!c->read(s, offset)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + } + val =3D s->regs[c->regmap[offset]]; + break; + } + + trace_allwinner_rtc_read(offset, val); + return val; +} + +static void allwinner_rtc_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwRtcState *s =3D AW_RTC(opaque); + const AwRtcClass *c =3D AW_RTC_GET_CLASS(s); + + if (offset >=3D AW_RTC_REGS_MAXADDR) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + if (!c->regmap[offset]) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid register 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + trace_allwinner_rtc_write(offset, val); + + switch (c->regmap[offset]) { + case REG_YYMMDD: /* RTC Year-Month-Day */ + s->regs[REG_YYMMDD] =3D val; + s->regs[REG_LOSC] |=3D REG_LOSC_YMD; + break; + case REG_HHMMSS: /* RTC Hour-Minute-Second */ + s->regs[REG_HHMMSS] =3D val; + s->regs[REG_LOSC] |=3D REG_LOSC_HMS; + break; + case REG_GP0: /* General Purpose Register 0 */ + case REG_GP1: /* General Purpose Register 1 */ + case REG_GP2: /* General Purpose Register 2 */ + case REG_GP3: /* General Purpose Register 3 */ + s->regs[c->regmap[offset]] =3D val; + break; + default: + if (!c->write(s, offset, val)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + } + break; + } +} + +static const MemoryRegionOps allwinner_rtc_ops =3D { + .read =3D allwinner_rtc_read, + .write =3D allwinner_rtc_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_rtc_reset(DeviceState *dev) +{ + AwRtcState *s =3D AW_RTC(dev); + const AwRtcClass *c =3D AW_RTC_GET_CLASS(dev); + struct tm now; + + /* Clear registers */ + memset(s->regs, 0, sizeof(s->regs)); + + /* Get current datetime */ + qemu_get_timedate(&now, 0); + + /* Set RTC with current datetime */ + s->regs[REG_YYMMDD] =3D ((now.tm_year - c->year_offset) << 16) | + ((now.tm_mon + 1) << 8) | + now.tm_mday; + s->regs[REG_HHMMSS] =3D (((now.tm_wday + 6) % 7) << 29) | + (now.tm_hour << 16) | + (now.tm_min << 8) | + now.tm_sec; +} + +static void allwinner_rtc_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwRtcState *s =3D AW_RTC(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_rtc_ops, s, + TYPE_AW_RTC, 1 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static const VMStateDescription allwinner_rtc_vmstate =3D { + .name =3D "allwinner-rtc", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, AwRtcState, AW_RTC_REGS_NUM), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_rtc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D allwinner_rtc_reset; + dc->vmsd =3D &allwinner_rtc_vmstate; +} + +static void allwinner_rtc_sun4i_class_init(ObjectClass *klass, void *data) +{ + AwRtcClass *arc =3D AW_RTC_CLASS(klass); + + arc->regmap =3D allwinner_rtc_sun4i_regmap; + arc->regmap_size =3D ARRAY_SIZE(allwinner_rtc_sun4i_regmap); + arc->year_offset =3D 110; + arc->read =3D allwinner_rtc_sun4i_read; + arc->write =3D allwinner_rtc_sun4i_write; +} + +static void allwinner_rtc_sun6i_class_init(ObjectClass *klass, void *data) +{ + AwRtcClass *arc =3D AW_RTC_CLASS(klass); + + arc->regmap =3D allwinner_rtc_sun6i_regmap; + arc->regmap_size =3D ARRAY_SIZE(allwinner_rtc_sun6i_regmap); + arc->year_offset =3D 70; + arc->read =3D allwinner_rtc_sun6i_read; + arc->write =3D allwinner_rtc_sun6i_write; +} + +static void allwinner_rtc_sun7i_class_init(ObjectClass *klass, void *data) +{ + AwRtcClass *arc =3D AW_RTC_CLASS(klass); + + allwinner_rtc_sun4i_class_init(klass, arc); + arc->year_offset =3D 70; +} + +static const TypeInfo allwinner_rtc_info =3D { + .name =3D TYPE_AW_RTC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_rtc_init, + .instance_size =3D sizeof(AwRtcState), + .class_init =3D allwinner_rtc_class_init, + .class_size =3D sizeof(AwRtcClass), + .abstract =3D true, +}; + +static const TypeInfo allwinner_rtc_sun4i_info =3D { + .name =3D TYPE_AW_RTC_SUN4I, + .parent =3D TYPE_AW_RTC, + .class_init =3D allwinner_rtc_sun4i_class_init, +}; + +static const TypeInfo allwinner_rtc_sun6i_info =3D { + .name =3D TYPE_AW_RTC_SUN6I, + .parent =3D TYPE_AW_RTC, + .class_init =3D allwinner_rtc_sun6i_class_init, +}; + +static const TypeInfo allwinner_rtc_sun7i_info =3D { + .name =3D TYPE_AW_RTC_SUN7I, + .parent =3D TYPE_AW_RTC, + .class_init =3D allwinner_rtc_sun7i_class_init, +}; + +static void allwinner_rtc_register(void) +{ + type_register_static(&allwinner_rtc_info); + type_register_static(&allwinner_rtc_sun4i_info); + type_register_static(&allwinner_rtc_sun6i_info); + type_register_static(&allwinner_rtc_sun7i_info); +} + +type_init(allwinner_rtc_register) diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs index 8dc9fcd3a9..12d92feebf 100644 --- a/hw/rtc/Makefile.objs +++ b/hw/rtc/Makefile.objs @@ -11,3 +11,4 @@ common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_rtc.o obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o common-obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_rtc.o +common-obj-$(CONFIG_ALLWINNER_H3) +=3D allwinner-rtc.o diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events index d6749f4616..eb57de3bd6 100644 --- a/hw/rtc/trace-events +++ b/hw/rtc/trace-events @@ -1,5 +1,9 @@ # See docs/devel/tracing.txt for syntax documentation. =20 +# allwinner-rtc.c +allwinner_rtc_read(uint64_t addr, uint64_t value) "addr 0x%" PRIx64 " valu= e 0x%" PRIx64 +allwinner_rtc_write(uint64_t addr, uint64_t value) "addr 0x%" PRIx64 " val= ue 0x%" PRIx64 + # sun4v-rtc.c sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " va= lue 0x%" PRIx64 sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " = value 0x%" PRIx64 --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578513863; cv=none; d=zohomail.com; s=zohoarc; b=lY2F0ATi4P0DOELoacrz9P1AF/tmkvZhT40CWY1YjNCbm4x9Nw4y57ADtYJUlw0OuOFHtJcOEe/x3q2hU5yaw8+JsvDsT3lFxPx9vi+J5mREcciCv8iLgslMVw4WcD/h1zGJDbgvlMu5Dkz1YpjsVziz+JHIiwcYoXnF3a3/5eU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578513863; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Eqa4YpaNfuc48h2bwSMiKBQFwH8msqFwuM/LkfTRkog=; b=hML/xcb8Lp/gfNIDA/yGikwQNLY28iFe0J5agYsFRysP8TbwkxnhOHiA49EJvYtWBLh1HAwxOzpxgFmIx53075GW/JEhfDuQ/Q5rfJ19WnnqEb5g3t3PMROR026WmFFYqrf03WeiE2u8RxaWj9wNMV0KRezXiSFNlQy7PuuhtC4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578513863187845.4727818242774; Wed, 8 Jan 2020 12:04:23 -0800 (PST) Received: from localhost ([::1]:48690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHYz-0004c5-Gs for importer@patchew.org; Wed, 08 Jan 2020 15:04:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVb-0001QJ-KR for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVZ-0002fq-V1 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:51 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVZ-0002e5-NS; Wed, 08 Jan 2020 15:00:49 -0500 Received: by mail-wm1-x343.google.com with SMTP id q9so229435wmj.5; Wed, 08 Jan 2020 12:00:49 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Eqa4YpaNfuc48h2bwSMiKBQFwH8msqFwuM/LkfTRkog=; b=oEFVFgfgKLQK3ve6J9pSUn0r9tHrWERYh/fRbhuuOivm67Ka0QF7syh/gNNhvSH8Zi 82IfR4tx7kJPFjOmDAu+FbWuzhEBHdqR98DZTQwE6zccGc7sLsV1SAUgXjl2dWZOYxz1 C5ldyzQqiRc6UFXkkF9l5W4pjN5pOCiT+ECXXkWY5/H7dhUqREiiwBroZxPXs2CtuNYf jfy+2KDz20MnvzraM3ucYIW58rEl+HFQCVUyuTVuapd4Pkyxbp8LsMk6k5b2W+LGjhGU k3anIY/7izHGuVxyg//dMGs3BKWrcFQJSFfLzc5FaNkk+kzJ9khUk+UtqmEvGqlsjfsq QScA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Eqa4YpaNfuc48h2bwSMiKBQFwH8msqFwuM/LkfTRkog=; b=Nyb6guUNHXEVGeuRMD+pOhJehx+QQdWtOFogWHz735ueZAiU4qcHT5R5yZqrnq2MvP i3QnY+aWNbbjkX8tsmLYmrwQa3O7ywoJU3ShLixbY+afyHSZiquzTPzhVihIzOC8iyTq g2sCJkiZEjvm21dqdVywJeSwgQjRml3ZvG0n1mjcZf3+RXiptFMNysDKy9+2BGv+YXuo 7Q9ESnkFHUa+4g0r4T25Pvmj10gZ9pwbXaxj+/JDa7q3SZuBJGwk9/rm4f7djUeP1oxA iZZsk7u3B9seFB050t7+kxbR8W+uHaXCdsbPI0/c49UYg/5H/fvqVS0tKmJ2MfPhJ/4K 04JQ== X-Gm-Message-State: APjAAAUcrhJ+SgOLIUFfz2sHf9s35P4TUoQHOKpcB5hTOXMwP/wThacK Mg0OxW9ok8ioQZdnNkWjlMsOh8ka X-Google-Smtp-Source: APXvYqy2cELqAl2WLJR9yHpAjJ/XI+4Di9cjrZg9mcwzhlGWndpqsG8TguCwVprLnC3+cboH1uOnXg== X-Received: by 2002:a1c:6a07:: with SMTP id f7mr312441wmc.171.1578513648464; Wed, 08 Jan 2020 12:00:48 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 13/17] tests/boot_linux_console: Add a quick test for the OrangePi PC board Date: Wed, 8 Jan 2020 21:00:16 +0100 Message-Id: <20200108200020.4745-14-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This test boots a Linux kernel on a OrangePi PC board and verify the serial output is working. The kernel image and DeviceTree blob are built by the Armbian project (based on Debian): https://www.armbian.com/orange-pi-pc/ If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags. Alternatively, this test can be run using: $ make check-venv $ ./tests/venv/bin/avocado --show=3Dconsole,app run -t machine:orangepi-p= c tests/acceptance/boot_linux_console.py JOB ID : 2e4d15eceb13c33672af406f08171e6e9de1414a JOB LOG : ~/job-results/job-2019-12-17T05.46-2e4d15e/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_or= angepi: console: Uncompressing Linux... done, booting the kernel. console: Booting Linux on physical CPU 0x0 console: Linux version 4.20.7-sunxi (root@armbian.com) (gcc version 7.2.1= 20171011 (Linaro GCC 7.2-2017.11)) #5.75 SMP Fri Feb 8 09:02:10 CET 2019 console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=3D50c5387d console: CPU: div instructions available: patching division code console: CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instructi= on cache console: OF: fdt: Machine model: Xunlong Orange Pi PC console: Memory policy: Data cache writealloc console: OF: reserved mem: failed to allocate memory for node 'cma@4a0000= 00' console: cma: Failed to reserve 128 MiB console: psci: probing for conduit method from DT. console: psci: PSCIv0.2 detected in firmware. console: psci: Using standard PSCI v0.2 function IDs console: psci: Trusted OS migration not required console: random: get_random_bytes called from start_kernel+0x8d/0x3c2 wit= h crng_init=3D0 console: percpu: Embedded 18 pages/cpu @(ptrval) s41228 r8192 d24308 u737= 28 console: Built 1 zonelists, mobility grouping on. Total pages: 32480 console: Kernel command line: printk.time=3D0 console=3DttyS0,115200 PASS (8.59 s) JOB TIME : 8.81 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 [NL: rename in commit message Raspbian to Armbian] Signed-off-by: Niek Linnenbank --- tests/acceptance/boot_linux_console.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 9c6aa2040a..b58308d724 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -400,6 +400,32 @@ class BootLinuxConsole(Test): self.wait_for_console_pattern('Boot successful.') # TODO user command, for now the uart is stuck =20 + def test_arm_orangepi(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + """ + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') + deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-4.20.7-sunxi') + dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + + self.vm.set_machine('orangepi-pc') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200n8 ' + 'earlycon=3Duart,mmio32,0x1c28000') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern) + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514574; cv=none; d=zohomail.com; s=zohoarc; b=TsHoi42NTbWSm4Xuxtvb2bLMMp/I8JyeOd1jA68AbYVwv71ZlvJ4b8OtqdsNcrTMvWj0Yxz/cmrK/GXYFLz9Gi2tozBb1f7+yWyNoncYV/L3WOZs5dhpODzzK2OLcXJnjO74C52uwkFmnrz8g0s/YJTP7Yo1BhnzOjv6OhZQBZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514574; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=euLzln6uXXqTjwugSbBf1Qq5DB3lqK+zofvchURbMRQ=; b=lD7Azx78ULkqcTwwsYEqQFtbp8Zy3ZJldlj2khSPq8gZ0lfAb7HShnUjLNQanTDS5zpH2jyuyC6jOQWZt/ijyqVHgWOLNIK5djkNJHNSwM/kV3LsTa0HXnxY8HnrZCl7dS+15Dc36VlSGU2BmbiXsFpHvLmvrfG/mu9DUu+95K8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514574567775.6300986480185; Wed, 8 Jan 2020 12:16:14 -0800 (PST) Received: from localhost ([::1]:48912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHkS-0004qw-K8 for importer@patchew.org; Wed, 08 Jan 2020 15:16:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35656) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVd-0001T7-St for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVb-0002h0-1Y for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:53 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVa-0002fy-Oh; Wed, 08 Jan 2020 15:00:50 -0500 Received: by mail-wm1-x331.google.com with SMTP id a5so257115wmb.0; Wed, 08 Jan 2020 12:00:50 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=euLzln6uXXqTjwugSbBf1Qq5DB3lqK+zofvchURbMRQ=; b=Laais0Wne3qC55b4FXeLYwn1KMwe2duBpYHjP+eHZmrsLO1hdJoUZ4AoH8UzFjjIM/ hfp6hUniyFpexMzdP6vKDOvhg5Dq37BViGYwrJ3WvUcKgbzsDx3UUXLcYDFyGxH9Ov7C 1pbXBxrI8mUPjP9cTk82wqND3TE+rD5oTVFg0hSUrl+Je9EXn5bctp6lyCcYixoV1qkC oq0tTEJ6cfqY2LEsdPQtRfxhOU6YhwEJ/2KFkz/DDE49O8Rl9HhDOduplDuEIAH7G4wp DcPNFdqg+t/QgbOgrgIa9pl48L9VoYwv5+7TB+fkgWWB8/xdnNCVHzbacoNnIJcGGkR/ iO2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=euLzln6uXXqTjwugSbBf1Qq5DB3lqK+zofvchURbMRQ=; b=DXi6uzYjQOGoan2s2Qw90qNoRo4bLVVGkTTAOxTnY+3clX6LAsHJz1XwW9lhMlZ2tQ eOkMOZ+zJLMRQpV3TXN9LlBHW7XZt1X4R/ljZRVW2+ioirErFnnm4A7KLjlXdVJsdI7E sCb9bGPC5Ge5tyVf+fnv6ejxruQ3LQm2pk+j2SW8vvCVCDH3SDg/266uwZwEdzwckvl1 LDKazRXUCwiLEHAwAIq+LEzoojSkLX1R/N9tZ5VK/eSonMOrL2wmNpIMxkzV518D+EPG uOCj9ebfIb23ljqL2tgZ2RWHCdtQmoN1yGTesb5u2IPfaCdh/DcWMiCLeDFKskA6IdCm BlPg== X-Gm-Message-State: APjAAAXRE3JAZw9iFiVEtQLEJGwYR3uiJUGCmjlc88zeiFsIfpzQgGTu hzBEVup8mq+xIsODx0UIo6hWZyYx X-Google-Smtp-Source: APXvYqyjAAWdWcSW2Ric9E41n2Fdz82ao4OD2CWsQq9d993yzcWRw6OvaQtO1wt4DTZebl6V5y6FtQ== X-Received: by 2002:a1c:1f56:: with SMTP id f83mr329216wmf.93.1578513649291; Wed, 08 Jan 2020 12:00:49 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 14/17] tests/boot_linux_console: Add initrd test for the Orange Pi PC board Date: Wed, 8 Jan 2020 21:00:17 +0100 Message-Id: <20200108200020.4745-15-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This test boots a Linux kernel on a OrangePi PC board and verify the serial output is working. The kernel image and DeviceTree blob are built by the Armbian project (based on Debian): https://www.armbian.com/orange-pi-pc/ The cpio image used comes from the linux-build-test project: https://github.com/groeck/linux-build-test If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags. Alternatively, this test can be run using: $ avocado --show=3Dconsole run -t machine:orangepi-pc tests/acceptance/bo= ot_linux_console.py console: Uncompressing Linux... done, booting the kernel. console: Booting Linux on physical CPU 0x0 console: Linux version 4.20.7-sunxi (root@armbian.com) (gcc version 7.2.1= 20171011 (Linaro GCC 7.2-2017.11)) #5.75 SMP Fri Feb 8 09:02:10 CET 2019 console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=3D50c5387d console: CPU: div instructions available: patching division code console: CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instructi= on cache console: OF: fdt: Machine model: Xunlong Orange Pi PC [...] console: Trying to unpack rootfs image as initramfs... console: Freeing initrd memory: 3256K console: Freeing unused kernel memory: 1024K console: Run /init as init process console: mount: mounting devtmpfs on /dev failed: Device or resource busy console: Starting logging: OK console: Initializing random number generator... random: dd: uninitialize= d urandom read (512 bytes read) console: done. console: Starting network: OK console: Found console ttyS0 console: Linux version 4.20.7-sunxi (root@armbian.com) (gcc version 7.2.1= 20171011 (Linaro GCC 7.2-2017.11)) #5.75 SMP Fri Feb 8 09:02:10 CET 2019 console: Boot successful. console: cat /proc/cpuinfo console: / # cat /proc/cpuinfo console: processor : 0 console: model name : ARMv7 Processor rev 5 (v7l) console: BogoMIPS : 125.00 console: Features : half thumb fastmult vfp edsp neon vfpv3 tls vfp= v4 idiva idivt vfpd32 lpae evtstrm console: CPU implementer : 0x41 console: CPU architecture: 7 console: CPU variant : 0x0 console: CPU part : 0xc07 console: CPU revision : 5 [...] console: processor : 3 console: model name : ARMv7 Processor rev 5 (v7l) console: BogoMIPS : 125.00 console: Features : half thumb fastmult vfp edsp neon vfpv3 tls vfp= v4 idiva idivt vfpd32 lpae evtstrm console: CPU implementer : 0x41 console: CPU architecture: 7 console: CPU variant : 0x0 console: CPU part : 0xc07 console: CPU revision : 5 console: Hardware : Allwinner sun8i Family console: Revision : 0000 console: Serial : 0000000000000000 console: cat /proc/iomem console: / # cat /proc/iomem console: 01000000-010fffff : clock@1000000 console: 01c00000-01c00fff : system-control@1c00000 console: 01c02000-01c02fff : dma-controller@1c02000 [...] console: reboot console: / # reboot console: / # Found console ttyS0 console: Stopping network: OK console: hrtimer: interrupt took 21852064 ns console: Saving random seed... random: dd: uninitialized urandom read (51= 2 bytes read) console: done. console: Stopping logging: OK console: umount: devtmpfs busy - remounted read-only console: umount: can't unmount /: Invalid argument console: The system is going down NOW! console: Sent SIGTERM to all processes console: Sent SIGKILL to all processes console: Requesting system reboot console: reboot: Restarting system PASS (48.32 s) JOB TIME : 49.16 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 [NL: rename in commit message Raspbian to Armbian] Signed-off-by: Niek Linnenbank --- tests/acceptance/boot_linux_console.py | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index b58308d724..eeab4fa62a 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -426,6 +426,47 @@ class BootLinuxConsole(Test): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def test_arm_orangepi_initrd(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + """ + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') + deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-4.20.7-sunxi') + dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' + '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' + 'arm/rootfs-armv7a.cpio.gz') + initrd_hash =3D '604b2e45cdf35045846b8bbfbf2129b1891bdc9c' + initrd_path_gz =3D self.fetch_asset(initrd_url, asset_hash=3Dinitr= d_hash) + initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio') + archive.gzip_uncompress(initrd_path_gz, initrd_path) + + self.vm.set_machine('orangepi-pc') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('Boot successful.') + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', + 'system-control@1c00000') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514717; cv=none; d=zohomail.com; s=zohoarc; b=Z5sz7vp8emGfbIlP04m6kHb7Ygi6Stp/Pe0JXZoNNSaYgDktdd5uO/OwmYMzwLhPrCt1thUExfzzDSYeEsAlrSoAk01nSC55u7RTYKYJIfepSbo5uOntzXLr9KuYGrVhFvPMV60hgT/AieljtKycaYZcDOUuNPRummc0NlmNH3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514717; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/o4bDn3dx+hvLpJNubHBy3g8/kBOKMigvDbQowCoNJI=; b=N9V8uFFrnEXaz/KLiKQb4KML5i2D91lifs3PaIk9yOcclb8bMHfA9MCQlI/btmmfZiw1F3kUxrPFk0rGiDRU2eDGylu0ogAr2TbpBPAAQlkTnrOk0nX6rMGR8l4nQJwgmnPCN8Ttz2i+oEgcpLotlFrHLU8TCovYqN4NKeyERDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514717927196.49890884424087; Wed, 8 Jan 2020 12:18:37 -0800 (PST) Received: from localhost ([::1]:48940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHmm-0007hQ-LA for importer@patchew.org; Wed, 08 Jan 2020 15:18:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35682) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVe-0001U2-OB for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVc-0002iC-0R for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:54 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36942) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVb-0002h5-P4; Wed, 08 Jan 2020 15:00:51 -0500 Received: by mail-wm1-x344.google.com with SMTP id f129so223058wmf.2; Wed, 08 Jan 2020 12:00:51 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/o4bDn3dx+hvLpJNubHBy3g8/kBOKMigvDbQowCoNJI=; b=ThQeaFGe9J0v0sdaKlhaToTQuzjLxJqbSrnIQAHGMl2G4+i7w1UDNcjYZ0kFn+9HSg vvvy0Jvcy/KE9+1MWtf8BgSG25tbeAyuMIduk3INwyWb/kaE/IszgxAztZyjL3EO/xLx OT6+itXYNdh4SLJ3Z6Tc9eStrNmE3hSfAZgET9lUHjJomPwU5Y2yrOd21kSVvFIWY5Qu vyY5zjDIyBe3Xgkm3Rq/mnY4Y4/fMmRvU3hWJz+YQqkACRizyOjgTEZL4N33KtP/3yCI 4BxYDrvAQm5b/BR3XCMrbhAXF2d0h6ye19eCNYNC4QKYlZKRJIb5FmmqgjB6c80j/PGK WBQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/o4bDn3dx+hvLpJNubHBy3g8/kBOKMigvDbQowCoNJI=; b=TsLE7ieLyNET/p9Qayn0n13nrtC25x0EzloUkghAwRqdiD+wwyavp+tb+MhVcQbbpe X0z39BaucLnZ8X0M1+sPd8UMR0dHF/JGx98dh5EnT5h4fEEnWfzazgVCRB3nDet6rs7B wEfI1+KoPmHxggVY1lBosZ2JLzV25ZSTfFd76AW8QNmjb5S0BTMhI6qcldlOjNiMwq1v 1p2BIJKGtrF5bd83SqQAkYQGJLPlP8h69pCG5LGG69XN4GzHyMujSdML52E40Rn8CykV ln1EJJomBRq4EjY1OMbbZ42F07+aBSNBRcmfb49uH71YiQELtcrllto2tVmYg7AiCvW4 b7aw== X-Gm-Message-State: APjAAAVEoHV+zg68Ry/NLHPphpqoERRADCPrh2FWj6f8p6v4/IVkdH/X I3m9oPJ6sr55fxGm9wBaWrCDmbe0 X-Google-Smtp-Source: APXvYqzQcDkdnF090Iw3/QXyFjZEXXsbk645gCs54mZqgnjgpzVb9EOi7vKqF6HI/k0GLvD9Kh25SA== X-Received: by 2002:a1c:1f51:: with SMTP id f78mr357854wmf.60.1578513650402; Wed, 08 Jan 2020 12:00:50 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 15/17] tests/boot_linux_console: Add a SD card test for the OrangePi PC board Date: Wed, 8 Jan 2020 21:00:18 +0100 Message-Id: <20200108200020.4745-16-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The kernel image and DeviceTree blob are built by the Armbian project (based on Debian): https://www.armbian.com/orange-pi-pc/ The SD image is from the kernelci.org project: https://kernelci.org/faq/#the-code If ARM is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:arm" tags. Alternatively, this test can be run using: $ avocado --show=3Dconsole run -t machine:orangepi-pc tests/acceptance/bo= ot_linux_console.py console: Uncompressing Linux... done, booting the kernel. console: Booting Linux on physical CPU 0x0 console: Linux version 4.20.7-sunxi (root@armbian.com) (gcc version 7.2.1= 20171011 (Linaro GCC 7.2-2017.11)) #5.75 SMP Fri Feb 8 09:02:10 CET 2019 console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=3D50c5387d [...] console: sunxi-wdt 1c20ca0.watchdog: Watchdog enabled (timeout=3D16 sec, = nowayout=3D0) console: sunxi-mmc 1c0f000.mmc: Linked as a consumer to regulator.2 console: sunxi-mmc 1c0f000.mmc: Got CD GPIO console: ledtrig-cpu: registered to indicate activity on CPUs console: hidraw: raw HID events driver (C) Jiri Kosina console: usbcore: registered new interface driver usbhid console: usbhid: USB HID core driver console: Initializing XFRM netlink socket console: sunxi-mmc 1c0f000.mmc: initialized, max. request size: 16384 KB console: NET: Registered protocol family 10 console: mmc0: host does not support reading read-only switch, assuming w= rite-enable console: mmc0: Problem switching card into high-speed mode! console: mmc0: new SD card at address 4567 console: mmcblk0: mmc0:4567 QEMU! 60.0 MiB [...] console: EXT4-fs (mmcblk0): mounting ext2 file system using the ext4 subs= ystem console: EXT4-fs (mmcblk0): mounted filesystem without journal. Opts: (nu= ll) console: VFS: Mounted root (ext2 filesystem) on device 179:0. console: Run /sbin/init as init process console: EXT4-fs (mmcblk0): re-mounted. Opts: block_validity,barrier,user= _xattr,acl console: Starting syslogd: OK console: Starting klogd: OK console: Populating /dev using udev: udevd[203]: starting version 3.2.7 console: /bin/sh: can't access tty; job control turned off console: cat /proc/partitions console: / # cat /proc/partitions console: major minor #blocks name console: 1 0 4096 ram0 console: 1 1 4096 ram1 console: 1 2 4096 ram2 console: 1 3 4096 ram3 console: 179 0 61440 mmcblk0 console: reboot console: / # reboot console: umount: devtmpfs busy - remounted read-only console: EXT4-fs (mmcblk0): re-mounted. Opts: (null) console: The system is going down NOW! console: Sent SIGTERM to all processes console: Sent SIGKILL to all processes console: Requesting system reboot console: reboot: Restarting system JOB TIME : 68.64 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 [NL: rename in commit message Raspbian to Armbian] Signed-off-by: Niek Linnenbank --- tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index eeab4fa62a..d663106694 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -467,6 +467,48 @@ class BootLinuxConsole(Test): exec_command_and_wait_for_pattern(self, 'reboot', 'reboot: Restarting system= ') =20 + def test_arm_orangepi_sd(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + """ + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') + deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-4.20.7-sunxi') + dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' + 'kci-2019.02/armel/base/rootfs.ext2.xz') + rootfs_hash =3D '692510cb625efda31640d1de0a8d60e26040f061' + rootfs_path_xz =3D self.fetch_asset(rootfs_url, asset_hash=3Drootf= s_hash) + rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') + archive.lzma_uncompress(rootfs_path_xz, rootfs_path) + + self.vm.set_machine('orangepi-pc') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'root=3D/dev/mmcblk0 rootwait rw ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-drive', 'file=3D' + rootfs_path + ',if=3Dsd,for= mat=3Draw', + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + shell_ready =3D "/bin/sh: can't access tty; job control turned off" + self.wait_for_console_pattern(shell_ready) + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', + 'mmcblk0') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514078; cv=none; d=zohomail.com; s=zohoarc; b=mP6iBIcZQxucstArcE8kdypQhLZQTvIzKTgkJrzSqWgyxmTlEYVkHbJeevo8kwNTNkzaWj+CMfPiMI/pHBAhIqfeKseQiCD2wwKWJXzvIFvOTy5RgezQbpocPFjrp1on8l/6MGmFWyc9AoOM2MA7It0UqFFdSDjinlo6nHZxJBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514078; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=abuJiz5zWdyJ/CxH78fn4z3ySkdVr9/Q8yCzhfi86YQ=; b=FJcPL98QdQ1TVpvSn4btffCoPpweH1SkrG2YxNzRiX3sxxt45zX+FyliksdvFwf+YBzRPwVXv2QHg18FltbPOU9i+pIQNAfO6uY5lgZBBQ2A/q0W4JirRMj/jUEbOffGOIUsUFVduT+dBIf2Di7m0wxMu7fYi/MQteF6Oqc0Kjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514078361197.97153342274873; Wed, 8 Jan 2020 12:07:58 -0800 (PST) Received: from localhost ([::1]:48742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHcS-0000pW-T2 for importer@patchew.org; Wed, 08 Jan 2020 15:07:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35709) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVf-0001VC-HW for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVc-0002jL-N7 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:55 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVc-0002hu-EN; Wed, 08 Jan 2020 15:00:52 -0500 Received: by mail-wm1-x341.google.com with SMTP id u2so216605wmc.3; Wed, 08 Jan 2020 12:00:52 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abuJiz5zWdyJ/CxH78fn4z3ySkdVr9/Q8yCzhfi86YQ=; b=I2fE1rPW3S7z7nR945NS6ioIxTUgLlg2rgkZqmqCWrsz3CrF19sl89zVrvGGpvXF2G FrPLgootpR4McDaX51gzzH/q/n3zzSDBU1NwVE9M8zAX6c0PQluTaIhsMeosz/BJw++q YXZycPS0iT7ImVUTsZ4TOlD81AtEYyCPcStrJxv3HVvsXsUtAEqbJqW9X7SSE9J5wrzq XvnHTjWNV3ZVbIAMS72wPrWunc1ZbEiwzQFv7NM0dHAp9gdhsAnh0Dq+PWwYKpC/jJ6/ 1kvMxLmI5TnuCKCX5CYueguWW8oo48PXbBY/7x3qi4F6DJnE6jnbHMz19S6UHjM7LuVF ZAug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=abuJiz5zWdyJ/CxH78fn4z3ySkdVr9/Q8yCzhfi86YQ=; b=FbHRYEiMJ8Kg5scrZ+zzWQKMCYhkSmJ8vRPbuxcct4smEaiOEIuy2CHiIvd/UV8QiN bKLwDv1JR/TjJXGi1WX7/XSjgv23XF8OYhHemgYuTZTKAT2nOsFTbFWCDz2gFvDDhuhK FW/VMCs2z/GiPDM/vYFP6JLwNAVFbxKB2hNzhbmuI6SpopYB459RPmgrCfb6w/QEygss EKgUAPifftcUiZT87s4Qdzx73GJSUKVEF3RyGANvf/g8551KIRj1KvRCP0K6Rb6Oz0Qg PzXOx9DG1/n0mxdEc7W3B5/CbQ+CGdjiLxROCqvI5uBPtTnGFdiiQy/lsoaw8lMuXj0C MMVA== X-Gm-Message-State: APjAAAXCszRMn7xI7+i4V7pHEZbgAfRUWQfRFGKjK5kydTiqiL7/s0Ta EIdG0kzeO2NTnBZrxcAYBX5fxpfq X-Google-Smtp-Source: APXvYqxxsx42BDNzIdi8HCWiY8PapnUsDGWamyiO9WYgw417TSeAk88JgJNaUNVvou505CSklTXxTw== X-Received: by 2002:a7b:c934:: with SMTP id h20mr316573wml.103.1578513651172; Wed, 08 Jan 2020 12:00:51 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 16/17] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC Date: Wed, 8 Jan 2020 21:00:19 +0100 Message-Id: <20200108200020.4745-17-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This test boots Ubuntu Bionic on a OrangePi PC board. As it requires 1GB of storage, and is slow, this test is disabled on automatic CI testing. It is useful for workstation testing. Currently Avocado timeouts too quickly, so we can't run userland commands. The kernel image and DeviceTree blob are built by the Armbian project (based on Debian): https://www.armbian.com/orange-pi-pc/ The Ubuntu image is downloaded from: https://dl.armbian.com/orangepipc/Bionic_current This test can be run using: $ AVOCADO_ALLOW_LARGE_STORAGE=3Dyes \ avocado --show=3Dapp,console run -t machine:orangepi-pc \ tests/acceptance/boot_linux_console.py console: U-Boot SPL 2019.04-armbian (Nov 18 2019 - 23:08:35 +0100) console: DRAM: 1024 MiB console: Failed to set core voltage! Can't set CPU frequency console: Trying to boot from MMC1 console: U-Boot 2019.04-armbian (Nov 18 2019 - 23:08:35 +0100) Allwinner = Technology console: CPU: Allwinner H3 (SUN8I 0000) console: Model: Xunlong Orange Pi PC console: DRAM: 1 GiB console: MMC: mmc@1c0f000: 0 [...] console: Uncompressing Linux... done, booting the kernel. console: Booting Linux on physical CPU 0x0 console: Linux version 5.3.9-sunxi (root@builder) (gcc version 8.3.0 (GNU= Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36))) #19.= 11.3 SMP Mon Nov 18 18:49:43 CET 2019 console: CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7), cr=3D50c5387d console: CPU: div instructions available: patching division code console: CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instructi= on cache console: OF: fdt: Machine model: Xunlong Orange Pi PC [...] console: EXT4-fs (mmcblk0p1): mounted filesystem with writeback data mode= . Opts: (null) console: done. console: Begin: Running /scripts/local-bottom ... done. console: Begin: Running /scripts/init-bottom ... done. console: systemd[1]: systemd 237 running in system mode. (...) console: systemd[1]: Detected architecture arm. console: Welcome to Ubuntu 18.04.3 LTS! console: systemd[1]: Set hostname to . Signed-off-by: Philippe Mathieu-Daud=C3=A9 [NL: rename in commit message Raspbian to Armbian] [NL: changed test to boot from SD card via BootROM] Signed-off-by: Niek Linnenbank --- tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index d663106694..55d0b8b036 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -509,6 +509,48 @@ class BootLinuxConsole(Test): exec_command_and_wait_for_pattern(self, 'reboot', 'reboot: Restarting system= ') =20 + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') + def test_arm_orangepi_bionic(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + """ + + # This test download a 196MB compressed image and expand it to 932= MB... + image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') + image_hash =3D '196a8ffb72b0123d92cea4a070894813d305c71e' + image_path_7z =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) + image_name =3D 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.im= g' + image_path =3D os.path.join(self.workdir, image_name) + process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) + + self.vm.set_machine('orangepi-pc') + self.vm.set_console() + self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', + '-nic', 'user', + '-no-reboot') + self.vm.launch() + + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'loglevel=3D7 ' + 'nosmp ' + 'systemd.default_timeout_start_sec=3D9000 ' + 'systemd.mask=3Darmbian-zram-config.service= ' + 'systemd.mask=3Darmbian-ramlog.service') + + self.wait_for_console_pattern('U-Boot SPL') + self.wait_for_console_pattern('Autoboot in ') + exec_command_and_wait_for_pattern(self, ' ', '=3D>') + exec_command_and_wait_for_pattern(self, "setenv extraargs '" + + kernel_command_line + "'",= '=3D>') + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + + self.wait_for_console_pattern('systemd[1]: Set hostname ' + + 'to ') + self.wait_for_console_pattern('Starting Load Kernel Modules...') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.17.1 From nobody Fri May 17 19:53:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578514820; cv=none; d=zohomail.com; s=zohoarc; b=PPnd0vpOEoDjcBld5aUO3FuzVGEUB7fL8xVJ+GYEiD+nN9yhJtBBh5kMFCxJLMgSufNkiePV0kqG8gMXTK/cjWbCcAyo44uhcalvsbhiD5bZhngkU0jLqr77/zVh/wTushgeXQIfWo6qx6S7OtbwWvbI2tlUkzyEOrD5iA+V/vo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578514820; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=FhZfMCx+hQAEMHoDM8nohY4Wa8xPj65mmIcDkIovQ1w=; b=P75WV8oZO5XMi1dasnqGlkCJPJQ6B6w7v17r64OXhgeY99SF+eUmo+5jKfuhVMT5LsyLDQcdw+3vyW4ucezFdLheKoN55z2mc54TF9jrWPCU7CIYOJAYsqsHbJYa3po+LUn9uyo6a2oqN6UNpF0qzdgHwntGJ46Ql9wMefj4mB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578514820446663.0942657566272; Wed, 8 Jan 2020 12:20:20 -0800 (PST) Received: from localhost ([::1]:48970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHoR-0001fk-3x for importer@patchew.org; Wed, 08 Jan 2020 15:20:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35721) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipHVf-0001VW-UH for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipHVd-0002kY-Lk for qemu-devel@nongnu.org; Wed, 08 Jan 2020 15:00:55 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipHVd-0002jP-Br; Wed, 08 Jan 2020 15:00:53 -0500 Received: by mail-wm1-x342.google.com with SMTP id m24so240131wmc.3; Wed, 08 Jan 2020 12:00:53 -0800 (PST) Received: from pavilion.home ([2a02:a456:6be8:1:8edc:d4ff:fe8b:18b7]) by smtp.gmail.com with ESMTPSA id u18sm4970099wrt.26.2020.01.08.12.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 12:00:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FhZfMCx+hQAEMHoDM8nohY4Wa8xPj65mmIcDkIovQ1w=; b=rXAp2NVjqEMOqRShOBpP+Qxlfp8sJCPPNf4IgvcCbAORtT7Jg0jxXbGS3yRHGRoqYq B4QRBXB35gPUo7fSGsJIH58lBYvKBF5DvL523peCNYzgZqMqy0ubFsfJyfF4BXH0feqf mDICXj3O9WATkYu1+1SHNoT1jJ7TfpP6odIwBHc1HjT8P60hsgDqqaRtROUGBQ+oJivt vQFoPS/Q/d+TpOhY6yB0AZO/0Dhf7KEvOsXn4MgkyFINOYqY6UTeUnObpaFjeyeGkuFg tCC3Duj/AR4/EB9cH0HkPkmBQuIZIk2mi5y1g62k7spUbWXJIMJRTj3MhUUtO4BI7zpn oMrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FhZfMCx+hQAEMHoDM8nohY4Wa8xPj65mmIcDkIovQ1w=; b=mttOoQdLjZjvyfP7VKZugj896B/UHNDq+9YzoMdwtoXLf018iBFrqSaOLXCUidDME9 fBw7qvnvEnbnsOt40DT0OHaHEY7yrNJPMtgknI6Sqei2enSB2P+kGGjTGiBYNDdjpgSp YTEMiodO5n8S+S32DJMiGTZop7u38SaNF3iQS3Dr+aKkSWbDO7KuSI8DT3fBxEstibiH C+a50mMhGrwCKRX23/K77ZBmNTicoKT/Vez6ESzt+HqoA6njqIbX7eGcU8BGaMipfjyG aLoGTqJJMfUViBJx8n9k0TyPUKrtASq/OUpD9uzWPa6IDPk8HGqoDBWIuLmYwdQ573sk z0yQ== X-Gm-Message-State: APjAAAUC2S9gMWUwltr0dBWdTWrDLCPTP6oPQ8LWjGKe24b3nKueOhR3 3z4BMchoOkhM8fk4lks34wP3n5DC X-Google-Smtp-Source: APXvYqyc1aNst1AOHX28WE3iWVNSD3fZpLWe/Fjq+O4ftRJ2yn2VYfOsJAXWH4C2AFOwJchP44VVwA== X-Received: by 2002:a7b:c38c:: with SMTP id s12mr366170wmj.96.1578513651937; Wed, 08 Jan 2020 12:00:51 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 17/17] docs: add Orange Pi PC document Date: Wed, 8 Jan 2020 21:00:20 +0100 Message-Id: <20200108200020.4745-18-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108200020.4745-1-nieklinnenbank@gmail.com> References: <20200108200020.4745-1-nieklinnenbank@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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: , Cc: peter.maydell@linaro.org, Niek Linnenbank , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Xunlong Orange Pi PC machine is a functional ARM machine based on the Allwinner H3 System-on-Chip. It supports mainline Linux, U-Boot, NetBSD and is covered by acceptance tests. This commit adds a documentation text file with a description of the machine and instructions for the user. Signed-off-by: Niek Linnenbank --- docs/orangepi.rst | 200 ++++++++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 201 insertions(+) create mode 100644 docs/orangepi.rst diff --git a/docs/orangepi.rst b/docs/orangepi.rst new file mode 100644 index 0000000000..5ac2a7b7cc --- /dev/null +++ b/docs/orangepi.rst @@ -0,0 +1,200 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D +Orange Pi PC Machine Type +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + +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. + +Supported devices +----------------- + +The Orange Pi PC machine type supports the following devices: + + * SMP (Quad Core Cortex A7) + * Generic Interrupt Controller configuration + * SRAM mappings + * SDRAM controller + * Real Time Clock + * Timer device (re-used from Allwinner A10) + * UART + * SD/MMC storage controller + * EMAC ethernet connectivity + * USB 2.0 interfaces + * Clock Control Unit + * System Control module + * Security Identifier device + +Limitations +----------- + +Currently, Orange Pi PC does *not* support the following features: + +- Graphical output via HDMI, GPU and/or the Display Engine +- Audio output +- Hardware Watchdog + +Also see the 'unimplemented' array in the Allwinner H3 SoC module +for a complete list of unimplemented I/O devices: + ./hw/arm/allwinner-h3.c + +Using the Orange Pi PC machine type +----------------------------------- + +Boot options +~~~~~~~~~~~~ + +The Orange Pi PC machine can start using the standard -kernel functionality +for loading a Linux kernel or ELF executable. Additionally, the Orange Pi = PC +machine can also emulate the BootROM which is present on an actual Allwinn= er H3 +based SoC, which loads the bootloader from SD card, specified via the -sd = argument +to qemu-system-arm. + +Running mainline Linux +~~~~~~~~~~~~~~~~~~~~~~ + +Recently released mainline Linux kernels from 4.19 up to latest master +are known to work. To build a Linux mainline kernel that can be booted +by the Orange Pi PC machine, simply configure the kernel using the +sunxi_defconfig configuration: + + $ ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabi- make mrproper + $ ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabi- make sunxi_defconfig + +To be able to use USB storage, you need to manually enable the correspondi= ng +configuration item. Start the kconfig configuration tool: + + $ ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabi- make menuconfig + +Navigate to the following item, enable it and save your configuration: + + Device Drivers > USB support > USB Mass Storage support + +Build the Linux kernel with: + + $ ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabi- make -j5 + +To boot the newly build linux kernel in QEMU with the Orange Pi PC machine= , use: + + $ qemu-system-arm -M orangepi-pc -nic user -nographic \ + -kernel /path/to/linux/arch/arm/boot/zImage \ + -append 'console=3DttyS0,115200' \ + -dtb /path/to/linux/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dtb + +Orange Pi PC images +~~~~~~~~~~~~~~~~~~~ + +Note that the mainline kernel does not have a root filesystem. You may pro= vide it +with an official Orange Pi PC image from the official website: + + http://www.orangepi.org/downloadresources/ + +Another possibility is to run an Armbian image for Orange Pi PC which +can be downloaded from: + + https://www.armbian.com/orange-pi-pc/ + +Alternatively, you can also choose to build you own image with buildroot +using the orangepi_pc_defconfig. Also see https://buildroot.org for more i= nformation. + +You can choose to attach the selected image either as an SD card or as USB= mass storage. +For example, to boot using the Orange Pi PC Debian image on SD card, simpl= y add the -sd +argument and provide the proper root=3D kernel parameter: + + $ qemu-system-arm -M orangepi-pc -nic user -nographic \ + -kernel /path/to/linux/arch/arm/boot/zImage \ + -append 'console=3DttyS0,115200 root=3D/dev/mmcblk0p2' \ + -dtb /path/to/linux/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dtb \ + -sd OrangePi_pc_debian_stretch_server_linux5.3.5_v1.0.img + +To attach the image as an USB mass storage device to the machine, +simply append to the command: + + -drive if=3Dnone,id=3Dstick,file=3Dmyimage.img \ + -device usb-storage,bus=3Dusb-bus.0,drive=3Dstick + +Instead of providing a custom Linux kernel via the -kernel command you may= also +choose to let the Orange Pi PC machine load the bootloader from SD card, j= ust like +a real board would do using the BootROM. Simply pass the selected image vi= a the -sd +argument and remove the -kernel, -append, -dbt and -initrd arguments: + + $ qemu-system-arm -M orangepi-pc -nic user -nographic \ + -sd Armbian_19.11.3_Orangepipc_buster_current_5.3.9.img + +Note that both the official Orange Pi PC images and Armbian images start +a lot of userland programs via systemd. Depending on the host hardware and= OS, +they may be slow to emulate, especially due to emulating the 4 cores. +To help reduce the performance slow down due to emulating the 4 cores, you= can +give the following kernel parameters (or via -append): + + =3D> setenv extraargs 'systemd.default_timeout_start_sec=3D9000 loglevel= =3D7 nosmp console=3DttyS0,115200' + +Running U-Boot +~~~~~~~~~~~~~~ + +U-Boot mainline can be build and configured using the orangepi_pc_defconfig +using similar commands as describe above for Linux. Note that it is recomm= ended +for development/testing to select the following configuration setting in U= -Boot: + + Device Tree Control > Provider for DTB for DT Control > Embedded DTB + +To start U-Boot using the Orange Pi PC machine, provide the +u-boot binary to the -kernel argument: + + $ qemu-system-arm -M orangepi-pc -nic user -nographic \ + -kernel /path/to/uboot/u-boot -sd disk.img + +Use the following U-boot commands to load and boot a Linux kernel from SD = card: + + -> setenv bootargs console=3DttyS0,115200 + -> ext2load mmc 0 0x42000000 zImage + -> ext2load mmc 0 0x43000000 sun8i-h3-orangepi-pc.dtb + -> bootz 0x42000000 - 0x43000000 + +Running NetBSD +~~~~~~~~~~~~~~ + +The NetBSD operating system also includes support for Allwinner H3 based b= oards, +including the Orange Pi PC. NetBSD 9.0 is known to work best for the Orang= e Pi PC +board and provides a fully working system with serial console, networking = and storage. + +Currently NetBSD 9.0 is in testing, but release candidate 1 can be started +successfully on the Orange Pi PC machine. Get the 'evbarm-earmv7hf' based = image from: + + https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0_RC1/evbarm-earmv7hf/binary/= gzimg/armv7.img.gz + +The image requires manually installing U-Boot in the image. Build U-Boot w= ith +the orangepi_pc_defconfig configuration as described in the previous secti= on. +Next, unzip the NetBSD image and write the U-Boot binary including SPL usi= ng: + + $ gunzip armv7.img.gz + $ dd if=3D/path/to/u-boot-sunxi-with-spl.bin of=3Darmv7.img bs=3D1024 se= ek=3D8 conv=3Dnotrunc + +Start the machine using the following command: + + $ qemu-system-arm -M orangepi-pc -nic user -nographic \ + -sd armv7.img + +At the U-Boot stage, interrupt the automatic boot process by pressing a key +and set the following environment variables before booting: + + =3D> setenv bootargs root=3Dld0a + =3D> setenv kernel netbsd-GENERIC.ub + =3D> setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb + =3D> setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r} ${kernel}; fatload= mmc 0:1 ${fdt_addr_r} ${fdtfile}; fdt addr ${fdt_addr_r}; bootm ${kernel_a= ddr_r} - ${fdt_addr_r}' + +Optionally you may save the environment variables to SD card with 'saveenv= '. +To continue booting simply give the 'boot' command and NetBSD boots. + +Orange Pi PC acceptance tests +----------------------------- + +The Orange Pi PC machine has several acceptance tests included. +To run the whole set of tests, build QEMU from source and simply +provide the following command: + + $ AVOCADO_ALLOW_LARGE_STORAGE=3Dyes avocado --show=3Dapp,console run \ + -t machine:orangepi-pc tests/acceptance/boot_linux_console.py + diff --git a/MAINTAINERS b/MAINTAINERS index 6e1b92b5fa..b52ac2fb9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -488,6 +488,7 @@ S: Maintained F: hw/*/allwinner-h3* F: include/hw/*/allwinner-h3* F: hw/arm/orangepi.c +F: docs/orangepi.rst =20 ARM PrimeCell and CMSDK devices M: Peter Maydell --=20 2.17.1