From nobody Fri May 17 11:05:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895429; cv=none; d=zohomail.com; s=zohoarc; b=LcmbMFBYwyhO3Q1VBM87YqDYOpdRt+6HtvUhfljvWePEV2Nm+VO9SiItJkDGuk3A1crceMJRYhRMuq95wVVgIMWjFNLv5ZW9G5VEm+T/4Jo5CKwibPT5IIeDAqQPvi1uGUvxZVdgBR8ZXrzuOTq/H3YptG6LYRSATBaipSA1Btg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895429; h=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=ug8gf36sQ1wZFHX/VeV63ZR5tgvxid1GuQO3/Y3GAfo=; b=mgievyUFIFOBMEdpL+2OjMq9F/igZeVJvqGeewIumd4nCoBRJ3TSgk8mgRviCQEHGWopybdn4/qFbcJB7x5p4nbItDjnJ/OTJxVBsWjM/dvfSohDJO9toSAcNht6QbRmsp18gc3cWe0O1OwgoZmmfOLxnWW5g4cLdYB2m7D4VUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614895429307554.392468235195; Thu, 4 Mar 2021 14:03:49 -0800 (PST) Received: from localhost ([::1]:37230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHw4S-00060i-6a for importer@patchew.org; Thu, 04 Mar 2021 17:03:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw2A-00048x-8q for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:26 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw27-00013i-JS for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:26 -0500 Received: from localhost.localdomain ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQy0N-1l625L2DkF-00O2W2; Thu, 04 Mar 2021 23:01:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] char: add goldfish-tty Date: Thu, 4 Mar 2021 23:01:00 +0100 Message-Id: <20210304220104.2574112-2-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304220104.2574112-1-laurent@vivier.eu> References: <20210304220104.2574112-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6sb6N36O6k3ySX9oRKfd626f7Jv/sd82o6cmuBShU92M3sZmczm 9cJbPdLaDixNWe8xqWjRh0DDuffSCTi8nDyK1jjymZvy5HABCt2oNFyWqYOfWEFRViTbdQA wxldXBjqQmCmATn7aAvu7bCsBW/f74X74Y3jV8J2j1NRTYovg3TcG3XAJjsVZl6s5cfcDaF 6VleHfFhA6XHVUMw1kqUA== X-UI-Out-Filterresults: notjunk:1;V03:K0:lc7n8xLTR7Q=:/V8vXYRpuwPkCWrwvgHd86 airDHk5yZb0Y5EHY15SVisj0yt4XorLQ/hq5M6nELGrdgJo0Y54kQdZCEuuLih8K8Gs0ziMpr 6p4HXaGrqWaR77Q5a8gN61Ktl+nDNB+QWuGPe/1CvoY2xofzWAl3KYpdLsCjXafnIp/hATecr lTmOgBmr501IIuJZlGdALIk53YCccxI/aA0GILzkJy5Qv+ah/wpUnuOlreLE3VnEjSK9nNsaU 8amEicVVPAv34MzDjhPVvqMQhGK13QD/MSKWAs1jz3NiX7HGwFfbYixC4xBZB4MBPLU79kFJL bmlIdXyKTrxij/mxhofIXVPvTwhmRrA2myPJDOaYWRFUVFxAYtbQGAaRm+iwqWuvsqLXYkW3K 7GPGe154hgl1Gz3EOxEWoda1DprFAoCM9Bu0WgEvVpsu27iEOoJtWhlYqWxdXO0xpBv4PmIM+ 8A9AL+p0Ng== 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; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Implement the goldfish tty device as defined in https://android.googlesource.com/platform/external/qemu/+/master/docs/GOLDF= ISH-VIRTUAL-HARDWARE.TXT and based on the kernel driver code: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/dri= vers/tty/goldfish.c Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- include/hw/char/goldfish_tty.h | 36 +++++ hw/char/goldfish_tty.c | 266 +++++++++++++++++++++++++++++++++ hw/char/Kconfig | 3 + hw/char/meson.build | 2 + hw/char/trace-events | 9 ++ 5 files changed, 316 insertions(+) create mode 100644 include/hw/char/goldfish_tty.h create mode 100644 hw/char/goldfish_tty.c diff --git a/include/hw/char/goldfish_tty.h b/include/hw/char/goldfish_tty.h new file mode 100644 index 000000000000..84d78f8cff54 --- /dev/null +++ b/include/hw/char/goldfish_tty.h @@ -0,0 +1,36 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Goldfish TTY + * + * (c) 2020 Laurent Vivier + * + */ + +#ifndef HW_CHAR_GOLDFISH_TTY_H +#define HW_CHAR_GOLDFISH_TTY_H + +#include "chardev/char-fe.h" + +#define TYPE_GOLDFISH_TTY "goldfish_tty" +OBJECT_DECLARE_SIMPLE_TYPE(GoldfishTTYState, GOLDFISH_TTY) + +#define GOLFISH_TTY_BUFFER_SIZE 128 + +struct GoldfishTTYState { + SysBusDevice parent_obj; + + MemoryRegion iomem; + qemu_irq irq; + CharBackend chr; + + uint32_t data_len; + uint64_t data_ptr; + bool int_enabled; + + uint32_t data_in_count; + uint8_t data_in[GOLFISH_TTY_BUFFER_SIZE]; + uint8_t data_out[GOLFISH_TTY_BUFFER_SIZE]; +}; + +#endif diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c new file mode 100644 index 000000000000..73d9cfd0e10e --- /dev/null +++ b/hw/char/goldfish_tty.c @@ -0,0 +1,266 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Goldfish TTY + * + * (c) 2020 Laurent Vivier + * + */ + +#include "qemu/osdep.h" +#include "hw/irq.h" +#include "hw/qdev-properties-system.h" +#include "hw/sysbus.h" +#include "migration/vmstate.h" +#include "chardev/char-fe.h" +#include "qemu/log.h" +#include "trace.h" +#include "exec/address-spaces.h" +#include "hw/char/goldfish_tty.h" + +/* registers */ + +enum { + REG_PUT_CHAR =3D 0x00, + REG_BYTES_READY =3D 0x04, + REG_CMD =3D 0x08, + REG_DATA_PTR =3D 0x10, + REG_DATA_LEN =3D 0x14, + REG_DATA_PTR_HIGH =3D 0x18, + REG_VERSION =3D 0x20, +}; + +/* commands */ + +enum { + CMD_INT_DISABLE =3D 0x00, + CMD_INT_ENABLE =3D 0x01, + CMD_WRITE_BUFFER =3D 0x02, + CMD_READ_BUFFER =3D 0x03, +}; + +static uint64_t goldfish_tty_read(void *opaque, hwaddr addr, + unsigned size) +{ + GoldfishTTYState *s =3D opaque; + uint64_t value =3D 0; + + switch (addr) { + case REG_BYTES_READY: + value =3D s->data_in_count; + break; + case REG_VERSION: + value =3D 0; + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register read 0x%02"HWADDR_PRIx"\= n", + __func__, addr); + break; + } + + trace_goldfish_tty_read(s, addr, size, value); + + return value; +} + +static void goldfish_tty_cmd(GoldfishTTYState *s, uint32_t cmd) +{ + int to_copy; + + switch (cmd) { + case CMD_INT_DISABLE: + if (s->int_enabled) { + if (s->data_in_count) { + qemu_set_irq(s->irq, 0); + } + s->int_enabled =3D false; + } + break; + case CMD_INT_ENABLE: + if (!s->int_enabled) { + if (s->data_in_count) { + qemu_set_irq(s->irq, 1); + } + s->int_enabled =3D true; + } + break; + case CMD_WRITE_BUFFER: + to_copy =3D s->data_len; + while (to_copy) { + int len; + + len =3D MIN(GOLFISH_TTY_BUFFER_SIZE, to_copy); + + address_space_rw(&address_space_memory, s->data_ptr, + MEMTXATTRS_UNSPECIFIED, s->data_out, len, 0); + to_copy -=3D len; + qemu_chr_fe_write_all(&s->chr, s->data_out, len); + } + break; + case CMD_READ_BUFFER: + to_copy =3D MIN(s->data_len, s->data_in_count); + address_space_rw(&address_space_memory, s->data_ptr, + MEMTXATTRS_UNSPECIFIED, s->data_in, to_copy, 1); + s->data_in_count -=3D to_copy; + memmove(s->data_in, s->data_in + to_copy, s->data_in_count); + if (s->int_enabled && !s->data_in_count) { + qemu_set_irq(s->irq, 0); + } + break; + } +} + +static void goldfish_tty_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + GoldfishTTYState *s =3D opaque; + unsigned char c; + + trace_goldfish_tty_write(s, addr, size, value); + + switch (addr) { + case REG_PUT_CHAR: + c =3D value; + qemu_chr_fe_write_all(&s->chr, &c, sizeof(c)); + break; + case REG_CMD: + goldfish_tty_cmd(s, value); + break; + case REG_DATA_PTR: + s->data_ptr =3D value; + break; + case REG_DATA_PTR_HIGH: + s->data_ptr =3D (value << 32) | (uint32_t)s->data_ptr; + break; + case REG_DATA_LEN: + s->data_len =3D value; + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register write 0x%02"HWADDR_PRIx"= \n", + __func__, addr); + break; + } +} + +static const MemoryRegionOps goldfish_tty_ops =3D { + .read =3D goldfish_tty_read, + .write =3D goldfish_tty_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid.max_access_size =3D 4, + .impl.max_access_size =3D 4, +}; + +static int goldfish_tty_can_receive(void *opaque) +{ + GoldfishTTYState *s =3D opaque; + int available =3D GOLFISH_TTY_BUFFER_SIZE - s->data_in_count; + + trace_goldfish_tty_can_receive(s, available); + + return available; +} + +static void goldfish_tty_receive(void *opaque, const uint8_t *buffer, int = size) +{ + GoldfishTTYState *s =3D opaque; + + trace_goldfish_tty_receive(s, size); + + g_assert(size <=3D GOLFISH_TTY_BUFFER_SIZE - s->data_in_count); + + memcpy(s->data_in + s->data_in_count, buffer, size); + s->data_in_count +=3D size; + + if (s->int_enabled && s->data_in_count) { + qemu_set_irq(s->irq, 1); + } +} + +static void goldfish_tty_reset(DeviceState *dev) +{ + GoldfishTTYState *s =3D GOLDFISH_TTY(dev); + + trace_goldfish_tty_reset(s); + + memset(s->data_in, 0, GOLFISH_TTY_BUFFER_SIZE); + memset(s->data_out, 0, GOLFISH_TTY_BUFFER_SIZE); + s->data_in_count =3D 0; + s->int_enabled =3D false; + s->data_ptr =3D 0; + s->data_len =3D 0; +} + +static void goldfish_tty_realize(DeviceState *dev, Error **errp) +{ + GoldfishTTYState *s =3D GOLDFISH_TTY(dev); + + trace_goldfish_tty_realize(s); + + memory_region_init_io(&s->iomem, OBJECT(s), &goldfish_tty_ops, s, + "goldfish_tty", 0x24); + + if (qemu_chr_fe_backend_connected(&s->chr)) { + qemu_chr_fe_set_handlers(&s->chr, goldfish_tty_can_receive, + goldfish_tty_receive, NULL, NULL, + s, NULL, true); + } +} + +static const VMStateDescription vmstate_goldfish_tty =3D { + .name =3D "goldfish_tty", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(data_len, GoldfishTTYState), + VMSTATE_UINT64(data_ptr, GoldfishTTYState), + VMSTATE_BOOL(int_enabled, GoldfishTTYState), + VMSTATE_UINT32(data_in_count, GoldfishTTYState), + VMSTATE_BUFFER(data_in, GoldfishTTYState), + VMSTATE_BUFFER(data_out, GoldfishTTYState), + VMSTATE_END_OF_LIST() + } +}; + +static Property goldfish_tty_properties[] =3D { + DEFINE_PROP_CHR("chardev", GoldfishTTYState, chr), + DEFINE_PROP_END_OF_LIST(), +}; + +static void goldfish_tty_instance_init(Object *obj) +{ + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); + GoldfishTTYState *s =3D GOLDFISH_TTY(obj); + + trace_goldfish_tty_instance_init(s); + + sysbus_init_mmio(dev, &s->iomem); + sysbus_init_irq(dev, &s->irq); +} + +static void goldfish_tty_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + device_class_set_props(dc, goldfish_tty_properties); + dc->reset =3D goldfish_tty_reset; + dc->realize =3D goldfish_tty_realize; + dc->vmsd =3D &vmstate_goldfish_tty; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); +} + +static const TypeInfo goldfish_tty_info =3D { + .name =3D TYPE_GOLDFISH_TTY, + .parent =3D TYPE_SYS_BUS_DEVICE, + .class_init =3D goldfish_tty_class_init, + .instance_init =3D goldfish_tty_instance_init, + .instance_size =3D sizeof(GoldfishTTYState), +}; + +static void goldfish_tty_register_types(void) +{ + type_register_static(&goldfish_tty_info); +} + +type_init(goldfish_tty_register_types) diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 939bc4475883..a8bf0c6a7708 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -61,3 +61,6 @@ config MCHP_PFSOC_MMUART =20 config SIFIVE_UART bool + +config GOLDFISH_TTY + bool diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29a..69d974873606 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -39,3 +39,5 @@ specific_ss.add(when: 'CONFIG_HTIF', if_true: files('risc= v_htif.c')) specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.= c')) specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c= ')) specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) + +specific_ss.add(when: 'CONFIG_GOLDFISH_TTY', if_true: files('goldfish_tty.= c')) diff --git a/hw/char/trace-events b/hw/char/trace-events index 81026f661277..dc7fb717e13b 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -20,6 +20,15 @@ virtio_console_flush_buf(unsigned int port, size_t len, = ssize_t ret) "port %u, i virtio_console_chr_read(unsigned int port, int size) "port %u, size %d" virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" =20 +# goldfish_tty.c +goldfish_tty_read(void *dev, unsigned int addr, unsigned int size, uint64_= t value) "tty: %p reg: 0x%02x size: %d value: 0x%"PRIx64 +goldfish_tty_write(void *dev, unsigned int addr, unsigned int size, uint64= _t value) "tty: %p reg: 0x%02x size: %d value: 0x%"PRIx64 +goldfish_tty_can_receive(void *dev, unsigned int available) "tty: %p avail= able: %u" +goldfish_tty_receive(void *dev, unsigned int size) "tty: %p size: %u" +goldfish_tty_reset(void *dev) "tty: %p" +goldfish_tty_realize(void *dev) "tty: %p" +goldfish_tty_instance_init(void *dev) "tty: %p" + # grlib_apbuart.c grlib_apbuart_event(int event) "event:%d" grlib_apbuart_writel_unknown(uint64_t addr, uint32_t value) "addr 0x%"PRIx= 64" value 0x%x" --=20 2.29.2 From nobody Fri May 17 11:05:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895426; cv=none; d=zohomail.com; s=zohoarc; b=T1FZ4WaPCB3CTHzVCvCYEmfvEubNeTX1UQUxxcXuCyM+hcvyBNm2ItbFXpbsjCahmRuCQWP+3uvpMMibEWZtTyHaV7m0vhVsVoKsTxpTZF+/OPb3451Mc/v9UNlxmB2nz4cgv0/w660YxJV964NI3Fii8NYFsemZpkXRhVpTh4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895426; h=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=CmqlUuCh8EBFkY7ZjDIS9BBJcc7Pzn61XcZE+D5zlTw=; b=Jy2f9NA04bIa4ByeMnJtIiHyiDs9li9cQG7Z8R6SWOOVuHRFU2a452Ja9u4GI7Q41ugl1fehLfCAQ4mNqJIhJXYwOtYQ3QMPmGS6ruPvVI+b+sOqMsozeSlzqe7DXd8MSB0yIidqfDJXDXYYDRFmukzXmeZuIUyVWc9IUgT+rW0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614895426750563.1582221725821; Thu, 4 Mar 2021 14:03:46 -0800 (PST) Received: from localhost ([::1]:36912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHw4P-0005s5-5G for importer@patchew.org; Thu, 04 Mar 2021 17:03:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw2B-00049B-AK for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:27 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:36715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw27-00014i-Qk for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:27 -0500 Received: from localhost.localdomain ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MuVOM-1la9dX0s7u-00rc2p; Thu, 04 Mar 2021 23:01:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] intc: add goldfish-pic Date: Thu, 4 Mar 2021 23:01:01 +0100 Message-Id: <20210304220104.2574112-3-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304220104.2574112-1-laurent@vivier.eu> References: <20210304220104.2574112-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:I1pBytjCuQY4UUz85rPoaEatMQVyiH+1uDdwy6FscsPkOHYiUER AX0biDOlwM1pfBIH8OTfa+070Lp3Nj/rCmrm0ESsUSrQZOvwfizXaWsK8u5Asc2ngj1ZCY4 MOS5o2oDinMcPpAQH+K9Xfxouf/6wELXAbMRWEal7G+11zqGzSgYLj2VpMXKYnbVPZdYpwG lr/fr5eEFuFaVsFxogTuw== X-UI-Out-Filterresults: notjunk:1;V03:K0:cgDSSd/o7lg=:920tluIDBBqvzw+uaLTmSP HOChbH3CXAr1wKi+/c+Xm5e5Mwccz4uBmtKlrUF+eVuJo8R9MsyHSAVLWk+WPofNFACeIr/Ce z0Lyb1L6/WTlztVB1je+v3HFhOFvkqGvudLZIFSEna4/Q4pwSjO+TZ0qFc2B6kDHSfi7mT1XI dDdq9pqj+C+iaJxgSDm/Qb+IQHkTXORcJxu+o1dOXGF++0DCM5Vzw/b/8VT9JadDNKeTxFkkv jGrt1vmQ+1Tg/K5Lh5+Wu5VhdGclLUwD8RLMT/viellIyEx+0hj1dK/pXJwC3VwKRkXF2DTbJ I5DJ0Gg+WghCOEq6kSTMPN99F4OcrpuomvvgC/+PkA+u2warjJLBlUCAGnSkPE14wNPXeIkj8 8ljcYZpGmF8AQrxWlyuhZPyip4w8wfa2L5KvQZzoKMU70pYmmZHgMVPzHer/xFaJju1piXsK3 d2VMRjOYLA== 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; Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Implement the goldfish pic device as defined in https://android.googlesource.com/platform/external/qemu/+/master/docs/GOLDF= ISH-VIRTUAL-HARDWARE.TXT Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/intc/goldfish_pic.h | 33 +++++ hw/intc/goldfish_pic.c | 214 +++++++++++++++++++++++++++++++++ hw/intc/Kconfig | 3 + hw/intc/meson.build | 1 + hw/intc/trace-events | 8 ++ 5 files changed, 259 insertions(+) create mode 100644 include/hw/intc/goldfish_pic.h create mode 100644 hw/intc/goldfish_pic.c diff --git a/include/hw/intc/goldfish_pic.h b/include/hw/intc/goldfish_pic.h new file mode 100644 index 000000000000..26e7ca75a3ec --- /dev/null +++ b/include/hw/intc/goldfish_pic.h @@ -0,0 +1,33 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Goldfish PIC + * + * (c) 2020 Laurent Vivier + * + */ + +#ifndef HW_INTC_GOLDFISH_PIC_H +#define HW_INTC_GOLDFISH_PIC_H + +#define TYPE_GOLDFISH_PIC "goldfish_pic" +OBJECT_DECLARE_SIMPLE_TYPE(GoldfishPICState, GOLDFISH_PIC) + +#define GOLDFISH_PIC_IRQ_NB 32 + +struct GoldfishPICState { + SysBusDevice parent_obj; + + MemoryRegion iomem; + qemu_irq irq; + + uint32_t pending; + uint32_t enabled; + + /* statistics */ + uint64_t stats_irq_count[32]; + /* for tracing */ + int idx; +}; + +#endif diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c new file mode 100644 index 000000000000..4ed08b17cfe2 --- /dev/null +++ b/hw/intc/goldfish_pic.c @@ -0,0 +1,214 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Goldfish PIC + * + * (c) 2020 Laurent Vivier + * + */ + +#include "qemu/osdep.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" +#include "migration/vmstate.h" +#include "monitor/monitor.h" +#include "qemu/log.h" +#include "trace.h" +#include "hw/intc/intc.h" +#include "hw/intc/goldfish_pic.h" + +/* registers */ + +enum { + REG_STATUS =3D 0x00, + REG_IRQ_PENDING =3D 0x04, + REG_IRQ_DISABLE_ALL =3D 0x08, + REG_DISABLE =3D 0x0c, + REG_ENABLE =3D 0x10, +}; + +static bool goldfish_pic_get_statistics(InterruptStatsProvider *obj, + uint64_t **irq_counts, + unsigned int *nb_irqs) +{ + GoldfishPICState *s =3D GOLDFISH_PIC(obj); + + *irq_counts =3D s->stats_irq_count; + *nb_irqs =3D ARRAY_SIZE(s->stats_irq_count); + return true; +} + +static void goldfish_pic_print_info(InterruptStatsProvider *obj, Monitor *= mon) +{ + GoldfishPICState *s =3D GOLDFISH_PIC(obj); + monitor_printf(mon, "goldfish-pic.%d: pending=3D0x%08x enabled=3D0x%08= x\n", + s->idx, s->pending, s->enabled); +} + +static void goldfish_pic_update(GoldfishPICState *s) +{ + if (s->pending & s->enabled) { + qemu_irq_raise(s->irq); + } else { + qemu_irq_lower(s->irq); + } +} + +static void goldfish_irq_request(void *opaque, int irq, int level) +{ + GoldfishPICState *s =3D opaque; + + trace_goldfish_irq_request(s, s->idx, irq, level); + + if (level) { + s->pending |=3D 1 << irq; + s->stats_irq_count[irq]++; + } else { + s->pending &=3D ~(1 << irq); + } + goldfish_pic_update(s); +} + +static uint64_t goldfish_pic_read(void *opaque, hwaddr addr, + unsigned size) +{ + GoldfishPICState *s =3D opaque; + uint64_t value =3D 0; + + switch (addr) { + case REG_STATUS: + /* The number of pending interrupts (0 to 32) */ + value =3D ctpop32(s->pending & s->enabled); + break; + case REG_IRQ_PENDING: + /* The pending interrupt mask */ + value =3D s->pending & s->enabled; + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register read 0x%02"HWADDR_PRIx"\= n", + __func__, addr); + break; + } + + trace_goldfish_pic_read(s, s->idx, addr, size, value); + + return value; +} + +static void goldfish_pic_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + GoldfishPICState *s =3D opaque; + + trace_goldfish_pic_write(s, s->idx, addr, size, value); + + switch (addr) { + case REG_IRQ_DISABLE_ALL: + s->enabled =3D 0; + s->pending =3D 0; + break; + case REG_DISABLE: + s->enabled &=3D ~value; + break; + case REG_ENABLE: + s->enabled |=3D value; + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register write 0x%02"HWADDR_PRIx"= \n", + __func__, addr); + break; + } + goldfish_pic_update(s); +} + +static const MemoryRegionOps goldfish_pic_ops =3D { + .read =3D goldfish_pic_read, + .write =3D goldfish_pic_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid.max_access_size =3D 4, + .impl.max_access_size =3D 4, +}; + +static void goldfish_pic_reset(DeviceState *dev) +{ + GoldfishPICState *s =3D GOLDFISH_PIC(dev); + int i; + + trace_goldfish_pic_reset(s, s->idx); + s->pending =3D 0; + s->enabled =3D 0; + + for (i =3D 0; i < ARRAY_SIZE(s->stats_irq_count); i++) { + s->stats_irq_count[i] =3D 0; + } +} + +static void goldfish_pic_realize(DeviceState *dev, Error **errp) +{ + GoldfishPICState *s =3D GOLDFISH_PIC(dev); + static int counter; + + s->idx =3D counter++; + trace_goldfish_pic_realize(s, s->idx); + + memory_region_init_io(&s->iomem, OBJECT(s), &goldfish_pic_ops, s, + "goldfish_pic", 0x24); +} + +static const VMStateDescription vmstate_goldfish_pic =3D { + .name =3D "goldfish_pic", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(pending, GoldfishPICState), + VMSTATE_UINT32(enabled, GoldfishPICState), + VMSTATE_END_OF_LIST() + } +}; + +static void goldfish_pic_instance_init(Object *obj) +{ + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); + GoldfishPICState *s =3D GOLDFISH_PIC(obj); + + trace_goldfish_pic_instance_init(s, s->idx); + + sysbus_init_mmio(dev, &s->iomem); + sysbus_init_irq(dev, &s->irq); + + qdev_init_gpio_in(DEVICE(obj), goldfish_irq_request, GOLDFISH_PIC_IRQ_= NB); +} + +static void goldfish_pic_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(oc); + + dc->reset =3D goldfish_pic_reset; + dc->realize =3D goldfish_pic_realize; + dc->vmsd =3D &vmstate_goldfish_pic; + ic->get_statistics =3D goldfish_pic_get_statistics; + ic->print_info =3D goldfish_pic_print_info; +} + +static const TypeInfo goldfish_pic_info =3D { + .name =3D TYPE_GOLDFISH_PIC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .class_init =3D goldfish_pic_class_init, + .instance_init =3D goldfish_pic_instance_init, + .instance_size =3D sizeof(GoldfishPICState), + .interfaces =3D (InterfaceInfo[]) { + { TYPE_INTERRUPT_STATS_PROVIDER }, + { } + }, +}; + +static void goldfish_pic_register_types(void) +{ + type_register_static(&goldfish_pic_info); +} + +type_init(goldfish_pic_register_types) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index c18d11142a8f..c4f8642dae8e 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -64,3 +64,6 @@ config SIFIVE_CLINT =20 config SIFIVE_PLIC bool + +config GOLDFISH_PIC + bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 53cba115690f..5d0f5d1b3812 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -57,3 +57,4 @@ specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('x= ics_spapr.c', 'spapr_xi specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], if_true: files('spapr_xive_kvm.c')) +specific_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.= c')) diff --git a/hw/intc/trace-events b/hw/intc/trace-events index 45ddaf48df8e..c06b0f5f8029 100644 --- a/hw/intc/trace-events +++ b/hw/intc/trace-events @@ -239,3 +239,11 @@ xive_end_source_read(uint8_t end_blk, uint32_t end_idx= , uint64_t addr) "END 0x%x =20 # pnv_xive.c pnv_xive_ic_hw_trigger(uint64_t addr, uint64_t val) "@0x%"PRIx64" val=3D0x= %"PRIx64 + +# goldfish_pic.c +goldfish_irq_request(void *dev, int idx, int irq, int level) "pic: %p gold= fish-irq.%d irq: %d level: %d" +goldfish_pic_read(void *dev, int idx, unsigned int addr, unsigned int size= , uint64_t value) "pic: %p goldfish-irq.%d reg: 0x%02x size: %d value: 0x%"= PRIx64 +goldfish_pic_write(void *dev, int idx, unsigned int addr, unsigned int siz= e, uint64_t value) "pic: %p goldfish-irq.%d reg: 0x%02x size: %d value: 0x%= "PRIx64 +goldfish_pic_reset(void *dev, int idx) "pic: %p goldfish-irq.%d" +goldfish_pic_realize(void *dev, int idx) "pic: %p goldfish-irq.%d" +goldfish_pic_instance_init(void *dev, int idx) "pic: %p goldfish-irq.%d" --=20 2.29.2 From nobody Fri May 17 11:05:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895426; cv=none; d=zohomail.com; s=zohoarc; b=NaIMeJrEpSQxvRBF4I6Dvc6kQ3FNiNPqd3AwS8TSq7Hh1xFViFK31ZZUxO+jspN+O+5Q9l8rQUzrjB8EVg7wNpm2sv2NUY9p98MImMco4DmjHMKX9cVFa7Vu5KLVTxMh6nuyboLRuHJUU40n8GsZGxEnTlbYa58J/K4gyqHM5OM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895426; h=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=otWmO7uNTM9jkbuRU6Hr/EZ3OleopQg9Z0KJVzD7jqw=; b=dQ0lhvvuJxhK0lfodg3YPaudvoNlvgMX2FljYOip8fqzj9CNvej/kifqQQt8Z4QNJQNxDCCOswNE0sLwbOlp8z32CrnHl3so8MQJJtfrRDT7IEiMbqPusfWrso3TEGAqK2c+2sCwumcxo89gNj6DJGJPPgBMNpJ3Xxo0boYiw9k= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614895426725549.9099361634494; Thu, 4 Mar 2021 14:03:46 -0800 (PST) Received: from localhost ([::1]:36854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHw4O-0005qo-P9 for importer@patchew.org; Thu, 04 Mar 2021 17:03:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw29-00048r-Po for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:25 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:38367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw27-00013j-Mv for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:25 -0500 Received: from localhost.localdomain ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N7gfa-1lnN2t3SN8-014lCR; Thu, 04 Mar 2021 23:01:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] m68k: add an interrupt controller Date: Thu, 4 Mar 2021 23:01:02 +0100 Message-Id: <20210304220104.2574112-4-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304220104.2574112-1-laurent@vivier.eu> References: <20210304220104.2574112-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:f218YCMIS1+9LlZmz7SlXILorz96DwOW8YvmTlBb8zJGYuHQrU8 Pfjh0X4ZHlZbsmquJQ7oHzI9RVPNOy2w0UIqQWoayvZqPHEeLZfuShFUskGxSsY/paUiVxQ 7vAOaUg8PtGmP6Zwz9havyi8yfj0LPNMYpS3+OASV9gfh31gqjbZFr6mOVVE0BAyaDjrEcO Q8UJdvmZ5eR8Gf0ITBJOg== X-UI-Out-Filterresults: notjunk:1;V03:K0:FuhD+eyaEdE=:mts5fNvdmokrzkffo57mGD NQ25OzfEBLKub5GR4vi3v1GzWgnJceHoPWpco6vmLXegylljzZM3IC/WNAPUKvhebsxyfKRRF VMjn5R2zi3soBCH+aZr8/Zb/1wIPshAPcixzPvDTPPFijv5XdwPnqTFOrmoSI6MVbLCHHhekN NMmSGJX0jcT9rE0X65UQmL3SGq7aToaiCXF6IZAf9wJF9d6Cw4yCCpbG1qQjvdj268/6yTNnM vBcyQBK1PmBOBASnFKxkfqR9fZXGJopPBchTOmsDX7oVQJjhFe8tv4GUqSnX9ECrPx9WXSedm qnwocQD3LrB1KzUlmesMLylBdwPU52HhgPFmn+phqYf93kh6W8LCUvkFVrkHOnTH6Uzwjll+D e8bP+9VLEX9askYgWsqEhLZeMu17WhM5Pe/TOCqqYVbZ19ELj/yb+5FYsWvLR 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; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" A (generic) copy of the GLUE device we already have for q800 to use with the m68k-virt machine. The q800 one would disappear in the future as q800 uses actually the djMEMC controller. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/intc/m68k_irqc.h | 41 +++++++++++++ hw/intc/m68k_irqc.c | 119 ++++++++++++++++++++++++++++++++++++ hw/intc/Kconfig | 3 + hw/intc/meson.build | 1 + 4 files changed, 164 insertions(+) create mode 100644 include/hw/intc/m68k_irqc.h create mode 100644 hw/intc/m68k_irqc.c diff --git a/include/hw/intc/m68k_irqc.h b/include/hw/intc/m68k_irqc.h new file mode 100644 index 000000000000..dbcfcfc2e000 --- /dev/null +++ b/include/hw/intc/m68k_irqc.h @@ -0,0 +1,41 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * QEMU Motorola 680x0 IRQ Controller + * + * (c) 2020 Laurent Vivier + * + */ + +#ifndef M68K_IRQC_H +#define M68K_IRQC_H + +#include "hw/sysbus.h" + +#define TYPE_M68K_IRQC "m68k-irq-controller" +#define M68K_IRQC(obj) OBJECT_CHECK(M68KIRQCState, (obj), \ + TYPE_M68K_IRQC) + +#define M68K_IRQC_AUTOVECTOR_BASE 25 + +enum { + M68K_IRQC_LEVEL_1 =3D 0, + M68K_IRQC_LEVEL_2, + M68K_IRQC_LEVEL_3, + M68K_IRQC_LEVEL_4, + M68K_IRQC_LEVEL_5, + M68K_IRQC_LEVEL_6, + M68K_IRQC_LEVEL_7, +}; +#define M68K_IRQC_LEVEL_NUM (M68K_IRQC_LEVEL_7 - M68K_IRQC_LEVEL_1 + 1) + +typedef struct M68KIRQCState { + SysBusDevice parent_obj; + + uint8_t ipr; + + /* statistics */ + uint64_t stats_irq_count[M68K_IRQC_LEVEL_NUM]; +} M68KIRQCState; + +#endif diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c new file mode 100644 index 000000000000..2133d2a698ab --- /dev/null +++ b/hw/intc/m68k_irqc.c @@ -0,0 +1,119 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * QEMU Motorola 680x0 IRQ Controller + * + * (c) 2020 Laurent Vivier + * + */ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/vmstate.h" +#include "monitor/monitor.h" +#include "hw/nmi.h" +#include "hw/intc/intc.h" +#include "hw/intc/m68k_irqc.h" + + +static bool m68k_irqc_get_statistics(InterruptStatsProvider *obj, + uint64_t **irq_counts, unsigned int *= nb_irqs) +{ + M68KIRQCState *s =3D M68K_IRQC(obj); + + *irq_counts =3D s->stats_irq_count; + *nb_irqs =3D ARRAY_SIZE(s->stats_irq_count); + return true; +} + +static void m68k_irqc_print_info(InterruptStatsProvider *obj, Monitor *mon) +{ + M68KIRQCState *s =3D M68K_IRQC(obj); + monitor_printf(mon, "m68k-irqc: ipr=3D0x%x\n", s->ipr); +} + +static void m68k_set_irq(void *opaque, int irq, int level) +{ + M68KIRQCState *s =3D opaque; + M68kCPU *cpu =3D M68K_CPU(first_cpu); + int i; + + if (level) { + s->ipr |=3D 1 << irq; + s->stats_irq_count[irq]++; + } else { + s->ipr &=3D ~(1 << irq); + } + + for (i =3D M68K_IRQC_LEVEL_7; i >=3D M68K_IRQC_LEVEL_1; i--) { + if ((s->ipr >> i) & 1) { + m68k_set_irq_level(cpu, i + 1, i + M68K_IRQC_AUTOVECTOR_BASE); + return; + } + } + m68k_set_irq_level(cpu, 0, 0); +} + +static void m68k_irqc_reset(DeviceState *d) +{ + M68KIRQCState *s =3D M68K_IRQC(d); + int i; + + s->ipr =3D 0; + for (i =3D 0; i < ARRAY_SIZE(s->stats_irq_count); i++) { + s->stats_irq_count[i] =3D 0; + } +} + +static void m68k_irqc_instance_init(Object *obj) +{ + qdev_init_gpio_in(DEVICE(obj), m68k_set_irq, M68K_IRQC_LEVEL_NUM); +} + +static void m68k_nmi(NMIState *n, int cpu_index, Error **errp) +{ + m68k_set_irq(n, M68K_IRQC_LEVEL_7, 1); +} + +static const VMStateDescription vmstate_m68k_irqc =3D { + .name =3D "m68k-irqc", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT8(ipr, M68KIRQCState), + VMSTATE_END_OF_LIST() + } +}; + +static void m68k_irqc_class_init(ObjectClass *oc, void *data) + { + DeviceClass *dc =3D DEVICE_CLASS(oc); + NMIClass *nc =3D NMI_CLASS(oc); + InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(oc); + + nc->nmi_monitor_handler =3D m68k_nmi; + dc->reset =3D m68k_irqc_reset; + dc->vmsd =3D &vmstate_m68k_irqc; + ic->get_statistics =3D m68k_irqc_get_statistics; + ic->print_info =3D m68k_irqc_print_info; +} + +static const TypeInfo m68k_irqc_type_info =3D { + .name =3D TYPE_M68K_IRQC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(M68KIRQCState), + .instance_init =3D m68k_irqc_instance_init, + .class_init =3D m68k_irqc_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_NMI }, + { TYPE_INTERRUPT_STATS_PROVIDER }, + { } + }, +}; + +static void q800_irq_register_types(void) +{ + type_register_static(&m68k_irqc_type_info); +} + +type_init(q800_irq_register_types); diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index c4f8642dae8e..fdb4a30b98e8 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -67,3 +67,6 @@ config SIFIVE_PLIC =20 config GOLDFISH_PIC bool + +config M68K_IRQC + bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 5d0f5d1b3812..fb39e19d3ef8 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -58,3 +58,4 @@ specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive= .c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], if_true: files('spapr_xive_kvm.c')) specific_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.= c')) +specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) --=20 2.29.2 From nobody Fri May 17 11:05:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895426; cv=none; d=zohomail.com; s=zohoarc; b=Hr5sXVCQeefqFMToK/KvF/qH4DXNRavs9PGy8WVDj/J4V4MNbZkDQGb0DL7Fb4Pq1Ecnr5paZxIegI0YUKaIfmioUshT3cKzYuMsCU7/k8JeZFlynYV0X0s3C4veSqYEyTb/I6I3RAEa02EJJ7VMJUHIIYH0T0O3BbsqPR8Xyrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895426; h=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=UfaCZmpSDy4JRVNu94zmbopnXtdkXmx5gGYf3Q3b8s8=; b=Gg5pXU1aLyz/PBtm/W8Wr4+L3CPyIZTCSw1XPH67/OndhGvop8WkOJVdq3W6czIvTrQcsuqkh3i6S5jTnQOaCT2zMsgbGL7QKDofVjPXCy4kzA4KsraG0+v2fshrJPJjvqSVMV0MtyukNQfCOIwsV3Xl2UCLbyvu/6fc7uugteo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614895426722486.3168444311774; Thu, 4 Mar 2021 14:03:46 -0800 (PST) Received: from localhost ([::1]:36892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHw4P-0005rn-57 for importer@patchew.org; Thu, 04 Mar 2021 17:03:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw2B-000499-3i for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:27 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:42087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw28-00014z-02 for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:26 -0500 Received: from localhost.localdomain ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N62mG-1lp0fu1cE4-016P5h; Thu, 04 Mar 2021 23:01:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] m68k: add a system controller Date: Thu, 4 Mar 2021 23:01:03 +0100 Message-Id: <20210304220104.2574112-5-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304220104.2574112-1-laurent@vivier.eu> References: <20210304220104.2574112-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:tPA5RuqitP2h1Q+DuP/nuUDUC+hxb3TrwfbpJvUF2hU8l1tEPX8 f/AiRWsVsyUd3epuTWXwg/HhJhk2LzKXgbDXwzAgKgoMFfStpoc6i/n+aJmRgtfejGfBSYD thM488F1lZIMxDm1q/zRfEnWHG1lD4fnmRn3Tc0fF/u1i9AlJpOocsTQNAkiNSclOfLWkEs udUamUEGjIJ0/DHhJ8MNQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:MYHIDOj2BR4=:Fhs7KLzzgMOFFJbVgW5f7S w0FSHsYOrLKfC8EldtO1ksI8RzfE9AYTK07jb85sfUoiwCsONyqExhPG/9t5Lctl8idjar1Wa TyeSNdUwQKuoiJT1nSoAJmKpHp5QEVBFkLtlSAkB17Bk2ijWi8WVeBT5vqvswPDA+W6LjrwOO hStKD9CGhyIQj+AGKH8pWwHW4EuHsM1i7C30d9cz6EO4l8R4YAMVHthLzTMhEx5JYkoE0Dv9a ImoUkm4b+cv177kLsCWwrX4pstaFwCujdchhvQTdGhbb5wY9XcNzCQHVX0j4SnUB//wN85xc/ iZ4MwLIiK1IW3ca2MQhiFB18D1GX58PdMWqKFCjGt0MfM7fTtZVV+/nWVIa9H4Upz+D4qUxHJ gJbkhHocDdJW1PSYvZqVnQmyW40tJ7Ab0Xkx//WHN73fWxQb4ed6jYUimG7TffComfb7lPWKY BjsS5F3qkw== 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; Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add a system controller for the m68k-virt machine. This controller allows the kernel to power off or reset the machine. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- include/hw/misc/m68k_virt_ctrl.h | 22 +++++ hw/misc/m68k_virt_ctrl.c | 152 +++++++++++++++++++++++++++++++ hw/misc/Kconfig | 3 + hw/misc/meson.build | 3 + hw/misc/trace-events | 7 ++ 5 files changed, 187 insertions(+) create mode 100644 include/hw/misc/m68k_virt_ctrl.h create mode 100644 hw/misc/m68k_virt_ctrl.c diff --git a/include/hw/misc/m68k_virt_ctrl.h b/include/hw/misc/m68k_virt_c= trl.h new file mode 100644 index 000000000000..1db7960e5477 --- /dev/null +++ b/include/hw/misc/m68k_virt_ctrl.h @@ -0,0 +1,22 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Virt m68k system Controller + */ + +#ifndef M68K_VIRT_CTRL_H +#define M68K_VIRT_CTRL_H + +#define TYPE_M68K_VIRT_CTRL "m68k-virt-ctrl" +OBJECT_DECLARE_SIMPLE_TYPE(M68KVirtCtrlState, M68K_VIRT_CTRL) + +struct M68KVirtCtrlState { + SysBusDevice parent_obj; + + MemoryRegion iomem; + qemu_irq irq; + + uint32_t irq_enabled; +}; + +#endif diff --git a/hw/misc/m68k_virt_ctrl.c b/hw/misc/m68k_virt_ctrl.c new file mode 100644 index 000000000000..fb34aa10211a --- /dev/null +++ b/hw/misc/m68k_virt_ctrl.c @@ -0,0 +1,152 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * Virt m68k system Controller + */ + +#include "qemu/osdep.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "trace.h" +#include "sysemu/runstate.h" +#include "hw/misc/m68k_virt_ctrl.h" + +enum { + REG_FEATURES =3D 0x00, + REG_CMD =3D 0x04, +}; + +#define FEAT_POWER_CTRL 0x00000001 + +enum { + CMD_NOOP, + CMD_RESET, + CMD_HALT, + CMD_PANIC, +}; + +static uint64_t m68k_virt_ctrl_read(void *opaque, hwaddr addr, + unsigned size) +{ + M68KVirtCtrlState *s =3D opaque; + uint64_t value =3D 0; + + switch (addr) { + case REG_FEATURES: + value =3D FEAT_POWER_CTRL; + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register read 0x%02"HWADDR_PRIx"\= n", + __func__, addr); + break; + } + + trace_m68k_virt_ctrl_write(s, addr, size, value); + + return value; +} + +static void m68k_virt_ctrl_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + M68KVirtCtrlState *s =3D opaque; + + trace_m68k_virt_ctrl_write(s, addr, size, value); + + switch (addr) { + case REG_CMD: + switch (value) { + case CMD_NOOP: + break; + case CMD_RESET: + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + break; + case CMD_HALT: + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + break; + case CMD_PANIC: + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_PANIC); + break; + } + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register write 0x%02"HWADDR_PRIx"= \n", + __func__, addr); + break; + } +} + +static const MemoryRegionOps m68k_virt_ctrl_ops =3D { + .read =3D m68k_virt_ctrl_read, + .write =3D m68k_virt_ctrl_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid.max_access_size =3D 4, + .impl.max_access_size =3D 4, +}; + +static void m68k_virt_ctrl_reset(DeviceState *dev) +{ + M68KVirtCtrlState *s =3D M68K_VIRT_CTRL(dev); + + trace_m68k_virt_ctrl_reset(s); +} + +static void m68k_virt_ctrl_realize(DeviceState *dev, Error **errp) +{ + M68KVirtCtrlState *s =3D M68K_VIRT_CTRL(dev); + + trace_m68k_virt_ctrl_instance_init(s); + + memory_region_init_io(&s->iomem, OBJECT(s), &m68k_virt_ctrl_ops, s, + "m68k-virt-ctrl", 0x100); +} + +static const VMStateDescription vmstate_m68k_virt_ctrl =3D { + .name =3D "m68k-virt-ctrl", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(irq_enabled, M68KVirtCtrlState), + VMSTATE_END_OF_LIST() + } +}; + +static void m68k_virt_ctrl_instance_init(Object *obj) +{ + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); + M68KVirtCtrlState *s =3D M68K_VIRT_CTRL(obj); + + trace_m68k_virt_ctrl_instance_init(s); + + sysbus_init_mmio(dev, &s->iomem); + sysbus_init_irq(dev, &s->irq); +} + +static void m68k_virt_ctrl_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->reset =3D m68k_virt_ctrl_reset; + dc->realize =3D m68k_virt_ctrl_realize; + dc->vmsd =3D &vmstate_m68k_virt_ctrl; +} + +static const TypeInfo m68k_virt_ctrl_info =3D { + .name =3D TYPE_M68K_VIRT_CTRL, + .parent =3D TYPE_SYS_BUS_DEVICE, + .class_init =3D m68k_virt_ctrl_class_init, + .instance_init =3D m68k_virt_ctrl_instance_init, + .instance_size =3D sizeof(M68KVirtCtrlState), +}; + +static void m68k_virt_ctrl_register_types(void) +{ + type_register_static(&m68k_virt_ctrl_info); +} + +type_init(m68k_virt_ctrl_register_types) diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 19c216f3efb0..9abf021ace0e 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -174,4 +174,7 @@ config SIFIVE_U_OTP config SIFIVE_U_PRCI bool =20 +config M68K_VIRT_CTRL + bool + source macio/Kconfig diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 629283957fcc..49b9e3c05e7a 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -24,6 +24,9 @@ softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('a= rm11scu.c')) # Mac devices softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) =20 +# virt m68k devices +softmmu_ss.add(when: 'CONFIG_M68K_VIRT_CTRL', if_true: files('m68k_virt_ct= rl.c')) + # RISC-V devices softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_d= mc.c')) softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc= _ioscb.c')) diff --git a/hw/misc/trace-events b/hw/misc/trace-events index d626b9d7a7c6..d326fb1d1a56 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -243,3 +243,10 @@ pca955x_gpio_change(const char *description, unsigned = id, unsigned prev_state, u bcm2835_cprman_read(uint64_t offset, uint64_t value) "offset:0x%" PRIx64 "= value:0x%" PRIx64 bcm2835_cprman_write(uint64_t offset, uint64_t value) "offset:0x%" PRIx64 = " value:0x%" PRIx64 bcm2835_cprman_write_invalid_magic(uint64_t offset, uint64_t value) "offse= t:0x%" PRIx64 " value:0x%" PRIx64 + +# m68k_virt_ctrl.c +m68k_virt_ctrl_read(void *dev, unsigned int addr, unsigned int size, uint6= 4_t value) "ctrl: %p reg: 0x%02x size: %d value: 0x%"PRIx64 +m68k_virt_ctrl_write(void *dev, unsigned int addr, unsigned int size, uint= 64_t value) "ctrl: %p reg: 0x%02x size: %d value: 0x%"PRIx64 +m68k_virt_ctrl_reset(void *dev) "ctrl: %p" +m68k_virt_ctrl_realize(void *dev) "ctrl: %p" +m68k_virt_ctrl_instance_init(void *dev) "ctrl: %p" --=20 2.29.2 From nobody Fri May 17 11:05:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895589; cv=none; d=zohomail.com; s=zohoarc; b=U6cWzifrcqVQGh/p035WqceaPK8MaDc0Cx4sOu8nnxH8sSR45HIdoCSKWSILn1atOuGUbbJSKxFd45IZVi1SThhrf5BY6rX4mpb3zZuUbk2V3q1lAUXJvb6b3ETaUN7TKmgcyf5KYjvTYyu/6UWYH24aAnA5pkw+nb2HkKJJX28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895589; h=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=FqB6qJSlLxFHRGP+CHudL6vVjFqFM2tJt7knvFIxTTA=; b=M+cauPg0JUq4bSNKiezbxSzEP4sU1DelA1XJ4LDmT1gRqPTiqEM9Y6cAtsGITq6K0+mbS/XOslqumtu036pw68vVPZvXg4EKzNHR623lhkyo0BIRyOKVgQpeoNUJ3brJeTHFtC86gGyfKbTatNBebbB9iOrlBKvgMhnZCDWmBtE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161489558994760.516573389930954; Thu, 4 Mar 2021 14:06:29 -0800 (PST) Received: from localhost ([::1]:45094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHw72-0000q6-Px for importer@patchew.org; Thu, 04 Mar 2021 17:06:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw2C-00049V-1c for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:28 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:41863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHw28-00015C-0C for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:01:27 -0500 Received: from localhost.localdomain ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwjO6-1lgjDZ02Ju-00yBc7; Thu, 04 Mar 2021 23:01:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] m68k: add Virtual M68k Machine Date: Thu, 4 Mar 2021 23:01:04 +0100 Message-Id: <20210304220104.2574112-6-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304220104.2574112-1-laurent@vivier.eu> References: <20210304220104.2574112-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:SzbEKQLVHIkm4kck978j4SjSAxFTe3uXydfugjkx6ujxf1aY1Em 2bOkkg/RV7rU4kOf2ir6D9/pthjtlStLEbSzEUg1NZunXyXKbbYjnBslBust4YIiTNjLdqX +VJsHiUEeoV6mxTWJ3ckrLqCOUZ6ykYwQa13mdSffXAVjyn9ZnTJ/X+baecQ/sHEvITT3GB Lb3VBpvTr/pL+EfOwPqiw== X-UI-Out-Filterresults: notjunk:1;V03:K0:MJ4rAyzS8nk=:QL4NY1T3yGBuHdzmASwfej WW266HuqcN7SLPjVtGwhwKBHzDbe9n9s5WnWkqYNL+3ayTdy/B8X5mrwIhdF6YpXHg9mZOwBo ijInrwFXnhGiBBP71NDy+WV1h7yWM4HBYB3ieRhJOeBPUWFzzPjzIMa6SgnZKB2BGcSzJR+GI S88mf0LanXTsf8AVNQpjDNsuFmo8Q5h9ZsxtCHDGLHYnQ1JN7IS1M+MBqiUwUqtM44zD/NXJ6 0Em8ovrwNNILCQ+WqxuRqSmtRX3NB12loMym6W67c1nWKIR6I+ZOuhJJvcQiDZdEhW8XGHlua SDwGUZNFBIx07ZqNkYWUGb/VIlZ8CT9wI6LQD+cPlXVfkEx3SYQcKejNXCWZALuJoXlwARSye njnb9BrpOGUykCih8PwFBdaHLdkYjGLgK178InD1s2BvTAdENQ9UkDMY8G35z 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; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The machine is based on Goldfish interfaces defined by Google for Android simulator. It uses Goldfish-rtc (timer and RTC), Goldfish-pic (PIC) and Goldfish-tty (for serial port and early tty). The machine is created with 128 virtio-mmio bus, and they can be used to use serial console, GPU, disk, NIC, HID, ... Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- default-configs/devices/m68k-softmmu.mak | 1 + .../standard-headers/asm-m68k/bootinfo-virt.h | 18 + hw/m68k/virt.c | 312 ++++++++++++++++++ MAINTAINERS | 13 + hw/m68k/Kconfig | 10 + hw/m68k/meson.build | 1 + 6 files changed, 355 insertions(+) create mode 100644 include/standard-headers/asm-m68k/bootinfo-virt.h create mode 100644 hw/m68k/virt.c diff --git a/default-configs/devices/m68k-softmmu.mak b/default-configs/dev= ices/m68k-softmmu.mak index 6629fd2aa330..7f8619e42786 100644 --- a/default-configs/devices/m68k-softmmu.mak +++ b/default-configs/devices/m68k-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy CONFIG_NEXTCUBE=3Dy CONFIG_Q800=3Dy +CONFIG_M68K_VIRT=3Dy diff --git a/include/standard-headers/asm-m68k/bootinfo-virt.h b/include/st= andard-headers/asm-m68k/bootinfo-virt.h new file mode 100644 index 000000000000..81be1e092497 --- /dev/null +++ b/include/standard-headers/asm-m68k/bootinfo-virt.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* +** asm/bootinfo-virt.h -- Virtual-m68k-specific boot information definitio= ns +*/ + +#ifndef _UAPI_ASM_M68K_BOOTINFO_VIRT_H +#define _UAPI_ASM_M68K_BOOTINFO_VIRT_H + +#define BI_VIRT_QEMU_VERSION 0x8000 +#define BI_VIRT_GF_PIC_BASE 0x8001 +#define BI_VIRT_GF_RTC_BASE 0x8002 +#define BI_VIRT_GF_TTY_BASE 0x8003 +#define BI_VIRT_VIRTIO_BASE 0x8004 +#define BI_VIRT_CTRL_BASE 0x8005 + +#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0) + +#endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */ diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c new file mode 100644 index 000000000000..00edcc8f22e0 --- /dev/null +++ b/hw/m68k/virt.c @@ -0,0 +1,312 @@ +/* + * SPDX-License-Identifer: GPL-2.0-or-later + * + * QEMU Vitual M68K Machine + * + * (c) 2020 Laurent Vivier + * + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu-common.h" +#include "sysemu/sysemu.h" +#include "cpu.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "elf.h" +#include "hw/loader.h" +#include "ui/console.h" +#include "exec/address-spaces.h" +#include "hw/sysbus.h" +#include "standard-headers/asm-m68k/bootinfo.h" +#include "standard-headers/asm-m68k/bootinfo-virt.h" +#include "bootinfo.h" +#include "net/net.h" +#include "qapi/error.h" +#include "sysemu/qtest.h" +#include "sysemu/runstate.h" +#include "sysemu/reset.h" + +#include "hw/intc/m68k_irqc.h" +#include "hw/misc/m68k_virt_ctrl.h" +#include "hw/char/goldfish_tty.h" +#include "hw/rtc/goldfish_rtc.h" +#include "hw/intc/goldfish_pic.h" +#include "hw/virtio/virtio-mmio.h" +#include "hw/virtio/virtio-blk.h" + +/* + * 6 goldfish-pic for CPU IRQ #1 to IRQ #6 + * CPU IRQ #1 -> PIC #1 + * IRQ #1 to IRQ #31 -> unused + * IRQ #32 -> goldfish-tty + * CPU IRQ #2 -> PIC #2 + * IRQ #1 to IRQ #32 -> virtio-mmio from 1 to 32 + * CPU IRQ #3 -> PIC #3 + * IRQ #1 to IRQ #32 -> virtio-mmio from 33 to 64 + * CPU IRQ #4 -> PIC #4 + * IRQ #1 to IRQ #32 -> virtio-mmio from 65 to 96 + * CPU IRQ #5 -> PIC #5 + * IRQ #1 to IRQ #32 -> virtio-mmio from 97 to 128 + * CPU IRQ #6 -> PIC #6 + * IRQ #1 -> goldfish-rtc + * IRQ #2 to IRQ #32 -> unused + * CPU IRQ #7 -> NMI + */ + +#define PIC_IRQ_BASE(num) (8 + (num - 1) * 32) +#define PIC_IRQ(num, irq) (PIC_IRQ_BASE(num) + irq - 1) +#define PIC_GPIO(pic_irq) (qdev_get_gpio_in(pic_dev[(pic_irq - 8) / 32= ], \ + (pic_irq - 8) % 32)) + +#define VIRT_GF_PIC_MMIO_BASE 0xff000000 /* MMIO: 0xff000000 - 0xff005= fff */ +#define VIRT_GF_PIC_IRQ_BASE 1 /* IRQ: #1 -> #6 */ +#define VIRT_GF_PIC_NB 6 + +/* 2 goldfish-rtc (and timer) */ +#define VIRT_GF_RTC_MMIO_BASE 0xff006000 /* MMIO: 0xff006000 - 0xff007= fff */ +#define VIRT_GF_RTC_IRQ_BASE PIC_IRQ(6, 1) /* PIC: #6, IRQ: #1 */ +#define VIRT_GF_RTC_NB 2 + +/* 1 goldfish-tty */ +#define VIRT_GF_TTY_MMIO_BASE 0xff008000 /* MMIO: 0xff008000 - 0xff008= fff */ +#define VIRT_GF_TTY_IRQ_BASE PIC_IRQ(1, 32) /* PIC: #1, IRQ: #32 */ + +/* 1 m68k-virt-ctrl */ +#define VIRT_M68K_CTRL_MMIO_BASE 0xff009000 /* MMIO: 0xff009000 - 0xff0= 09fff */ +#define VIRT_M68K_CTRL_IRQ_BASE PIC_IRQ(1, 1) /* PIC: #1, IRQ: #1 */ + +/* + * virtio-mmio size is 0x200 bytes + * we use 4 goldfish-pic to attach them, + * we can attach 32 virtio devices / goldfish-pic + * -> we can manage 32 * 4 =3D 128 virtio devices + */ +#define VIRT_VIRTIO_MMIO_BASE 0xff010000 /* MMIO: 0xff010000 - 0xff01f= fff */ +#define VIRT_VIRTIO_IRQ_BASE PIC_IRQ(2, 1) /* PIC: 2, 3, 4, 5, IRQ: ALL = */ + +static void main_cpu_reset(void *opaque) +{ + M68kCPU *cpu =3D opaque; + CPUState *cs =3D CPU(cpu); + + cpu_reset(cs); + cpu->env.aregs[7] =3D ldl_phys(cs->as, 0); + cpu->env.pc =3D ldl_phys(cs->as, 4); +} + +static void virt_init(MachineState *machine) +{ + M68kCPU *cpu =3D NULL; + int32_t kernel_size; + uint64_t elf_entry; + ram_addr_t initrd_base; + int32_t initrd_size; + ram_addr_t ram_size =3D machine->ram_size; + const char *kernel_filename =3D machine->kernel_filename; + const char *initrd_filename =3D machine->initrd_filename; + const char *kernel_cmdline =3D machine->kernel_cmdline; + hwaddr parameters_base; + DeviceState *dev; + DeviceState *irqc_dev; + DeviceState *pic_dev[VIRT_GF_PIC_NB]; + SysBusDevice *sysbus; + hwaddr io_base; + int i; + + if (ram_size > 3399672 * KiB) { + /* + * The physical memory can be up to 4 GiB - 16 MiB, but linux + * kernel crashes after this limit (~ 3.2 GiB) + */ + error_report("Too much memory for this machine: %" PRId64 " KiB, " + "maximum 3399672 KiB", ram_size / KiB); + exit(1); + } + + /* init CPUs */ + cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); + qemu_register_reset(main_cpu_reset, cpu); + + /* RAM */ + memory_region_add_subregion(get_system_memory(), 0, machine->ram); + + /* IRQ Controller */ + + irqc_dev =3D qdev_new(TYPE_M68K_IRQC); + sysbus_realize_and_unref(SYS_BUS_DEVICE(irqc_dev), &error_fatal); + + /* + * 6 goldfish-pic + * + * map: 0xff000000 - 0xff006fff =3D 28 KiB + * IRQ: #1 (lower priority) -> #6 (higher priority) + * + */ + io_base =3D VIRT_GF_PIC_MMIO_BASE; + for (i =3D 0; i < VIRT_GF_PIC_NB; i++) { + pic_dev[i] =3D qdev_new(TYPE_GOLDFISH_PIC); + sysbus =3D SYS_BUS_DEVICE(pic_dev[i]); + sysbus_realize_and_unref(sysbus, &error_fatal); + + sysbus_mmio_map(sysbus, 0, io_base); + sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(irqc_dev, i)); + + io_base +=3D 0x1000; + } + + /* goldfish-rtc */ + io_base =3D VIRT_GF_RTC_MMIO_BASE; + for (i =3D 0; i < VIRT_GF_RTC_NB; i++) { + dev =3D qdev_new(TYPE_GOLDFISH_RTC); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, io_base); + sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_GF_RTC_IRQ_BASE + i)); + + io_base +=3D 0x1000; + } + + /* goldfish-tty */ + dev =3D qdev_new(TYPE_GOLDFISH_TTY); + sysbus =3D SYS_BUS_DEVICE(dev); + qdev_prop_set_chr(dev, "chardev", serial_hd(0)); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, VIRT_GF_TTY_MMIO_BASE); + sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_GF_TTY_IRQ_BASE)); + + /* M68K virt controller */ + dev =3D qdev_new(TYPE_M68K_VIRT_CTRL); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, VIRT_M68K_CTRL_MMIO_BASE); + sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_M68K_CTRL_IRQ_BASE)); + + /* virtio-mmio */ + io_base =3D VIRT_VIRTIO_MMIO_BASE; + for (i =3D 0; i < 128; i++) { + dev =3D qdev_new(TYPE_VIRTIO_MMIO); + qdev_prop_set_bit(dev, "force-legacy", false); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_VIRTIO_IRQ_BASE + i)); + sysbus_mmio_map(sysbus, 0, io_base); + io_base +=3D 0x200; + } + + if (kernel_filename) { + CPUState *cs =3D CPU(cpu); + uint64_t high; + + kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, + &elf_entry, NULL, &high, NULL, 1, + EM_68K, 0, 0); + if (kernel_size < 0) { + error_report("could not load kernel '%s'", kernel_filename); + exit(1); + } + stl_phys(cs->as, 4, elf_entry); /* reset initial PC */ + parameters_base =3D (high + 1) & ~1; + + BOOTINFO1(cs->as, parameters_base, BI_MACHTYPE, MACH_VIRT); + BOOTINFO1(cs->as, parameters_base, BI_FPUTYPE, FPU_68040); + BOOTINFO1(cs->as, parameters_base, BI_MMUTYPE, MMU_68040); + BOOTINFO1(cs->as, parameters_base, BI_CPUTYPE, CPU_68040); + BOOTINFO2(cs->as, parameters_base, BI_MEMCHUNK, 0, ram_size); + + BOOTINFO1(cs->as, parameters_base, BI_VIRT_QEMU_VERSION, + ((QEMU_VERSION_MAJOR << 24) | (QEMU_VERSION_MINOR << 16)= | + (QEMU_VERSION_MICRO << 8))); + BOOTINFO2(cs->as, parameters_base, BI_VIRT_GF_PIC_BASE, + VIRT_GF_PIC_MMIO_BASE, VIRT_GF_PIC_IRQ_BASE); + BOOTINFO2(cs->as, parameters_base, BI_VIRT_GF_RTC_BASE, + VIRT_GF_RTC_MMIO_BASE, VIRT_GF_RTC_IRQ_BASE); + BOOTINFO2(cs->as, parameters_base, BI_VIRT_GF_TTY_BASE, + VIRT_GF_TTY_MMIO_BASE, VIRT_GF_TTY_IRQ_BASE); + BOOTINFO2(cs->as, parameters_base, BI_VIRT_CTRL_BASE, + VIRT_M68K_CTRL_MMIO_BASE, VIRT_M68K_CTRL_IRQ_BASE); + BOOTINFO2(cs->as, parameters_base, BI_VIRT_VIRTIO_BASE, + VIRT_VIRTIO_MMIO_BASE, VIRT_VIRTIO_IRQ_BASE); + + if (kernel_cmdline) { + BOOTINFOSTR(cs->as, parameters_base, BI_COMMAND_LINE, + kernel_cmdline); + } + + /* load initrd */ + if (initrd_filename) { + initrd_size =3D get_image_size(initrd_filename); + if (initrd_size < 0) { + error_report("could not load initial ram disk '%s'", + initrd_filename); + exit(1); + } + + initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; + load_image_targphys(initrd_filename, initrd_base, + ram_size - initrd_base); + BOOTINFO2(cs->as, parameters_base, BI_RAMDISK, initrd_base, + initrd_size); + } else { + initrd_base =3D 0; + initrd_size =3D 0; + } + BOOTINFO0(cs->as, parameters_base, BI_LAST); + } +} + +static void virt_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->desc =3D "QEMU M68K Virtual Machine"; + mc->init =3D virt_init; + mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); + mc->max_cpus =3D 1; + mc->no_floppy =3D 1; + mc->no_parallel =3D 1; + mc->default_ram_id =3D "m68k_virt.ram"; +} + +static const TypeInfo virt_machine_info =3D { + .name =3D MACHINE_TYPE_NAME("virt"), + .parent =3D TYPE_MACHINE, + .abstract =3D true, + .class_init =3D virt_machine_class_init, +}; + +static void virt_machine_register_types(void) +{ + type_register_static(&virt_machine_info); +} + +type_init(virt_machine_register_types) + +#define DEFINE_VIRT_MACHINE(major, minor, latest) \ + static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ + void *data) \ + { \ + MachineClass *mc =3D MACHINE_CLASS(oc); \ + virt_machine_##major##_##minor##_options(mc); \ + mc->desc =3D "QEMU " # major "." # minor " M68K Virtual Machine"; \ + if (latest) { \ + mc->alias =3D "virt"; \ + } \ + } \ + static const TypeInfo machvirt_##major##_##minor##_info =3D { \ + .name =3D MACHINE_TYPE_NAME("virt-" # major "." # minor), \ + .parent =3D MACHINE_TYPE_NAME("virt"), \ + .class_init =3D virt_##major##_##minor##_class_init, \ + }; \ + static void machvirt_machine_##major##_##minor##_init(void) \ + { \ + type_register_static(&machvirt_##major##_##minor##_info); \ + } \ + type_init(machvirt_machine_##major##_##minor##_init); + +static void virt_machine_6_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(6, 0, true) diff --git a/MAINTAINERS b/MAINTAINERS index 9b2aa18e1fe3..6224dd0c445b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1123,6 +1123,19 @@ F: include/hw/nubus/* F: include/hw/display/macfb.h F: include/hw/block/swim.h =20 +virt +M: Laurent Vivier +S: Maintained +F: hw/m68k/virt.c +F: hw/char/goldfish_tty.c +F: hw/intc/goldfish_pic.c +F: hw/intc/m68k_irqc.c +F: hw/misc/m68k_virt_ctrl.c +F: include/hw/char/goldfish_tty.h +F: include/hw/intc/goldfish_pic.h +F: include/hw/intc/m68k_irqc.h +F: include/hw/misc/m68k_virt_ctrl.h + MicroBlaze Machines ------------------- petalogix_s3adsp1800 diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index 60d7bcfb8f2b..f90d06d1cab7 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -23,3 +23,13 @@ config Q800 select ESP select DP8393X select OR_IRQ + +config M68K_VIRT + bool + select M68K_IRQC + select M68K_VIRT_CTRL + select GOLDFISH_PIC + select GOLDFISH_TTY + select GOLDFISH_RTC + select VIRTIO + select VIRTIO_MMIO diff --git a/hw/m68k/meson.build b/hw/m68k/meson.build index ca0044c652d3..31248641d301 100644 --- a/hw/m68k/meson.build +++ b/hw/m68k/meson.build @@ -3,5 +3,6 @@ m68k_ss.add(when: 'CONFIG_AN5206', if_true: files('an5206.c= ', 'mcf5206.c')) m68k_ss.add(when: 'CONFIG_MCF5208', if_true: files('mcf5208.c', 'mcf_intc.= c')) m68k_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-kbd.c', 'next-cu= be.c')) m68k_ss.add(when: 'CONFIG_Q800', if_true: files('q800.c')) +m68k_ss.add(when: 'CONFIG_M68K_VIRT', if_true: files('virt.c')) =20 hw_arch +=3D {'m68k': m68k_ss} --=20 2.29.2