From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F753C6FD18 for ; Tue, 18 Apr 2023 17:38:17 +0000 (UTC) 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) 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) 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) 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: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 = 0; + ChameleonFPGAHeader *header = s->header; + + switch (addr >> 2) { + case 0: + ret |= header->revision; + ret |= header->model << 8; + ret |= header->minor << 16; + ret |= header->bus_type << 24; + break; + case 1: + ret |= header->magic; + ret |= 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 = 0; + + gdd = mdev->gdd; + + switch (reg) { + case 0: + ret = gdd->reg1; + break; + case 1: + ret = gdd->reg2; + break; + case 2: + ret = gdd->offset; + break; + case 3: + ret = gdd->size; + break; + } + + return ret; +} + +static uint64_t mpci_chamtbl_read(void *opaque, hwaddr addr, unsigned size) +{ + MPCIState *s = opaque; + MCBus *bus = &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 >= sizeof(ChameleonFPGAHeader) && + addr < CHAMELEON_TABLE_SIZE) { + /* Handle read on chameleon table */ + BusChild *kid; + DeviceState *qdev; + int slot; + int offset; + int i; + + offset = addr - sizeof(ChameleonFPGAHeader); + slot = offset / sizeof(ChameleonDeviceDescriptor); + + kid = QTAILQ_FIRST(&BUS(bus)->children); + for (i = 0; i < slot; i++) { + kid = QTAILQ_NEXT(kid, sibling); + if (!kid) { /* Last element */ + return ~0U; + } + } + qdev = kid->child; + mdev = MCB_DEVICE(qdev); + offset -= 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 = { + .read = mpci_chamtbl_read, + .write = mpci_chamtbl_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4 + }, + .impl = { + .min_access_size = 4, + .max_access_size = 4 + }, +}; + +static void mcb_pci_set_irq(void *opaque, int intno, int level) +{ + MCBDevice *mdev = opaque; + MCBus *bus = MCB_BUS(qdev_get_parent_bus(DEVICE(mdev))); + PCIDevice *pcidev = PCI_DEVICE(BUS(bus)->parent); + MPCIState *dev = 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 = dev->status; + + if (level_status && !dev->int_set) { + pci_irq_assert(pcidev); + dev->int_set = 1; + } else if (!level_status && dev->int_set) { + pci_irq_deassert(pcidev); + dev->int_set = 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 = MPCI(pci_dev); + uint8_t *pci_conf = s->dev.config; + ChameleonFPGAHeader *header; + MCBus *bus = &s->bus; + + header = g_new0(ChameleonFPGAHeader, 1); + + s->header = header; + + header->revision = s->rev; + header->model = (char) s->model; + header->minor = s->minor; + header->bus_type = CHAMELEON_BUS_TYPE_WISHBONE; + header->magic = CHAMELEONV2_MAGIC; + memcpy(&header->filename, "QEMU MCB PCI", 12); + + pci_dev->config_write = mcb_pci_write_config; + pci_set_byte(pci_conf + PCI_INTERRUPT_PIN, 0x01); /* Interrupt pin A */ + pci_conf[PCI_COMMAND] = 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 = MPCI(pci_dev); + + g_free(s->header); + s->header = NULL; +} + +static const VMStateDescription vmstate_mcb_pci = { + .name = "mcb-pci", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(dev, MPCIState), + VMSTATE_END_OF_LIST() + } +}; + +static Property mcb_pci_props[] = { + 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 = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->realize = mcb_pci_realize; + k->exit = mcb_pci_unrealize; + k->vendor_id = PCI_VENDOR_ID_MEN; + k->device_id = PCI_DEVICE_ID_MEN_MCBPCI; + k->class_id = PCI_CLASS_BRIDGE_OTHER; + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc = "MEN Chameleon Bus over PCI"; + dc->vmsd = &vmstate_mcb_pci; + device_class_set_props(dc, mcb_pci_props); +} + +static const TypeInfo mcb_pci_info = { + .name = TYPE_MCB_PCI, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(MPCIState), + .class_init = mcb_pci_class_init, + .interfaces = (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 address 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=%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', -- 2.39.2