From nobody Tue May 14 22:17:54 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; dmarc=fail(p=none dis=none) header.from=kernel.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681859305390988.4149568698591; Tue, 18 Apr 2023 16:08:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1popG9-0002bu-FI; Tue, 18 Apr 2023 13:36:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1popG8-0002ax-Fs for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:52 -0400 Received: from mail-ej1-f48.google.com ([209.85.218.48]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1popG6-0007H2-Aw for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:52 -0400 Received: by mail-ej1-f48.google.com with SMTP id kt6so37076784ejb.0 for ; Tue, 18 Apr 2023 10:36:49 -0700 (PDT) Received: from localhost.localdomain (aftr-62-216-205-204.dynamic.mnet-online.de. [62.216.205.204]) by smtp.googlemail.com with ESMTPSA id j23-20020a1709066c1700b0095342bfb701sm73738ejr.16.2023.04.18.10.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 10:36:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681839408; x=1684431408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EUU7B4ro8hVQAhlzUCnr6ec8NcXXiXdrOdFLWYCeCiE=; b=M/cv1lUiPzMSiK7ydZFSUv0AzE39fG2+YPeLVUI2ccX41BlRsqMAtkYVvQ5ajJQfkk /mZWzHMa361APXieEZ5F6N5heRJy51eNqtn8Q4KhZSwE5gqF5UHsdE4Gqn5Qh+Y29b2t SnvIUuK3Skg2o2sUWtvY6W4KAggG2wwsMQcr+tCVy4PgkGBAKZKmfcdTmJ1/JYKfGtiT aJgYOdkwEPsM6v+hmsXoISFRmNtZ5hsBg6N8yhllvyz6Ex30n8BvR4Q6Qr+Sc1Lpulvl GwsYQWIpHWFxOKrkI674Cppu3RBjyAjPg6Jr71PUc2VtrpFWtu/hIWCob+sboSh2HHPO mCiQ== X-Gm-Message-State: AAQBX9dO4Jq8rZSE3CkQnWhUstGMORlXZiT4BZ7BQ/r3l91UF6bGusWK CMXTrYm4AkQMP7QHZP/f+m5u3Z2Gu14PDDjR X-Google-Smtp-Source: AKy350Z46cGIQVz3LIA8OYtZ+9iiDnKW4iSs63MrOFEB1R4EACUOtdxSukfuXOaGRpINhJTRokkJCA== X-Received: by 2002:a17:907:1245:b0:94e:6294:9d23 with SMTP id wc5-20020a170907124500b0094e62949d23mr9451545ejb.26.1681839408047; Tue, 18 Apr 2023 10:36:48 -0700 (PDT) From: Johannes Thumshirn To: qemu-devel@nongnu.org Cc: Alistair Francis , Javier Rodriguez , =?UTF-8?q?Jorge=20Sanjuan=20Garc=C3=ADa?= , Peter Maydell , Dmitry Fomichev , Johannes Thumshirn , Alistair Francis Subject: [PATCH v4 1/4] Add MEN Chameleon Bus emulation Date: Tue, 18 Apr 2023 19:35:53 +0200 Message-Id: <20230418173556.177985-2-jth@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418173556.177985-1-jth@kernel.org> References: <20230418173556.177985-1-jth@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: pass client-ip=209.85.218.48; envelope-from=morbidrsa@gmail.com; helo=mail-ej1-f48.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1681859306803100001 Content-Type: text/plain; charset="utf-8" The MEN Chameleon Bus (MCB) is an on-chip bus system exposing IP Cores of an FPGA to a outside bus system like PCIe. Acked-by: Alistair Francis Signed-off-by: Johannes Thumshirn --- MAINTAINERS | 6 ++ hw/Kconfig | 1 + hw/mcb/Kconfig | 2 + hw/mcb/mcb.c | 180 +++++++++++++++++++++++++++++++++++++++++++ hw/mcb/meson.build | 1 + hw/meson.build | 1 + include/hw/mcb/mcb.h | 106 +++++++++++++++++++++++++ 7 files changed, 297 insertions(+) create mode 100644 hw/mcb/Kconfig create mode 100644 hw/mcb/mcb.c create mode 100644 hw/mcb/meson.build create mode 100644 include/hw/mcb/mcb.h diff --git a/MAINTAINERS b/MAINTAINERS index 2c2068ea5c..1fa5909a97 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1962,6 +1962,12 @@ R: Paolo Bonzini S: Odd Fixes F: hw/char/ =20 +MEN Chameleon Bus +M: Johannes Thumshirn +S: Maintained +F: hw/mcb/ +F: include/hw/mcb/ + Network devices M: Jason Wang S: Odd Fixes diff --git a/hw/Kconfig b/hw/Kconfig index ba62ff6417..f5ef84b10b 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -18,6 +18,7 @@ source intc/Kconfig source ipack/Kconfig source ipmi/Kconfig source isa/Kconfig +source mcb/Kconfig source mem/Kconfig source misc/Kconfig source net/Kconfig diff --git a/hw/mcb/Kconfig b/hw/mcb/Kconfig new file mode 100644 index 0000000000..36a7a583a8 --- /dev/null +++ b/hw/mcb/Kconfig @@ -0,0 +1,2 @@ +config MCB + bool diff --git a/hw/mcb/mcb.c b/hw/mcb/mcb.c new file mode 100644 index 0000000000..1c4f693a73 --- /dev/null +++ b/hw/mcb/mcb.c @@ -0,0 +1,180 @@ +/* + * QEMU MEN Chameleon Bus emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "hw/mcb/mcb.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" + +ChameleonDeviceDescriptor *mcb_new_chameleon_descriptor(MCBus *bus, uint8_= t id, + uint8_t rev, + uint8_t var, + uint32_t size) +{ + BusChild *kid; + ChameleonDeviceDescriptor *gdd; + uint32_t reg1 =3D 0; + uint32_t end =3D 0x200; + + gdd =3D g_new0(ChameleonDeviceDescriptor, 1); + if (!gdd) { + return NULL; + } + + reg1 |=3D GDD_DEV(id); + reg1 |=3D GDD_DTY(CHAMELEON_DTYPE_GENERAL); + reg1 |=3D GDD_REV(rev); + reg1 |=3D GDD_VAR(var); + gdd->reg1 =3D cpu_to_le32(reg1); + + QTAILQ_FOREACH(kid, &BUS(bus)->children, sibling) { + DeviceState *qdev =3D kid->child; + MCBDevice *mdev =3D MCB_DEVICE(qdev); + + if (mdev->gdd) { + end +=3D mdev->gdd->size; + } + } + + gdd->offset =3D end; + gdd->size =3D size; + + return gdd; +} + +static void mcb_irq_handler(void *opaque, int irq_num, int level) +{ + MCBDevice *dev =3D opaque; + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + + if (bus->set_irq) { + bus->set_irq(dev, irq_num, level); + } +} + +qemu_irq mcb_allocate_irq(MCBDevice *dev) +{ + int irq =3D 0; + return qemu_allocate_irq(mcb_irq_handler, dev, irq); +} + +MCBDevice *mcb_device_find(MCBus *bus, hwaddr addr) +{ + BusChild *kid; + uint32_t start; + uint32_t end; + + QTAILQ_FOREACH(kid, &BUS(bus)->children, sibling) { + DeviceState *qdev =3D kid->child; + MCBDevice *mdev =3D MCB_DEVICE(qdev); + + start =3D mdev->gdd->offset; + end =3D start + mdev->gdd->size; + + if (addr >=3D start && addr <=3D end) { + return mdev; + } + } + return NULL; +} + +void mcb_bus_init(MCBus *bus, size_t bus_size, + DeviceState *parent, + uint8_t n_slots, + qemu_irq_handler handler) +{ + qbus_init(bus, bus_size, TYPE_MCB_BUS, parent, NULL); + bus->n_slots =3D n_slots; + bus->set_irq =3D handler; +} + +static void mcb_device_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(dev)); + MCBDeviceClass *k =3D MCB_DEVICE_GET_CLASS(dev); + + if (mdev->slot < 0) { + mdev->slot =3D bus->free_slot; + } + + if (mdev->slot >=3D bus->n_slots) { + error_setg(errp, "Only %" PRIu8 " slots available.", bus->n_slots); + return; + } + bus->free_slot =3D mdev->slot + 1; + + mdev->irq =3D qemu_allocate_irqs(bus->set_irq, mdev, 1); + + k->realize(dev, errp); +} + +static void mcb_device_unrealize(DeviceState *dev) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MCBDeviceClass *k =3D MCB_DEVICE_GET_CLASS(dev); + + if (k->unrealize) { + k->unrealize(dev); + return; + } + + qemu_free_irqs(mdev->irq, 1); +} + +static Property mcb_device_props[] =3D { + DEFINE_PROP_INT32("slot", MCBDevice, slot, -1), + DEFINE_PROP_END_OF_LIST() +}; + +static void mcb_device_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *k =3D DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_INPUT, k->categories); + k->bus_type =3D TYPE_MCB_BUS; + k->realize =3D mcb_device_realize; + k->unrealize =3D mcb_device_unrealize; + device_class_set_props(k, mcb_device_props); +} + +const VMStateDescription vmstate_mcb_device =3D { + .name =3D "mcb_device", + .version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_INT32(slot, MCBDevice), + VMSTATE_END_OF_LIST() + } +}; + +static const TypeInfo mcb_device_info =3D { + .name =3D TYPE_MCB_DEVICE, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(MCBDevice), + .class_size =3D sizeof(MCBDeviceClass), + .class_init =3D mcb_device_class_init, + .abstract =3D true, +}; + +static const TypeInfo mcb_bus_info =3D { + .name =3D TYPE_MCB_BUS, + .parent =3D TYPE_BUS, + .instance_size =3D sizeof(MCBus), +}; + +static void mcb_register_types(void) +{ + type_register_static(&mcb_device_info); + type_register_static(&mcb_bus_info); +} + +type_init(mcb_register_types); diff --git a/hw/mcb/meson.build b/hw/mcb/meson.build new file mode 100644 index 0000000000..a385edc07c --- /dev/null +++ b/hw/mcb/meson.build @@ -0,0 +1 @@ +softmmu_ss.add(when: 'CONFIG_MCB', if_true: files('mcb.c')) diff --git a/hw/meson.build b/hw/meson.build index c7ac7d3d75..3d1462ad8b 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -18,6 +18,7 @@ subdir('intc') subdir('ipack') subdir('ipmi') subdir('isa') +subdir('mcb') subdir('mem') subdir('misc') subdir('net') diff --git a/include/hw/mcb/mcb.h b/include/hw/mcb/mcb.h new file mode 100644 index 0000000000..03d7e12ad2 --- /dev/null +++ b/include/hw/mcb/mcb.h @@ -0,0 +1,106 @@ +/* + * QEMU MEN Chameleon Bus emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#ifndef QEMU_MCB_H +#define QEMU_MCB_H + +#include "hw/qdev-core.h" +#include "qom/object.h" +#include "exec/memory.h" + +#define CHAMELEON_DTYPE_GENERAL 0x0 +#define CHAMELEON_DTYPE_END 0xf + +typedef struct { + uint32_t reg1; + uint32_t reg2; + uint32_t offset; + uint32_t size; +} ChameleonDeviceDescriptor; + +#define GDD_DEV(x) (((x) & 0x3ff) << 18) +#define GDD_DTY(x) (((x) & 0xf) << 28) +#define GDD_REV(x) (((x) & 0x3f) << 5) +#define GDD_VAR(x) (((x) & 0x3f) << 11) + +/* GDD Register 1 fields */ +#define GDD_IRQ(x) ((x) & 0x1f) + +/* GDD Register 2 fields */ +#define GDD_BAR(x) ((x) & 0x7) +#define GDD_INS(x) (((x) >> 3) & 0x3f) +#define GDD_GRP(x) (((x) >> 9) & 0x3f) + +typedef struct MCBus MCBus; + +#define TYPE_MCB_BUS "MEN Chameleon Bus" +OBJECT_DECLARE_SIMPLE_TYPE(MCBus, MCB_BUS) + +struct MCBus { + /*< private >*/ + BusState parent_obj; + + uint8_t n_slots; + uint8_t free_slot; + qemu_irq_handler set_irq; + MemoryRegion mmio_region; +}; + +typedef struct MCBDevice MCBDevice; +typedef struct MCBDeviceClass MCBDeviceClass; + +#define TYPE_MCB_DEVICE "mcb-device" +#define MCB_DEVICE(obj) \ + OBJECT_CHECK(MCBDevice, (obj), TYPE_MCB_DEVICE) +#define MCB_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(MCBDeviceClass, (klass), TYPE_MCB_DEVICE) +#define MCB_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MCBDeviceClass, (obj), TYPE_MCB_DEVICE) + +struct MCBDeviceClass { + /*< private >*/ + DeviceClass parent_class; + /*< public >*/ + + + DeviceRealize realize; + DeviceUnrealize unrealize; +}; + +struct MCBDevice { + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + + qemu_irq *irq; + ChameleonDeviceDescriptor *gdd; + int slot; + + uint8_t rev; + uint8_t var; +}; + +extern const VMStateDescription vmstate_mcb_device; + +ChameleonDeviceDescriptor *mcb_new_chameleon_descriptor(MCBus *bus, uint8_= t id, + uint8_t rev, + uint8_t var, + uint32_t size); + +#define VMSTATE_MCB_DEVICE(_field, _state) \ + VMSTATE_STRUCT(_field, _state, 1, vmstate_mcb_device, MCBDevice) + +MCBDevice *mcb_device_find(MCBus *bus, hwaddr addr); +void mcb_bus_init(MCBus *bus, size_t bus_size, + DeviceState *parent, + uint8_t n_slots, + qemu_irq_handler handler); + +qemu_irq mcb_allocate_irq(MCBDevice *dev); +#endif --=20 2.39.2 From nobody Tue May 14 22:17:54 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; dmarc=fail(p=none dis=none) header.from=kernel.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681857684181305.4569132364653; Tue, 18 Apr 2023 15:41:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1popGA-0002cd-CI; Tue, 18 Apr 2023 13:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1popG9-0002c8-Hk for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: from mail-ej1-f42.google.com ([209.85.218.42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1popG6-0007H6-MI for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: by mail-ej1-f42.google.com with SMTP id fw30so22457706ejc.5 for ; Tue, 18 Apr 2023 10:36:50 -0700 (PDT) Received: from localhost.localdomain (aftr-62-216-205-204.dynamic.mnet-online.de. [62.216.205.204]) by smtp.googlemail.com with ESMTPSA id j23-20020a1709066c1700b0095342bfb701sm73738ejr.16.2023.04.18.10.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 10:36:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681839409; x=1684431409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zr2byZSZN8w6q346ztN4ycoCu96awVWj6/snEzHU8I8=; b=f6+pz5M2/YG+rsbwXDS7qta3CCivIEJOcWtLFNyVlUiuubliB6NEN5ZAad6iLSO2BY F0EIsGsIJOSIg00QdqrPniBzCcGsXOI8g9egjTS9bbSZEfdBubCS68kM1FfVlAeSvh0w uoDLlJUB1OzFr3Lp/7esdB9L5MwX+evooaeTA1IrzyV7RYYJxn/tH46t2e+VeAMJrRgf cNFvWjFMOoBViDPJ80l+KP6x7J73UVGVv0uOpydkeFK++rDr8HMiKaFstxiiYyaNIYuH K+JiJqh3hVK7kymSNTTWAe0XKBb7Tl+pzfLXFXP17VIJaoHsl1Lk/Zxey3QkA1oIgLgw GIbg== X-Gm-Message-State: AAQBX9cutDAXp8MH1BN4eGxEHcA1xlewIUXbcH9bsEEubRRIwKxM34Q7 QAQdyWqQuG/WQcIpjA6bW/gtGl3cHdNJTPfz X-Google-Smtp-Source: AKy350aFoHLi7zxG4Du06VSEFsCuRlR0E4FeOcTQejDfW33HQw2+W4G2gg5dJmPzml3zD+KgB0vHcA== X-Received: by 2002:a17:907:985b:b0:94f:3ce3:7cd9 with SMTP id jj27-20020a170907985b00b0094f3ce37cd9mr10461250ejc.10.1681839408933; Tue, 18 Apr 2023 10:36:48 -0700 (PDT) From: Johannes Thumshirn To: qemu-devel@nongnu.org Cc: Alistair Francis , Javier Rodriguez , =?UTF-8?q?Jorge=20Sanjuan=20Garc=C3=ADa?= , Peter Maydell , Dmitry Fomichev , Johannes Thumshirn , Alistair Francis Subject: [PATCH v4 2/4] Add MEN Chameleon Bus via PCI carrier Date: Tue, 18 Apr 2023 19:35:54 +0200 Message-Id: <20230418173556.177985-3-jth@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418173556.177985-1-jth@kernel.org> References: <20230418173556.177985-1-jth@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: pass client-ip=209.85.218.42; envelope-from=morbidrsa@gmail.com; helo=mail-ej1-f42.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1681857684977100001 Content-Type: text/plain; charset="utf-8" Add PCI based MEN Chameleon Bus carrier emulation. Acked-by: Alistair Francis Signed-off-by: Johannes Thumshirn --- hw/mcb/Kconfig | 6 + hw/mcb/mcb-pci.c | 298 ++++++++++++++++++++++++++++++++++++++++++++ hw/mcb/meson.build | 1 + hw/mcb/trace-events | 4 + hw/mcb/trace.h | 1 + meson.build | 1 + 6 files changed, 311 insertions(+) create mode 100644 hw/mcb/mcb-pci.c create mode 100644 hw/mcb/trace-events create mode 100644 hw/mcb/trace.h diff --git a/hw/mcb/Kconfig b/hw/mcb/Kconfig index 36a7a583a8..7deb96c2fe 100644 --- a/hw/mcb/Kconfig +++ b/hw/mcb/Kconfig @@ -1,2 +1,8 @@ config MCB bool + +config MCB_PCI + bool + default y if PCI_DEVICES + depends on PCI + select MCB diff --git a/hw/mcb/mcb-pci.c b/hw/mcb/mcb-pci.c new file mode 100644 index 0000000000..905b9adb3b --- /dev/null +++ b/hw/mcb/mcb-pci.c @@ -0,0 +1,298 @@ +/* + * QEMU MEN Chameleon Bus emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/mcb/mcb.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_device.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" +#include "trace.h" + +typedef struct { + uint8_t revision; + char model; + uint8_t minor; + uint8_t bus_type; + uint16_t magic; + uint16_t reserved; + /* This one has no '\0' at the end!!! */ + char filename[12]; +} ChameleonFPGAHeader; +#define CHAMELEON_BUS_TYPE_WISHBONE 0 +#define CHAMELEONV2_MAGIC 0xabce + +typedef struct { + PCIDevice dev; + MCBus bus; + MemoryRegion ctbl; + uint16_t status; + uint8_t int_set; + ChameleonFPGAHeader *header; + + uint8_t minor; + uint8_t rev; + uint8_t model; +} MPCIState; + +#define TYPE_MCB_PCI "mcb-pci" + +#define MPCI(obj) \ + OBJECT_CHECK(MPCIState, (obj), TYPE_MCB_PCI) + +#define CHAMELEON_TABLE_SIZE 0x200 +#define N_MODULES 32 + +#define PCI_VENDOR_ID_MEN 0x1a88 +#define PCI_DEVICE_ID_MEN_MCBPCI 0x4d45 + +static uint32_t read_header(MPCIState *s, hwaddr addr) +{ + uint32_t ret =3D 0; + ChameleonFPGAHeader *header =3D s->header; + + switch (addr >> 2) { + case 0: + ret |=3D header->revision; + ret |=3D header->model << 8; + ret |=3D header->minor << 16; + ret |=3D header->bus_type << 24; + break; + case 1: + ret |=3D header->magic; + ret |=3D header->reserved << 16; + break; + case 2: + memcpy(&ret, header->filename, sizeof(uint32_t)); + break; + case 3: + memcpy(&ret, header->filename + sizeof(uint32_t), + sizeof(uint32_t)); + break; + case 4: + memcpy(&ret, header->filename + 2 * sizeof(uint32_t), + sizeof(uint32_t)); + } + + return ret; +} + +static uint32_t read_gdd(MCBDevice *mdev, int reg) +{ + ChameleonDeviceDescriptor *gdd; + uint32_t ret =3D 0; + + gdd =3D mdev->gdd; + + switch (reg) { + case 0: + ret =3D gdd->reg1; + break; + case 1: + ret =3D gdd->reg2; + break; + case 2: + ret =3D gdd->offset; + break; + case 3: + ret =3D gdd->size; + break; + } + + return ret; +} + +static uint64_t mpci_chamtbl_read(void *opaque, hwaddr addr, unsigned size) +{ + MPCIState *s =3D opaque; + MCBus *bus =3D &s->bus; + MCBDevice *mdev; + + trace_mpci_chamtbl_read(addr, size); + + if (addr < sizeof(ChameleonFPGAHeader)) { + return le32_to_cpu(read_header(s, addr)); + } else if (addr >=3D sizeof(ChameleonFPGAHeader) && + addr < CHAMELEON_TABLE_SIZE) { + /* Handle read on chameleon table */ + BusChild *kid; + DeviceState *qdev; + int slot; + int offset; + int i; + + offset =3D addr - sizeof(ChameleonFPGAHeader); + slot =3D offset / sizeof(ChameleonDeviceDescriptor); + + kid =3D QTAILQ_FIRST(&BUS(bus)->children); + for (i =3D 0; i < slot; i++) { + kid =3D QTAILQ_NEXT(kid, sibling); + if (!kid) { /* Last element */ + return ~0U; + } + } + qdev =3D kid->child; + mdev =3D MCB_DEVICE(qdev); + offset -=3D slot * 16; + + return le32_to_cpu(read_gdd(mdev, offset / 4)); + } + + return 0; +} + +static void mpci_chamtbl_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + + if (addr < CHAMELEON_TABLE_SIZE) { + trace_mpci_chamtbl_write(addr, val); + } + + return; +} + +static const MemoryRegionOps mpci_chamtbl_ops =3D { + .read =3D mpci_chamtbl_read, + .write =3D mpci_chamtbl_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + }, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + }, +}; + +static void mcb_pci_set_irq(void *opaque, int intno, int level) +{ + MCBDevice *mdev =3D opaque; + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(mdev))); + PCIDevice *pcidev =3D PCI_DEVICE(BUS(bus)->parent); + MPCIState *dev =3D MPCI(pcidev); + + trace_mpci_set_irq(intno, level); + if (level) { + pci_set_irq(pcidev, !dev->int_set); + pci_set_irq(pcidev, dev->int_set); + } else { + uint16_t level_status =3D dev->status; + + if (level_status && !dev->int_set) { + pci_irq_assert(pcidev); + dev->int_set =3D 1; + } else if (!level_status && dev->int_set) { + pci_irq_deassert(pcidev); + dev->int_set =3D 0; + } + } +} + +static void mcb_pci_write_config(PCIDevice *pci_dev, uint32_t address, + uint32_t val, int len) +{ + pci_default_write_config(pci_dev, address, val, len); +} + +static void mcb_pci_realize(PCIDevice *pci_dev, Error **errp) +{ + MPCIState *s =3D MPCI(pci_dev); + uint8_t *pci_conf =3D s->dev.config; + ChameleonFPGAHeader *header; + MCBus *bus =3D &s->bus; + + header =3D g_new0(ChameleonFPGAHeader, 1); + + s->header =3D header; + + header->revision =3D s->rev; + header->model =3D (char) s->model; + header->minor =3D s->minor; + header->bus_type =3D CHAMELEON_BUS_TYPE_WISHBONE; + header->magic =3D CHAMELEONV2_MAGIC; + memcpy(&header->filename, "QEMU MCB PCI", 12); + + pci_dev->config_write =3D mcb_pci_write_config; + pci_set_byte(pci_conf + PCI_INTERRUPT_PIN, 0x01); /* Interrupt pin A */ + pci_conf[PCI_COMMAND] =3D PCI_COMMAND_MEMORY; + + mcb_bus_init(bus, sizeof(MCBus), DEVICE(pci_dev), N_MODULES, + mcb_pci_set_irq); + + memory_region_init(&bus->mmio_region, OBJECT(s), "mcb-pci.mmio", + 2048 * 1024); + memory_region_init_io(&s->ctbl, OBJECT(s), &mpci_chamtbl_ops, + s, "mpci_chamtbl_ops", CHAMELEON_TABLE_SIZE); + memory_region_add_subregion(&bus->mmio_region, 0, &s->ctbl); + pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, + &bus->mmio_region); + +} + +static void mcb_pci_unrealize(PCIDevice *pci_dev) +{ + MPCIState *s =3D MPCI(pci_dev); + + g_free(s->header); + s->header =3D NULL; +} + +static const VMStateDescription vmstate_mcb_pci =3D { + .name =3D "mcb-pci", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_PCI_DEVICE(dev, MPCIState), + VMSTATE_END_OF_LIST() + } +}; + +static Property mcb_pci_props[] =3D { + DEFINE_PROP_UINT8("revision", MPCIState, rev, 1), + DEFINE_PROP_UINT8("minor", MPCIState, minor, 0), + DEFINE_PROP_UINT8("model", MPCIState, model, 0x41), + DEFINE_PROP_END_OF_LIST(), +}; + +static void mcb_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + + k->realize =3D mcb_pci_realize; + k->exit =3D mcb_pci_unrealize; + k->vendor_id =3D PCI_VENDOR_ID_MEN; + k->device_id =3D PCI_DEVICE_ID_MEN_MCBPCI; + k->class_id =3D PCI_CLASS_BRIDGE_OTHER; + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc =3D "MEN Chameleon Bus over PCI"; + dc->vmsd =3D &vmstate_mcb_pci; + device_class_set_props(dc, mcb_pci_props); +} + +static const TypeInfo mcb_pci_info =3D { + .name =3D TYPE_MCB_PCI, + .parent =3D TYPE_PCI_DEVICE, + .instance_size =3D sizeof(MPCIState), + .class_init =3D mcb_pci_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { } + }, +}; + +static void mcb_pci_register_types(void) +{ + type_register(&mcb_pci_info); +} +type_init(mcb_pci_register_types); diff --git a/hw/mcb/meson.build b/hw/mcb/meson.build index a385edc07c..4e1a0f0cdb 100644 --- a/hw/mcb/meson.build +++ b/hw/mcb/meson.build @@ -1 +1,2 @@ softmmu_ss.add(when: 'CONFIG_MCB', if_true: files('mcb.c')) +softmmu_ss.add(when: 'CONFIG_MCB_PCI', if_true: files('mcb-pci.c')) diff --git a/hw/mcb/trace-events b/hw/mcb/trace-events new file mode 100644 index 0000000000..e4f71315ab --- /dev/null +++ b/hw/mcb/trace-events @@ -0,0 +1,4 @@ +# mcb-pci.c +mpci_chamtbl_read(unsigned long addr, unsigned int size) "read from addres= s 0x%lx size %d" +mpci_chamtbl_write(unsigned long addr, uint64_t val) "invalid write to 0x%= lx: 0x%" PRIx64 +mpci_set_irq(int intno, int level) "set IRQ #%d (level=3D%d)" diff --git a/hw/mcb/trace.h b/hw/mcb/trace.h new file mode 100644 index 0000000000..35653b3381 --- /dev/null +++ b/hw/mcb/trace.h @@ -0,0 +1 @@ +#include "trace/trace-hw_mcb.h" diff --git a/meson.build b/meson.build index c44d05a13f..26fe8e4115 100644 --- a/meson.build +++ b/meson.build @@ -2990,6 +2990,7 @@ if have_system 'hw/input', 'hw/intc', 'hw/isa', + 'hw/mcb', 'hw/mem', 'hw/mips', 'hw/misc', --=20 2.39.2 From nobody Tue May 14 22:17:54 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; dmarc=fail(p=none dis=none) header.from=kernel.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681857688531779.2991518923691; Tue, 18 Apr 2023 15:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1popGA-0002cU-0O; Tue, 18 Apr 2023 13:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1popG9-0002by-Dy for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: from mail-ej1-f42.google.com ([209.85.218.42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1popG7-0007HD-Dh for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: by mail-ej1-f42.google.com with SMTP id vc20so20295737ejc.10 for ; Tue, 18 Apr 2023 10:36:51 -0700 (PDT) Received: from localhost.localdomain (aftr-62-216-205-204.dynamic.mnet-online.de. [62.216.205.204]) by smtp.googlemail.com with ESMTPSA id j23-20020a1709066c1700b0095342bfb701sm73738ejr.16.2023.04.18.10.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 10:36:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681839410; x=1684431410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FE6Q2IcdC4/dlJSljQioDP6Jf5qnL+b5tpnHVTBSVH0=; b=AvwE9eRXRwuUQY2J/AOKs3xesdw360t1qnD+IYRxONZRLPOEaejRu3jUkUrXFXuWVS eE3kG9ci9xmXzfDo1Poe/RW6XlD6RqnLvd7oIdyL9Yj/14Iqpc39UQGudzRI7X/ssk5J D+AyIzkhEDbKmnOMORYsLsejOi/pkaLlatOXK5Ocd3I8YU07hQmgG8bLAYhj1eeGgSpx mWpdWCaAxYIsdFEQlTjRSwrHdN5BxdVV0bLl8XIx1/6AgdH+uRwhpTXTbD/BGBEB8MAS UxZxTVVRTJgE9yd+w645JU/QnAmQFdWOnXCgjfzirlkKX4PRFTwCSrGM/9bVbMyrmLl5 rDGw== X-Gm-Message-State: AAQBX9e+yfY2ZlHvfsL8gm4uUQBK0MJJ1aHzE2lrmtbuXGv6hG/fx8j6 6FhU7osQh6X8587/bncglk47NBgTWD8F06xu X-Google-Smtp-Source: AKy350ZFL6HJUXqNNTUG9obWAsPy40uSD2iZqEv047/bjyNeac1DsRZJVnF7gsfXDKR0Yjn3ZrHW3Q== X-Received: by 2002:a17:906:6d15:b0:94a:a41b:558 with SMTP id m21-20020a1709066d1500b0094aa41b0558mr12821736ejr.54.1681839409818; Tue, 18 Apr 2023 10:36:49 -0700 (PDT) From: Johannes Thumshirn To: qemu-devel@nongnu.org Cc: Alistair Francis , Javier Rodriguez , =?UTF-8?q?Jorge=20Sanjuan=20Garc=C3=ADa?= , Peter Maydell , Dmitry Fomichev , Johannes Thumshirn , Alistair Francis Subject: [PATCH v4 3/4] serial-mcb: Add serial via MEN chameleon bus Date: Tue, 18 Apr 2023 19:35:55 +0200 Message-Id: <20230418173556.177985-4-jth@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418173556.177985-1-jth@kernel.org> References: <20230418173556.177985-1-jth@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: pass client-ip=209.85.218.42; envelope-from=morbidrsa@gmail.com; helo=mail-ej1-f42.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1681857688893100009 Content-Type: text/plain; charset="utf-8" Add MEN z125 UART over MEN Chameleon Bus emulation. Acked-by: Alistair Francis Signed-off-by: Johannes Thumshirn --- hw/char/Kconfig | 6 +++ hw/char/meson.build | 1 + hw/char/serial-mcb.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 hw/char/serial-mcb.c diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6b6cf2fc1d..9e8ebf1d3d 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -71,3 +71,9 @@ config GOLDFISH_TTY =20 config SHAKTI_UART bool + +config SERIAL_MCB + bool + default y if MCB + depends on MCB + select SERIAL diff --git a/hw/char/meson.build b/hw/char/meson.build index e02c60dd54..d5893a142d 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -20,6 +20,7 @@ softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files= ('shakti_uart.c')) softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-consol= e.c')) softmmu_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen_console.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c')) +softmmu_ss.add(when: 'CONFIG_SERIAL_MCB', if_true: files('serial-mcb.c')) =20 softmmu_ss.add(when: 'CONFIG_AVR_USART', if_true: files('avr_usart.c')) softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_uart.c')) diff --git a/hw/char/serial-mcb.c b/hw/char/serial-mcb.c new file mode 100644 index 0000000000..09f8fec11e --- /dev/null +++ b/hw/char/serial-mcb.c @@ -0,0 +1,115 @@ +/* + * QEMU MEN 16z125 UART over MCB emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "hw/char/serial.h" +#include "hw/mcb/mcb.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" +#include "migration/vmstate.h" + +struct MCBSerialState { + MCBDevice dev; + SerialState state; +}; + +#define TYPE_MCB_SERIAL "mcb-serial" +OBJECT_DECLARE_SIMPLE_TYPE(MCBSerialState, MCB_SERIAL) + +static void serial_mcb_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MCBSerialState *mss =3D DO_UPCAST(MCBSerialState, dev, mdev); + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + SerialState *s =3D &mss->state; + + mdev->gdd =3D mcb_new_chameleon_descriptor(bus, 125, mdev->rev, + mdev->var, 0x10); + if (!mdev->gdd) { + return; + } + + s->baudbase =3D 115200; + if (!qdev_realize(DEVICE(s), NULL, errp)) { + return; + } + + s->irq =3D mcb_allocate_irq(&mss->dev); + memory_region_init_io(&s->io, OBJECT(mss), &serial_io_ops, s, "serial"= , 8); + memory_region_add_subregion(&bus->mmio_region, mdev->gdd->offset, &s->= io); +} + +static void serial_mcb_unrealize(DeviceState *dev) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MCBSerialState *mss =3D DO_UPCAST(MCBSerialState, dev, mdev); + SerialState *s =3D &mss->state; + + qdev_unrealize(DEVICE(s)); + qemu_free_irq(s->irq); + g_free(&mdev->gdd); +} + +static const VMStateDescription vmstate_mcb_serial =3D { + .name =3D "mcb-serial", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_MCB_DEVICE(dev, MCBSerialState), + VMSTATE_STRUCT(state, MCBSerialState, 0, vmstate_serial, SerialSta= te), + VMSTATE_END_OF_LIST() + } +}; + +static Property serial_mcb_properties[] =3D { + DEFINE_PROP_UINT8("rev", MCBSerialState, dev.rev, 0), + DEFINE_PROP_UINT8("var", MCBSerialState, dev.var, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void serial_mcb_class_initfn(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + MCBDeviceClass *mc =3D MCB_DEVICE_CLASS(klass); + + mc->realize =3D serial_mcb_realize; + mc->unrealize =3D serial_mcb_unrealize; + + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + dc->desc =3D "MEN 16z125 UART over MCB"; + dc->vmsd =3D &vmstate_mcb_serial; + device_class_set_props(dc, serial_mcb_properties); +} + +static void serial_mcb_init(Object *o) +{ + MCBSerialState *mss =3D MCB_SERIAL(o); + + object_initialize_child(o, "serial", &mss->state, TYPE_SERIAL); + + qdev_alias_all_properties(DEVICE(&mss->state), o); +} + +static const TypeInfo serial_mcb_info =3D { + .name =3D "mcb-serial", + .parent =3D TYPE_MCB_DEVICE, + .instance_size =3D sizeof(MCBSerialState), + .instance_init =3D serial_mcb_init, + .class_init =3D serial_mcb_class_initfn, +}; + +static void serial_mcb_register_types(void) +{ + type_register_static(&serial_mcb_info); +} + +type_init(serial_mcb_register_types); --=20 2.39.2 From nobody Tue May 14 22:17:54 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; dmarc=fail(p=none dis=none) header.from=kernel.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16818570687581016.1333925700505; Tue, 18 Apr 2023 15:31:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1popGC-0002eP-Tc; Tue, 18 Apr 2023 13:36:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1popGA-0002cV-4G for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:54 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1popG8-0007HO-As for qemu-devel@nongnu.org; Tue, 18 Apr 2023 13:36:53 -0400 Received: by mail-ej1-f47.google.com with SMTP id u3so23250237ejj.12 for ; Tue, 18 Apr 2023 10:36:51 -0700 (PDT) Received: from localhost.localdomain (aftr-62-216-205-204.dynamic.mnet-online.de. [62.216.205.204]) by smtp.googlemail.com with ESMTPSA id j23-20020a1709066c1700b0095342bfb701sm73738ejr.16.2023.04.18.10.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 10:36:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681839411; x=1684431411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JpAMgmt2TgpqVrboahAY5/F1nVHhsfZscl13tr9kfxg=; b=VvkxopEUqGj5arlWa4uRMCpC/KnqwJcm5l028IbrJV6zsrrgj4ZJGyrXvcrWwT5wg4 ZF0ixQ2XKBIdreakY/DovWn8IwXZvyvHiLsVAAifjH6HWY82aqzUKxJc/JeS21wuMY08 tjQfwJQJkVJS7rx8fx3Yb69buJwBYDi5hq0lq11Amup9ZM4Pzex5yOSV3md6KOs4VtWr U26lI6XdwdEqUcX58RnUcPeLvPP5DZQTBnqbYKqP1SauiWRpPd/IUPw+xxs8fBerH2ol anKkc+HLBO17jt0RlZK9WdzNcgpCplB1wNByREcBvog0t3RdMAcV0KXhRZqxjXhLP4I3 7oaA== X-Gm-Message-State: AAQBX9fFARcK5CuROvSbBlL5iO+PO3H3bbD0zvxCAwuL+DFOkhQuAsWj Zy9SPh4I3hznjIuFZd60CBqJb2C4JMjc8hwq X-Google-Smtp-Source: AKy350Ze6gTJbihLuToqTn/P4+7NDMTb96Bi3KHaHVYUp19v198OpWLZYIRf0ScIf8YzqL4fSLLC3A== X-Received: by 2002:a17:906:4b1a:b0:94f:3f22:2d37 with SMTP id y26-20020a1709064b1a00b0094f3f222d37mr9335269eju.55.1681839410782; Tue, 18 Apr 2023 10:36:50 -0700 (PDT) From: Johannes Thumshirn To: qemu-devel@nongnu.org Cc: Alistair Francis , Javier Rodriguez , =?UTF-8?q?Jorge=20Sanjuan=20Garc=C3=ADa?= , Peter Maydell , Dmitry Fomichev , Johannes Thumshirn Subject: [PATCH v4 4/4] wdt_z069: Add support for MEN 16z069 Watchdog Date: Tue, 18 Apr 2023 19:35:56 +0200 Message-Id: <20230418173556.177985-5-jth@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230418173556.177985-1-jth@kernel.org> References: <20230418173556.177985-1-jth@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: pass client-ip=209.85.218.47; envelope-from=morbidrsa@gmail.com; helo=mail-ej1-f47.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1681857070658100001 Content-Type: text/plain; charset="utf-8" Add 16z069 Watchdog over MEN Chameleon BUS emulation. Signed-off-by: Johannes Thumshirn --- hw/watchdog/Kconfig | 5 + hw/watchdog/meson.build | 1 + hw/watchdog/trace-events | 6 ++ hw/watchdog/wdt_z069.c | 207 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+) create mode 100644 hw/watchdog/wdt_z069.c diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 66e1d029e3..a3f1196f66 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -20,3 +20,8 @@ config WDT_IMX2 =20 config WDT_SBSA bool + +config WDT_Z069 + bool + default y if MCB + depends on MCB diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build index 8974b5cf4c..7bc353774e 100644 --- a/hw/watchdog/meson.build +++ b/hw/watchdog/meson.build @@ -6,4 +6,5 @@ softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('= wdt_diag288.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c')) softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c')) softmmu_ss.add(when: 'CONFIG_WDT_SBSA', if_true: files('sbsa_gwdt.c')) +softmmu_ss.add(when: 'CONFIG_WDT_Z069', if_true: files('wdt_z069.c')) specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_watchdog.c')) diff --git a/hw/watchdog/trace-events b/hw/watchdog/trace-events index 54371ae075..854fa3f0c8 100644 --- a/hw/watchdog/trace-events +++ b/hw/watchdog/trace-events @@ -17,6 +17,12 @@ spapr_watchdog_query(uint64_t caps) "caps=3D0x%" PRIx64 spapr_watchdog_query_lpm(uint64_t caps) "caps=3D0x%" PRIx64 spapr_watchdog_expired(uint64_t num, unsigned action) "num=3D%" PRIu64 " a= ction=3D%u" =20 +# wdt_z069.c +men_z069_wdt_enable(unsigned int timeout) "next timeout will fire in +%dms" +men_z069_wdt_write_wtr(uint16_t tout, uint16_t t, unsigned int timeout) "n= ew timeout: %u (0x%x) %u" +men_z069_wdt_write_wvr(uint16_t wvr, unsigned int timeout) "watchdog trigg= ered (wvr=3D0x%x), next timeout will fire in +%dms" +men_z069_wdt_read(unsigned long addr, int size, uint64_t ret) "addr=3D0x%l= x, size=3D%d, ret=3D0x%" PRIx64 + # watchdog.c watchdog_perform_action(unsigned int action) "action=3D%u" watchdog_set_action(unsigned int action) "action=3D%u" diff --git a/hw/watchdog/wdt_z069.c b/hw/watchdog/wdt_z069.c new file mode 100644 index 0000000000..eb58a44697 --- /dev/null +++ b/hw/watchdog/wdt_z069.c @@ -0,0 +1,207 @@ +/* + * QEMU MEN 16z069 Watchdog over MCB emulation + * + * Copyright (C) 2023 Johannes Thumshirn + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qemu/timer.h" +#include "sysemu/watchdog.h" +#include "hw/mcb/mcb.h" +#include "migration/vmstate.h" +#include "hw/qdev-properties.h" +#include "trace.h" + +#define MEN_Z069_WTR 0x10 +#define MEN_Z069_WTR_WDEN BIT(15) +#define MEN_Z069_WTR_WDET_MASK 0x7fff +#define MEN_Z069_WVR 0x14 + +#define CLK_500(x) ((x) * 2) /* 500Hz in ms */ + +typedef struct { + /*< private >*/ + MCBDevice dev; + + /*< public >*/ + QEMUTimer *timer; + + bool enabled; + unsigned int timeout; + + MemoryRegion mmio; + + /* Registers */ + uint16_t wtr; + uint16_t wvr; +} MENZ069State; + +static void men_z069_wdt_enable(MENZ069State *s) +{ + trace_men_z069_wdt_enable(s->timeout); + timer_mod(s->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->timeout= ); +} + +static void men_z069_wdt_disable(MENZ069State *s) +{ + timer_del(s->timer); +} + +static uint64_t men_z069_wdt_read(void *opaque, hwaddr addr, unsigned size) +{ + MENZ069State *s =3D opaque; + uint64_t ret; + + switch (addr) { + case MEN_Z069_WTR: + ret =3D s->wtr; + break; + case MEN_Z069_WVR: + ret =3D s->wvr; + break; + default: + ret =3D 0UL; + break; + } + + trace_men_z069_wdt_read(addr, size, ret); + return ret; +} + +static void men_z069_wdt_write(void *opaque, hwaddr addr, uint64_t v, + unsigned size) +{ + MENZ069State *s =3D opaque; + bool old_ena =3D s->enabled; + uint16_t val =3D v & 0xffff; + uint16_t tout; + + switch (addr) { + case MEN_Z069_WTR: + s->wtr =3D val; + tout =3D val & MEN_Z069_WTR_WDET_MASK; + s->timeout =3D CLK_500(tout); + s->enabled =3D val & MEN_Z069_WTR_WDEN; + trace_men_z069_wdt_write_wtr(tout, tout, s->timeout); + + if (old_ena && !s->enabled) { + men_z069_wdt_disable(s); + } else if (!old_ena && s->enabled) { + men_z069_wdt_enable(s); + } + + break; + case MEN_Z069_WVR: + /* The watchdog trigger value toggles between 0x5555 and 0xaaaa */ + if (val =3D=3D (s->wvr ^ 0xffff)) { + s->wvr =3D val; + trace_men_z069_wdt_write_wvr(s->wvr, s->timeout); + timer_mod(s->timer, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->timeout); + } + break; + default: + break; + } + return; +} + +static const MemoryRegionOps men_z069_io_ops =3D { + .read =3D men_z069_wdt_read, + .write =3D men_z069_wdt_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 2, + .max_access_size =3D 2 + }, + .impl =3D { + .min_access_size =3D 2, + .max_access_size =3D 2 + }, +}; + +static void men_z069_timer_expired(void *opaque) +{ + MENZ069State *s =3D opaque; + + watchdog_perform_action(); + timer_del(s->timer); +} + +static void men_z069_wdt_realize(DeviceState *dev, Error **errp) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + MENZ069State *s =3D DO_UPCAST(MENZ069State, dev, mdev); + MCBus *bus =3D MCB_BUS(qdev_get_parent_bus(DEVICE(dev))); + + mdev->gdd =3D mcb_new_chameleon_descriptor(bus, 69, mdev->rev, + mdev->var, 0x18); + if (!mdev->gdd) { + return; + } + + s->wvr =3D 0x5555; + s->wtr =3D 0x7fff; + s->timeout =3D CLK_500(s->wtr & MEN_Z069_WTR_WDET_MASK); + s->timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, + men_z069_timer_expired, s); + + memory_region_init_io(&s->mmio, OBJECT(s), + &men_z069_io_ops, s, "z069.wdt", 0x16); + memory_region_add_subregion(&bus->mmio_region, mdev->gdd->offset, + &s->mmio); +} + +static void men_z069_wdt_unrealize(DeviceState *dev) +{ + MCBDevice *mdev =3D MCB_DEVICE(dev); + + g_free(&mdev->gdd); +} + +static const VMStateDescription vmstate_z069_wdt =3D { + .name =3D "z069-wdt", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_MCB_DEVICE(dev, MENZ069State), + VMSTATE_TIMER_PTR(timer, MENZ069State), + VMSTATE_END_OF_LIST() + } +}; + +static Property men_z069_wdt_properties[] =3D { + DEFINE_PROP_UINT8("rev", MENZ069State, dev.rev, 0), + DEFINE_PROP_UINT8("var", MENZ069State, dev.var, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void men_z069_wdt_class_intifn(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + MCBDeviceClass *mc =3D MCB_DEVICE_CLASS(klass); + + mc->realize =3D men_z069_wdt_realize; + mc->unrealize =3D men_z069_wdt_unrealize; + + dc->desc =3D "MEN 16z069 Watchdog Timer"; + dc->vmsd =3D &vmstate_z069_wdt; + device_class_set_props(dc, men_z069_wdt_properties); +} + +static const TypeInfo men_z069_wdt_info =3D { + .name =3D "z069-wdt", + .parent =3D TYPE_MCB_DEVICE, + .instance_size =3D sizeof(MENZ069State), + .class_init =3D men_z069_wdt_class_intifn, +}; + +static void men_z069_wdt_register_types(void) +{ + type_register_static(&men_z069_wdt_info); +} + +type_init(men_z069_wdt_register_types); --=20 2.39.2