* [PATCH v3 01/11] hw/misc: Add Nuvoton's PCI Mailbox Module
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 02/11] hw/arm: Add PCI mailbox module to Nuvoton SoC Nabih Estefan
` (9 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman
From: Hao Wu <wuhaotsh@google.com>
The PCI Mailbox Module is a high-bandwidth communcation module
between a Nuvoton BMC and CPU. It features 16KB RAM that are both
accessible by the BMC and core CPU. and supports interrupt for
both sides.
This patch implements the BMC side of the PCI mailbox module.
Communication with the core CPU is emulated via a chardev and
will be in a follow-up patch.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
---
hw/arm/npcm7xx.c | 16 +-
hw/misc/meson.build | 1 +
hw/misc/npcm7xx_pci_mbox.c | 324 +++++++++++++++++++++++++++++
hw/misc/trace-events | 5 +
include/hw/arm/npcm7xx.h | 1 +
include/hw/misc/npcm7xx_pci_mbox.h | 81 ++++++++
6 files changed, 427 insertions(+), 1 deletion(-)
create mode 100644 hw/misc/npcm7xx_pci_mbox.c
create mode 100644 include/hw/misc/npcm7xx_pci_mbox.h
diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index 15ff21d047..c69e936669 100644
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -53,6 +53,9 @@
/* ADC Module */
#define NPCM7XX_ADC_BA (0xf000c000)
+/* PCI Mailbox Module */
+#define NPCM7XX_PCI_MBOX_BA (0xf0848000)
+
/* Internal AHB SRAM */
#define NPCM7XX_RAM3_BA (0xc0008000)
#define NPCM7XX_RAM3_SZ (4 * KiB)
@@ -83,6 +86,10 @@ enum NPCM7xxInterrupt {
NPCM7XX_UART1_IRQ,
NPCM7XX_UART2_IRQ,
NPCM7XX_UART3_IRQ,
+ NPCM7XX_PECI_IRQ = 6,
+ NPCM7XX_PCI_MBOX_IRQ = 8,
+ NPCM7XX_KCS_HIB_IRQ = 9,
+ NPCM7XX_GMAC1_IRQ = 14,
NPCM7XX_EMC1RX_IRQ = 15,
NPCM7XX_EMC1TX_IRQ,
NPCM7XX_MMC_IRQ = 26,
@@ -706,6 +713,14 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
}
}
+ /* PCI Mailbox. Cannot fail */
+ sysbus_realize(SYS_BUS_DEVICE(&s->pci_mbox), &error_abort);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->pci_mbox), 0, NPCM7XX_PCI_MBOX_BA);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->pci_mbox), 1,
+ NPCM7XX_PCI_MBOX_BA + NPCM7XX_PCI_MBOX_RAM_SIZE);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pci_mbox), 0,
+ npcm7xx_irq(s, NPCM7XX_PCI_MBOX_IRQ));
+
/* RAM2 (SRAM) */
memory_region_init_ram(&s->sram, OBJECT(dev), "ram2",
NPCM7XX_RAM2_SZ, &error_abort);
@@ -765,7 +780,6 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
create_unimplemented_device("npcm7xx.usbd[8]", 0xf0838000, 4 * KiB);
create_unimplemented_device("npcm7xx.usbd[9]", 0xf0839000, 4 * KiB);
create_unimplemented_device("npcm7xx.sd", 0xf0840000, 8 * KiB);
- create_unimplemented_device("npcm7xx.pcimbx", 0xf0848000, 512 * KiB);
create_unimplemented_device("npcm7xx.aes", 0xf0858000, 4 * KiB);
create_unimplemented_device("npcm7xx.des", 0xf0859000, 4 * KiB);
create_unimplemented_device("npcm7xx.sha", 0xf085a000, 4 * KiB);
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index f60de33f9a..3ee3f2226f 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -73,6 +73,7 @@ system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
'npcm7xx_clk.c',
'npcm7xx_gcr.c',
'npcm7xx_mft.c',
+ 'npcm7xx_pci_mbox.c',
'npcm7xx_pwm.c',
'npcm7xx_rng.c',
))
diff --git a/hw/misc/npcm7xx_pci_mbox.c b/hw/misc/npcm7xx_pci_mbox.c
new file mode 100644
index 0000000000..c770ad6fcf
--- /dev/null
+++ b/hw/misc/npcm7xx_pci_mbox.c
@@ -0,0 +1,324 @@
+/*
+ * Nuvoton NPCM7xx PCI Mailbox Module
+ *
+ * Copyright 2021 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "qemu/osdep.h"
+#include "chardev/char-fe.h"
+#include "hw/irq.h"
+#include "hw/qdev-clock.h"
+#include "hw/qdev-properties-system.h"
+#include "hw/misc/npcm7xx_pci_mbox.h"
+#include "hw/registerfields.h"
+#include "migration/vmstate.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"
+#include "qemu/bitops.h"
+#include "qemu/error-report.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qemu/timer.h"
+#include "qemu/units.h"
+#include "trace.h"
+
+REG32(NPCM7XX_PCI_MBOX_BMBXSTAT, 0x00);
+REG32(NPCM7XX_PCI_MBOX_BMBXCTL, 0x04);
+REG32(NPCM7XX_PCI_MBOX_BMBXCMD, 0x08);
+
+enum NPCM7xxPCIMBoxOperation {
+ NPCM7XX_PCI_MBOX_OP_READ = 1,
+ NPCM7XX_PCI_MBOX_OP_WRITE,
+};
+
+#define NPCM7XX_PCI_MBOX_OFFSET_BYTES 8
+
+/* Response code */
+#define NPCM7XX_PCI_MBOX_OK 0
+#define NPCM7XX_PCI_MBOX_INVALID_OP 0xa0
+#define NPCM7XX_PCI_MBOX_INVALID_SIZE 0xa1
+#define NPCM7XX_PCI_MBOX_UNSPECIFIED_ERROR 0xff
+
+#define NPCM7XX_PCI_MBOX_NR_CI 8
+#define NPCM7XX_PCI_MBOX_CI_MASK MAKE_64BIT_MASK(0, NPCM7XX_PCI_MBOX_NR_CI)
+
+static void npcm7xx_pci_mbox_update_irq(NPCM7xxPCIMBoxState *s)
+{
+ /* We should send an interrupt when one of the CIE and CIF are both 1. */
+ if (s->regs[R_NPCM7XX_PCI_MBOX_BMBXSTAT] &
+ s->regs[R_NPCM7XX_PCI_MBOX_BMBXCTL] &
+ NPCM7XX_PCI_MBOX_CI_MASK) {
+ qemu_irq_raise(s->irq);
+ trace_npcm7xx_pci_mbox_irq(1);
+ } else {
+ qemu_irq_lower(s->irq);
+ trace_npcm7xx_pci_mbox_irq(0);
+ }
+}
+
+static void npcm7xx_pci_mbox_send_response(NPCM7xxPCIMBoxState *s, uint8_t code)
+{
+ qemu_chr_fe_write(&s->chr, &code, 1);
+ if (code == NPCM7XX_PCI_MBOX_OK && s->op == NPCM7XX_PCI_MBOX_OP_READ) {
+ qemu_chr_fe_write(&s->chr, (uint8_t *)(&s->data), s->size);
+ }
+}
+
+static void npcm7xx_pci_mbox_handle_read(NPCM7xxPCIMBoxState *s)
+{
+ MemTxResult r = memory_region_dispatch_read(
+ &s->ram, s->offset, &s->data, MO_LE | size_memop(s->size),
+ MEMTXATTRS_UNSPECIFIED);
+
+ npcm7xx_pci_mbox_send_response(s, (uint8_t)r);
+}
+
+static void npcm7xx_pci_mbox_handle_write(NPCM7xxPCIMBoxState *s)
+{
+ MemTxResult r = memory_region_dispatch_write(
+ &s->ram, s->offset, s->data, MO_LE | size_memop(s->size),
+ MEMTXATTRS_UNSPECIFIED);
+
+ npcm7xx_pci_mbox_send_response(s, (uint8_t)r);
+}
+
+static void npcm7xx_pci_mbox_receive_char(NPCM7xxPCIMBoxState *s, uint8_t byte)
+{
+ switch (s->state) {
+ case NPCM7XX_PCI_MBOX_STATE_IDLE:
+ switch (byte) {
+ case NPCM7XX_PCI_MBOX_OP_READ:
+ case NPCM7XX_PCI_MBOX_OP_WRITE:
+ s->op = byte;
+ s->state = NPCM7XX_PCI_MBOX_STATE_OFFSET;
+ s->offset = 0;
+ s->receive_count = 0;
+ break;
+
+ default:
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "received invalid op type: 0x%" PRIx8, byte);
+ npcm7xx_pci_mbox_send_response(s, NPCM7XX_PCI_MBOX_INVALID_OP);
+ break;
+ }
+ break;
+
+ case NPCM7XX_PCI_MBOX_STATE_OFFSET:
+ s->offset += (uint64_t)byte << (s->receive_count * BITS_PER_BYTE);
+ if (++s->receive_count >= NPCM7XX_PCI_MBOX_OFFSET_BYTES) {
+ s->state = NPCM7XX_PCI_MBOX_STATE_SIZE;
+ }
+ break;
+
+ case NPCM7XX_PCI_MBOX_STATE_SIZE:
+ s->size = byte;
+ if (s->size < 1 || s->size > sizeof(uint64_t)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "received invalid size: %u", byte);
+ npcm7xx_pci_mbox_send_response(s, NPCM7XX_PCI_MBOX_INVALID_SIZE);
+ s->state = NPCM7XX_PCI_MBOX_STATE_IDLE;
+ break;
+ }
+ if (s->op == NPCM7XX_PCI_MBOX_OP_READ) {
+ npcm7xx_pci_mbox_handle_read(s);
+ s->state = NPCM7XX_PCI_MBOX_STATE_IDLE;
+ } else {
+ s->receive_count = 0;
+ s->data = 0;
+ s->state = NPCM7XX_PCI_MBOX_STATE_DATA;
+ }
+ break;
+
+ case NPCM7XX_PCI_MBOX_STATE_DATA:
+ g_assert(s->op == NPCM7XX_PCI_MBOX_OP_WRITE);
+ s->data += (uint64_t)byte << (s->receive_count * BITS_PER_BYTE);
+ if (++s->receive_count >= s->size) {
+ npcm7xx_pci_mbox_handle_write(s);
+ s->state = NPCM7XX_PCI_MBOX_STATE_IDLE;
+ }
+ break;
+
+ default:
+ g_assert_not_reached();
+ }
+}
+
+static uint64_t npcm7xx_pci_mbox_read(void *opaque, hwaddr offset,
+ unsigned size)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(opaque);
+ uint16_t value = 0;
+
+ if (offset / sizeof(uint32_t) >= NPCM7XX_PCI_MBOX_NR_REGS) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: offset 0x%04" HWADDR_PRIx " out of range\n",
+ __func__, offset);
+ return 0;
+ }
+
+ value = s->regs[offset / sizeof(uint32_t)];
+ trace_npcm7xx_pci_mbox_read(DEVICE(s)->canonical_path, offset, value, size);
+ return value;
+}
+
+static void npcm7xx_pci_mbox_write(void *opaque, hwaddr offset,
+ uint64_t v, unsigned size)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(opaque);
+
+ trace_npcm7xx_pci_mbox_write(DEVICE(s)->canonical_path, offset, v, size);
+ switch (offset) {
+ case A_NPCM7XX_PCI_MBOX_BMBXSTAT:
+ /* Clear bits that are 1. */
+ s->regs[R_NPCM7XX_PCI_MBOX_BMBXSTAT] &= ~v;
+ break;
+
+ case A_NPCM7XX_PCI_MBOX_BMBXCTL:
+ s->regs[R_NPCM7XX_PCI_MBOX_BMBXCTL] = v;
+ break;
+
+ case A_NPCM7XX_PCI_MBOX_BMBXCMD:
+ /* Set the bits that are 1. */
+ s->regs[R_NPCM7XX_PCI_MBOX_BMBXCMD] |= v;
+ /* TODO: Set interrupt to host. */
+ break;
+
+ default:
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: offset 0x%04" HWADDR_PRIx " out of range\n",
+ __func__, offset);
+ }
+ npcm7xx_pci_mbox_update_irq(s);
+}
+
+static const struct MemoryRegionOps npcm7xx_pci_mbox_ops = {
+ .read = npcm7xx_pci_mbox_read,
+ .write = npcm7xx_pci_mbox_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ .unaligned = false,
+ },
+};
+
+static void npcm7xx_pci_mbox_enter_reset(Object *obj, ResetType type)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(obj);
+
+ memset(s->regs, 0, 4 * NPCM7XX_PCI_MBOX_NR_REGS);
+ s->state = NPCM7XX_PCI_MBOX_STATE_IDLE;
+ s->receive_count = 0;
+}
+
+static void npcm7xx_pci_mbox_hold_reset(Object *obj)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(obj);
+
+ qemu_irq_lower(s->irq);
+}
+
+static int can_receive(void *opaque)
+{
+ return 1;
+}
+
+static void receive(void *opaque, const uint8_t *buf, int size)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(opaque);
+ int i;
+
+ for (i = 0; i < size; ++i) {
+ npcm7xx_pci_mbox_receive_char(s, buf[i]);
+ }
+}
+
+static void chr_event(void *opaque, QEMUChrEvent event)
+{
+ switch (event) {
+ case CHR_EVENT_OPENED:
+ case CHR_EVENT_CLOSED:
+ case CHR_EVENT_BREAK:
+ case CHR_EVENT_MUX_IN:
+ case CHR_EVENT_MUX_OUT:
+ /* Ignore */
+ break;
+
+ default:
+ g_assert_not_reached();
+ }
+}
+
+static void npcm7xx_pci_mbox_init(Object *obj)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+
+ memory_region_init_ram_device_ptr(&s->ram, obj, "pci-mbox-ram",
+ NPCM7XX_PCI_MBOX_RAM_SIZE, s->content);
+ memory_region_init_io(&s->iomem, obj, &npcm7xx_pci_mbox_ops, s,
+ "pci-mbox-iomem", 4 * KiB);
+ sysbus_init_mmio(sbd, &s->ram);
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
+}
+
+static void npcm7xx_pci_mbox_realize(DeviceState *dev, Error **errp)
+{
+ NPCM7xxPCIMBoxState *s = NPCM7XX_PCI_MBOX(dev);
+
+ qemu_chr_fe_set_handlers(&s->chr, can_receive, receive,
+ chr_event, NULL, OBJECT(dev), NULL, true);
+}
+
+static const VMStateDescription vmstate_npcm7xx_pci_mbox = {
+ .name = "npcm7xx-pci-mbox-module",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(regs, NPCM7xxPCIMBoxState,
+ NPCM7XX_PCI_MBOX_NR_REGS),
+ VMSTATE_END_OF_LIST(),
+ },
+};
+
+static Property npcm7xx_pci_mbox_properties[] = {
+ DEFINE_PROP_CHR("chardev", NPCM7xxPCIMBoxState, chr),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void npcm7xx_pci_mbox_class_init(ObjectClass *klass, void *data)
+{
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->desc = "NPCM7xx PCI Mailbox Controller";
+ dc->vmsd = &vmstate_npcm7xx_pci_mbox;
+ dc->realize = npcm7xx_pci_mbox_realize;
+ rc->phases.enter = npcm7xx_pci_mbox_enter_reset;
+ rc->phases.hold = npcm7xx_pci_mbox_hold_reset;
+ device_class_set_props(dc, npcm7xx_pci_mbox_properties);
+}
+
+static const TypeInfo npcm7xx_pci_mbox_info = {
+ .name = TYPE_NPCM7XX_PCI_MBOX,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(NPCM7xxPCIMBoxState),
+ .class_init = npcm7xx_pci_mbox_class_init,
+ .instance_init = npcm7xx_pci_mbox_init,
+};
+
+static void npcm7xx_pci_mbox_register_type(void)
+{
+ type_register_static(&npcm7xx_pci_mbox_info);
+}
+type_init(npcm7xx_pci_mbox_register_type);
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index 24ba7cc4d0..36c7840143 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -148,6 +148,11 @@ npcm7xx_pwm_write(const char *id, uint64_t offset, uint32_t value) "%s offset: 0
npcm7xx_pwm_update_freq(const char *id, uint8_t index, uint32_t old_value, uint32_t new_value) "%s pwm[%u] Update Freq: old_freq: %u, new_freq: %u"
npcm7xx_pwm_update_duty(const char *id, uint8_t index, uint32_t old_value, uint32_t new_value) "%s pwm[%u] Update Duty: old_duty: %u, new_duty: %u"
+# npcm7xx_pci_mbox.c
+npcm7xx_pci_mbox_read(const char *id, uint64_t offset, uint64_t value, unsigned size) "%s offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u"
+npcm7xx_pci_mbox_write(const char *id, uint64_t offset, uint64_t value, unsigned size) "%s offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u"
+npcm7xx_pci_mbox_irq(int irq_level) "irq level: %d"
+
# stm32f4xx_syscfg.c
stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interrupt: GPIO: %d, Line: %d; Level: %d"
stm32f4xx_pulse_exti(int irq) "Pulse EXTI: %d"
diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
index 72c7722096..273090ac60 100644
--- a/include/hw/arm/npcm7xx.h
+++ b/include/hw/arm/npcm7xx.h
@@ -26,6 +26,7 @@
#include "hw/misc/npcm7xx_clk.h"
#include "hw/misc/npcm7xx_gcr.h"
#include "hw/misc/npcm7xx_mft.h"
+#include "hw/misc/npcm7xx_pci_mbox.h"
#include "hw/misc/npcm7xx_pwm.h"
#include "hw/misc/npcm7xx_rng.h"
#include "hw/net/npcm7xx_emc.h"
diff --git a/include/hw/misc/npcm7xx_pci_mbox.h b/include/hw/misc/npcm7xx_pci_mbox.h
new file mode 100644
index 0000000000..e595fbcc70
--- /dev/null
+++ b/include/hw/misc/npcm7xx_pci_mbox.h
@@ -0,0 +1,81 @@
+/*
+ * Nuvoton NPCM7xx PCI Mailbox Module
+ *
+ * Copyright 2021 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+#ifndef NPCM7XX_PCI_MBOX_H
+#define NPCM7XX_PCI_MBOX_H
+
+#include "chardev/char-fe.h"
+#include "exec/memory.h"
+#include "hw/clock.h"
+#include "hw/irq.h"
+#include "hw/pci/pci.h"
+#include "hw/sysbus.h"
+#include "qom/object.h"
+
+#define NPCM7XX_PCI_MBOX_RAM_SIZE 0x4000
+
+#define NPCM7XX_PCI_VENDOR_ID 0x1050
+#define NPCM7XX_PCI_DEVICE_ID 0x0750
+#define NPCM7XX_PCI_REVISION 0
+#define NPCM7XX_PCI_CLASS_CODE 0xff
+
+typedef enum NPCM7xxPCIMBoxHostState {
+ NPCM7XX_PCI_MBOX_STATE_IDLE,
+ NPCM7XX_PCI_MBOX_STATE_OFFSET,
+ NPCM7XX_PCI_MBOX_STATE_SIZE,
+ NPCM7XX_PCI_MBOX_STATE_DATA,
+} NPCM7xxPCIMBoxHostState ;
+
+/*
+ * Maximum amount of control registers in PCI Mailbox module. Do not increase
+ * this value without bumping vm version.
+ */
+#define NPCM7XX_PCI_MBOX_NR_REGS 3
+
+/**
+ * struct NPCM7xxPciMboxState - PCI Mailbox Device
+ * @parent: System bus device.
+ * @ram: the mailbox RAM memory space
+ * @iomem: Memory region through which registers are accessed.
+ * @content: The content of the PCI mailbox, initialized to 0.
+ * @regs: The MMIO registers.
+ * @chr: The chardev backend used to communicate with core CPU.
+ * @offset: The offset to start transfer.
+ */
+typedef struct NPCM7xxPCIMBoxState {
+ SysBusDevice parent;
+
+ MemoryRegion ram;
+ MemoryRegion iomem;
+
+ qemu_irq irq;
+ uint8_t content[NPCM7XX_PCI_MBOX_RAM_SIZE];
+ uint32_t regs[NPCM7XX_PCI_MBOX_NR_REGS];
+ CharBackend chr;
+
+ /* aux data for receiving host commands. */
+ NPCM7xxPCIMBoxHostState state;
+ uint8_t op;
+ hwaddr offset;
+ uint8_t size;
+ uint64_t data;
+ int receive_count;
+} NPCM7xxPCIMBoxState;
+
+#define TYPE_NPCM7XX_PCI_MBOX "npcm7xx-pci-mbox"
+#define NPCM7XX_PCI_MBOX(obj) \
+ OBJECT_CHECK(NPCM7xxPCIMBoxState, (obj), TYPE_NPCM7XX_PCI_MBOX)
+
+#endif /* NPCM7XX_PCI_MBOX_H */
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 02/11] hw/arm: Add PCI mailbox module to Nuvoton SoC
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 01/11] hw/misc: Add Nuvoton's PCI Mailbox Module Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 03/11] hw/misc: Add qtest for NPCM7xx PCI Mailbox Nabih Estefan
` (8 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman
From: Hao Wu <wuhaotsh@google.com>
This patch wires the PCI mailbox module to Nuvoton SoC.
Google-Rebase-Count: 5
Google-Bug-Id: 262938292
Signed-off-by: Hao Wu <wuhaotsh@google.com>
Change-Id: Ifd858a7ed760557faa15a7a1cef66b2056f06e2e
---
docs/system/arm/nuvoton.rst | 2 ++
hw/arm/npcm7xx.c | 3 ++-
include/hw/arm/npcm7xx.h | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/system/arm/nuvoton.rst b/docs/system/arm/nuvoton.rst
index 0424cae4b0..e611099545 100644
--- a/docs/system/arm/nuvoton.rst
+++ b/docs/system/arm/nuvoton.rst
@@ -50,6 +50,8 @@ Supported devices
* Ethernet controller (EMC)
* Tachometer
* Peripheral SPI controller (PSPI)
+ * BIOS POST code FIFO
+ * PCI Mailbox
Missing devices
---------------
diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index c69e936669..c9e87162cb 100644
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -86,7 +86,6 @@ enum NPCM7xxInterrupt {
NPCM7XX_UART1_IRQ,
NPCM7XX_UART2_IRQ,
NPCM7XX_UART3_IRQ,
- NPCM7XX_PECI_IRQ = 6,
NPCM7XX_PCI_MBOX_IRQ = 8,
NPCM7XX_KCS_HIB_IRQ = 9,
NPCM7XX_GMAC1_IRQ = 14,
@@ -463,6 +462,8 @@ static void npcm7xx_init(Object *obj)
object_initialize_child(obj, "pspi[*]", &s->pspi[i], TYPE_NPCM_PSPI);
}
+ object_initialize_child(obj, "pci-mbox", &s->pci_mbox,
+ TYPE_NPCM7XX_PCI_MBOX);
object_initialize_child(obj, "mmc", &s->mmc, TYPE_NPCM7XX_SDHCI);
}
diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
index 273090ac60..cec3792a2e 100644
--- a/include/hw/arm/npcm7xx.h
+++ b/include/hw/arm/npcm7xx.h
@@ -105,6 +105,7 @@ struct NPCM7xxState {
OHCISysBusState ohci;
NPCM7xxFIUState fiu[2];
NPCM7xxEMCState emc[2];
+ NPCM7xxPCIMBoxState pci_mbox;
NPCM7xxSDHCIState mmc;
NPCMPSPIState pspi[2];
};
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 03/11] hw/misc: Add qtest for NPCM7xx PCI Mailbox
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 01/11] hw/misc: Add Nuvoton's PCI Mailbox Module Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 02/11] hw/arm: Add PCI mailbox module to Nuvoton SoC Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 04/11] hw/net: Add NPCMXXX GMAC device Nabih Estefan
` (7 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman
From: Hao Wu <wuhaotsh@google.com>
This patches adds a qtest for NPCM7XX PCI Mailbox module.
It sends read and write requests to the module, and verifies that
the module contains the correct data after the requests.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
---
tests/qtest/meson.build | 1 +
tests/qtest/npcm7xx_pci_mbox-test.c | 238 ++++++++++++++++++++++++++++
2 files changed, 239 insertions(+)
create mode 100644 tests/qtest/npcm7xx_pci_mbox-test.c
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 66795cfcd2..05d26e9292 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -183,6 +183,7 @@ qtests_sparc64 = \
qtests_npcm7xx = \
['npcm7xx_adc-test',
'npcm7xx_gpio-test',
+ 'npcm7xx_pci_mbox-test',
'npcm7xx_pwm-test',
'npcm7xx_rng-test',
'npcm7xx_sdhci-test',
diff --git a/tests/qtest/npcm7xx_pci_mbox-test.c b/tests/qtest/npcm7xx_pci_mbox-test.c
new file mode 100644
index 0000000000..24eec18e3c
--- /dev/null
+++ b/tests/qtest/npcm7xx_pci_mbox-test.c
@@ -0,0 +1,238 @@
+/*
+ * QTests for Nuvoton NPCM7xx PCI Mailbox Modules.
+ *
+ * Copyright 2021 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/bitops.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qnum.h"
+#include "libqtest-single.h"
+
+#define PCI_MBOX_BA 0xf0848000
+#define PCI_MBOX_IRQ 8
+
+/* register offset */
+#define PCI_MBOX_STAT 0x00
+#define PCI_MBOX_CTL 0x04
+#define PCI_MBOX_CMD 0x08
+
+#define CODE_OK 0x00
+#define CODE_INVALID_OP 0xa0
+#define CODE_INVALID_SIZE 0xa1
+#define CODE_ERROR 0xff
+
+#define OP_READ 0x01
+#define OP_WRITE 0x02
+#define OP_INVALID 0x41
+
+
+static int sock;
+static int fd;
+
+/*
+ * Create a local TCP socket with any port, then save off the port we got.
+ */
+static in_port_t open_socket(void)
+{
+ struct sockaddr_in myaddr;
+ socklen_t addrlen;
+
+ myaddr.sin_family = AF_INET;
+ myaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ myaddr.sin_port = 0;
+ sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ g_assert(sock != -1);
+ g_assert(bind(sock, (struct sockaddr *) &myaddr, sizeof(myaddr)) != -1);
+ addrlen = sizeof(myaddr);
+ g_assert(getsockname(sock, (struct sockaddr *) &myaddr , &addrlen) != -1);
+ g_assert(listen(sock, 1) != -1);
+ return ntohs(myaddr.sin_port);
+}
+
+static void setup_fd(void)
+{
+ fd_set readfds;
+
+ FD_ZERO(&readfds);
+ FD_SET(sock, &readfds);
+ g_assert(select(sock + 1, &readfds, NULL, NULL, NULL) == 1);
+
+ fd = accept(sock, NULL, 0);
+ g_assert(fd >= 0);
+}
+
+static uint8_t read_response(uint8_t *buf, size_t len)
+{
+ uint8_t code;
+ ssize_t ret = read(fd, &code, 1);
+
+ if (ret == -1) {
+ return CODE_ERROR;
+ }
+ if (code != CODE_OK) {
+ return code;
+ }
+ g_test_message("response code: %x", code);
+ if (len > 0) {
+ ret = read(fd, buf, len);
+ if (ret < len) {
+ return CODE_ERROR;
+ }
+ }
+ return CODE_OK;
+}
+
+static void receive_data(uint64_t offset, uint8_t *buf, size_t len)
+{
+ uint8_t op = OP_READ;
+ uint8_t code;
+ ssize_t rv;
+
+ while (len > 0) {
+ uint8_t size;
+
+ if (len >= 8) {
+ size = 8;
+ } else if (len >= 4) {
+ size = 4;
+ } else if (len >= 2) {
+ size = 2;
+ } else {
+ size = 1;
+ }
+
+ g_test_message("receiving %u bytes", size);
+ /* Write op */
+ rv = write(fd, &op, 1);
+ g_assert_cmpint(rv, ==, 1);
+ /* Write offset */
+ rv = write(fd, (uint8_t *)&offset, sizeof(uint64_t));
+ g_assert_cmpint(rv, ==, sizeof(uint64_t));
+ /* Write size */
+ g_assert_cmpint(write(fd, &size, 1), ==, 1);
+
+ /* Read data and Expect response */
+ code = read_response(buf, size);
+ g_assert_cmphex(code, ==, CODE_OK);
+
+ buf += size;
+ offset += size;
+ len -= size;
+ }
+}
+
+static void send_data(uint64_t offset, const uint8_t *buf, size_t len)
+{
+ uint8_t op = OP_WRITE;
+ uint8_t code;
+ ssize_t rv;
+
+ while (len > 0) {
+ uint8_t size;
+
+ if (len >= 8) {
+ size = 8;
+ } else if (len >= 4) {
+ size = 4;
+ } else if (len >= 2) {
+ size = 2;
+ } else {
+ size = 1;
+ }
+
+ g_test_message("sending %u bytes", size);
+ /* Write op */
+ rv = write(fd, &op, 1);
+ g_assert_cmpint(rv, ==, 1);
+ /* Write offset */
+ rv = write(fd, (uint8_t *)&offset, sizeof(uint64_t));
+ g_assert_cmpint(rv, ==, sizeof(uint64_t));
+ /* Write size */
+ g_assert_cmpint(write(fd, &size, 1), ==, 1);
+ /* Write data */
+ g_assert_cmpint(write(fd, buf, size), ==, size);
+
+ /* Expect response */
+ code = read_response(NULL, 0);
+ g_assert_cmphex(code, ==, CODE_OK);
+
+ buf += size;
+ offset += size;
+ len -= size;
+ }
+}
+
+static void test_invalid_op(void)
+{
+ uint8_t op = OP_INVALID;
+ uint8_t code;
+ uint8_t buf[1];
+
+ g_assert_cmpint(write(fd, &op, 1), ==, 1);
+ code = read_response(buf, 1);
+ g_assert_cmphex(code, ==, CODE_INVALID_OP);
+}
+
+/* Send data via chardev and read them in guest. */
+static void test_guest_read(void)
+{
+ const char *data = "Hello World!";
+ uint64_t offset = 0xa0;
+ char buf[100];
+ size_t len = strlen(data);
+
+ send_data(offset, (uint8_t *)data, len);
+ memread(PCI_MBOX_BA + offset, buf, len);
+ g_assert_cmpint(strncmp(data, buf, len), ==, 0);
+}
+
+/* Write data in guest and read out via chardev. */
+static void test_guest_write(void)
+{
+ const char *data = "Hello World!";
+ uint64_t offset = 0xa0;
+ char buf[100];
+ size_t len = strlen(data);
+
+ memwrite(PCI_MBOX_BA + offset, data, len);
+ receive_data(offset, (uint8_t *)buf, len);
+ g_assert_cmpint(strncmp(data, buf, len), ==, 0);
+}
+
+int main(int argc, char **argv)
+{
+ int ret;
+ int port;
+
+ g_test_init(&argc, &argv, NULL);
+ port = open_socket();
+ g_test_message("port=%d", port);
+ global_qtest = qtest_initf("-machine npcm750-evb "
+ "-chardev socket,id=npcm7xx-pcimbox-chr,host=localhost,"
+ "port=%d,reconnect=10 "
+ "-global driver=npcm7xx-pci-mbox,property=chardev,"
+ "value=npcm7xx-pcimbox-chr",
+ port);
+ setup_fd();
+ qtest_irq_intercept_in(global_qtest, "/machine/soc/a9mpcore/gic");
+
+ qtest_add_func("/npcm7xx_pci_mbox/invalid_op", test_invalid_op);
+ qtest_add_func("/npcm7xx_pci_mbox/read", test_guest_read);
+ qtest_add_func("/npcm7xx_pci_mbox/write", test_guest_write);
+ ret = g_test_run();
+ qtest_quit(global_qtest);
+
+ return ret;
+}
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 04/11] hw/net: Add NPCMXXX GMAC device
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (2 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 03/11] hw/misc: Add qtest for NPCM7xx PCI Mailbox Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 05/11] hw/arm: Add GMAC devices to NPCM7XX SoC Nabih Estefan
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Hao Wu <wuhaotsh@google.com>
This patch implements the basic registers of GMAC device. Actual network
communications are not supported yet.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
include/hw: Fix type problem in NPCMGMACState
- Fix type problem in NPCMGMACState
- Fix Register Initalization which was breaking boot-up in driver
- Added trace for NPCM_GMAC reset
- Added nd_table to npcm8xx.c for GMAC bootup
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
hw/net: Add BCM54612E PHY regs for GMAC
This patch adds default values for PHYs to make the driver happy.
The device is derived from an actual Izumi machine.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: change GMAC PHY regs to indicate link is up
This change makes NPCM GMAC module to use BCM54612E unconditionally
and make some fake PHY registers such that the kernel driver thinks
the link partner is up.
Tested:
The following message shows up with the change:
Broadcom BCM54612E stmmac-0:00: attached PHY driver [Broadcom BCM54612E] (mii_bus:phy_addr=stmmac-0:00, irq=POLL)
stmmaceth f0802000.eth eth0: Link is Up - 1Gbps/Full - flow control rx/tx
Signed-off-by: Hao Wu <wuhaotsh@google.com>
---
hw/net/meson.build | 2 +-
hw/net/npcm_gmac.c | 395 +++++++++++++++++++++++++++++++++++++
hw/net/trace-events | 11 ++
include/hw/net/npcm_gmac.h | 170 ++++++++++++++++
4 files changed, 577 insertions(+), 1 deletion(-)
create mode 100644 hw/net/npcm_gmac.c
create mode 100644 include/hw/net/npcm_gmac.h
diff --git a/hw/net/meson.build b/hw/net/meson.build
index 2632634df3..8389a134d5 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -38,7 +38,7 @@ system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
system_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c'))
-system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c'))
+system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_emc.c', 'npcm_gmac.c'))
system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
system_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
new file mode 100644
index 0000000000..5ce632858d
--- /dev/null
+++ b/hw/net/npcm_gmac.c
@@ -0,0 +1,395 @@
+/*
+ * Nuvoton NPCM7xx/8xx GMAC Module
+ *
+ * Copyright 2022 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * Unsupported/unimplemented features:
+ * - MII is not implemented, MII_ADDR.BUSY and MII_DATA always return zero
+ * - Precision timestamp (PTP) is not implemented.
+ */
+
+#include "qemu/osdep.h"
+
+#include "hw/registerfields.h"
+#include "hw/net/mii.h"
+#include "hw/net/npcm_gmac.h"
+#include "migration/vmstate.h"
+#include "qemu/log.h"
+#include "qemu/units.h"
+#include "sysemu/dma.h"
+#include "trace.h"
+
+REG32(NPCM_DMA_BUS_MODE, 0x1000)
+REG32(NPCM_DMA_XMT_POLL_DEMAND, 0x1004)
+REG32(NPCM_DMA_RCV_POLL_DEMAND, 0x1008)
+REG32(NPCM_DMA_RCV_BASE_ADDR, 0x100c)
+REG32(NPCM_DMA_TX_BASE_ADDR, 0x1010)
+REG32(NPCM_DMA_STATUS, 0x1014)
+REG32(NPCM_DMA_CONTROL, 0x1018)
+REG32(NPCM_DMA_INTR_ENA, 0x101c)
+REG32(NPCM_DMA_MISSED_FRAME_CTR, 0x1020)
+REG32(NPCM_DMA_HOST_TX_DESC, 0x1048)
+REG32(NPCM_DMA_HOST_RX_DESC, 0x104c)
+REG32(NPCM_DMA_CUR_TX_BUF_ADDR, 0x1050)
+REG32(NPCM_DMA_CUR_RX_BUF_ADDR, 0x1054)
+REG32(NPCM_DMA_HW_FEATURE, 0x1058)
+
+REG32(NPCM_GMAC_MAC_CONFIG, 0x0)
+REG32(NPCM_GMAC_FRAME_FILTER, 0x4)
+REG32(NPCM_GMAC_HASH_HIGH, 0x8)
+REG32(NPCM_GMAC_HASH_LOW, 0xc)
+REG32(NPCM_GMAC_MII_ADDR, 0x10)
+REG32(NPCM_GMAC_MII_DATA, 0x14)
+REG32(NPCM_GMAC_FLOW_CTRL, 0x18)
+REG32(NPCM_GMAC_VLAN_FLAG, 0x1c)
+REG32(NPCM_GMAC_VERSION, 0x20)
+REG32(NPCM_GMAC_WAKEUP_FILTER, 0x28)
+REG32(NPCM_GMAC_PMT, 0x2c)
+REG32(NPCM_GMAC_LPI_CTRL, 0x30)
+REG32(NPCM_GMAC_TIMER_CTRL, 0x34)
+REG32(NPCM_GMAC_INT_STATUS, 0x38)
+REG32(NPCM_GMAC_INT_MASK, 0x3c)
+REG32(NPCM_GMAC_MAC0_ADDR_HI, 0x40)
+REG32(NPCM_GMAC_MAC0_ADDR_LO, 0x44)
+REG32(NPCM_GMAC_MAC1_ADDR_HI, 0x48)
+REG32(NPCM_GMAC_MAC1_ADDR_LO, 0x4c)
+REG32(NPCM_GMAC_MAC2_ADDR_HI, 0x50)
+REG32(NPCM_GMAC_MAC2_ADDR_LO, 0x54)
+REG32(NPCM_GMAC_MAC3_ADDR_HI, 0x58)
+REG32(NPCM_GMAC_MAC3_ADDR_LO, 0x5c)
+REG32(NPCM_GMAC_RGMII_STATUS, 0xd8)
+REG32(NPCM_GMAC_WATCHDOG, 0xdc)
+REG32(NPCM_GMAC_PTP_TCR, 0x700)
+REG32(NPCM_GMAC_PTP_SSIR, 0x704)
+REG32(NPCM_GMAC_PTP_STSR, 0x708)
+REG32(NPCM_GMAC_PTP_STNSR, 0x70c)
+REG32(NPCM_GMAC_PTP_STSUR, 0x710)
+REG32(NPCM_GMAC_PTP_STNSUR, 0x714)
+REG32(NPCM_GMAC_PTP_TAR, 0x718)
+REG32(NPCM_GMAC_PTP_TTSR, 0x71c)
+
+/* Register Fields */
+#define NPCM_GMAC_MII_ADDR_BUSY BIT(0)
+#define NPCM_GMAC_MII_ADDR_WRITE BIT(1)
+#define NPCM_GMAC_MII_ADDR_GR(rv) extract16((rv), 6, 5)
+#define NPCM_GMAC_MII_ADDR_PA(rv) extract16((rv), 11, 5)
+
+#define NPCM_GMAC_INT_MASK_LPIIM BIT(10)
+#define NPCM_GMAC_INT_MASK_PMTM BIT(3)
+#define NPCM_GMAC_INT_MASK_RGIM BIT(0)
+
+#define NPCM_DMA_BUS_MODE_SWR BIT(0)
+
+static const uint32_t npcm_gmac_cold_reset_values[NPCM_GMAC_NR_REGS] = {
+ [R_NPCM_GMAC_VERSION] = 0x00001037,
+ [R_NPCM_GMAC_TIMER_CTRL] = 0x03e80000,
+ [R_NPCM_GMAC_MAC0_ADDR_HI] = 0x8000ffff,
+ [R_NPCM_GMAC_MAC0_ADDR_LO] = 0xffffffff,
+ [R_NPCM_GMAC_MAC1_ADDR_HI] = 0x0000ffff,
+ [R_NPCM_GMAC_MAC1_ADDR_LO] = 0xffffffff,
+ [R_NPCM_GMAC_MAC2_ADDR_HI] = 0x0000ffff,
+ [R_NPCM_GMAC_MAC2_ADDR_LO] = 0xffffffff,
+ [R_NPCM_GMAC_MAC3_ADDR_HI] = 0x0000ffff,
+ [R_NPCM_GMAC_MAC3_ADDR_LO] = 0xffffffff,
+ [R_NPCM_GMAC_PTP_TCR] = 0x00002000,
+ [R_NPCM_DMA_BUS_MODE] = 0x00020101,
+ [R_NPCM_DMA_HW_FEATURE] = 0x100d4f37,
+};
+
+static const uint16_t phy_reg_init[] = {
+ [MII_BMCR] = MII_BMCR_AUTOEN | MII_BMCR_FD | MII_BMCR_SPEED1000,
+ [MII_BMSR] = MII_BMSR_100TX_FD | MII_BMSR_100TX_HD | MII_BMSR_10T_FD |
+ MII_BMSR_10T_HD | MII_BMSR_EXTSTAT | MII_BMSR_AUTONEG |
+ MII_BMSR_LINK_ST | MII_BMSR_EXTCAP,
+ [MII_PHYID1] = 0x0362,
+ [MII_PHYID2] = 0x5e6a,
+ [MII_ANAR] = MII_ANAR_TXFD | MII_ANAR_TX | MII_ANAR_10FD |
+ MII_ANAR_10 | MII_ANAR_CSMACD,
+ [MII_ANLPAR] = MII_ANLPAR_ACK | MII_ANLPAR_PAUSE |
+ MII_ANLPAR_TXFD | MII_ANLPAR_TX | MII_ANLPAR_10FD |
+ MII_ANLPAR_10 | MII_ANLPAR_CSMACD,
+ [MII_ANER] = 0x64 | MII_ANER_NWAY,
+ [MII_ANNP] = 0x2001,
+ [MII_CTRL1000] = MII_CTRL1000_FULL,
+ [MII_STAT1000] = MII_STAT1000_FULL,
+ [MII_EXTSTAT] = 0x3000, /* 1000BASTE_T full-duplex capable */
+};
+
+static void npcm_gmac_soft_reset(NPCMGMACState *s)
+{
+ memcpy(s->regs, npcm_gmac_cold_reset_values,
+ NPCM_GMAC_NR_REGS * sizeof(uint32_t));
+ /* Clear reset bits */
+ s->regs[R_NPCM_DMA_BUS_MODE] &= ~NPCM_DMA_BUS_MODE_SWR;
+}
+
+static void gmac_phy_set_link(NPCMGMACState *s, bool active)
+{
+ /* Autonegotiation status mirrors link status. */
+ if (active) {
+ s->phy_regs[0][MII_BMSR] |= (MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
+ } else {
+ s->phy_regs[0][MII_BMSR] &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
+ }
+}
+
+static bool gmac_can_receive(NetClientState *nc)
+{
+ return true;
+}
+
+static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len1)
+{
+ return 0;
+}
+
+static void gmac_cleanup(NetClientState *nc)
+{
+ /* Nothing to do yet. */
+}
+
+static void gmac_set_link(NetClientState *nc)
+{
+ NPCMGMACState *s = qemu_get_nic_opaque(nc);
+
+ trace_npcm_gmac_set_link(!nc->link_down);
+ gmac_phy_set_link(s, !nc->link_down);
+}
+
+static void npcm_gmac_mdio_access(NPCMGMACState *s, uint16_t v)
+{
+ bool busy = v & NPCM_GMAC_MII_ADDR_BUSY;
+ uint8_t is_write;
+ uint8_t pa, gr;
+ uint16_t data;
+
+ if (busy) {
+ is_write = v & NPCM_GMAC_MII_ADDR_WRITE;
+ pa = NPCM_GMAC_MII_ADDR_PA(v);
+ gr = NPCM_GMAC_MII_ADDR_GR(v);
+ /* Both pa and gr are 5 bits, so they are less than 32. */
+ g_assert(pa < NPCM_GMAC_MAX_PHYS);
+ g_assert(gr < NPCM_GMAC_MAX_PHY_REGS);
+
+
+ if (v & NPCM_GMAC_MII_ADDR_WRITE) {
+ data = s->regs[R_NPCM_GMAC_MII_DATA];
+ /* Clear reset bit for BMCR register */
+ switch (gr) {
+ case MII_BMCR:
+ data &= ~MII_BMCR_RESET;
+ /* Complete auto-negotiation immediately and set as complete */
+ if (data & MII_BMCR_AUTOEN) {
+ /* Tells autonegotiation to not restart again */
+ data &= ~MII_BMCR_ANRESTART;
+ /* sets autonegotiation as complete */
+ s->phy_regs[pa][MII_BMSR] |= MII_BMSR_AN_COMP;
+ }
+ }
+ s->phy_regs[pa][gr] = data;
+ } else {
+ data = s->phy_regs[pa][gr];
+ s->regs[R_NPCM_GMAC_MII_DATA] = data;
+ }
+ trace_npcm_gmac_mdio_access(DEVICE(s)->canonical_path, is_write, pa,
+ gr, data);
+ }
+ s->regs[R_NPCM_GMAC_MII_ADDR] = v & ~NPCM_GMAC_MII_ADDR_BUSY;
+}
+
+static uint64_t npcm_gmac_read(void *opaque, hwaddr offset, unsigned size)
+{
+ NPCMGMACState *s = opaque;
+ uint32_t v = 0;
+
+ switch (offset) {
+ /* Write only registers */
+ case A_NPCM_DMA_XMT_POLL_DEMAND:
+ case A_NPCM_DMA_RCV_POLL_DEMAND:
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Read of write-only reg: offset: 0x%04" HWADDR_PRIx
+ "\n", DEVICE(s)->canonical_path, offset);
+ break;
+
+ default:
+ v = s->regs[offset / sizeof(uint32_t)];
+ }
+ trace_npcm_gmac_reg_read(DEVICE(s)->canonical_path, offset, v);
+ return v;
+}
+
+static void npcm_gmac_write(void *opaque, hwaddr offset,
+ uint64_t v, unsigned size)
+{
+ NPCMGMACState *s = opaque;
+
+ trace_npcm_gmac_reg_write(DEVICE(s)->canonical_path, offset, v);
+ switch (offset) {
+ /* Read only registers */
+ case A_NPCM_GMAC_VERSION:
+ case A_NPCM_GMAC_INT_STATUS:
+ case A_NPCM_GMAC_RGMII_STATUS:
+ case A_NPCM_GMAC_PTP_STSR:
+ case A_NPCM_GMAC_PTP_STNSR:
+ case A_NPCM_DMA_MISSED_FRAME_CTR:
+ case A_NPCM_DMA_HOST_TX_DESC:
+ case A_NPCM_DMA_HOST_RX_DESC:
+ case A_NPCM_DMA_CUR_TX_BUF_ADDR:
+ case A_NPCM_DMA_CUR_RX_BUF_ADDR:
+ case A_NPCM_DMA_HW_FEATURE:
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Write of read-only reg: offset: 0x%04" HWADDR_PRIx
+ ", value: 0x%04" PRIx64 "\n",
+ DEVICE(s)->canonical_path, offset, v);
+ break;
+
+ case A_NPCM_GMAC_MII_ADDR:
+ npcm_gmac_mdio_access(s, v);
+ break;
+
+ case A_NPCM_GMAC_MAC0_ADDR_HI:
+ s->regs[offset / sizeof(uint32_t)] = v;
+ s->conf.macaddr.a[0] = v >> 8;
+ s->conf.macaddr.a[1] = v >> 0;
+ break;
+
+ case A_NPCM_GMAC_MAC0_ADDR_LO:
+ s->regs[offset / sizeof(uint32_t)] = v;
+ s->conf.macaddr.a[2] = v >> 24;
+ s->conf.macaddr.a[3] = v >> 16;
+ s->conf.macaddr.a[4] = v >> 8;
+ s->conf.macaddr.a[5] = v >> 0;
+ break;
+
+ case A_NPCM_GMAC_MAC1_ADDR_HI:
+ case A_NPCM_GMAC_MAC1_ADDR_LO:
+ case A_NPCM_GMAC_MAC2_ADDR_HI:
+ case A_NPCM_GMAC_MAC2_ADDR_LO:
+ case A_NPCM_GMAC_MAC3_ADDR_HI:
+ case A_NPCM_GMAC_MAC3_ADDR_LO:
+ s->regs[offset / sizeof(uint32_t)] = v;
+ qemu_log_mask(LOG_UNIMP,
+ "%s: Only MAC Address 0 is supported. This request "
+ "is ignored.\n", DEVICE(s)->canonical_path);
+ break;
+
+ case A_NPCM_DMA_BUS_MODE:
+ s->regs[offset / sizeof(uint32_t)] = v;
+ if (v & NPCM_DMA_BUS_MODE_SWR) {
+ npcm_gmac_soft_reset(s);
+ }
+ break;
+
+ default:
+ s->regs[offset / sizeof(uint32_t)] = v;
+ break;
+ }
+}
+
+static void npcm_gmac_reset(DeviceState *dev)
+{
+ NPCMGMACState *s = NPCM_GMAC(dev);
+
+ npcm_gmac_soft_reset(s);
+ memcpy(s->phy_regs[0], phy_reg_init, sizeof(phy_reg_init));
+
+ trace_npcm_gmac_reset(DEVICE(s)->canonical_path, s->phy_regs[0][MII_BMSR]);
+}
+
+static NetClientInfo net_npcm_gmac_info = {
+ .type = NET_CLIENT_DRIVER_NIC,
+ .size = sizeof(NICState),
+ .can_receive = gmac_can_receive,
+ .receive = gmac_receive,
+ .cleanup = gmac_cleanup,
+ .link_status_changed = gmac_set_link,
+};
+
+static const struct MemoryRegionOps npcm_gmac_ops = {
+ .read = npcm_gmac_read,
+ .write = npcm_gmac_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ .unaligned = false,
+ },
+};
+
+static void npcm_gmac_realize(DeviceState *dev, Error **errp)
+{
+ NPCMGMACState *gmac = NPCM_GMAC(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+
+ memory_region_init_io(&gmac->iomem, OBJECT(gmac), &npcm_gmac_ops, gmac,
+ TYPE_NPCM_GMAC, 8 * KiB);
+ sysbus_init_mmio(sbd, &gmac->iomem);
+ sysbus_init_irq(sbd, &gmac->irq);
+
+ qemu_macaddr_default_if_unset(&gmac->conf.macaddr);
+
+ gmac->nic = qemu_new_nic(&net_npcm_gmac_info, &gmac->conf, TYPE_NPCM_GMAC,
+ dev->id, gmac);
+ qemu_format_nic_info_str(qemu_get_queue(gmac->nic), gmac->conf.macaddr.a);
+ gmac->regs[R_NPCM_GMAC_MAC0_ADDR_HI] = (gmac->conf.macaddr.a[0] << 8) + \
+ gmac->conf.macaddr.a[1];
+ gmac->regs[R_NPCM_GMAC_MAC0_ADDR_LO] = (gmac->conf.macaddr.a[2] << 24) + \
+ (gmac->conf.macaddr.a[3] << 16) + \
+ (gmac->conf.macaddr.a[4] << 8) + \
+ gmac->conf.macaddr.a[5];
+}
+
+static void npcm_gmac_unrealize(DeviceState *dev)
+{
+ NPCMGMACState *gmac = NPCM_GMAC(dev);
+
+ qemu_del_nic(gmac->nic);
+}
+
+static const VMStateDescription vmstate_npcm_gmac = {
+ .name = TYPE_NPCM_GMAC,
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(regs, NPCMGMACState, NPCM_GMAC_NR_REGS),
+ VMSTATE_END_OF_LIST(),
+ },
+};
+
+static Property npcm_gmac_properties[] = {
+ DEFINE_NIC_PROPERTIES(NPCMGMACState, conf),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void npcm_gmac_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
+ dc->desc = "NPCM GMAC Controller";
+ dc->realize = npcm_gmac_realize;
+ dc->unrealize = npcm_gmac_unrealize;
+ dc->reset = npcm_gmac_reset;
+ dc->vmsd = &vmstate_npcm_gmac;
+ device_class_set_props(dc, npcm_gmac_properties);
+}
+
+static const TypeInfo npcm_gmac_types[] = {
+ {
+ .name = TYPE_NPCM_GMAC,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(NPCMGMACState),
+ .class_init = npcm_gmac_class_init,
+ },
+};
+DEFINE_TYPES(npcm_gmac_types)
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 3abfd65e5b..1dbb5d2d64 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -466,6 +466,17 @@ npcm7xx_emc_rx_done(uint32_t crxdsa) "RX done, CRXDSA=0x%x"
npcm7xx_emc_reg_read(int emc_num, uint32_t result, const char *name, int regno) "emc%d: 0x%x = reg[%s/%d]"
npcm7xx_emc_reg_write(int emc_num, const char *name, int regno, uint32_t value) "emc%d: reg[%s/%d] = 0x%x"
+# npcm_gmac.c
+npcm_gmac_reg_read(const char *name, uint64_t offset, uint32_t value) "%s: offset: 0x%04" PRIx64 " value: 0x%04" PRIx32
+npcm_gmac_reg_write(const char *name, uint64_t offset, uint32_t value) "%s: offset: 0x%04" PRIx64 " value: 0x%04" PRIx32
+npcm_gmac_mdio_access(const char *name, uint8_t is_write, uint8_t pa, uint8_t gr, uint16_t val) "%s: is_write: %" PRIu8 " pa: %" PRIu8 " gr: %" PRIu8 " val: 0x%04" PRIx16
+npcm_gmac_reset(const char *name, uint16_t value) "%s: phy_regs[0][1]: 0x%04" PRIx16
+npcm_gmac_set_link(bool active) "Set link: active=%u"
+
+# npcm_pcs.c
+npcm_pcs_reg_read(const char *name, uint16_t indirect_access_baes, uint64_t offset, uint16_t value) "%s: IND: 0x%02" PRIx16 " offset: 0x%04" PRIx64 " value: 0x%04" PRIx16
+npcm_pcs_reg_write(const char *name, uint16_t indirect_access_baes, uint64_t offset, uint16_t value) "%s: IND: 0x%02" PRIx16 " offset: 0x%04" PRIx64 " value: 0x%04" PRIx16
+
# dp8398x.c
dp8393x_raise_irq(int isr) "raise irq, isr is 0x%04x"
dp8393x_lower_irq(void) "lower irq"
diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
new file mode 100644
index 0000000000..a92a654278
--- /dev/null
+++ b/include/hw/net/npcm_gmac.h
@@ -0,0 +1,170 @@
+/*
+ * Nuvoton NPCM7xx/8xx GMAC Module
+ *
+ * Copyright 2022 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef NPCM_GMAC_H
+#define NPCM_GMAC_H
+
+#include "hw/irq.h"
+#include "hw/sysbus.h"
+#include "net/net.h"
+
+#define NPCM_GMAC_NR_REGS (0x1060 / sizeof(uint32_t))
+
+#define NPCM_GMAC_MAX_PHYS 32
+#define NPCM_GMAC_MAX_PHY_REGS 32
+
+struct NPCMGMACRxDesc {
+ uint32_t rdes0;
+ uint32_t rdes1;
+ uint32_t rdes2;
+ uint32_t rdes3;
+};
+
+/* NPCMGMACRxDesc.flags values */
+/* RDES2 and RDES3 are buffer address pointers */
+/* Owner: 0 = software, 1 = gmac */
+#define RX_DESC_RDES0_OWNER_MASK BIT(31)
+/* Owner*/
+#define RX_DESC_RDES0_OWNER_SHIFT 31
+/* Destination Address Filter Fail */
+#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL_MASK BIT(30)
+/* Frame length*/
+#define RX_DESC_RDES0_FRAME_LEN_MASK(word) extract32(word, 16, 29)
+/* Error Summary */
+#define RX_DESC_RDES0_ERR_SUMM_MASK BIT(15)
+/* Descriptor Error */
+#define RX_DESC_RDES0_DESC_ERR_MASK BIT(14)
+/* Source Address Filter Fail */
+#define RX_DESC_RDES0_SRC_ADDR_FILT_FAIL_MASK BIT(13)
+/* Length Error */
+#define RX_DESC_RDES0_LEN_ERR_MASK BIT(12)
+/* Overflow Error */
+#define RX_DESC_RDES0_OVRFLW_ERR_MASK BIT(11)
+/* VLAN Tag */
+#define RX_DESC_RDES0_VLAN_TAG_MASK BIT(10)
+/* First Descriptor */
+#define RX_DESC_RDES0_FIRST_DESC_MASK BIT(9)
+/* Last Descriptor */
+#define RX_DESC_RDES0_LAST_DESC_MASK BIT(8)
+/* IPC Checksum Error/Giant Frame */
+#define RX_DESC_RDES0_IPC_CHKSM_ERR_GNT_FRM_MASK BIT(7)
+/* Late Collision */
+#define RX_DESC_RDES0_LT_COLL_MASK BIT(6)
+/* Frame Type */
+#define RX_DESC_RDES0_FRM_TYPE_MASK BIT(5)
+/* Receive Watchdog Timeout */
+#define RX_DESC_RDES0_REC_WTCHDG_TMT_MASK BIT(4)
+/* Receive Error */
+#define RX_DESC_RDES0_RCV_ERR_MASK BIT(3)
+/* Dribble Bit Error */
+#define RX_DESC_RDES0_DRBL_BIT_ERR_MASK BIT(2)
+/* Cyclcic Redundancy Check Error */
+#define RX_DESC_RDES0_CRC_ERR_MASK BIT(1)
+/* Rx MAC Address/Payload Checksum Error */
+#define RC_DESC_RDES0_RCE_MASK BIT(0)
+
+/* Disable Interrupt on Completion */
+#define RX_DESC_RDES1_DIS_INTR_COMP_MASK BIT(31)
+/* Recieve end of ring */
+#define RX_DESC_RDES1_RC_END_RING_MASK BIT(25)
+/* Second Address Chained */
+#define RX_DESC_RDES1_SEC_ADDR_CHND_MASK BIT(24)
+/* Receive Buffer 2 Size */
+#define RX_DESC_RDES1_BFFR2_SZ_SHIFT 11
+#define RX_DESC_RDES1_BFFR2_SZ_MASK(word) extract32(word, \
+ RX_DESC_RDES1_BFFR2_SZ_SHIFT, 10 + RX_DESC_RDES1_BFFR2_SZ_SHIFT)
+/* Receive Buffer 1 Size */
+#define RX_DESC_RDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
+
+
+struct NPCMGMACTxDesc {
+ uint32_t tdes0;
+ uint32_t tdes1;
+ uint32_t tdes2;
+ uint32_t tdes3;
+};
+
+/* NPCMGMACTxDesc.flags values */
+/* TDES2 and TDES3 are buffer address pointers */
+/* Owner: 0 = software, 1 = gmac */
+#define TX_DESC_TDES0_OWNER_MASK BIT(31)
+/* Tx Time Stamp Status */
+#define TX_DESC_TDES0_TTSS_MASK BIT(17)
+/* IP Header Error */
+#define TX_DESC_TDES0_IP_HEAD_ERR_MASK BIT(16)
+/* Error Summary */
+#define TX_DESC_TDES0_ERR_SUMM_MASK BIT(15)
+/* Jabber Timeout */
+#define TX_DESC_TDES0_JBBR_TMT_MASK BIT(14)
+/* Frame Flushed */
+#define TX_DESC_TDES0_FRM_FLSHD_MASK BIT(13)
+/* Payload Checksum Error */
+#define TX_DESC_TDES0_PYLD_CHKSM_ERR_MASK BIT(12)
+/* Loss of Carrier */
+#define TX_DESC_TDES0_LSS_CARR_MASK BIT(11)
+/* No Carrier */
+#define TX_DESC_TDES0_NO_CARR_MASK BIT(10)
+/* Late Collision */
+#define TX_DESC_TDES0_LATE_COLL_MASK BIT(9)
+/* Excessive Collision */
+#define TX_DESC_TDES0_EXCS_COLL_MASK BIT(8)
+/* VLAN Frame */
+#define TX_DESC_TDES0_VLAN_FRM_MASK BIT(7)
+/* Collision Count */
+#define TX_DESC_TDES0_COLL_CNT_MASK(word) extract32(word, 3, 6)
+/* Excessive Deferral */
+#define TX_DESC_TDES0_EXCS_DEF_MASK BIT(2)
+/* Underflow Error */
+#define TX_DESC_TDES0_UNDRFLW_ERR_MASK BIT(1)
+/* Deferred Bit */
+#define TX_DESC_TDES0_DFRD_BIT_MASK BIT(0)
+
+/* Interrupt of Completion */
+#define TX_DESC_TDES1_INTERR_COMP_MASK BIT(31)
+/* Last Segment */
+#define TX_DESC_TDES1_LAST_SEG_MASK BIT(30)
+/* Last Segment */
+#define TX_DESC_TDES1_FIRST_SEG_MASK BIT(29)
+/* Checksum Insertion Control */
+#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 28)
+/* Disable Cyclic Redundancy Check */
+#define TX_DESC_TDES1_DIS_CDC_MASK BIT(26)
+/* Transmit End of Ring */
+#define TX_DESC_TDES1_TX_END_RING_MASK BIT(25)
+/* Secondary Address Chained */
+#define TX_DESC_TDES1_SEC_ADDR_CHND_MASK BIT(24)
+/* Transmit Buffer 2 Size */
+#define TX_DESC_TDES1_BFFR2_SZ_MASK(word) extract32(word, 11, 21)
+/* Transmit Buffer 1 Size */
+#define TX_DESC_TDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
+
+typedef struct NPCMGMACState {
+ SysBusDevice parent;
+
+ MemoryRegion iomem;
+ qemu_irq irq;
+
+ NICState *nic;
+ NICConf conf;
+
+ uint32_t regs[NPCM_GMAC_NR_REGS];
+ uint16_t phy_regs[NPCM_GMAC_MAX_PHYS][NPCM_GMAC_MAX_PHY_REGS];
+} NPCMGMACState;
+
+#define TYPE_NPCM_GMAC "npcm-gmac"
+OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
+
+#endif /* NPCM_GMAC_H */
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 05/11] hw/arm: Add GMAC devices to NPCM7XX SoC
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (3 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 04/11] hw/net: Add NPCMXXX GMAC device Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 06/11] \tests/qtest: Creating qtest for GMAC Module Nabih Estefan
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman
From: Hao Wu <wuhaotsh@google.com>
Signed-off-by: Hao Wu <wuhaotsh@google.com>
---
hw/arm/npcm7xx.c | 36 ++++++++++++++++++++++++++++++++++--
include/hw/arm/npcm7xx.h | 2 ++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index c9e87162cb..12e11250e1 100644
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -91,6 +91,7 @@ enum NPCM7xxInterrupt {
NPCM7XX_GMAC1_IRQ = 14,
NPCM7XX_EMC1RX_IRQ = 15,
NPCM7XX_EMC1TX_IRQ,
+ NPCM7XX_GMAC2_IRQ,
NPCM7XX_MMC_IRQ = 26,
NPCM7XX_PSPI2_IRQ = 28,
NPCM7XX_PSPI1_IRQ = 31,
@@ -234,6 +235,12 @@ static const hwaddr npcm7xx_pspi_addr[] = {
0xf0201000,
};
+/* Register base address for each GMAC Module */
+static const hwaddr npcm7xx_gmac_addr[] = {
+ 0xf0802000,
+ 0xf0804000,
+};
+
static const struct {
hwaddr regs_addr;
uint32_t unconnected_pins;
@@ -462,6 +469,10 @@ static void npcm7xx_init(Object *obj)
object_initialize_child(obj, "pspi[*]", &s->pspi[i], TYPE_NPCM_PSPI);
}
+ for (i = 0; i < ARRAY_SIZE(s->gmac); i++) {
+ object_initialize_child(obj, "gmac[*]", &s->gmac[i], TYPE_NPCM_GMAC);
+ }
+
object_initialize_child(obj, "pci-mbox", &s->pci_mbox,
TYPE_NPCM7XX_PCI_MBOX);
object_initialize_child(obj, "mmc", &s->mmc, TYPE_NPCM7XX_SDHCI);
@@ -695,6 +706,29 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(sbd, 1, npcm7xx_irq(s, rx_irq));
}
+ /*
+ * GMAC Modules. Cannot fail.
+ */
+ QEMU_BUILD_BUG_ON(ARRAY_SIZE(npcm7xx_gmac_addr) != ARRAY_SIZE(s->gmac));
+ QEMU_BUILD_BUG_ON(ARRAY_SIZE(s->gmac) != 2);
+ for (i = 0; i < ARRAY_SIZE(s->gmac); i++) {
+ SysBusDevice *sbd = SYS_BUS_DEVICE(&s->gmac[i]);
+
+ /*
+ * The device exists regardless of whether it's connected to a QEMU
+ * netdev backend. So always instantiate it even if there is no
+ * backend.
+ */
+ sysbus_realize(sbd, &error_abort);
+ sysbus_mmio_map(sbd, 0, npcm7xx_gmac_addr[i]);
+ int irq = i == 0 ? NPCM7XX_GMAC1_IRQ : NPCM7XX_GMAC2_IRQ;
+ /*
+ * N.B. The values for the second argument sysbus_connect_irq are
+ * chosen to match the registration order in npcm7xx_emc_realize.
+ */
+ sysbus_connect_irq(sbd, 0, npcm7xx_irq(s, irq));
+ }
+
/*
* Flash Interface Unit (FIU). Can fail if incorrect number of chip selects
* specified, but this is a programming error.
@@ -765,8 +799,6 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)
create_unimplemented_device("npcm7xx.siox[2]", 0xf0102000, 4 * KiB);
create_unimplemented_device("npcm7xx.ahbpci", 0xf0400000, 1 * MiB);
create_unimplemented_device("npcm7xx.mcphy", 0xf05f0000, 64 * KiB);
- create_unimplemented_device("npcm7xx.gmac1", 0xf0802000, 8 * KiB);
- create_unimplemented_device("npcm7xx.gmac2", 0xf0804000, 8 * KiB);
create_unimplemented_device("npcm7xx.vcd", 0xf0810000, 64 * KiB);
create_unimplemented_device("npcm7xx.ece", 0xf0820000, 8 * KiB);
create_unimplemented_device("npcm7xx.vdma", 0xf0822000, 8 * KiB);
diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
index cec3792a2e..9e5cf639a2 100644
--- a/include/hw/arm/npcm7xx.h
+++ b/include/hw/arm/npcm7xx.h
@@ -30,6 +30,7 @@
#include "hw/misc/npcm7xx_pwm.h"
#include "hw/misc/npcm7xx_rng.h"
#include "hw/net/npcm7xx_emc.h"
+#include "hw/net/npcm_gmac.h"
#include "hw/nvram/npcm7xx_otp.h"
#include "hw/timer/npcm7xx_timer.h"
#include "hw/ssi/npcm7xx_fiu.h"
@@ -105,6 +106,7 @@ struct NPCM7xxState {
OHCISysBusState ohci;
NPCM7xxFIUState fiu[2];
NPCM7xxEMCState emc[2];
+ NPCMGMACState gmac[2];
NPCM7xxPCIMBoxState pci_mbox;
NPCM7xxSDHCIState mmc;
NPCMPSPIState pspi[2];
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 06/11] \tests/qtest: Creating qtest for GMAC Module
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (4 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 05/11] hw/arm: Add GMAC devices to NPCM7XX SoC Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-18 0:14 ` Hao Wu
2023-10-17 23:03 ` [PATCH v3 07/11] include/hw/net: Implemented Classes and Masks for GMAC Descriptors Nabih Estefan
` (4 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- Created qtest to check initialization of registers in GMAC Module.
- Implemented test into Build File.
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
---
tests/qtest/meson.build | 11 +-
tests/qtest/npcm_gmac-test.c | 209 +++++++++++++++++++++++++++++++++++
2 files changed, 215 insertions(+), 5 deletions(-)
create mode 100644 tests/qtest/npcm_gmac-test.c
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 05d26e9292..3ff9f5d364 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -191,6 +191,8 @@ qtests_npcm7xx = \
'npcm7xx_timer-test',
'npcm7xx_watchdog_timer-test'] + \
(slirp.found() ? ['npcm7xx_emc-test'] : [])
+qtests_npcm8xx = \
+ ['npcm_gmac-test']
qtests_aspeed = \
['aspeed_hace-test',
'aspeed_smc-test',
@@ -205,9 +207,7 @@ qtests_arm = \
(config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : []) + \
(config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
(config_all_devices.has_key('CONFIG_GENERIC_LOADER') ? ['hexloader-test'] : []) + \
- (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
- (config_all_devices.has_key('CONFIG_VEXPRESS') ? ['test-arm-mptimer'] : []) + \
- (config_all_devices.has_key('CONFIG_MICROBIT') ? ['microbit-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \
['arm-cpu-features',
'boot-serial-test']
@@ -219,8 +219,9 @@ qtests_aarch64 = \
(config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
(config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test'] : []) + \
(config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \
- (config_all.has_key('CONFIG_TCG') and \
- config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : []) + \
+ (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
+ (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \
['arm-cpu-features',
'numa-test',
'boot-serial-test',
diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
new file mode 100644
index 0000000000..30d27e8dcc
--- /dev/null
+++ b/tests/qtest/npcm_gmac-test.c
@@ -0,0 +1,209 @@
+/*
+ * QTests for Nuvoton NPCM7xx/8xx GMAC Modules.
+ *
+ * Copyright 2022 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "qemu/osdep.h"
+#include "libqos/libqos.h"
+
+/* Name of the GMAC Device */
+#define TYPE_NPCM_GMAC "npcm-gmac"
+
+typedef struct GMACModule {
+ int irq;
+ uint64_t base_addr;
+} GMACModule;
+
+typedef struct TestData {
+ const GMACModule *module;
+} TestData;
+
+/* Values extracted from hw/arm/npcm8xx.c */
+static const GMACModule gmac_module_list[] = {
+ {
+ .irq = 14,
+ .base_addr = 0xf0802000
+ },
+ {
+ .irq = 15,
+ .base_addr = 0xf0804000
+ },
+ {
+ .irq = 16,
+ .base_addr = 0xf0806000
+ },
+ {
+ .irq = 17,
+ .base_addr = 0xf0808000
+ }
+};
+
+/* Returns the index of the GMAC module. */
+static int gmac_module_index(const GMACModule *mod)
+{
+ ptrdiff_t diff = mod - gmac_module_list;
+
+ g_assert_true(diff >= 0 && diff < ARRAY_SIZE(gmac_module_list));
+
+ return diff;
+}
+
+/* 32-bit register indices. Taken from npcm_gmac.c */
+typedef enum NPCMRegister {
+ /* DMA Registers */
+ NPCM_DMA_BUS_MODE = 0x1000,
+ NPCM_DMA_XMT_POLL_DEMAND = 0x1004,
+ NPCM_DMA_RCV_POLL_DEMAND = 0x1008,
+ NPCM_DMA_RCV_BASE_ADDR = 0x100c,
+ NPCM_DMA_TX_BASE_ADDR = 0x1010,
+ NPCM_DMA_STATUS = 0x1014,
+ NPCM_DMA_CONTROL = 0x1018,
+ NPCM_DMA_INTR_ENA = 0x101c,
+ NPCM_DMA_MISSED_FRAME_CTR = 0x1020,
+ NPCM_DMA_HOST_TX_DESC = 0x1048,
+ NPCM_DMA_HOST_RX_DESC = 0x104c,
+ NPCM_DMA_CUR_TX_BUF_ADDR = 0x1050,
+ NPCM_DMA_CUR_RX_BUF_ADDR = 0x1054,
+ NPCM_DMA_HW_FEATURE = 0x1058,
+
+ /* GMAC Registers */
+ NPCM_GMAC_MAC_CONFIG = 0x0,
+ NPCM_GMAC_FRAME_FILTER = 0x4,
+ NPCM_GMAC_HASH_HIGH = 0x8,
+ NPCM_GMAC_HASH_LOW = 0xc,
+ NPCM_GMAC_MII_ADDR = 0x10,
+ NPCM_GMAC_MII_DATA = 0x14,
+ NPCM_GMAC_FLOW_CTRL = 0x18,
+ NPCM_GMAC_VLAN_FLAG = 0x1c,
+ NPCM_GMAC_VERSION = 0x20,
+ NPCM_GMAC_WAKEUP_FILTER = 0x28,
+ NPCM_GMAC_PMT = 0x2c,
+ NPCM_GMAC_LPI_CTRL = 0x30,
+ NPCM_GMAC_TIMER_CTRL = 0x34,
+ NPCM_GMAC_INT_STATUS = 0x38,
+ NPCM_GMAC_INT_MASK = 0x3c,
+ NPCM_GMAC_MAC0_ADDR_HI = 0x40,
+ NPCM_GMAC_MAC0_ADDR_LO = 0x44,
+ NPCM_GMAC_MAC1_ADDR_HI = 0x48,
+ NPCM_GMAC_MAC1_ADDR_LO = 0x4c,
+ NPCM_GMAC_MAC2_ADDR_HI = 0x50,
+ NPCM_GMAC_MAC2_ADDR_LO = 0x54,
+ NPCM_GMAC_MAC3_ADDR_HI = 0x58,
+ NPCM_GMAC_MAC3_ADDR_LO = 0x5c,
+ NPCM_GMAC_RGMII_STATUS = 0xd8,
+ NPCM_GMAC_WATCHDOG = 0xdc,
+ NPCM_GMAC_PTP_TCR = 0x700,
+ NPCM_GMAC_PTP_SSIR = 0x704,
+ NPCM_GMAC_PTP_STSR = 0x708,
+ NPCM_GMAC_PTP_STNSR = 0x70c,
+ NPCM_GMAC_PTP_STSUR = 0x710,
+ NPCM_GMAC_PTP_STNSUR = 0x714,
+ NPCM_GMAC_PTP_TAR = 0x718,
+ NPCM_GMAC_PTP_TTSR = 0x71c,
+} NPCMRegister;
+
+static uint32_t gmac_read(QTestState *qts, const GMACModule *mod,
+ NPCMRegister regno)
+{
+ return qtest_readl(qts, mod->base_addr + regno);
+}
+
+/* Check that GMAC registers are reset to default value */
+static void test_init(gconstpointer test_data)
+{
+ const TestData *td = test_data;
+ const GMACModule *mod = td->module;
+ QTestState *qts = qtest_init("-machine npcm845-evb");
+
+#define CHECK_REG32(regno, value) \
+ do { \
+ g_assert_cmphex(gmac_read(qts, mod, (regno)), ==, (value)); \
+ } while (0)
+
+ CHECK_REG32(NPCM_DMA_BUS_MODE, 0x00020100);
+ CHECK_REG32(NPCM_DMA_XMT_POLL_DEMAND, 0);
+ CHECK_REG32(NPCM_DMA_RCV_POLL_DEMAND, 0);
+ CHECK_REG32(NPCM_DMA_RCV_BASE_ADDR, 0);
+ CHECK_REG32(NPCM_DMA_TX_BASE_ADDR, 0);
+ CHECK_REG32(NPCM_DMA_STATUS, 0);
+ CHECK_REG32(NPCM_DMA_CONTROL, 0);
+ CHECK_REG32(NPCM_DMA_INTR_ENA, 0);
+ CHECK_REG32(NPCM_DMA_MISSED_FRAME_CTR, 0);
+ CHECK_REG32(NPCM_DMA_HOST_TX_DESC, 0);
+ CHECK_REG32(NPCM_DMA_HOST_RX_DESC, 0);
+ CHECK_REG32(NPCM_DMA_CUR_TX_BUF_ADDR, 0);
+ CHECK_REG32(NPCM_DMA_CUR_RX_BUF_ADDR, 0);
+ CHECK_REG32(NPCM_DMA_HW_FEATURE, 0x100d4f37);
+
+ CHECK_REG32(NPCM_GMAC_MAC_CONFIG, 0);
+ CHECK_REG32(NPCM_GMAC_FRAME_FILTER, 0);
+ CHECK_REG32(NPCM_GMAC_HASH_HIGH, 0);
+ CHECK_REG32(NPCM_GMAC_HASH_LOW, 0);
+ CHECK_REG32(NPCM_GMAC_MII_ADDR, 0);
+ CHECK_REG32(NPCM_GMAC_MII_DATA, 0);
+ CHECK_REG32(NPCM_GMAC_FLOW_CTRL, 0);
+ CHECK_REG32(NPCM_GMAC_VLAN_FLAG, 0);
+ CHECK_REG32(NPCM_GMAC_VERSION, 0x00001037);
+ CHECK_REG32(NPCM_GMAC_WAKEUP_FILTER, 0);
+ CHECK_REG32(NPCM_GMAC_PMT, 0);
+ CHECK_REG32(NPCM_GMAC_LPI_CTRL, 0);
+ CHECK_REG32(NPCM_GMAC_TIMER_CTRL, 0x03e80000);
+ CHECK_REG32(NPCM_GMAC_INT_STATUS, 0);
+ CHECK_REG32(NPCM_GMAC_INT_MASK, 0);
+ CHECK_REG32(NPCM_GMAC_MAC0_ADDR_HI, 0x8000ffff);
+ CHECK_REG32(NPCM_GMAC_MAC0_ADDR_LO, 0xffffffff);
+ CHECK_REG32(NPCM_GMAC_MAC1_ADDR_HI, 0x0000ffff);
+ CHECK_REG32(NPCM_GMAC_MAC1_ADDR_LO, 0xffffffff);
+ CHECK_REG32(NPCM_GMAC_MAC2_ADDR_HI, 0x0000ffff);
+ CHECK_REG32(NPCM_GMAC_MAC2_ADDR_LO, 0xffffffff);
+ CHECK_REG32(NPCM_GMAC_MAC3_ADDR_HI, 0x0000ffff);
+ CHECK_REG32(NPCM_GMAC_MAC3_ADDR_LO, 0xffffffff);
+ CHECK_REG32(NPCM_GMAC_RGMII_STATUS, 0);
+ CHECK_REG32(NPCM_GMAC_WATCHDOG, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_TCR, 0x00002000);
+ CHECK_REG32(NPCM_GMAC_PTP_SSIR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_STSR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_STNSR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_STSUR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_STNSUR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_TAR, 0);
+ CHECK_REG32(NPCM_GMAC_PTP_TTSR, 0);
+
+ qtest_quit(qts);
+}
+
+static void gmac_add_test(const char *name, const TestData* td,
+ GTestDataFunc fn)
+{
+ g_autofree char *full_name = g_strdup_printf(
+ "npcm8xx_gmac/gmac[%d]/%s", gmac_module_index(td->module), name);
+ qtest_add_data_func(full_name, td, fn);
+}
+
+int main(int argc, char **argv)
+{
+ TestData test_data_list[ARRAY_SIZE(gmac_module_list)];
+
+ g_test_init(&argc, &argv, NULL);
+
+ for (int i = 0; i < ARRAY_SIZE(gmac_module_list); ++i) {
+ TestData *td = &test_data_list[i];
+
+ td->module = &gmac_module_list[i];
+
+ gmac_add_test("init", td, test_init);
+ }
+
+ return g_test_run();
+}
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v3 06/11] \tests/qtest: Creating qtest for GMAC Module
2023-10-17 23:03 ` [PATCH v3 06/11] \tests/qtest: Creating qtest for GMAC Module Nabih Estefan
@ 2023-10-18 0:14 ` Hao Wu
0 siblings, 0 replies; 17+ messages in thread
From: Hao Wu @ 2023-10-18 0:14 UTC (permalink / raw)
To: Nabih Estefan
Cc: peter.maydell, qemu-arm, qemu-devel, kfting, jasonwang,
avi.fishman
[-- Attachment #1: Type: text/plain, Size: 10403 bytes --]
You have an extra "\" in the title.
On Tue, Oct 17, 2023 at 4:04 PM Nabih Estefan <nabihestefan@google.com>
wrote:
> From: Nabih Estefan Diaz <nabihestefan@google.com>
>
> - Created qtest to check initialization of registers in GMAC Module.
> - Implemented test into Build File.
>
> Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
> ---
> tests/qtest/meson.build | 11 +-
> tests/qtest/npcm_gmac-test.c | 209 +++++++++++++++++++++++++++++++++++
> 2 files changed, 215 insertions(+), 5 deletions(-)
> create mode 100644 tests/qtest/npcm_gmac-test.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 05d26e9292..3ff9f5d364 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -191,6 +191,8 @@ qtests_npcm7xx = \
> 'npcm7xx_timer-test',
> 'npcm7xx_watchdog_timer-test'] + \
> (slirp.found() ? ['npcm7xx_emc-test'] : [])
> +qtests_npcm8xx = \
> + ['npcm_gmac-test']
>
I haven't sent 8xx code yet (which I should do, sorry!). Maybe we should
remove 8xx related config for now?
> qtests_aspeed = \
> ['aspeed_hace-test',
> 'aspeed_smc-test',
> @@ -205,9 +207,7 @@ qtests_arm = \
> (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : [])
> + \
> (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
> (config_all_devices.has_key('CONFIG_GENERIC_LOADER') ?
> ['hexloader-test'] : []) + \
> - (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ?
> ['tpm-tis-i2c-test'] : []) + \
> - (config_all_devices.has_key('CONFIG_VEXPRESS') ? ['test-arm-mptimer'] :
> []) + \
> - (config_all_devices.has_key('CONFIG_MICROBIT') ? ['microbit-test'] :
> []) + \
> + (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \
>
ditto.
> ['arm-cpu-features',
> 'boot-serial-test']
>
> @@ -219,8 +219,9 @@ qtests_aarch64 = \
> (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ?
> ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
> (config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test']
> : []) + \
> (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] :
> []) + \
> - (config_all.has_key('CONFIG_TCG') and
> \
> - config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ?
> ['tpm-tis-i2c-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : [])
> + \
> + (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
> + (config_all_devices.has_key('CONFIG_NPCM8XX') ? qtests_npcm8xx : []) + \
>
ditto
> ['arm-cpu-features',
> 'numa-test',
> 'boot-serial-test',
> diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
> new file mode 100644
> index 0000000000..30d27e8dcc
> --- /dev/null
> +++ b/tests/qtest/npcm_gmac-test.c
> @@ -0,0 +1,209 @@
> +/*
> + * QTests for Nuvoton NPCM7xx/8xx GMAC Modules.
> + *
> + * Copyright 2022 Google LLC
>
nit: could be 2023 right now?
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but
> WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * for more details.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "libqos/libqos.h"
> +
> +/* Name of the GMAC Device */
> +#define TYPE_NPCM_GMAC "npcm-gmac"
> +
> +typedef struct GMACModule {
> + int irq;
> + uint64_t base_addr;
> +} GMACModule;
> +
> +typedef struct TestData {
> + const GMACModule *module;
> +} TestData;
> +
> +/* Values extracted from hw/arm/npcm8xx.c */
>
I think 7xx and 8xx has the same config for GMAC. Maybe use 7xx for now?
> +static const GMACModule gmac_module_list[] = {
> + {
> + .irq = 14,
> + .base_addr = 0xf0802000
> + },
> + {
> + .irq = 15,
> + .base_addr = 0xf0804000
> + },
> + {
> + .irq = 16,
> + .base_addr = 0xf0806000
> + },
> + {
> + .irq = 17,
> + .base_addr = 0xf0808000
> + }
> +};
> +
> +/* Returns the index of the GMAC module. */
> +static int gmac_module_index(const GMACModule *mod)
> +{
> + ptrdiff_t diff = mod - gmac_module_list;
> +
> + g_assert_true(diff >= 0 && diff < ARRAY_SIZE(gmac_module_list));
> +
> + return diff;
> +}
> +
> +/* 32-bit register indices. Taken from npcm_gmac.c */
> +typedef enum NPCMRegister {
> + /* DMA Registers */
> + NPCM_DMA_BUS_MODE = 0x1000,
> + NPCM_DMA_XMT_POLL_DEMAND = 0x1004,
> + NPCM_DMA_RCV_POLL_DEMAND = 0x1008,
> + NPCM_DMA_RCV_BASE_ADDR = 0x100c,
> + NPCM_DMA_TX_BASE_ADDR = 0x1010,
> + NPCM_DMA_STATUS = 0x1014,
> + NPCM_DMA_CONTROL = 0x1018,
> + NPCM_DMA_INTR_ENA = 0x101c,
> + NPCM_DMA_MISSED_FRAME_CTR = 0x1020,
> + NPCM_DMA_HOST_TX_DESC = 0x1048,
> + NPCM_DMA_HOST_RX_DESC = 0x104c,
> + NPCM_DMA_CUR_TX_BUF_ADDR = 0x1050,
> + NPCM_DMA_CUR_RX_BUF_ADDR = 0x1054,
> + NPCM_DMA_HW_FEATURE = 0x1058,
> +
> + /* GMAC Registers */
> + NPCM_GMAC_MAC_CONFIG = 0x0,
> + NPCM_GMAC_FRAME_FILTER = 0x4,
> + NPCM_GMAC_HASH_HIGH = 0x8,
> + NPCM_GMAC_HASH_LOW = 0xc,
> + NPCM_GMAC_MII_ADDR = 0x10,
> + NPCM_GMAC_MII_DATA = 0x14,
> + NPCM_GMAC_FLOW_CTRL = 0x18,
> + NPCM_GMAC_VLAN_FLAG = 0x1c,
> + NPCM_GMAC_VERSION = 0x20,
> + NPCM_GMAC_WAKEUP_FILTER = 0x28,
> + NPCM_GMAC_PMT = 0x2c,
> + NPCM_GMAC_LPI_CTRL = 0x30,
> + NPCM_GMAC_TIMER_CTRL = 0x34,
> + NPCM_GMAC_INT_STATUS = 0x38,
> + NPCM_GMAC_INT_MASK = 0x3c,
> + NPCM_GMAC_MAC0_ADDR_HI = 0x40,
> + NPCM_GMAC_MAC0_ADDR_LO = 0x44,
> + NPCM_GMAC_MAC1_ADDR_HI = 0x48,
> + NPCM_GMAC_MAC1_ADDR_LO = 0x4c,
> + NPCM_GMAC_MAC2_ADDR_HI = 0x50,
> + NPCM_GMAC_MAC2_ADDR_LO = 0x54,
> + NPCM_GMAC_MAC3_ADDR_HI = 0x58,
> + NPCM_GMAC_MAC3_ADDR_LO = 0x5c,
> + NPCM_GMAC_RGMII_STATUS = 0xd8,
> + NPCM_GMAC_WATCHDOG = 0xdc,
> + NPCM_GMAC_PTP_TCR = 0x700,
> + NPCM_GMAC_PTP_SSIR = 0x704,
> + NPCM_GMAC_PTP_STSR = 0x708,
> + NPCM_GMAC_PTP_STNSR = 0x70c,
> + NPCM_GMAC_PTP_STSUR = 0x710,
> + NPCM_GMAC_PTP_STNSUR = 0x714,
> + NPCM_GMAC_PTP_TAR = 0x718,
> + NPCM_GMAC_PTP_TTSR = 0x71c,
> +} NPCMRegister;
> +
> +static uint32_t gmac_read(QTestState *qts, const GMACModule *mod,
> + NPCMRegister regno)
> +{
> + return qtest_readl(qts, mod->base_addr + regno);
> +}
> +
> +/* Check that GMAC registers are reset to default value */
> +static void test_init(gconstpointer test_data)
> +{
> + const TestData *td = test_data;
> + const GMACModule *mod = td->module;
> + QTestState *qts = qtest_init("-machine npcm845-evb");
> +
> +#define CHECK_REG32(regno, value) \
> + do { \
> + g_assert_cmphex(gmac_read(qts, mod, (regno)), ==, (value)); \
> + } while (0)
> +
> + CHECK_REG32(NPCM_DMA_BUS_MODE, 0x00020100);
> + CHECK_REG32(NPCM_DMA_XMT_POLL_DEMAND, 0);
> + CHECK_REG32(NPCM_DMA_RCV_POLL_DEMAND, 0);
> + CHECK_REG32(NPCM_DMA_RCV_BASE_ADDR, 0);
> + CHECK_REG32(NPCM_DMA_TX_BASE_ADDR, 0);
> + CHECK_REG32(NPCM_DMA_STATUS, 0);
> + CHECK_REG32(NPCM_DMA_CONTROL, 0);
> + CHECK_REG32(NPCM_DMA_INTR_ENA, 0);
> + CHECK_REG32(NPCM_DMA_MISSED_FRAME_CTR, 0);
> + CHECK_REG32(NPCM_DMA_HOST_TX_DESC, 0);
> + CHECK_REG32(NPCM_DMA_HOST_RX_DESC, 0);
> + CHECK_REG32(NPCM_DMA_CUR_TX_BUF_ADDR, 0);
> + CHECK_REG32(NPCM_DMA_CUR_RX_BUF_ADDR, 0);
> + CHECK_REG32(NPCM_DMA_HW_FEATURE, 0x100d4f37);
> +
> + CHECK_REG32(NPCM_GMAC_MAC_CONFIG, 0);
> + CHECK_REG32(NPCM_GMAC_FRAME_FILTER, 0);
> + CHECK_REG32(NPCM_GMAC_HASH_HIGH, 0);
> + CHECK_REG32(NPCM_GMAC_HASH_LOW, 0);
> + CHECK_REG32(NPCM_GMAC_MII_ADDR, 0);
> + CHECK_REG32(NPCM_GMAC_MII_DATA, 0);
> + CHECK_REG32(NPCM_GMAC_FLOW_CTRL, 0);
> + CHECK_REG32(NPCM_GMAC_VLAN_FLAG, 0);
> + CHECK_REG32(NPCM_GMAC_VERSION, 0x00001037);
> + CHECK_REG32(NPCM_GMAC_WAKEUP_FILTER, 0);
> + CHECK_REG32(NPCM_GMAC_PMT, 0);
> + CHECK_REG32(NPCM_GMAC_LPI_CTRL, 0);
> + CHECK_REG32(NPCM_GMAC_TIMER_CTRL, 0x03e80000);
> + CHECK_REG32(NPCM_GMAC_INT_STATUS, 0);
> + CHECK_REG32(NPCM_GMAC_INT_MASK, 0);
> + CHECK_REG32(NPCM_GMAC_MAC0_ADDR_HI, 0x8000ffff);
> + CHECK_REG32(NPCM_GMAC_MAC0_ADDR_LO, 0xffffffff);
> + CHECK_REG32(NPCM_GMAC_MAC1_ADDR_HI, 0x0000ffff);
> + CHECK_REG32(NPCM_GMAC_MAC1_ADDR_LO, 0xffffffff);
> + CHECK_REG32(NPCM_GMAC_MAC2_ADDR_HI, 0x0000ffff);
> + CHECK_REG32(NPCM_GMAC_MAC2_ADDR_LO, 0xffffffff);
> + CHECK_REG32(NPCM_GMAC_MAC3_ADDR_HI, 0x0000ffff);
> + CHECK_REG32(NPCM_GMAC_MAC3_ADDR_LO, 0xffffffff);
> + CHECK_REG32(NPCM_GMAC_RGMII_STATUS, 0);
> + CHECK_REG32(NPCM_GMAC_WATCHDOG, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_TCR, 0x00002000);
> + CHECK_REG32(NPCM_GMAC_PTP_SSIR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_STSR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_STNSR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_STSUR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_STNSUR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_TAR, 0);
> + CHECK_REG32(NPCM_GMAC_PTP_TTSR, 0);
> +
> + qtest_quit(qts);
> +}
> +
> +static void gmac_add_test(const char *name, const TestData* td,
> + GTestDataFunc fn)
> +{
> + g_autofree char *full_name = g_strdup_printf(
> + "npcm8xx_gmac/gmac[%d]/%s", gmac_module_index(td->module),
> name);
> + qtest_add_data_func(full_name, td, fn);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + TestData test_data_list[ARRAY_SIZE(gmac_module_list)];
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + for (int i = 0; i < ARRAY_SIZE(gmac_module_list); ++i) {
> + TestData *td = &test_data_list[i];
> +
> + td->module = &gmac_module_list[i];
> +
> + gmac_add_test("init", td, test_init);
> + }
> +
> + return g_test_run();
> +}
> --
> 2.42.0.655.g421f12c284-goog
>
>
[-- Attachment #2: Type: text/html, Size: 12888 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 07/11] include/hw/net: Implemented Classes and Masks for GMAC Descriptors
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (5 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 06/11] \tests/qtest: Creating qtest for GMAC Module Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-18 0:16 ` Hao Wu
2023-10-17 23:03 ` [PATCH v3 08/11] hw/net: General GMAC Implementation Nabih Estefan
` (3 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- Implemeted classes for GMAC Receive and Transmit Descriptors
- Implemented Masks for said descriptors
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
---
hw/net/npcm_gmac.c | 183 +++++++++++++++++++++++++++--------
hw/net/trace-events | 9 ++
include/hw/net/npcm_gmac.h | 2 -
tests/qtest/npcm_gmac-test.c | 2 +-
4 files changed, 150 insertions(+), 46 deletions(-)
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
index 5ce632858d..6f8109e0ee 100644
--- a/hw/net/npcm_gmac.c
+++ b/hw/net/npcm_gmac.c
@@ -32,7 +32,7 @@
REG32(NPCM_DMA_BUS_MODE, 0x1000)
REG32(NPCM_DMA_XMT_POLL_DEMAND, 0x1004)
REG32(NPCM_DMA_RCV_POLL_DEMAND, 0x1008)
-REG32(NPCM_DMA_RCV_BASE_ADDR, 0x100c)
+REG32(NPCM_DMA_RX_BASE_ADDR, 0x100c)
REG32(NPCM_DMA_TX_BASE_ADDR, 0x1010)
REG32(NPCM_DMA_STATUS, 0x1014)
REG32(NPCM_DMA_CONTROL, 0x1018)
@@ -91,7 +91,8 @@ REG32(NPCM_GMAC_PTP_TTSR, 0x71c)
#define NPCM_DMA_BUS_MODE_SWR BIT(0)
static const uint32_t npcm_gmac_cold_reset_values[NPCM_GMAC_NR_REGS] = {
- [R_NPCM_GMAC_VERSION] = 0x00001037,
+ /* Reduce version to 3.2 so that the kernel can enable interrupt. */
+ [R_NPCM_GMAC_VERSION] = 0x00001032,
[R_NPCM_GMAC_TIMER_CTRL] = 0x03e80000,
[R_NPCM_GMAC_MAC0_ADDR_HI] = 0x8000ffff,
[R_NPCM_GMAC_MAC0_ADDR_LO] = 0xffffffff,
@@ -125,12 +126,12 @@ static const uint16_t phy_reg_init[] = {
[MII_EXTSTAT] = 0x3000, /* 1000BASTE_T full-duplex capable */
};
-static void npcm_gmac_soft_reset(NPCMGMACState *s)
+static void npcm_gmac_soft_reset(NPCMGMACState *gmac)
{
- memcpy(s->regs, npcm_gmac_cold_reset_values,
+ memcpy(gmac->regs, npcm_gmac_cold_reset_values,
NPCM_GMAC_NR_REGS * sizeof(uint32_t));
/* Clear reset bits */
- s->regs[R_NPCM_DMA_BUS_MODE] &= ~NPCM_DMA_BUS_MODE_SWR;
+ gmac->regs[R_NPCM_DMA_BUS_MODE] &= ~NPCM_DMA_BUS_MODE_SWR;
}
static void gmac_phy_set_link(NPCMGMACState *s, bool active)
@@ -148,11 +149,53 @@ static bool gmac_can_receive(NetClientState *nc)
return true;
}
-static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len1)
+/*
+ * Function that updates the GMAC IRQ
+ * It find the logical OR of the enabled bits for NIS (if enabled)
+ * It find the logical OR of the enabled bits for AIS (if enabled)
+ */
+static void gmac_update_irq(NPCMGMACState *gmac)
{
- return 0;
+ /*
+ * Check if the normal interrupts summery is enabled
+ * if so, add the bits for the summary that are enabled
+ */
+ if (gmac->regs[R_NPCM_DMA_INTR_ENA] & gmac->regs[R_NPCM_DMA_STATUS] &
+ (NPCM_DMA_INTR_ENAB_NIE_BITS))
+ {
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_NIS;
+ }
+ /*
+ * Check if the abnormal interrupts summery is enabled
+ * if so, add the bits for the summary that are enabled
+ */
+ if (gmac->regs[R_NPCM_DMA_INTR_ENA] & gmac->regs[R_NPCM_DMA_STATUS] &
+ (NPCM_DMA_INTR_ENAB_AIE_BITS))
+ {
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_AIS;
+ }
+
+ /* Get the logical OR of both normal and abnormal interrupts */
+ int level = !!((gmac->regs[R_NPCM_DMA_STATUS] &
+ gmac->regs[R_NPCM_DMA_INTR_ENA] &
+ NPCM_DMA_STATUS_NIS) |
+ (gmac->regs[R_NPCM_DMA_STATUS] &
+ gmac->regs[R_NPCM_DMA_INTR_ENA] &
+ NPCM_DMA_STATUS_AIS));
+
+ /* Set the IRQ */
+ trace_npcm_gmac_update_irq(DEVICE(gmac)->canonical_path,
+ gmac->regs[R_NPCM_DMA_STATUS],
+ gmac->regs[R_NPCM_DMA_INTR_ENA],
+ level);
+ qemu_set_irq(gmac->irq, level);
}
+static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len)
+{
+ /* Placeholder */
+ return 0;
+}
static void gmac_cleanup(NetClientState *nc)
{
/* Nothing to do yet. */
@@ -166,7 +209,7 @@ static void gmac_set_link(NetClientState *nc)
gmac_phy_set_link(s, !nc->link_down);
}
-static void npcm_gmac_mdio_access(NPCMGMACState *s, uint16_t v)
+static void npcm_gmac_mdio_access(NPCMGMACState *gmac, uint16_t v)
{
bool busy = v & NPCM_GMAC_MII_ADDR_BUSY;
uint8_t is_write;
@@ -183,33 +226,38 @@ static void npcm_gmac_mdio_access(NPCMGMACState *s, uint16_t v)
if (v & NPCM_GMAC_MII_ADDR_WRITE) {
- data = s->regs[R_NPCM_GMAC_MII_DATA];
+ data = gmac->regs[R_NPCM_GMAC_MII_DATA];
/* Clear reset bit for BMCR register */
switch (gr) {
case MII_BMCR:
data &= ~MII_BMCR_RESET;
- /* Complete auto-negotiation immediately and set as complete */
- if (data & MII_BMCR_AUTOEN) {
+ /* Autonegotiation is a W1C bit*/
+ if (data & MII_BMCR_ANRESTART) {
/* Tells autonegotiation to not restart again */
data &= ~MII_BMCR_ANRESTART;
+ }
+ if ((data & MII_BMCR_AUTOEN) &&
+ !(gmac->phy_regs[pa][MII_BMSR] & MII_BMSR_AN_COMP)) {
/* sets autonegotiation as complete */
- s->phy_regs[pa][MII_BMSR] |= MII_BMSR_AN_COMP;
+ gmac->phy_regs[pa][MII_BMSR] |= MII_BMSR_AN_COMP;
+ /* Resolve AN automatically->need to set this */
+ gmac->phy_regs[0][MII_ANLPAR] = 0x0000;
}
}
- s->phy_regs[pa][gr] = data;
+ gmac->phy_regs[pa][gr] = data;
} else {
- data = s->phy_regs[pa][gr];
- s->regs[R_NPCM_GMAC_MII_DATA] = data;
+ data = gmac->phy_regs[pa][gr];
+ gmac->regs[R_NPCM_GMAC_MII_DATA] = data;
}
- trace_npcm_gmac_mdio_access(DEVICE(s)->canonical_path, is_write, pa,
- gr, data);
+ trace_npcm_gmac_mdio_access(DEVICE(gmac)->canonical_path, is_write, pa,
+ gr, data);
}
- s->regs[R_NPCM_GMAC_MII_ADDR] = v & ~NPCM_GMAC_MII_ADDR_BUSY;
+ gmac->regs[R_NPCM_GMAC_MII_ADDR] = v & ~NPCM_GMAC_MII_ADDR_BUSY;
}
static uint64_t npcm_gmac_read(void *opaque, hwaddr offset, unsigned size)
{
- NPCMGMACState *s = opaque;
+ NPCMGMACState *gmac = opaque;
uint32_t v = 0;
switch (offset) {
@@ -218,22 +266,25 @@ static uint64_t npcm_gmac_read(void *opaque, hwaddr offset, unsigned size)
case A_NPCM_DMA_RCV_POLL_DEMAND:
qemu_log_mask(LOG_GUEST_ERROR,
"%s: Read of write-only reg: offset: 0x%04" HWADDR_PRIx
- "\n", DEVICE(s)->canonical_path, offset);
+ "\n", DEVICE(gmac)->canonical_path, offset);
break;
default:
- v = s->regs[offset / sizeof(uint32_t)];
+ v = gmac->regs[offset / sizeof(uint32_t)];
}
- trace_npcm_gmac_reg_read(DEVICE(s)->canonical_path, offset, v);
+
+ trace_npcm_gmac_reg_read(DEVICE(gmac)->canonical_path, offset, v);
return v;
}
static void npcm_gmac_write(void *opaque, hwaddr offset,
uint64_t v, unsigned size)
{
- NPCMGMACState *s = opaque;
+ NPCMGMACState *gmac = opaque;
+ uint32_t prev;
+
+ trace_npcm_gmac_reg_write(DEVICE(gmac)->canonical_path, offset, v);
- trace_npcm_gmac_reg_write(DEVICE(s)->canonical_path, offset, v);
switch (offset) {
/* Read only registers */
case A_NPCM_GMAC_VERSION:
@@ -250,25 +301,44 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
qemu_log_mask(LOG_GUEST_ERROR,
"%s: Write of read-only reg: offset: 0x%04" HWADDR_PRIx
", value: 0x%04" PRIx64 "\n",
- DEVICE(s)->canonical_path, offset, v);
+ DEVICE(gmac)->canonical_path, offset, v);
+ break;
+
+ case A_NPCM_GMAC_MAC_CONFIG:
+ prev = gmac->regs[offset / sizeof(uint32_t)];
+ gmac->regs[offset / sizeof(uint32_t)] = v;
+
+ /* If transmit is being enabled for first time, update desc addr */
+ if (~(prev & NPCM_GMAC_MAC_CONFIG_TX_EN) &
+ (v & NPCM_GMAC_MAC_CONFIG_TX_EN)) {
+ gmac->regs[R_NPCM_DMA_HOST_TX_DESC] =
+ gmac->regs[R_NPCM_DMA_TX_BASE_ADDR];
+ }
+
+ /* If receive is being enabled for first time, update desc addr */
+ if (~(prev & NPCM_GMAC_MAC_CONFIG_RX_EN) &
+ (v & NPCM_GMAC_MAC_CONFIG_RX_EN)) {
+ gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
+ gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
+ }
break;
case A_NPCM_GMAC_MII_ADDR:
- npcm_gmac_mdio_access(s, v);
+ npcm_gmac_mdio_access(gmac, v);
break;
case A_NPCM_GMAC_MAC0_ADDR_HI:
- s->regs[offset / sizeof(uint32_t)] = v;
- s->conf.macaddr.a[0] = v >> 8;
- s->conf.macaddr.a[1] = v >> 0;
+ gmac->regs[offset / sizeof(uint32_t)] = v;
+ gmac->conf.macaddr.a[0] = v >> 8;
+ gmac->conf.macaddr.a[1] = v >> 0;
break;
case A_NPCM_GMAC_MAC0_ADDR_LO:
- s->regs[offset / sizeof(uint32_t)] = v;
- s->conf.macaddr.a[2] = v >> 24;
- s->conf.macaddr.a[3] = v >> 16;
- s->conf.macaddr.a[4] = v >> 8;
- s->conf.macaddr.a[5] = v >> 0;
+ gmac->regs[offset / sizeof(uint32_t)] = v;
+ gmac->conf.macaddr.a[2] = v >> 24;
+ gmac->conf.macaddr.a[3] = v >> 16;
+ gmac->conf.macaddr.a[4] = v >> 8;
+ gmac->conf.macaddr.a[5] = v >> 0;
break;
case A_NPCM_GMAC_MAC1_ADDR_HI:
@@ -277,33 +347,60 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
case A_NPCM_GMAC_MAC2_ADDR_LO:
case A_NPCM_GMAC_MAC3_ADDR_HI:
case A_NPCM_GMAC_MAC3_ADDR_LO:
- s->regs[offset / sizeof(uint32_t)] = v;
+ gmac->regs[offset / sizeof(uint32_t)] = v;
qemu_log_mask(LOG_UNIMP,
"%s: Only MAC Address 0 is supported. This request "
- "is ignored.\n", DEVICE(s)->canonical_path);
+ "is ignored.\n", DEVICE(gmac)->canonical_path);
break;
case A_NPCM_DMA_BUS_MODE:
- s->regs[offset / sizeof(uint32_t)] = v;
+ gmac->regs[offset / sizeof(uint32_t)] = v;
if (v & NPCM_DMA_BUS_MODE_SWR) {
- npcm_gmac_soft_reset(s);
+ npcm_gmac_soft_reset(gmac);
+ }
+ break;
+
+ case A_NPCM_DMA_RCV_POLL_DEMAND:
+ /* We dont actually care about the value */
+ break;
+
+ case A_NPCM_DMA_STATUS:
+ /* Check that RO bits are not written to */
+ if (NPCM_DMA_STATUS_RO_MASK(v)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Write of read-only bits of reg: offset: 0x%04"
+ HWADDR_PRIx ", value: 0x%04" PRIx64 "\n",
+ DEVICE(gmac)->canonical_path, offset, v);
+ } else {
+ /* for W1c bits, implement W1C */
+ gmac->regs[offset / sizeof(uint32_t)] &=
+ ~NPCM_DMA_STATUS_W1C_MASK(v);
+ if (v & NPCM_DMA_STATUS_NIS_BITS) {
+ gmac->regs[offset / sizeof(uint32_t)] &= ~NPCM_DMA_STATUS_NIS;
+ }
+ if (v & NPCM_DMA_STATUS_AIS_BITS) {
+ gmac->regs[offset / sizeof(uint32_t)] &= ~NPCM_DMA_STATUS_AIS;
+ }
}
break;
default:
- s->regs[offset / sizeof(uint32_t)] = v;
+ gmac->regs[offset / sizeof(uint32_t)] = v;
break;
}
+
+ gmac_update_irq(gmac);
}
static void npcm_gmac_reset(DeviceState *dev)
{
- NPCMGMACState *s = NPCM_GMAC(dev);
+ NPCMGMACState *gmac = NPCM_GMAC(dev);
- npcm_gmac_soft_reset(s);
- memcpy(s->phy_regs[0], phy_reg_init, sizeof(phy_reg_init));
+ npcm_gmac_soft_reset(gmac);
+ memcpy(gmac->phy_regs[0], phy_reg_init, sizeof(phy_reg_init));
- trace_npcm_gmac_reset(DEVICE(s)->canonical_path, s->phy_regs[0][MII_BMSR]);
+ trace_npcm_gmac_reset(DEVICE(gmac)->canonical_path,
+ gmac->phy_regs[0][MII_BMSR]);
}
static NetClientInfo net_npcm_gmac_info = {
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 1dbb5d2d64..2843f1eaf8 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -472,6 +472,15 @@ npcm_gmac_reg_write(const char *name, uint64_t offset, uint32_t value) "%s: offs
npcm_gmac_mdio_access(const char *name, uint8_t is_write, uint8_t pa, uint8_t gr, uint16_t val) "%s: is_write: %" PRIu8 " pa: %" PRIu8 " gr: %" PRIu8 " val: 0x%04" PRIx16
npcm_gmac_reset(const char *name, uint16_t value) "%s: phy_regs[0][1]: 0x%04" PRIx16
npcm_gmac_set_link(bool active) "Set link: active=%u"
+npcm_gmac_update_irq(const char *name, uint32_t status, uint32_t intr_en, int level) "%s: Status Reg: 0x%04" PRIX32 " Interrupt Enable Reg: 0x%04" PRIX32 " IRQ Set: %d"
+npcm_gmac_packet_desc_read(const char* name, uint32_t desc_addr) "%s: attempting to read descriptor @0x%04" PRIX32
+npcm_gmac_packet_receive(const char* name, uint32_t len) "%s: RX packet length: 0x%04" PRIX32
+npcm_gmac_packet_receiving_buffer(const char* name, uint32_t buf_len, uint32_t rx_buf_addr) "%s: Receiving into Buffer size: 0x%04" PRIX32 " at address 0x%04" PRIX32
+npcm_gmac_packet_received(const char* name, uint32_t len) "%s: Reception finished, packet left: 0x%04" PRIX32
+npcm_gmac_packet_transmit(const char* name, uint16_t len) "%s: TX transmission start, packed length 0x%04" PRIX16
+npcm_gmac_packet_sent(const char* name, uint16_t len) "%s: TX packet sent!, length: 0x%04" PRIX16
+npcm_gmac_debug_desc_data(const char* name, void* addr, uint32_t des0, uint32_t des1, uint32_t des2, uint32_t des3)"%s: Address: %p Descriptor 0: 0x%04" PRIX32 " Descriptor 1: 0x%04" PRIX32 "Descriptor 2: 0x%04" PRIX32 " Descriptor 3: 0x%04" PRIX32
+npcm_gmac_packet_tx_desc_data(const char* name, uint32_t tdes0, uint32_t tdes1) "%s: Tdes0: 0x%04" PRIX32 " Tdes1: 0x%04" PRIX32
# npcm_pcs.c
npcm_pcs_reg_read(const char *name, uint16_t indirect_access_baes, uint64_t offset, uint16_t value) "%s: IND: 0x%02" PRIx16 " offset: 0x%04" PRIx64 " value: 0x%04" PRIx16
diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
index a92a654278..e5729e83ea 100644
--- a/include/hw/net/npcm_gmac.h
+++ b/include/hw/net/npcm_gmac.h
@@ -37,8 +37,6 @@ struct NPCMGMACRxDesc {
/* RDES2 and RDES3 are buffer address pointers */
/* Owner: 0 = software, 1 = gmac */
#define RX_DESC_RDES0_OWNER_MASK BIT(31)
-/* Owner*/
-#define RX_DESC_RDES0_OWNER_SHIFT 31
/* Destination Address Filter Fail */
#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL_MASK BIT(30)
/* Frame length*/
diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
index 30d27e8dcc..84511fd915 100644
--- a/tests/qtest/npcm_gmac-test.c
+++ b/tests/qtest/npcm_gmac-test.c
@@ -154,7 +154,7 @@ static void test_init(gconstpointer test_data)
CHECK_REG32(NPCM_GMAC_MII_DATA, 0);
CHECK_REG32(NPCM_GMAC_FLOW_CTRL, 0);
CHECK_REG32(NPCM_GMAC_VLAN_FLAG, 0);
- CHECK_REG32(NPCM_GMAC_VERSION, 0x00001037);
+ CHECK_REG32(NPCM_GMAC_VERSION, 0x00001032);
CHECK_REG32(NPCM_GMAC_WAKEUP_FILTER, 0);
CHECK_REG32(NPCM_GMAC_PMT, 0);
CHECK_REG32(NPCM_GMAC_LPI_CTRL, 0);
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v3 07/11] include/hw/net: Implemented Classes and Masks for GMAC Descriptors
2023-10-17 23:03 ` [PATCH v3 07/11] include/hw/net: Implemented Classes and Masks for GMAC Descriptors Nabih Estefan
@ 2023-10-18 0:16 ` Hao Wu
0 siblings, 0 replies; 17+ messages in thread
From: Hao Wu @ 2023-10-18 0:16 UTC (permalink / raw)
To: Nabih Estefan
Cc: peter.maydell, qemu-arm, qemu-devel, kfting, jasonwang,
avi.fishman
[-- Attachment #1: Type: text/plain, Size: 16725 bytes --]
On Tue, Oct 17, 2023 at 4:04 PM Nabih Estefan <nabihestefan@google.com>
wrote:
> From: Nabih Estefan Diaz <nabihestefan@google.com>
>
> - Implemeted classes for GMAC Receive and Transmit Descriptors
> - Implemented Masks for said descriptors
>
> Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
> ---
> hw/net/npcm_gmac.c | 183 +++++++++++++++++++++++++++--------
> hw/net/trace-events | 9 ++
> include/hw/net/npcm_gmac.h | 2 -
> tests/qtest/npcm_gmac-test.c | 2 +-
> 4 files changed, 150 insertions(+), 46 deletions(-)
>
> diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
> index 5ce632858d..6f8109e0ee 100644
> --- a/hw/net/npcm_gmac.c
> +++ b/hw/net/npcm_gmac.c
> @@ -32,7 +32,7 @@
> REG32(NPCM_DMA_BUS_MODE, 0x1000)
> REG32(NPCM_DMA_XMT_POLL_DEMAND, 0x1004)
> REG32(NPCM_DMA_RCV_POLL_DEMAND, 0x1008)
> -REG32(NPCM_DMA_RCV_BASE_ADDR, 0x100c)
> +REG32(NPCM_DMA_RX_BASE_ADDR, 0x100c)
> REG32(NPCM_DMA_TX_BASE_ADDR, 0x1010)
> REG32(NPCM_DMA_STATUS, 0x1014)
> REG32(NPCM_DMA_CONTROL, 0x1018)
> @@ -91,7 +91,8 @@ REG32(NPCM_GMAC_PTP_TTSR, 0x71c)
> #define NPCM_DMA_BUS_MODE_SWR BIT(0)
>
> static const uint32_t npcm_gmac_cold_reset_values[NPCM_GMAC_NR_REGS] = {
> - [R_NPCM_GMAC_VERSION] = 0x00001037,
> + /* Reduce version to 3.2 so that the kernel can enable interrupt. */
> + [R_NPCM_GMAC_VERSION] = 0x00001032,
> [R_NPCM_GMAC_TIMER_CTRL] = 0x03e80000,
> [R_NPCM_GMAC_MAC0_ADDR_HI] = 0x8000ffff,
> [R_NPCM_GMAC_MAC0_ADDR_LO] = 0xffffffff,
> @@ -125,12 +126,12 @@ static const uint16_t phy_reg_init[] = {
> [MII_EXTSTAT] = 0x3000, /* 1000BASTE_T full-duplex capable */
> };
>
> -static void npcm_gmac_soft_reset(NPCMGMACState *s)
> +static void npcm_gmac_soft_reset(NPCMGMACState *gmac)
> {
> - memcpy(s->regs, npcm_gmac_cold_reset_values,
> + memcpy(gmac->regs, npcm_gmac_cold_reset_values,
> NPCM_GMAC_NR_REGS * sizeof(uint32_t));
> /* Clear reset bits */
> - s->regs[R_NPCM_DMA_BUS_MODE] &= ~NPCM_DMA_BUS_MODE_SWR;
> + gmac->regs[R_NPCM_DMA_BUS_MODE] &= ~NPCM_DMA_BUS_MODE_SWR;
> }
>
> static void gmac_phy_set_link(NPCMGMACState *s, bool active)
> @@ -148,11 +149,53 @@ static bool gmac_can_receive(NetClientState *nc)
> return true;
> }
>
> -static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf,
> size_t len1)
> +/*
> + * Function that updates the GMAC IRQ
> + * It find the logical OR of the enabled bits for NIS (if enabled)
> + * It find the logical OR of the enabled bits for AIS (if enabled)
> + */
> +static void gmac_update_irq(NPCMGMACState *gmac)
> {
> - return 0;
> + /*
> + * Check if the normal interrupts summery is enabled
> + * if so, add the bits for the summary that are enabled
> + */
> + if (gmac->regs[R_NPCM_DMA_INTR_ENA] & gmac->regs[R_NPCM_DMA_STATUS] &
> + (NPCM_DMA_INTR_ENAB_NIE_BITS))
> + {
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_NIS;
> + }
> + /*
> + * Check if the abnormal interrupts summery is enabled
> + * if so, add the bits for the summary that are enabled
> + */
> + if (gmac->regs[R_NPCM_DMA_INTR_ENA] & gmac->regs[R_NPCM_DMA_STATUS] &
> + (NPCM_DMA_INTR_ENAB_AIE_BITS))
> + {
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_AIS;
> + }
> +
> + /* Get the logical OR of both normal and abnormal interrupts */
> + int level = !!((gmac->regs[R_NPCM_DMA_STATUS] &
> + gmac->regs[R_NPCM_DMA_INTR_ENA] &
> + NPCM_DMA_STATUS_NIS) |
> + (gmac->regs[R_NPCM_DMA_STATUS] &
> + gmac->regs[R_NPCM_DMA_INTR_ENA] &
> + NPCM_DMA_STATUS_AIS));
> +
> + /* Set the IRQ */
> + trace_npcm_gmac_update_irq(DEVICE(gmac)->canonical_path,
> + gmac->regs[R_NPCM_DMA_STATUS],
> + gmac->regs[R_NPCM_DMA_INTR_ENA],
> + level);
> + qemu_set_irq(gmac->irq, level);
> }
>
> +static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf,
> size_t len)
> +{
> + /* Placeholder */
> + return 0;
> +}
> static void gmac_cleanup(NetClientState *nc)
> {
> /* Nothing to do yet. */
> @@ -166,7 +209,7 @@ static void gmac_set_link(NetClientState *nc)
> gmac_phy_set_link(s, !nc->link_down);
> }
>
> -static void npcm_gmac_mdio_access(NPCMGMACState *s, uint16_t v)
> +static void npcm_gmac_mdio_access(NPCMGMACState *gmac, uint16_t v)
> {
> bool busy = v & NPCM_GMAC_MII_ADDR_BUSY;
> uint8_t is_write;
> @@ -183,33 +226,38 @@ static void npcm_gmac_mdio_access(NPCMGMACState *s,
> uint16_t v)
>
>
> if (v & NPCM_GMAC_MII_ADDR_WRITE) {
> - data = s->regs[R_NPCM_GMAC_MII_DATA];
> + data = gmac->regs[R_NPCM_GMAC_MII_DATA];
> /* Clear reset bit for BMCR register */
> switch (gr) {
> case MII_BMCR:
> data &= ~MII_BMCR_RESET;
> - /* Complete auto-negotiation immediately and set as
> complete */
> - if (data & MII_BMCR_AUTOEN) {
> + /* Autonegotiation is a W1C bit*/
> + if (data & MII_BMCR_ANRESTART) {
> /* Tells autonegotiation to not restart again */
> data &= ~MII_BMCR_ANRESTART;
> + }
> + if ((data & MII_BMCR_AUTOEN) &&
> + !(gmac->phy_regs[pa][MII_BMSR] & MII_BMSR_AN_COMP)) {
> /* sets autonegotiation as complete */
> - s->phy_regs[pa][MII_BMSR] |= MII_BMSR_AN_COMP;
> + gmac->phy_regs[pa][MII_BMSR] |= MII_BMSR_AN_COMP;
> + /* Resolve AN automatically->need to set this */
> + gmac->phy_regs[0][MII_ANLPAR] = 0x0000;
> }
> }
> - s->phy_regs[pa][gr] = data;
> + gmac->phy_regs[pa][gr] = data;
> } else {
> - data = s->phy_regs[pa][gr];
> - s->regs[R_NPCM_GMAC_MII_DATA] = data;
> + data = gmac->phy_regs[pa][gr];
> + gmac->regs[R_NPCM_GMAC_MII_DATA] = data;
> }
> - trace_npcm_gmac_mdio_access(DEVICE(s)->canonical_path, is_write,
> pa,
> - gr, data);
> + trace_npcm_gmac_mdio_access(DEVICE(gmac)->canonical_path,
> is_write, pa,
> + gr, data);
> }
> - s->regs[R_NPCM_GMAC_MII_ADDR] = v & ~NPCM_GMAC_MII_ADDR_BUSY;
> + gmac->regs[R_NPCM_GMAC_MII_ADDR] = v & ~NPCM_GMAC_MII_ADDR_BUSY;
> }
>
> static uint64_t npcm_gmac_read(void *opaque, hwaddr offset, unsigned size)
> {
> - NPCMGMACState *s = opaque;
> + NPCMGMACState *gmac = opaque;
> uint32_t v = 0;
>
> switch (offset) {
> @@ -218,22 +266,25 @@ static uint64_t npcm_gmac_read(void *opaque, hwaddr
> offset, unsigned size)
> case A_NPCM_DMA_RCV_POLL_DEMAND:
> qemu_log_mask(LOG_GUEST_ERROR,
> "%s: Read of write-only reg: offset: 0x%04"
> HWADDR_PRIx
> - "\n", DEVICE(s)->canonical_path, offset);
> + "\n", DEVICE(gmac)->canonical_path, offset);
> break;
>
> default:
> - v = s->regs[offset / sizeof(uint32_t)];
> + v = gmac->regs[offset / sizeof(uint32_t)];
> }
> - trace_npcm_gmac_reg_read(DEVICE(s)->canonical_path, offset, v);
> +
> + trace_npcm_gmac_reg_read(DEVICE(gmac)->canonical_path, offset, v);
> return v;
> }
>
> static void npcm_gmac_write(void *opaque, hwaddr offset,
> uint64_t v, unsigned size)
> {
> - NPCMGMACState *s = opaque;
> + NPCMGMACState *gmac = opaque;
> + uint32_t prev;
> +
> + trace_npcm_gmac_reg_write(DEVICE(gmac)->canonical_path, offset, v);
>
> - trace_npcm_gmac_reg_write(DEVICE(s)->canonical_path, offset, v);
> switch (offset) {
> /* Read only registers */
> case A_NPCM_GMAC_VERSION:
> @@ -250,25 +301,44 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
> qemu_log_mask(LOG_GUEST_ERROR,
> "%s: Write of read-only reg: offset: 0x%04"
> HWADDR_PRIx
> ", value: 0x%04" PRIx64 "\n",
> - DEVICE(s)->canonical_path, offset, v);
> + DEVICE(gmac)->canonical_path, offset, v);
> + break;
> +
> + case A_NPCM_GMAC_MAC_CONFIG:
> + prev = gmac->regs[offset / sizeof(uint32_t)];
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> +
> + /* If transmit is being enabled for first time, update desc addr
> */
> + if (~(prev & NPCM_GMAC_MAC_CONFIG_TX_EN) &
> + (v & NPCM_GMAC_MAC_CONFIG_TX_EN)) {
> + gmac->regs[R_NPCM_DMA_HOST_TX_DESC] =
> + gmac->regs[R_NPCM_DMA_TX_BASE_ADDR];
> + }
> +
> + /* If receive is being enabled for first time, update desc addr */
> + if (~(prev & NPCM_GMAC_MAC_CONFIG_RX_EN) &
> + (v & NPCM_GMAC_MAC_CONFIG_RX_EN)) {
> + gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
> + gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
> + }
> break;
>
> case A_NPCM_GMAC_MII_ADDR:
> - npcm_gmac_mdio_access(s, v);
> + npcm_gmac_mdio_access(gmac, v);
> break;
>
> case A_NPCM_GMAC_MAC0_ADDR_HI:
> - s->regs[offset / sizeof(uint32_t)] = v;
> - s->conf.macaddr.a[0] = v >> 8;
> - s->conf.macaddr.a[1] = v >> 0;
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> + gmac->conf.macaddr.a[0] = v >> 8;
> + gmac->conf.macaddr.a[1] = v >> 0;
> break;
>
> case A_NPCM_GMAC_MAC0_ADDR_LO:
> - s->regs[offset / sizeof(uint32_t)] = v;
> - s->conf.macaddr.a[2] = v >> 24;
> - s->conf.macaddr.a[3] = v >> 16;
> - s->conf.macaddr.a[4] = v >> 8;
> - s->conf.macaddr.a[5] = v >> 0;
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> + gmac->conf.macaddr.a[2] = v >> 24;
> + gmac->conf.macaddr.a[3] = v >> 16;
> + gmac->conf.macaddr.a[4] = v >> 8;
> + gmac->conf.macaddr.a[5] = v >> 0;
> break;
>
> case A_NPCM_GMAC_MAC1_ADDR_HI:
> @@ -277,33 +347,60 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
> case A_NPCM_GMAC_MAC2_ADDR_LO:
> case A_NPCM_GMAC_MAC3_ADDR_HI:
> case A_NPCM_GMAC_MAC3_ADDR_LO:
> - s->regs[offset / sizeof(uint32_t)] = v;
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> qemu_log_mask(LOG_UNIMP,
> "%s: Only MAC Address 0 is supported. This request "
> - "is ignored.\n", DEVICE(s)->canonical_path);
> + "is ignored.\n", DEVICE(gmac)->canonical_path);
> break;
>
> case A_NPCM_DMA_BUS_MODE:
> - s->regs[offset / sizeof(uint32_t)] = v;
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> if (v & NPCM_DMA_BUS_MODE_SWR) {
> - npcm_gmac_soft_reset(s);
> + npcm_gmac_soft_reset(gmac);
> + }
> + break;
> +
> + case A_NPCM_DMA_RCV_POLL_DEMAND:
> + /* We dont actually care about the value */
> + break;
> +
> + case A_NPCM_DMA_STATUS:
> + /* Check that RO bits are not written to */
> + if (NPCM_DMA_STATUS_RO_MASK(v)) {
> + qemu_log_mask(LOG_GUEST_ERROR,
> + "%s: Write of read-only bits of reg: offset:
> 0x%04"
> + HWADDR_PRIx ", value: 0x%04" PRIx64 "\n",
> + DEVICE(gmac)->canonical_path, offset, v);
> + } else {
> + /* for W1c bits, implement W1C */
> + gmac->regs[offset / sizeof(uint32_t)] &=
> + ~NPCM_DMA_STATUS_W1C_MASK(v);
> + if (v & NPCM_DMA_STATUS_NIS_BITS) {
> + gmac->regs[offset / sizeof(uint32_t)] &=
> ~NPCM_DMA_STATUS_NIS;
> + }
> + if (v & NPCM_DMA_STATUS_AIS_BITS) {
> + gmac->regs[offset / sizeof(uint32_t)] &=
> ~NPCM_DMA_STATUS_AIS;
> + }
> }
> break;
>
> default:
> - s->regs[offset / sizeof(uint32_t)] = v;
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> break;
> }
> +
> + gmac_update_irq(gmac);
> }
>
> static void npcm_gmac_reset(DeviceState *dev)
> {
> - NPCMGMACState *s = NPCM_GMAC(dev);
> + NPCMGMACState *gmac = NPCM_GMAC(dev);
>
> - npcm_gmac_soft_reset(s);
> - memcpy(s->phy_regs[0], phy_reg_init, sizeof(phy_reg_init));
> + npcm_gmac_soft_reset(gmac);
> + memcpy(gmac->phy_regs[0], phy_reg_init, sizeof(phy_reg_init));
>
> - trace_npcm_gmac_reset(DEVICE(s)->canonical_path,
> s->phy_regs[0][MII_BMSR]);
> + trace_npcm_gmac_reset(DEVICE(gmac)->canonical_path,
> + gmac->phy_regs[0][MII_BMSR]);
> }
>
> static NetClientInfo net_npcm_gmac_info = {
> diff --git a/hw/net/trace-events b/hw/net/trace-events
> index 1dbb5d2d64..2843f1eaf8 100644
> --- a/hw/net/trace-events
> +++ b/hw/net/trace-events
> @@ -472,6 +472,15 @@ npcm_gmac_reg_write(const char *name, uint64_t
> offset, uint32_t value) "%s: offs
> npcm_gmac_mdio_access(const char *name, uint8_t is_write, uint8_t pa,
> uint8_t gr, uint16_t val) "%s: is_write: %" PRIu8 " pa: %" PRIu8 " gr: %"
> PRIu8 " val: 0x%04" PRIx16
> npcm_gmac_reset(const char *name, uint16_t value) "%s: phy_regs[0][1]:
> 0x%04" PRIx16
> npcm_gmac_set_link(bool active) "Set link: active=%u"
> +npcm_gmac_update_irq(const char *name, uint32_t status, uint32_t intr_en,
> int level) "%s: Status Reg: 0x%04" PRIX32 " Interrupt Enable Reg: 0x%04"
> PRIX32 " IRQ Set: %d"
> +npcm_gmac_packet_desc_read(const char* name, uint32_t desc_addr) "%s:
> attempting to read descriptor @0x%04" PRIX32
> +npcm_gmac_packet_receive(const char* name, uint32_t len) "%s: RX packet
> length: 0x%04" PRIX32
> +npcm_gmac_packet_receiving_buffer(const char* name, uint32_t buf_len,
> uint32_t rx_buf_addr) "%s: Receiving into Buffer size: 0x%04" PRIX32 " at
> address 0x%04" PRIX32
> +npcm_gmac_packet_received(const char* name, uint32_t len) "%s: Reception
> finished, packet left: 0x%04" PRIX32
> +npcm_gmac_packet_transmit(const char* name, uint16_t len) "%s: TX
> transmission start, packed length 0x%04" PRIX16
> +npcm_gmac_packet_sent(const char* name, uint16_t len) "%s: TX packet
> sent!, length: 0x%04" PRIX16
> +npcm_gmac_debug_desc_data(const char* name, void* addr, uint32_t des0,
> uint32_t des1, uint32_t des2, uint32_t des3)"%s: Address: %p Descriptor 0:
> 0x%04" PRIX32 " Descriptor 1: 0x%04" PRIX32 "Descriptor 2: 0x%04" PRIX32 "
> Descriptor 3: 0x%04" PRIX32
> +npcm_gmac_packet_tx_desc_data(const char* name, uint32_t tdes0, uint32_t
> tdes1) "%s: Tdes0: 0x%04" PRIX32 " Tdes1: 0x%04" PRIX32
>
> # npcm_pcs.c
> npcm_pcs_reg_read(const char *name, uint16_t indirect_access_baes,
> uint64_t offset, uint16_t value) "%s: IND: 0x%02" PRIx16 " offset: 0x%04"
> PRIx64 " value: 0x%04" PRIx16
> diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
> index a92a654278..e5729e83ea 100644
> --- a/include/hw/net/npcm_gmac.h
> +++ b/include/hw/net/npcm_gmac.h
> @@ -37,8 +37,6 @@ struct NPCMGMACRxDesc {
> /* RDES2 and RDES3 are buffer address pointers */
> /* Owner: 0 = software, 1 = gmac */
> #define RX_DESC_RDES0_OWNER_MASK BIT(31)
> -/* Owner*/
> -#define RX_DESC_RDES0_OWNER_SHIFT 31
> /* Destination Address Filter Fail */
> #define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL_MASK BIT(30)
> /* Frame length*/
> diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
> index 30d27e8dcc..84511fd915 100644
> --- a/tests/qtest/npcm_gmac-test.c
> +++ b/tests/qtest/npcm_gmac-test.c
> @@ -154,7 +154,7 @@ static void test_init(gconstpointer test_data)
> CHECK_REG32(NPCM_GMAC_MII_DATA, 0);
> CHECK_REG32(NPCM_GMAC_FLOW_CTRL, 0);
> CHECK_REG32(NPCM_GMAC_VLAN_FLAG, 0);
> - CHECK_REG32(NPCM_GMAC_VERSION, 0x00001037);
> + CHECK_REG32(NPCM_GMAC_VERSION, 0x00001032);
> CHECK_REG32(NPCM_GMAC_WAKEUP_FILTER, 0);
> CHECK_REG32(NPCM_GMAC_PMT, 0);
> CHECK_REG32(NPCM_GMAC_LPI_CTRL, 0);
> --
> 2.42.0.655.g421f12c284-goog
>
>
[-- Attachment #2: Type: text/html, Size: 20120 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 08/11] hw/net: General GMAC Implementation
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (6 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 07/11] include/hw/net: Implemented Classes and Masks for GMAC Descriptors Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-18 0:18 ` Hao Wu
2023-10-17 23:03 ` [PATCH v3 09/11] hw/net: GMAC Rx Implementation Nabih Estefan
` (2 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- General GMAC Register handling
- GMAC IRQ Handling
- Added traces in some methods for debugging
- Lots of declarations for accessing information on GMAC Descriptors (npcm_gmac.h file)
NOTE: With code on this state, the GMAC can boot-up properly and will show up in the ifconfig command on the BMC
Google-Rebase-Count: 1
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
Google-Bug-Id: 237557100
Change-Id: I3a4332ee5bab31b919782031a77c5b943f45ca2f
---
include/hw/net/npcm_gmac.h | 198 ++++++++++++++++++++++++++++++++++---
1 file changed, 184 insertions(+), 14 deletions(-)
diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
index e5729e83ea..c97eb6fe6e 100644
--- a/include/hw/net/npcm_gmac.h
+++ b/include/hw/net/npcm_gmac.h
@@ -34,13 +34,15 @@ struct NPCMGMACRxDesc {
};
/* NPCMGMACRxDesc.flags values */
-/* RDES2 and RDES3 are buffer address pointers */
-/* Owner: 0 = software, 1 = gmac */
-#define RX_DESC_RDES0_OWNER_MASK BIT(31)
+/* RDES2 and RDES3 are buffer addresses */
+/* Owner: 0 = software, 1 = dma */
+#define RX_DESC_RDES0_OWN BIT(31)
/* Destination Address Filter Fail */
-#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL_MASK BIT(30)
-/* Frame length*/
-#define RX_DESC_RDES0_FRAME_LEN_MASK(word) extract32(word, 16, 29)
+#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL BIT(30)
+/* Frame length */
+#define RX_DESC_RDES0_FRAME_LEN_MASK(word) extract32(word, 16, 14)
+/* Frame length Shift*/
+#define RX_DESC_RDES0_FRAME_LEN_SHIFT 16
/* Error Summary */
#define RX_DESC_RDES0_ERR_SUMM_MASK BIT(15)
/* Descriptor Error */
@@ -83,9 +85,9 @@ struct NPCMGMACRxDesc {
/* Receive Buffer 2 Size */
#define RX_DESC_RDES1_BFFR2_SZ_SHIFT 11
#define RX_DESC_RDES1_BFFR2_SZ_MASK(word) extract32(word, \
- RX_DESC_RDES1_BFFR2_SZ_SHIFT, 10 + RX_DESC_RDES1_BFFR2_SZ_SHIFT)
+ RX_DESC_RDES1_BFFR2_SZ_SHIFT, 11)
/* Receive Buffer 1 Size */
-#define RX_DESC_RDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
+#define RX_DESC_RDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 11)
struct NPCMGMACTxDesc {
@@ -96,9 +98,9 @@ struct NPCMGMACTxDesc {
};
/* NPCMGMACTxDesc.flags values */
-/* TDES2 and TDES3 are buffer address pointers */
+/* TDES2 and TDES3 are buffer addresses */
/* Owner: 0 = software, 1 = gmac */
-#define TX_DESC_TDES0_OWNER_MASK BIT(31)
+#define TX_DESC_TDES0_OWN BIT(31)
/* Tx Time Stamp Status */
#define TX_DESC_TDES0_TTSS_MASK BIT(17)
/* IP Header Error */
@@ -122,7 +124,7 @@ struct NPCMGMACTxDesc {
/* VLAN Frame */
#define TX_DESC_TDES0_VLAN_FRM_MASK BIT(7)
/* Collision Count */
-#define TX_DESC_TDES0_COLL_CNT_MASK(word) extract32(word, 3, 6)
+#define TX_DESC_TDES0_COLL_CNT_MASK(word) extract32(word, 3, 4)
/* Excessive Deferral */
#define TX_DESC_TDES0_EXCS_DEF_MASK BIT(2)
/* Underflow Error */
@@ -137,7 +139,7 @@ struct NPCMGMACTxDesc {
/* Last Segment */
#define TX_DESC_TDES1_FIRST_SEG_MASK BIT(29)
/* Checksum Insertion Control */
-#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 28)
+#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 2)
/* Disable Cyclic Redundancy Check */
#define TX_DESC_TDES1_DIS_CDC_MASK BIT(26)
/* Transmit End of Ring */
@@ -145,9 +147,9 @@ struct NPCMGMACTxDesc {
/* Secondary Address Chained */
#define TX_DESC_TDES1_SEC_ADDR_CHND_MASK BIT(24)
/* Transmit Buffer 2 Size */
-#define TX_DESC_TDES1_BFFR2_SZ_MASK(word) extract32(word, 11, 21)
+#define TX_DESC_TDES1_BFFR2_SZ_MASK(word) extract32(word, 11, 11)
/* Transmit Buffer 1 Size */
-#define TX_DESC_TDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
+#define TX_DESC_TDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 11)
typedef struct NPCMGMACState {
SysBusDevice parent;
@@ -165,4 +167,172 @@ typedef struct NPCMGMACState {
#define TYPE_NPCM_GMAC "npcm-gmac"
OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
+/* Mask for RO bits in Status */
+#define NPCM_DMA_STATUS_RO_MASK(word) (word & 0xfffe0000)
+/* Mask for RO bits in Status */
+#define NPCM_DMA_STATUS_W1C_MASK(word) (word & 0x1e7ff)
+
+/* Transmit Process State */
+#define NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT 20
+/* Transmit States */
+#define NPCM_DMA_STATUS_TX_STOPPED_STATE \
+ (0b000 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_TX_RUNNING_FETCHING_STATE \
+ (0b001 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_TX_RUNNING_WAITING_STATE \
+ (0b010 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_TX_RUNNING_READ_STATE \
+ (0b011 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_TX_SUSPENDED_STATE \
+ (0b110 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_TX_RUNNING_CLOSING_STATE \
+ (0b111 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+/* Transmit Process State */
+#define NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT 17
+/* Receive States */
+#define NPCM_DMA_STATUS_RX_STOPPED_STATE \
+ (0b000 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE \
+ (0b001 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE \
+ (0b011 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_RX_SUSPENDED_STATE \
+ (0b100 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE \
+ (0b101 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+#define NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE \
+ (0b111 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+
+
+/* Early Receive Interrupt */
+#define NPCM_DMA_STATUS_ERI BIT(14)
+/* Fatal Bus Error Interrupt */
+#define NPCM_DMA_STATUS_FBI BIT(13)
+/* Early transmit Interrupt */
+#define NPCM_DMA_STATUS_ETI BIT(10)
+/* Receive Watchdog Timout */
+#define NPCM_DMA_STATUS_RWT BIT(9)
+/* Receive Process Stopped */
+#define NPCM_DMA_STATUS_RPS BIT(8)
+/* Receive Buffer Unavailable */
+#define NPCM_DMA_STATUS_RU BIT(7)
+/* Receive Interrupt */
+#define NPCM_DMA_STATUS_RI BIT(6)
+/* Transmit Underflow */
+#define NPCM_DMA_STATUS_UNF BIT(5)
+/* Receive Overflow */
+#define NPCM_DMA_STATUS_OVF BIT(4)
+/* Transmit Jabber Timeout */
+#define NPCM_DMA_STATUS_TJT BIT(3)
+/* Transmit Buffer Unavailable */
+#define NPCM_DMA_STATUS_TU BIT(2)
+/* Transmit Process Stopped */
+#define NPCM_DMA_STATUS_TPS BIT(1)
+/* Transmit Interrupt */
+#define NPCM_DMA_STATUS_TI BIT(0)
+
+/* Normal Interrupt Summary */
+#define NPCM_DMA_STATUS_NIS BIT(16)
+/* Interrupts enabled by NIE */
+#define NPCM_DMA_STATUS_NIS_BITS (NPCM_DMA_STATUS_TI | \
+ NPCM_DMA_STATUS_TU | \
+ NPCM_DMA_STATUS_RI | \
+ NPCM_DMA_STATUS_ERI)
+/* Abnormal Interrupt Summary */
+#define NPCM_DMA_STATUS_AIS BIT(15)
+/* Interrupts enabled by AIE */
+#define NPCM_DMA_STATUS_AIS_BITS (NPCM_DMA_STATUS_TPS | \
+ NPCM_DMA_STATUS_TJT | \
+ NPCM_DMA_STATUS_OVF | \
+ NPCM_DMA_STATUS_UNF | \
+ NPCM_DMA_STATUS_RU | \
+ NPCM_DMA_STATUS_RPS | \
+ NPCM_DMA_STATUS_RWT | \
+ NPCM_DMA_STATUS_ETI | \
+ NPCM_DMA_STATUS_FBI)
+
+/* Early Receive Interrupt Enable */
+#define NPCM_DMA_INTR_ENAB_ERE BIT(14)
+/* Fatal Bus Error Interrupt Enable */
+#define NPCM_DMA_INTR_ENAB_FBE BIT(13)
+/* Early transmit Interrupt Enable */
+#define NPCM_DMA_INTR_ENAB_ETE BIT(10)
+/* Receive Watchdog Timout Enable */
+#define NPCM_DMA_INTR_ENAB_RWE BIT(9)
+/* Receive Process Stopped Enable */
+#define NPCM_DMA_INTR_ENAB_RSE BIT(8)
+/* Receive Buffer Unavailable Enable */
+#define NPCM_DMA_INTR_ENAB_RUE BIT(7)
+/* Receive Interrupt Enable */
+#define NPCM_DMA_INTR_ENAB_RIE BIT(6)
+/* Transmit Underflow Enable */
+#define NPCM_DMA_INTR_ENAB_UNE BIT(5)
+/* Receive Overflow Enable */
+#define NPCM_DMA_INTR_ENAB_OVE BIT(4)
+/* Transmit Jabber Timeout Enable */
+#define NPCM_DMA_INTR_ENAB_TJE BIT(3)
+/* Transmit Buffer Unavailable Enable */
+#define NPCM_DMA_INTR_ENAB_TUE BIT(2)
+/* Transmit Process Stopped Enable */
+#define NPCM_DMA_INTR_ENAB_TSE BIT(1)
+/* Transmit Interrupt Enable */
+#define NPCM_DMA_INTR_ENAB_TIE BIT(0)
+
+/* Normal Interrupt Summary Enable */
+#define NPCM_DMA_INTR_ENAB_NIE BIT(16)
+/* Interrupts enabled by NIE Enable */
+#define NPCM_DMA_INTR_ENAB_NIE_BITS (NPCM_DMA_INTR_ENAB_TIE | \
+ NPCM_DMA_INTR_ENAB_TUE | \
+ NPCM_DMA_INTR_ENAB_RIE | \
+ NPCM_DMA_INTR_ENAB_ERE)
+/* Abnormal Interrupt Summary Enable */
+#define NPCM_DMA_INTR_ENAB_AIE BIT(15)
+/* Interrupts enabled by AIE Enable */
+#define NPCM_DMA_INTR_ENAB_AIE_BITS (NPCM_DMA_INTR_ENAB_TSE | \
+ NPCM_DMA_INTR_ENAB_TJE | \
+ NPCM_DMA_INTR_ENAB_OVE | \
+ NPCM_DMA_INTR_ENAB_UNE | \
+ NPCM_DMA_INTR_ENAB_RUE | \
+ NPCM_DMA_INTR_ENAB_RSE | \
+ NPCM_DMA_INTR_ENAB_RWE | \
+ NPCM_DMA_INTR_ENAB_ETE | \
+ NPCM_DMA_INTR_ENAB_FBE)
+
+/* Flushing Disabled */
+#define NPCM_DMA_CONTROL_FLUSH_MASK BIT(24)
+/* Start/stop Transmit */
+#define NPCM_DMA_CONTROL_START_STOP_TX BIT(13)
+/* Next receive descriptor start address */
+#define NPCM_DMA_HOST_RX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
+/* Next transmit descriptor start address */
+#define NPCM_DMA_HOST_TX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
+
+/* Receive enable */
+#define NPCM_GMAC_MAC_CONFIG_RX_EN BIT(2)
+/* Transmit enable */
+#define NPCM_GMAC_MAC_CONFIG_TX_EN BIT(3)
+
+/* Frame Receive All */
+#define NPCM_GMAC_FRAME_FILTER_REC_ALL_MASK BIT(31)
+/* Frame HPF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_HPF_MASK BIT(10)
+/* Frame SAF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_SAF_MASK BIT(9)
+/* Frame SAIF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_SAIF_MASK BIT(8)
+/* Frame PCF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_PCF_MASK BIT(word) extract32((word), 6, 2)
+/* Frame DBF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_DBF_MASK BIT(5)
+/* Frame PM Filter*/
+#define NPCM_GMAC_FRAME_FILTER_PM_MASK BIT(4)
+/* Frame DAIF Filter*/
+#define NPCM_GMAC_FRAME_FILTER_DAIF_MASK BIT(3)
+/* Frame HMC Filter*/
+#define NPCM_GMAC_FRAME_FILTER_HMC_MASK BIT(2)
+/* Frame HUC Filter*/
+#define NPCM_GMAC_FRAME_FILTER_HUC_MASK BIT(1)
+/* Frame PR Filter*/
+#define NPCM_GMAC_FRAME_FILTER_PR_MASK BIT(0)
+
#endif /* NPCM_GMAC_H */
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v3 08/11] hw/net: General GMAC Implementation
2023-10-17 23:03 ` [PATCH v3 08/11] hw/net: General GMAC Implementation Nabih Estefan
@ 2023-10-18 0:18 ` Hao Wu
0 siblings, 0 replies; 17+ messages in thread
From: Hao Wu @ 2023-10-18 0:18 UTC (permalink / raw)
To: Nabih Estefan
Cc: peter.maydell, qemu-arm, qemu-devel, kfting, jasonwang,
avi.fishman
[-- Attachment #1: Type: text/plain, Size: 11805 bytes --]
On Tue, Oct 17, 2023 at 4:04 PM Nabih Estefan <nabihestefan@google.com>
wrote:
> From: Nabih Estefan Diaz <nabihestefan@google.com>
>
> - General GMAC Register handling
> - GMAC IRQ Handling
> - Added traces in some methods for debugging
> - Lots of declarations for accessing information on GMAC Descriptors
> (npcm_gmac.h file)
>
> NOTE: With code on this state, the GMAC can boot-up properly and will show
> up in the ifconfig command on the BMC
>
> Google-Rebase-Count: 1
> Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
> Google-Bug-Id: 237557100
> Change-Id: I3a4332ee5bab31b919782031a77c5b943f45ca2f
>
Please remove the Google-specific hashes. (Only signed-off-by is needed.)
> ---
> include/hw/net/npcm_gmac.h | 198 ++++++++++++++++++++++++++++++++++---
> 1 file changed, 184 insertions(+), 14 deletions(-)
>
> diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
> index e5729e83ea..c97eb6fe6e 100644
> --- a/include/hw/net/npcm_gmac.h
> +++ b/include/hw/net/npcm_gmac.h
> @@ -34,13 +34,15 @@ struct NPCMGMACRxDesc {
> };
>
> /* NPCMGMACRxDesc.flags values */
> -/* RDES2 and RDES3 are buffer address pointers */
> -/* Owner: 0 = software, 1 = gmac */
> -#define RX_DESC_RDES0_OWNER_MASK BIT(31)
> +/* RDES2 and RDES3 are buffer addresses */
> +/* Owner: 0 = software, 1 = dma */
> +#define RX_DESC_RDES0_OWN BIT(31)
> /* Destination Address Filter Fail */
> -#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL_MASK BIT(30)
> -/* Frame length*/
> -#define RX_DESC_RDES0_FRAME_LEN_MASK(word) extract32(word, 16, 29)
> +#define RX_DESC_RDES0_DEST_ADDR_FILT_FAIL BIT(30)
> +/* Frame length */
> +#define RX_DESC_RDES0_FRAME_LEN_MASK(word) extract32(word, 16, 14)
> +/* Frame length Shift*/
> +#define RX_DESC_RDES0_FRAME_LEN_SHIFT 16
> /* Error Summary */
> #define RX_DESC_RDES0_ERR_SUMM_MASK BIT(15)
> /* Descriptor Error */
> @@ -83,9 +85,9 @@ struct NPCMGMACRxDesc {
> /* Receive Buffer 2 Size */
> #define RX_DESC_RDES1_BFFR2_SZ_SHIFT 11
> #define RX_DESC_RDES1_BFFR2_SZ_MASK(word) extract32(word, \
> - RX_DESC_RDES1_BFFR2_SZ_SHIFT, 10 + RX_DESC_RDES1_BFFR2_SZ_SHIFT)
> + RX_DESC_RDES1_BFFR2_SZ_SHIFT, 11)
> /* Receive Buffer 1 Size */
> -#define RX_DESC_RDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
> +#define RX_DESC_RDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 11)
>
>
> struct NPCMGMACTxDesc {
> @@ -96,9 +98,9 @@ struct NPCMGMACTxDesc {
> };
>
> /* NPCMGMACTxDesc.flags values */
> -/* TDES2 and TDES3 are buffer address pointers */
> +/* TDES2 and TDES3 are buffer addresses */
> /* Owner: 0 = software, 1 = gmac */
> -#define TX_DESC_TDES0_OWNER_MASK BIT(31)
> +#define TX_DESC_TDES0_OWN BIT(31)
> /* Tx Time Stamp Status */
> #define TX_DESC_TDES0_TTSS_MASK BIT(17)
> /* IP Header Error */
> @@ -122,7 +124,7 @@ struct NPCMGMACTxDesc {
> /* VLAN Frame */
> #define TX_DESC_TDES0_VLAN_FRM_MASK BIT(7)
> /* Collision Count */
> -#define TX_DESC_TDES0_COLL_CNT_MASK(word) extract32(word, 3, 6)
> +#define TX_DESC_TDES0_COLL_CNT_MASK(word) extract32(word, 3, 4)
> /* Excessive Deferral */
> #define TX_DESC_TDES0_EXCS_DEF_MASK BIT(2)
> /* Underflow Error */
> @@ -137,7 +139,7 @@ struct NPCMGMACTxDesc {
> /* Last Segment */
> #define TX_DESC_TDES1_FIRST_SEG_MASK BIT(29)
> /* Checksum Insertion Control */
> -#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 28)
> +#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 2)
> /* Disable Cyclic Redundancy Check */
> #define TX_DESC_TDES1_DIS_CDC_MASK BIT(26)
> /* Transmit End of Ring */
> @@ -145,9 +147,9 @@ struct NPCMGMACTxDesc {
> /* Secondary Address Chained */
> #define TX_DESC_TDES1_SEC_ADDR_CHND_MASK BIT(24)
> /* Transmit Buffer 2 Size */
> -#define TX_DESC_TDES1_BFFR2_SZ_MASK(word) extract32(word, 11, 21)
> +#define TX_DESC_TDES1_BFFR2_SZ_MASK(word) extract32(word, 11, 11)
> /* Transmit Buffer 1 Size */
> -#define TX_DESC_TDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 10)
> +#define TX_DESC_TDES1_BFFR1_SZ_MASK(word) extract32(word, 0, 11)
>
> typedef struct NPCMGMACState {
> SysBusDevice parent;
> @@ -165,4 +167,172 @@ typedef struct NPCMGMACState {
> #define TYPE_NPCM_GMAC "npcm-gmac"
> OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
>
> +/* Mask for RO bits in Status */
> +#define NPCM_DMA_STATUS_RO_MASK(word) (word & 0xfffe0000)
> +/* Mask for RO bits in Status */
> +#define NPCM_DMA_STATUS_W1C_MASK(word) (word & 0x1e7ff)
> +
> +/* Transmit Process State */
> +#define NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT 20
> +/* Transmit States */
> +#define NPCM_DMA_STATUS_TX_STOPPED_STATE \
> + (0b000 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_TX_RUNNING_FETCHING_STATE \
> + (0b001 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_TX_RUNNING_WAITING_STATE \
> + (0b010 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_TX_RUNNING_READ_STATE \
> + (0b011 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_TX_SUSPENDED_STATE \
> + (0b110 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_TX_RUNNING_CLOSING_STATE \
> + (0b111 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> +/* Transmit Process State */
> +#define NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT 17
> +/* Receive States */
> +#define NPCM_DMA_STATUS_RX_STOPPED_STATE \
> + (0b000 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE \
> + (0b001 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE \
> + (0b011 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_RX_SUSPENDED_STATE \
> + (0b100 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE \
> + (0b101 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +#define NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE \
> + (0b111 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> +
> +
> +/* Early Receive Interrupt */
> +#define NPCM_DMA_STATUS_ERI BIT(14)
> +/* Fatal Bus Error Interrupt */
> +#define NPCM_DMA_STATUS_FBI BIT(13)
> +/* Early transmit Interrupt */
> +#define NPCM_DMA_STATUS_ETI BIT(10)
> +/* Receive Watchdog Timout */
> +#define NPCM_DMA_STATUS_RWT BIT(9)
> +/* Receive Process Stopped */
> +#define NPCM_DMA_STATUS_RPS BIT(8)
> +/* Receive Buffer Unavailable */
> +#define NPCM_DMA_STATUS_RU BIT(7)
> +/* Receive Interrupt */
> +#define NPCM_DMA_STATUS_RI BIT(6)
> +/* Transmit Underflow */
> +#define NPCM_DMA_STATUS_UNF BIT(5)
> +/* Receive Overflow */
> +#define NPCM_DMA_STATUS_OVF BIT(4)
> +/* Transmit Jabber Timeout */
> +#define NPCM_DMA_STATUS_TJT BIT(3)
> +/* Transmit Buffer Unavailable */
> +#define NPCM_DMA_STATUS_TU BIT(2)
> +/* Transmit Process Stopped */
> +#define NPCM_DMA_STATUS_TPS BIT(1)
> +/* Transmit Interrupt */
> +#define NPCM_DMA_STATUS_TI BIT(0)
> +
> +/* Normal Interrupt Summary */
> +#define NPCM_DMA_STATUS_NIS BIT(16)
> +/* Interrupts enabled by NIE */
> +#define NPCM_DMA_STATUS_NIS_BITS (NPCM_DMA_STATUS_TI | \
> + NPCM_DMA_STATUS_TU | \
> + NPCM_DMA_STATUS_RI | \
> + NPCM_DMA_STATUS_ERI)
> +/* Abnormal Interrupt Summary */
> +#define NPCM_DMA_STATUS_AIS BIT(15)
> +/* Interrupts enabled by AIE */
> +#define NPCM_DMA_STATUS_AIS_BITS (NPCM_DMA_STATUS_TPS | \
> + NPCM_DMA_STATUS_TJT | \
> + NPCM_DMA_STATUS_OVF | \
> + NPCM_DMA_STATUS_UNF | \
> + NPCM_DMA_STATUS_RU | \
> + NPCM_DMA_STATUS_RPS | \
> + NPCM_DMA_STATUS_RWT | \
> + NPCM_DMA_STATUS_ETI | \
> + NPCM_DMA_STATUS_FBI)
> +
> +/* Early Receive Interrupt Enable */
> +#define NPCM_DMA_INTR_ENAB_ERE BIT(14)
> +/* Fatal Bus Error Interrupt Enable */
> +#define NPCM_DMA_INTR_ENAB_FBE BIT(13)
> +/* Early transmit Interrupt Enable */
> +#define NPCM_DMA_INTR_ENAB_ETE BIT(10)
> +/* Receive Watchdog Timout Enable */
> +#define NPCM_DMA_INTR_ENAB_RWE BIT(9)
> +/* Receive Process Stopped Enable */
> +#define NPCM_DMA_INTR_ENAB_RSE BIT(8)
> +/* Receive Buffer Unavailable Enable */
> +#define NPCM_DMA_INTR_ENAB_RUE BIT(7)
> +/* Receive Interrupt Enable */
> +#define NPCM_DMA_INTR_ENAB_RIE BIT(6)
> +/* Transmit Underflow Enable */
> +#define NPCM_DMA_INTR_ENAB_UNE BIT(5)
> +/* Receive Overflow Enable */
> +#define NPCM_DMA_INTR_ENAB_OVE BIT(4)
> +/* Transmit Jabber Timeout Enable */
> +#define NPCM_DMA_INTR_ENAB_TJE BIT(3)
> +/* Transmit Buffer Unavailable Enable */
> +#define NPCM_DMA_INTR_ENAB_TUE BIT(2)
> +/* Transmit Process Stopped Enable */
> +#define NPCM_DMA_INTR_ENAB_TSE BIT(1)
> +/* Transmit Interrupt Enable */
> +#define NPCM_DMA_INTR_ENAB_TIE BIT(0)
> +
> +/* Normal Interrupt Summary Enable */
> +#define NPCM_DMA_INTR_ENAB_NIE BIT(16)
> +/* Interrupts enabled by NIE Enable */
> +#define NPCM_DMA_INTR_ENAB_NIE_BITS (NPCM_DMA_INTR_ENAB_TIE | \
> + NPCM_DMA_INTR_ENAB_TUE | \
> + NPCM_DMA_INTR_ENAB_RIE | \
> + NPCM_DMA_INTR_ENAB_ERE)
> +/* Abnormal Interrupt Summary Enable */
> +#define NPCM_DMA_INTR_ENAB_AIE BIT(15)
> +/* Interrupts enabled by AIE Enable */
> +#define NPCM_DMA_INTR_ENAB_AIE_BITS (NPCM_DMA_INTR_ENAB_TSE | \
> + NPCM_DMA_INTR_ENAB_TJE | \
> + NPCM_DMA_INTR_ENAB_OVE | \
> + NPCM_DMA_INTR_ENAB_UNE | \
> + NPCM_DMA_INTR_ENAB_RUE | \
> + NPCM_DMA_INTR_ENAB_RSE | \
> + NPCM_DMA_INTR_ENAB_RWE | \
> + NPCM_DMA_INTR_ENAB_ETE | \
> + NPCM_DMA_INTR_ENAB_FBE)
> +
> +/* Flushing Disabled */
> +#define NPCM_DMA_CONTROL_FLUSH_MASK BIT(24)
> +/* Start/stop Transmit */
> +#define NPCM_DMA_CONTROL_START_STOP_TX BIT(13)
> +/* Next receive descriptor start address */
> +#define NPCM_DMA_HOST_RX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
> +/* Next transmit descriptor start address */
> +#define NPCM_DMA_HOST_TX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
> +
> +/* Receive enable */
> +#define NPCM_GMAC_MAC_CONFIG_RX_EN BIT(2)
> +/* Transmit enable */
> +#define NPCM_GMAC_MAC_CONFIG_TX_EN BIT(3)
> +
> +/* Frame Receive All */
> +#define NPCM_GMAC_FRAME_FILTER_REC_ALL_MASK BIT(31)
> +/* Frame HPF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_HPF_MASK BIT(10)
> +/* Frame SAF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_SAF_MASK BIT(9)
> +/* Frame SAIF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_SAIF_MASK BIT(8)
> +/* Frame PCF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_PCF_MASK BIT(word) extract32((word), 6, 2)
> +/* Frame DBF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_DBF_MASK BIT(5)
> +/* Frame PM Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_PM_MASK BIT(4)
> +/* Frame DAIF Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_DAIF_MASK BIT(3)
> +/* Frame HMC Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_HMC_MASK BIT(2)
> +/* Frame HUC Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_HUC_MASK BIT(1)
> +/* Frame PR Filter*/
> +#define NPCM_GMAC_FRAME_FILTER_PR_MASK BIT(0)
> +
> #endif /* NPCM_GMAC_H */
> --
> 2.42.0.655.g421f12c284-goog
>
>
[-- Attachment #2: Type: text/html, Size: 13500 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 09/11] hw/net: GMAC Rx Implementation
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (7 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 08/11] hw/net: General GMAC Implementation Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-18 0:24 ` Hao Wu
2023-10-17 23:03 ` [PATCH v3 10/11] hw/net: GMAC Tx Implementation Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 11/11] tests/qtest: Adding PCS Module test to GMAC Qtest Nabih Estefan
10 siblings, 1 reply; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- Implementation of Receive function for packets
- Implementation for reading and writing from and to descriptors in
memory for Rx
NOTE: At this point in development we believe this function is working
as intended, and the kernel supports these findings, but we need the
Transmit function to work before we upload
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
hw/net: npcm_gmac Flush queued packets when starting RX
When RX starts, we need to flush the queued packets so that they
can be received by the GMAC device. Without this it won't work
with TAP NIC device.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: Handle RX desc full in NPCM GMAC
When RX descriptor list is full, it returns a DMA_STATUS for software to handle it. But there's no way to indicate the software ha handled all RX descriptors and the whole pipeline stalls.
We do something similar to NPCM7XX EMC to handle this case.
1. Return packet size when RX descriptor is full, effectively dropping these packets in such a case.
2. When software clears RX descriptor full bit, continue receiving further packets by flushing QEMU packet queue.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: Receive and drop packets when descriptors are full in GMAC
Effectively this allows QEMU to receive and drop incoming packets when
RX descriptors are full. Similar to EMC, this lets GMAC to drop packets
faster, especially during bootup sequence.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: Update frame_ptr during gmac_receive
There was a bug that frame_ptr wasn't updated after receiving
the first batch of data, causing the received data to be wrong
when the frame is too large.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: Fix GMAC not detecting owned by software properly in RX
RX should stop receiving when a descriptor is owned by software
but currently implementation made it reversed (owned by DMA) instead.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
hw/net: Fix GMAC receive problem
Fix the following 2 problems in GMAC receive function:
1. When kernel driver disables GMAC RX interrupt and all descriptors
are full, it will not send further interrupt to the kernel
driver as the driver doesn't listen to NPCM_DMA_STATUS_RU.
Since descriptors full indicates that there are packets received
we should also set NPCM_DMA_STATUS_RI for firing the interrupt.
2. Kernel driver does not clear rdes0 from used descriptor so we need
to clear it such that old flags are removed before setting new
flags.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
---
hw/net/npcm_gmac.c | 356 ++++++++++++++++++++++++++++++++++---
include/hw/net/npcm_gmac.h | 28 +--
2 files changed, 342 insertions(+), 42 deletions(-)
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
index 6f8109e0ee..a7c8b67223 100644
--- a/hw/net/npcm_gmac.c
+++ b/hw/net/npcm_gmac.c
@@ -23,7 +23,11 @@
#include "hw/registerfields.h"
#include "hw/net/mii.h"
#include "hw/net/npcm_gmac.h"
+#include "linux/if_ether.h"
#include "migration/vmstate.h"
+#include "net/checksum.h"
+#include "net/net.h"
+#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/units.h"
#include "sysemu/dma.h"
@@ -91,7 +95,6 @@ REG32(NPCM_GMAC_PTP_TTSR, 0x71c)
#define NPCM_DMA_BUS_MODE_SWR BIT(0)
static const uint32_t npcm_gmac_cold_reset_values[NPCM_GMAC_NR_REGS] = {
- /* Reduce version to 3.2 so that the kernel can enable interrupt. */
[R_NPCM_GMAC_VERSION] = 0x00001032,
[R_NPCM_GMAC_TIMER_CTRL] = 0x03e80000,
[R_NPCM_GMAC_MAC0_ADDR_HI] = 0x8000ffff,
@@ -146,6 +149,17 @@ static void gmac_phy_set_link(NPCMGMACState *s, bool active)
static bool gmac_can_receive(NetClientState *nc)
{
+ NPCMGMACState *gmac = NPCM_GMAC(qemu_get_nic_opaque(nc));
+
+ /* If GMAC receive is disabled. */
+ if (!(gmac->regs[R_NPCM_GMAC_MAC_CONFIG] & NPCM_GMAC_MAC_CONFIG_RX_EN)) {
+ return false;
+ }
+
+ /* If GMAC DMA RX is stopped. */
+ if (!(gmac->regs[R_NPCM_DMA_CONTROL] & NPCM_DMA_CONTROL_START_STOP_RX)) {
+ return false;
+ }
return true;
}
@@ -191,11 +205,288 @@ static void gmac_update_irq(NPCMGMACState *gmac)
qemu_set_irq(gmac->irq, level);
}
-static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len)
+static int gmac_read_rx_desc(dma_addr_t addr, struct NPCMGMACRxDesc *desc)
{
- /* Placeholder */
+ if (dma_memory_read(&address_space_memory, addr, desc,
+ sizeof(*desc), MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to read descriptor @ 0x%"
+ HWADDR_PRIx "\n", __func__, addr);
+ return -1;
+ }
+ desc->rdes0 = le32_to_cpu(desc->rdes0);
+ desc->rdes1 = le32_to_cpu(desc->rdes1);
+ desc->rdes2 = le32_to_cpu(desc->rdes2);
+ desc->rdes3 = le32_to_cpu(desc->rdes3);
+ return 0;
+}
+
+static int gmac_write_rx_desc(dma_addr_t addr, struct NPCMGMACRxDesc *desc)
+{
+ struct NPCMGMACRxDesc le_desc;
+ le_desc.rdes0 = cpu_to_le32(desc->rdes0);
+ le_desc.rdes1 = cpu_to_le32(desc->rdes1);
+ le_desc.rdes2 = cpu_to_le32(desc->rdes2);
+ le_desc.rdes3 = cpu_to_le32(desc->rdes3);
+ if (dma_memory_write(&address_space_memory, addr, &le_desc,
+ sizeof(le_desc), MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to write descriptor @ 0x%"
+ HWADDR_PRIx "\n", __func__, addr);
+ return -1;
+ }
+ return 0;
+}
+
+static int gmac_read_tx_desc(dma_addr_t addr, struct NPCMGMACTxDesc *desc)
+{
+ if (dma_memory_read(&address_space_memory, addr, desc,
+ sizeof(*desc), MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to read descriptor @ 0x%"
+ HWADDR_PRIx "\n", __func__, addr);
+ return -1;
+ }
+ desc->tdes0 = le32_to_cpu(desc->tdes0);
+ desc->tdes1 = le32_to_cpu(desc->tdes1);
+ desc->tdes2 = le32_to_cpu(desc->tdes2);
+ desc->tdes3 = le32_to_cpu(desc->tdes3);
+ return 0;
+}
+
+static int gmac_write_tx_desc(dma_addr_t addr, struct NPCMGMACTxDesc *desc)
+{
+ struct NPCMGMACTxDesc le_desc;
+ le_desc.tdes0 = cpu_to_le32(desc->tdes0);
+ le_desc.tdes1 = cpu_to_le32(desc->tdes1);
+ le_desc.tdes2 = cpu_to_le32(desc->tdes2);
+ le_desc.tdes3 = cpu_to_le32(desc->tdes3);
+ if (dma_memory_write(&address_space_memory, addr, &le_desc,
+ sizeof(le_desc), MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to write descriptor @ 0x%"
+ HWADDR_PRIx "\n", __func__, addr);
+ return -1;
+ }
return 0;
}
+static int gmac_rx_transfer_frame_to_buffer(uint32_t rx_buf_len,
+ uint32_t *left_frame,
+ uint32_t rx_buf_addr,
+ bool *eof_transferred,
+ const uint8_t **frame_ptr,
+ uint16_t *transferred)
+{
+ uint32_t to_transfer;
+ /*
+ * Check that buffer is bigger than the frame being transfered
+ * If bigger then transfer only whats left of frame
+ * Else, fill frame with all the content possible
+ */
+ if (rx_buf_len >= *left_frame) {
+ to_transfer = *left_frame;
+ *eof_transferred = true;
+ } else {
+ to_transfer = rx_buf_len;
+ }
+
+ /* write frame part to memory */
+ if (dma_memory_write(&address_space_memory, (uint64_t) rx_buf_addr,
+ *frame_ptr, to_transfer, MEMTXATTRS_UNSPECIFIED))
+ {
+ return -1;
+ }
+
+ /* update frame pointer and size of whats left of frame */
+ *frame_ptr += to_transfer;
+ *left_frame -= to_transfer;
+ *transferred += to_transfer;
+
+ return 0;
+}
+
+static void gmac_dma_set_state(NPCMGMACState *gmac, int shift, uint32_t state)
+{
+ gmac->regs[R_NPCM_DMA_STATUS] = deposit32(gmac->regs[R_NPCM_DMA_STATUS],
+ shift, 3, state);
+}
+
+static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len)
+{
+ /*
+ * Comments have steps that relate to the
+ * receiving process steps in pg 386
+ */
+ NPCMGMACState *gmac = NPCM_GMAC(qemu_get_nic_opaque(nc));
+ uint32_t left_frame = len;
+ const uint8_t *frame_ptr = buf;
+ uint32_t desc_addr;
+ uint32_t rx_buf_len, rx_buf_addr;
+ struct NPCMGMACRxDesc rx_desc;
+ uint16_t transferred = 0;
+ bool eof_transferred = false;
+
+ trace_npcm_gmac_packet_receive(DEVICE(gmac)->canonical_path, len);
+ if (!gmac_can_receive(nc)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "GMAC Currently is not able for Rx");
+ return -1;
+ }
+ if (!gmac->regs[R_NPCM_DMA_HOST_RX_DESC]) {
+ gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
+ NPCM_DMA_HOST_RX_DESC_MASK(gmac->regs[R_NPCM_DMA_RX_BASE_ADDR]);
+ }
+ desc_addr = NPCM_DMA_HOST_RX_DESC_MASK(gmac->regs[R_NPCM_DMA_HOST_RX_DESC]);
+
+ /* step 1 */
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE);
+ trace_npcm_gmac_packet_desc_read(DEVICE(gmac)->canonical_path, desc_addr);
+ if (gmac_read_rx_desc(desc_addr, &rx_desc)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "RX Descriptor @ 0x%x cant be read\n",
+ desc_addr);
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_SUSPENDED_STATE);
+ return -1;
+ }
+
+ /* step 2 */
+ if (!(rx_desc.rdes0 & RX_DESC_RDES0_OWN)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "RX Descriptor @ 0x%x is owned by software\n",
+ desc_addr);
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RU;
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RI;
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_SUSPENDED_STATE);
+ gmac_update_irq(gmac);
+ return len;
+ }
+ /* step 3 */
+ /*
+ * TODO --
+ * Implement all frame filtering and processing (with its own interrupts)
+ */
+ trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path, &rx_desc,
+ rx_desc.rdes0, rx_desc.rdes1, rx_desc.rdes2,
+ rx_desc.rdes3);
+ /* Clear rdes0 for the incoming descriptor and set FS in first descriptor.*/
+ rx_desc.rdes0 = RX_DESC_RDES0_FIRST_DESC_MASK;
+
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE);
+
+ /* Pad the frame with FCS as the kernel driver will strip it away. */
+ left_frame += ETH_FCS_LEN;
+
+ /* repeat while we still have frame to transfer to memory */
+ while (!eof_transferred) {
+ /* Return descriptor no matter what happens */
+ rx_desc.rdes0 &= ~RX_DESC_RDES0_OWN;
+ /* Set the frame to be an IPv4/IPv6 frame. */
+ rx_desc.rdes0 |= RX_DESC_RDES0_FRM_TYPE_MASK;
+
+ /* step 4 */
+ rx_buf_len = RX_DESC_RDES1_BFFR1_SZ_MASK(rx_desc.rdes1);
+ rx_buf_addr = rx_desc.rdes2;
+ gmac->regs[R_NPCM_DMA_CUR_RX_BUF_ADDR] = rx_buf_addr;
+ gmac_rx_transfer_frame_to_buffer(rx_buf_len, &left_frame, rx_buf_addr,
+ &eof_transferred, &frame_ptr,
+ &transferred);
+
+ trace_npcm_gmac_packet_receiving_buffer(DEVICE(gmac)->canonical_path,
+ rx_buf_len, rx_buf_addr);
+ /* if we still have frame left and the second buffer is not chained */
+ if (!(rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) && \
+ !eof_transferred) {
+ /* repeat process from above on buffer 2 */
+ rx_buf_len = RX_DESC_RDES1_BFFR2_SZ_MASK(rx_desc.rdes1);
+ rx_buf_addr = rx_desc.rdes3;
+ gmac->regs[R_NPCM_DMA_CUR_RX_BUF_ADDR] = rx_buf_addr;
+ gmac_rx_transfer_frame_to_buffer(rx_buf_len, &left_frame,
+ rx_buf_addr, &eof_transferred,
+ &frame_ptr, &transferred);
+ trace_npcm_gmac_packet_receiving_buffer( \
+ DEVICE(gmac)->canonical_path,
+ rx_buf_len, rx_buf_addr);
+ }
+ /* update address for descriptor */
+ gmac->regs[R_NPCM_DMA_HOST_RX_DESC] = rx_buf_addr;
+ /* Return descriptor */
+ rx_desc.rdes0 &= ~RX_DESC_RDES0_OWN;
+ /* Update frame length transferred */
+ rx_desc.rdes0 |= ((uint32_t)transferred)
+ << RX_DESC_RDES0_FRAME_LEN_SHIFT;
+ trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path, &rx_desc,
+ rx_desc.rdes0, rx_desc.rdes1,
+ rx_desc.rdes2, rx_desc.rdes3);
+
+ /* step 5 */
+ gmac_write_rx_desc(desc_addr, &rx_desc);
+ trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path,
+ &rx_desc, rx_desc.rdes0,
+ rx_desc.rdes1, rx_desc.rdes2,
+ rx_desc.rdes3);
+ /* read new descriptor into rx_desc if needed*/
+ if (!eof_transferred) {
+ /* Get next descriptor address (chained or sequential) */
+ if (rx_desc.rdes1 & RX_DESC_RDES1_RC_END_RING_MASK) {
+ desc_addr = gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
+ } else if (rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) {
+ desc_addr = rx_desc.rdes3;
+ } else {
+ desc_addr += sizeof(rx_desc);
+ }
+ trace_npcm_gmac_packet_desc_read(DEVICE(gmac)->canonical_path,
+ desc_addr);
+ if (gmac_read_rx_desc(desc_addr, &rx_desc)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "RX Descriptor @ 0x%x cant be read\n",
+ desc_addr);
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RU;
+ gmac_update_irq(gmac);
+ return len;
+ }
+
+ /* step 6 */
+ if (!(rx_desc.rdes0 & RX_DESC_RDES0_OWN)) {
+ if (!(gmac->regs[R_NPCM_DMA_CONTROL] & \
+ NPCM_DMA_CONTROL_FLUSH_MASK)) {
+ rx_desc.rdes0 |= RX_DESC_RDES0_DESC_ERR_MASK;
+ }
+ eof_transferred = true;
+ }
+ /* Clear rdes0 for the incoming descriptor */
+ rx_desc.rdes0 = 0;
+ }
+ }
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE);
+
+ rx_desc.rdes0 |= RX_DESC_RDES0_LAST_DESC_MASK;
+ if (!(rx_desc.rdes1 & RX_DESC_RDES1_DIS_INTR_COMP_MASK)) {
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RI;
+ gmac_update_irq(gmac);
+ }
+ trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path, &rx_desc,
+ rx_desc.rdes0, rx_desc.rdes1, rx_desc.rdes2,
+ rx_desc.rdes3);
+
+ /* step 8 */
+ gmac->regs[R_NPCM_DMA_CONTROL] |= NPCM_DMA_CONTROL_FLUSH_MASK;
+
+ /* step 9 */
+ trace_npcm_gmac_packet_received(DEVICE(gmac)->canonical_path, left_frame);
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
+ gmac_write_rx_desc(desc_addr, &rx_desc);
+
+ /* Get next descriptor address (chained or sequential) */
+ if (rx_desc.rdes1 & RX_DESC_RDES1_RC_END_RING_MASK) {
+ desc_addr = gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
+ } else if (rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) {
+ desc_addr = rx_desc.rdes3;
+ } else {
+ desc_addr += sizeof(rx_desc);
+ }
+ gmac->regs[R_NPCM_DMA_HOST_RX_DESC] = desc_addr;
+ return len;
+}
static void gmac_cleanup(NetClientState *nc)
{
/* Nothing to do yet. */
@@ -281,7 +572,6 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
uint64_t v, unsigned size)
{
NPCMGMACState *gmac = opaque;
- uint32_t prev;
trace_npcm_gmac_reg_write(DEVICE(gmac)->canonical_path, offset, v);
@@ -305,22 +595,7 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
break;
case A_NPCM_GMAC_MAC_CONFIG:
- prev = gmac->regs[offset / sizeof(uint32_t)];
gmac->regs[offset / sizeof(uint32_t)] = v;
-
- /* If transmit is being enabled for first time, update desc addr */
- if (~(prev & NPCM_GMAC_MAC_CONFIG_TX_EN) &
- (v & NPCM_GMAC_MAC_CONFIG_TX_EN)) {
- gmac->regs[R_NPCM_DMA_HOST_TX_DESC] =
- gmac->regs[R_NPCM_DMA_TX_BASE_ADDR];
- }
-
- /* If receive is being enabled for first time, update desc addr */
- if (~(prev & NPCM_GMAC_MAC_CONFIG_RX_EN) &
- (v & NPCM_GMAC_MAC_CONFIG_RX_EN)) {
- gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
- gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
- }
break;
case A_NPCM_GMAC_MII_ADDR:
@@ -362,6 +637,31 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
case A_NPCM_DMA_RCV_POLL_DEMAND:
/* We dont actually care about the value */
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
+ break;
+
+ case A_NPCM_DMA_XMT_POLL_DEMAND:
+ /* We dont actually care about the value */
+ gmac_try_send_next_packet(gmac);
+ break;
+
+ case A_NPCM_DMA_CONTROL:
+ gmac->regs[offset / sizeof(uint32_t)] = v;
+ if (v & NPCM_DMA_CONTROL_START_STOP_TX) {
+ gmac_try_send_next_packet(gmac);
+ } else {
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_TX_STOPPED_STATE);
+ }
+ if (v & NPCM_DMA_CONTROL_START_STOP_RX) {
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
+ qemu_flush_queued_packets(qemu_get_queue(gmac->nic));
+ } else {
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_STOPPED_STATE);
+ }
break;
case A_NPCM_DMA_STATUS:
@@ -371,16 +671,14 @@ static void npcm_gmac_write(void *opaque, hwaddr offset,
"%s: Write of read-only bits of reg: offset: 0x%04"
HWADDR_PRIx ", value: 0x%04" PRIx64 "\n",
DEVICE(gmac)->canonical_path, offset, v);
- } else {
- /* for W1c bits, implement W1C */
- gmac->regs[offset / sizeof(uint32_t)] &=
- ~NPCM_DMA_STATUS_W1C_MASK(v);
- if (v & NPCM_DMA_STATUS_NIS_BITS) {
- gmac->regs[offset / sizeof(uint32_t)] &= ~NPCM_DMA_STATUS_NIS;
- }
- if (v & NPCM_DMA_STATUS_AIS_BITS) {
- gmac->regs[offset / sizeof(uint32_t)] &= ~NPCM_DMA_STATUS_AIS;
- }
+ }
+ /* for W1C bits, implement W1C */
+ gmac->regs[offset / sizeof(uint32_t)] &= ~NPCM_DMA_STATUS_W1C_MASK(v);
+ if (v & NPCM_DMA_STATUS_RU) {
+ /* Clearing RU bit indicates descriptor is owned by DMA again. */
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
+ qemu_flush_queued_packets(qemu_get_queue(gmac->nic));
}
break;
diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
index c97eb6fe6e..d0a37e6988 100644
--- a/include/hw/net/npcm_gmac.h
+++ b/include/hw/net/npcm_gmac.h
@@ -136,7 +136,7 @@ struct NPCMGMACTxDesc {
#define TX_DESC_TDES1_INTERR_COMP_MASK BIT(31)
/* Last Segment */
#define TX_DESC_TDES1_LAST_SEG_MASK BIT(30)
-/* Last Segment */
+/* First Segment */
#define TX_DESC_TDES1_FIRST_SEG_MASK BIT(29)
/* Checksum Insertion Control */
#define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 2)
@@ -176,32 +176,32 @@ OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
#define NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT 20
/* Transmit States */
#define NPCM_DMA_STATUS_TX_STOPPED_STATE \
- (0b000 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b000)
#define NPCM_DMA_STATUS_TX_RUNNING_FETCHING_STATE \
- (0b001 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b001)
#define NPCM_DMA_STATUS_TX_RUNNING_WAITING_STATE \
- (0b010 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b010)
#define NPCM_DMA_STATUS_TX_RUNNING_READ_STATE \
- (0b011 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b011)
#define NPCM_DMA_STATUS_TX_SUSPENDED_STATE \
- (0b110 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b110)
#define NPCM_DMA_STATUS_TX_RUNNING_CLOSING_STATE \
- (0b111 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
+ (0b111)
/* Transmit Process State */
#define NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT 17
/* Receive States */
#define NPCM_DMA_STATUS_RX_STOPPED_STATE \
- (0b000 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b000)
#define NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE \
- (0b001 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b001)
#define NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE \
- (0b011 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b011)
#define NPCM_DMA_STATUS_RX_SUSPENDED_STATE \
- (0b100 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b100)
#define NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE \
- (0b101 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b101)
#define NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE \
- (0b111 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
+ (0b111)
/* Early Receive Interrupt */
@@ -302,6 +302,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
#define NPCM_DMA_CONTROL_FLUSH_MASK BIT(24)
/* Start/stop Transmit */
#define NPCM_DMA_CONTROL_START_STOP_TX BIT(13)
+/* Start/stop Receive */
+#define NPCM_DMA_CONTROL_START_STOP_RX BIT(1)
/* Next receive descriptor start address */
#define NPCM_DMA_HOST_RX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
/* Next transmit descriptor start address */
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v3 09/11] hw/net: GMAC Rx Implementation
2023-10-17 23:03 ` [PATCH v3 09/11] hw/net: GMAC Rx Implementation Nabih Estefan
@ 2023-10-18 0:24 ` Hao Wu
0 siblings, 0 replies; 17+ messages in thread
From: Hao Wu @ 2023-10-18 0:24 UTC (permalink / raw)
To: Nabih Estefan
Cc: peter.maydell, qemu-arm, qemu-devel, kfting, jasonwang,
avi.fishman
[-- Attachment #1: Type: text/plain, Size: 24997 bytes --]
Please consolidate the commit message in this patch. I think we only need
to describe the functionality you implemented here (i.e. the receive (RX)
for the GMAC model) and how you did it. There's no need to keep the verbose
comment on each corner cases we had.
On Tue, Oct 17, 2023 at 4:04 PM Nabih Estefan <nabihestefan@google.com>
wrote:
> From: Nabih Estefan Diaz <nabihestefan@google.com>
>
> - Implementation of Receive function for packets
> - Implementation for reading and writing from and to descriptors in
> memory for Rx
>
> NOTE: At this point in development we believe this function is working
> as intended, and the kernel supports these findings, but we need the
> Transmit function to work before we upload
>
> Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
>
> hw/net: npcm_gmac Flush queued packets when starting RX
>
> When RX starts, we need to flush the queued packets so that they
> can be received by the GMAC device. Without this it won't work
> with TAP NIC device.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
>
> hw/net: Handle RX desc full in NPCM GMAC
>
> When RX descriptor list is full, it returns a DMA_STATUS for software to
> handle it. But there's no way to indicate the software ha handled all RX
> descriptors and the whole pipeline stalls.
>
> We do something similar to NPCM7XX EMC to handle this case.
>
> 1. Return packet size when RX descriptor is full, effectively dropping
> these packets in such a case.
> 2. When software clears RX descriptor full bit, continue receiving further
> packets by flushing QEMU packet queue.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
>
> hw/net: Receive and drop packets when descriptors are full in GMAC
>
> Effectively this allows QEMU to receive and drop incoming packets when
> RX descriptors are full. Similar to EMC, this lets GMAC to drop packets
> faster, especially during bootup sequence.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
>
> hw/net: Update frame_ptr during gmac_receive
>
> There was a bug that frame_ptr wasn't updated after receiving
> the first batch of data, causing the received data to be wrong
> when the frame is too large.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
>
> hw/net: Fix GMAC not detecting owned by software properly in RX
>
> RX should stop receiving when a descriptor is owned by software
> but currently implementation made it reversed (owned by DMA) instead.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
>
> hw/net: Fix GMAC receive problem
>
> Fix the following 2 problems in GMAC receive function:
>
> 1. When kernel driver disables GMAC RX interrupt and all descriptors
> are full, it will not send further interrupt to the kernel
> driver as the driver doesn't listen to NPCM_DMA_STATUS_RU.
> Since descriptors full indicates that there are packets received
> we should also set NPCM_DMA_STATUS_RI for firing the interrupt.
> 2. Kernel driver does not clear rdes0 from used descriptor so we need
> to clear it such that old flags are removed before setting new
> flags.
>
> Signed-off-by: Hao Wu <wuhaotsh@google.com>
> ---
> hw/net/npcm_gmac.c | 356 ++++++++++++++++++++++++++++++++++---
> include/hw/net/npcm_gmac.h | 28 +--
> 2 files changed, 342 insertions(+), 42 deletions(-)
>
> diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
> index 6f8109e0ee..a7c8b67223 100644
> --- a/hw/net/npcm_gmac.c
> +++ b/hw/net/npcm_gmac.c
> @@ -23,7 +23,11 @@
> #include "hw/registerfields.h"
> #include "hw/net/mii.h"
> #include "hw/net/npcm_gmac.h"
> +#include "linux/if_ether.h"
> #include "migration/vmstate.h"
> +#include "net/checksum.h"
> +#include "net/net.h"
> +#include "qemu/cutils.h"
> #include "qemu/log.h"
> #include "qemu/units.h"
> #include "sysemu/dma.h"
> @@ -91,7 +95,6 @@ REG32(NPCM_GMAC_PTP_TTSR, 0x71c)
> #define NPCM_DMA_BUS_MODE_SWR BIT(0)
>
> static const uint32_t npcm_gmac_cold_reset_values[NPCM_GMAC_NR_REGS] = {
> - /* Reduce version to 3.2 so that the kernel can enable interrupt. */
>
Why is this line removed?
> [R_NPCM_GMAC_VERSION] = 0x00001032,
> [R_NPCM_GMAC_TIMER_CTRL] = 0x03e80000,
> [R_NPCM_GMAC_MAC0_ADDR_HI] = 0x8000ffff,
> @@ -146,6 +149,17 @@ static void gmac_phy_set_link(NPCMGMACState *s, bool
> active)
>
> static bool gmac_can_receive(NetClientState *nc)
> {
> + NPCMGMACState *gmac = NPCM_GMAC(qemu_get_nic_opaque(nc));
> +
> + /* If GMAC receive is disabled. */
> + if (!(gmac->regs[R_NPCM_GMAC_MAC_CONFIG] &
> NPCM_GMAC_MAC_CONFIG_RX_EN)) {
> + return false;
> + }
> +
> + /* If GMAC DMA RX is stopped. */
> + if (!(gmac->regs[R_NPCM_DMA_CONTROL] &
> NPCM_DMA_CONTROL_START_STOP_RX)) {
> + return false;
> + }
> return true;
> }
>
> @@ -191,11 +205,288 @@ static void gmac_update_irq(NPCMGMACState *gmac)
> qemu_set_irq(gmac->irq, level);
> }
>
> -static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf,
> size_t len)
> +static int gmac_read_rx_desc(dma_addr_t addr, struct NPCMGMACRxDesc *desc)
> {
> - /* Placeholder */
> + if (dma_memory_read(&address_space_memory, addr, desc,
> + sizeof(*desc), MEMTXATTRS_UNSPECIFIED)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to read descriptor @
> 0x%"
> + HWADDR_PRIx "\n", __func__, addr);
> + return -1;
> + }
> + desc->rdes0 = le32_to_cpu(desc->rdes0);
> + desc->rdes1 = le32_to_cpu(desc->rdes1);
> + desc->rdes2 = le32_to_cpu(desc->rdes2);
> + desc->rdes3 = le32_to_cpu(desc->rdes3);
> + return 0;
> +}
> +
> +static int gmac_write_rx_desc(dma_addr_t addr, struct NPCMGMACRxDesc
> *desc)
> +{
> + struct NPCMGMACRxDesc le_desc;
> + le_desc.rdes0 = cpu_to_le32(desc->rdes0);
> + le_desc.rdes1 = cpu_to_le32(desc->rdes1);
> + le_desc.rdes2 = cpu_to_le32(desc->rdes2);
> + le_desc.rdes3 = cpu_to_le32(desc->rdes3);
> + if (dma_memory_write(&address_space_memory, addr, &le_desc,
> + sizeof(le_desc), MEMTXATTRS_UNSPECIFIED)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to write descriptor @
> 0x%"
> + HWADDR_PRIx "\n", __func__, addr);
> + return -1;
> + }
> + return 0;
> +}
> +
> +static int gmac_read_tx_desc(dma_addr_t addr, struct NPCMGMACTxDesc *desc)
> +{
> + if (dma_memory_read(&address_space_memory, addr, desc,
> + sizeof(*desc), MEMTXATTRS_UNSPECIFIED)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to read descriptor @
> 0x%"
> + HWADDR_PRIx "\n", __func__, addr);
> + return -1;
> + }
> + desc->tdes0 = le32_to_cpu(desc->tdes0);
> + desc->tdes1 = le32_to_cpu(desc->tdes1);
> + desc->tdes2 = le32_to_cpu(desc->tdes2);
> + desc->tdes3 = le32_to_cpu(desc->tdes3);
> + return 0;
> +}
> +
> +static int gmac_write_tx_desc(dma_addr_t addr, struct NPCMGMACTxDesc
> *desc)
> +{
> + struct NPCMGMACTxDesc le_desc;
> + le_desc.tdes0 = cpu_to_le32(desc->tdes0);
> + le_desc.tdes1 = cpu_to_le32(desc->tdes1);
> + le_desc.tdes2 = cpu_to_le32(desc->tdes2);
> + le_desc.tdes3 = cpu_to_le32(desc->tdes3);
> + if (dma_memory_write(&address_space_memory, addr, &le_desc,
> + sizeof(le_desc), MEMTXATTRS_UNSPECIFIED)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to write descriptor @
> 0x%"
> + HWADDR_PRIx "\n", __func__, addr);
> + return -1;
> + }
> return 0;
> }
> +static int gmac_rx_transfer_frame_to_buffer(uint32_t rx_buf_len,
> + uint32_t *left_frame,
> + uint32_t rx_buf_addr,
> + bool *eof_transferred,
> + const uint8_t **frame_ptr,
> + uint16_t *transferred)
> +{
> + uint32_t to_transfer;
> + /*
> + * Check that buffer is bigger than the frame being transfered
> + * If bigger then transfer only whats left of frame
> + * Else, fill frame with all the content possible
> + */
> + if (rx_buf_len >= *left_frame) {
> + to_transfer = *left_frame;
> + *eof_transferred = true;
> + } else {
> + to_transfer = rx_buf_len;
> + }
> +
> + /* write frame part to memory */
> + if (dma_memory_write(&address_space_memory, (uint64_t) rx_buf_addr,
> + *frame_ptr, to_transfer, MEMTXATTRS_UNSPECIFIED))
> + {
> + return -1;
> + }
> +
> + /* update frame pointer and size of whats left of frame */
> + *frame_ptr += to_transfer;
> + *left_frame -= to_transfer;
> + *transferred += to_transfer;
> +
> + return 0;
> +}
> +
> +static void gmac_dma_set_state(NPCMGMACState *gmac, int shift, uint32_t
> state)
> +{
> + gmac->regs[R_NPCM_DMA_STATUS] =
> deposit32(gmac->regs[R_NPCM_DMA_STATUS],
> + shift, 3, state);
> +}
> +
> +static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf,
> size_t len)
> +{
> + /*
> + * Comments have steps that relate to the
> + * receiving process steps in pg 386
> + */
> + NPCMGMACState *gmac = NPCM_GMAC(qemu_get_nic_opaque(nc));
> + uint32_t left_frame = len;
> + const uint8_t *frame_ptr = buf;
> + uint32_t desc_addr;
> + uint32_t rx_buf_len, rx_buf_addr;
> + struct NPCMGMACRxDesc rx_desc;
> + uint16_t transferred = 0;
> + bool eof_transferred = false;
> +
> + trace_npcm_gmac_packet_receive(DEVICE(gmac)->canonical_path, len);
> + if (!gmac_can_receive(nc)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "GMAC Currently is not able for
> Rx");
> + return -1;
> + }
> + if (!gmac->regs[R_NPCM_DMA_HOST_RX_DESC]) {
> + gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
> +
> NPCM_DMA_HOST_RX_DESC_MASK(gmac->regs[R_NPCM_DMA_RX_BASE_ADDR]);
> + }
> + desc_addr =
> NPCM_DMA_HOST_RX_DESC_MASK(gmac->regs[R_NPCM_DMA_HOST_RX_DESC]);
> +
> + /* step 1 */
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE);
> + trace_npcm_gmac_packet_desc_read(DEVICE(gmac)->canonical_path,
> desc_addr);
> + if (gmac_read_rx_desc(desc_addr, &rx_desc)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "RX Descriptor @ 0x%x cant be
> read\n",
> + desc_addr);
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_SUSPENDED_STATE);
> + return -1;
> + }
> +
> + /* step 2 */
> + if (!(rx_desc.rdes0 & RX_DESC_RDES0_OWN)) {
> + qemu_log_mask(LOG_GUEST_ERROR,
> + "RX Descriptor @ 0x%x is owned by software\n",
> + desc_addr);
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RU;
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RI;
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_SUSPENDED_STATE);
> + gmac_update_irq(gmac);
> + return len;
> + }
> + /* step 3 */
> + /*
> + * TODO --
> + * Implement all frame filtering and processing (with its own
> interrupts)
> + */
> + trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path,
> &rx_desc,
> + rx_desc.rdes0, rx_desc.rdes1,
> rx_desc.rdes2,
> + rx_desc.rdes3);
> + /* Clear rdes0 for the incoming descriptor and set FS in first
> descriptor.*/
> + rx_desc.rdes0 = RX_DESC_RDES0_FIRST_DESC_MASK;
> +
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE);
> +
> + /* Pad the frame with FCS as the kernel driver will strip it away. */
> + left_frame += ETH_FCS_LEN;
> +
> + /* repeat while we still have frame to transfer to memory */
> + while (!eof_transferred) {
> + /* Return descriptor no matter what happens */
> + rx_desc.rdes0 &= ~RX_DESC_RDES0_OWN;
> + /* Set the frame to be an IPv4/IPv6 frame. */
> + rx_desc.rdes0 |= RX_DESC_RDES0_FRM_TYPE_MASK;
> +
> + /* step 4 */
> + rx_buf_len = RX_DESC_RDES1_BFFR1_SZ_MASK(rx_desc.rdes1);
> + rx_buf_addr = rx_desc.rdes2;
> + gmac->regs[R_NPCM_DMA_CUR_RX_BUF_ADDR] = rx_buf_addr;
> + gmac_rx_transfer_frame_to_buffer(rx_buf_len, &left_frame,
> rx_buf_addr,
> + &eof_transferred, &frame_ptr,
> + &transferred);
> +
> +
> trace_npcm_gmac_packet_receiving_buffer(DEVICE(gmac)->canonical_path,
> + rx_buf_len, rx_buf_addr);
> + /* if we still have frame left and the second buffer is not
> chained */
> + if (!(rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) && \
> + !eof_transferred) {
> + /* repeat process from above on buffer 2 */
> + rx_buf_len = RX_DESC_RDES1_BFFR2_SZ_MASK(rx_desc.rdes1);
> + rx_buf_addr = rx_desc.rdes3;
> + gmac->regs[R_NPCM_DMA_CUR_RX_BUF_ADDR] = rx_buf_addr;
> + gmac_rx_transfer_frame_to_buffer(rx_buf_len, &left_frame,
> + rx_buf_addr,
> &eof_transferred,
> + &frame_ptr, &transferred);
> + trace_npcm_gmac_packet_receiving_buffer( \
> +
> DEVICE(gmac)->canonical_path,
> + rx_buf_len, rx_buf_addr);
> + }
> + /* update address for descriptor */
> + gmac->regs[R_NPCM_DMA_HOST_RX_DESC] = rx_buf_addr;
> + /* Return descriptor */
> + rx_desc.rdes0 &= ~RX_DESC_RDES0_OWN;
> + /* Update frame length transferred */
> + rx_desc.rdes0 |= ((uint32_t)transferred)
> + << RX_DESC_RDES0_FRAME_LEN_SHIFT;
> + trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path,
> &rx_desc,
> + rx_desc.rdes0, rx_desc.rdes1,
> + rx_desc.rdes2, rx_desc.rdes3);
> +
> + /* step 5 */
> + gmac_write_rx_desc(desc_addr, &rx_desc);
> + trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path,
> + &rx_desc, rx_desc.rdes0,
> + rx_desc.rdes1, rx_desc.rdes2,
> + rx_desc.rdes3);
> + /* read new descriptor into rx_desc if needed*/
> + if (!eof_transferred) {
> + /* Get next descriptor address (chained or sequential) */
> + if (rx_desc.rdes1 & RX_DESC_RDES1_RC_END_RING_MASK) {
> + desc_addr = gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
> + } else if (rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) {
> + desc_addr = rx_desc.rdes3;
> + } else {
> + desc_addr += sizeof(rx_desc);
> + }
> + trace_npcm_gmac_packet_desc_read(DEVICE(gmac)->canonical_path,
> + desc_addr);
> + if (gmac_read_rx_desc(desc_addr, &rx_desc)) {
> + qemu_log_mask(LOG_GUEST_ERROR,
> + "RX Descriptor @ 0x%x cant be read\n",
> + desc_addr);
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RU;
> + gmac_update_irq(gmac);
> + return len;
> + }
> +
> + /* step 6 */
> + if (!(rx_desc.rdes0 & RX_DESC_RDES0_OWN)) {
> + if (!(gmac->regs[R_NPCM_DMA_CONTROL] & \
> + NPCM_DMA_CONTROL_FLUSH_MASK)) {
> + rx_desc.rdes0 |= RX_DESC_RDES0_DESC_ERR_MASK;
> + }
> + eof_transferred = true;
> + }
> + /* Clear rdes0 for the incoming descriptor */
> + rx_desc.rdes0 = 0;
> + }
> + }
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE);
> +
> + rx_desc.rdes0 |= RX_DESC_RDES0_LAST_DESC_MASK;
> + if (!(rx_desc.rdes1 & RX_DESC_RDES1_DIS_INTR_COMP_MASK)) {
> + gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_RI;
> + gmac_update_irq(gmac);
> + }
> + trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path,
> &rx_desc,
> + rx_desc.rdes0, rx_desc.rdes1,
> rx_desc.rdes2,
> + rx_desc.rdes3);
> +
> + /* step 8 */
> + gmac->regs[R_NPCM_DMA_CONTROL] |= NPCM_DMA_CONTROL_FLUSH_MASK;
> +
> + /* step 9 */
> + trace_npcm_gmac_packet_received(DEVICE(gmac)->canonical_path,
> left_frame);
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
> + gmac_write_rx_desc(desc_addr, &rx_desc);
> +
> + /* Get next descriptor address (chained or sequential) */
> + if (rx_desc.rdes1 & RX_DESC_RDES1_RC_END_RING_MASK) {
> + desc_addr = gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
> + } else if (rx_desc.rdes1 & RX_DESC_RDES1_SEC_ADDR_CHND_MASK) {
> + desc_addr = rx_desc.rdes3;
> + } else {
> + desc_addr += sizeof(rx_desc);
> + }
> + gmac->regs[R_NPCM_DMA_HOST_RX_DESC] = desc_addr;
> + return len;
> +}
> static void gmac_cleanup(NetClientState *nc)
> {
> /* Nothing to do yet. */
> @@ -281,7 +572,6 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
> uint64_t v, unsigned size)
> {
> NPCMGMACState *gmac = opaque;
> - uint32_t prev;
>
> trace_npcm_gmac_reg_write(DEVICE(gmac)->canonical_path, offset, v);
>
> @@ -305,22 +595,7 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
> break;
>
> case A_NPCM_GMAC_MAC_CONFIG:
> - prev = gmac->regs[offset / sizeof(uint32_t)];
> gmac->regs[offset / sizeof(uint32_t)] = v;
> -
> - /* If transmit is being enabled for first time, update desc addr
> */
> - if (~(prev & NPCM_GMAC_MAC_CONFIG_TX_EN) &
> - (v & NPCM_GMAC_MAC_CONFIG_TX_EN)) {
> - gmac->regs[R_NPCM_DMA_HOST_TX_DESC] =
> - gmac->regs[R_NPCM_DMA_TX_BASE_ADDR];
> - }
> -
> - /* If receive is being enabled for first time, update desc addr */
> - if (~(prev & NPCM_GMAC_MAC_CONFIG_RX_EN) &
> - (v & NPCM_GMAC_MAC_CONFIG_RX_EN)) {
> - gmac->regs[R_NPCM_DMA_HOST_RX_DESC] =
> - gmac->regs[R_NPCM_DMA_RX_BASE_ADDR];
> - }
>
Why are these lines removed? Maybe they should exist in the first patch
we've added them if we don't need them.
> break;
>
> case A_NPCM_GMAC_MII_ADDR:
> @@ -362,6 +637,31 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
>
> case A_NPCM_DMA_RCV_POLL_DEMAND:
> /* We dont actually care about the value */
> + gmac_dma_set_state(gmac, NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
> + break;
> +
> + case A_NPCM_DMA_XMT_POLL_DEMAND:
> + /* We dont actually care about the value */
> + gmac_try_send_next_packet(gmac);
> + break;
> +
> + case A_NPCM_DMA_CONTROL:
> + gmac->regs[offset / sizeof(uint32_t)] = v;
> + if (v & NPCM_DMA_CONTROL_START_STOP_TX) {
> + gmac_try_send_next_packet(gmac);
> + } else {
> + gmac_dma_set_state(gmac,
> NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_TX_STOPPED_STATE);
> + }
> + if (v & NPCM_DMA_CONTROL_START_STOP_RX) {
> + gmac_dma_set_state(gmac,
> NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
> + qemu_flush_queued_packets(qemu_get_queue(gmac->nic));
> + } else {
> + gmac_dma_set_state(gmac,
> NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_STOPPED_STATE);
> + }
> break;
>
> case A_NPCM_DMA_STATUS:
> @@ -371,16 +671,14 @@ static void npcm_gmac_write(void *opaque, hwaddr
> offset,
> "%s: Write of read-only bits of reg: offset:
> 0x%04"
> HWADDR_PRIx ", value: 0x%04" PRIx64 "\n",
> DEVICE(gmac)->canonical_path, offset, v);
> - } else {
> - /* for W1c bits, implement W1C */
> - gmac->regs[offset / sizeof(uint32_t)] &=
> - ~NPCM_DMA_STATUS_W1C_MASK(v);
> - if (v & NPCM_DMA_STATUS_NIS_BITS) {
> - gmac->regs[offset / sizeof(uint32_t)] &=
> ~NPCM_DMA_STATUS_NIS;
> - }
> - if (v & NPCM_DMA_STATUS_AIS_BITS) {
> - gmac->regs[offset / sizeof(uint32_t)] &=
> ~NPCM_DMA_STATUS_AIS;
> - }
>
ditto.
> + }
> + /* for W1C bits, implement W1C */
> + gmac->regs[offset / sizeof(uint32_t)] &=
> ~NPCM_DMA_STATUS_W1C_MASK(v);
> + if (v & NPCM_DMA_STATUS_RU) {
> + /* Clearing RU bit indicates descriptor is owned by DMA
> again. */
> + gmac_dma_set_state(gmac,
> NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT,
> + NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE);
> + qemu_flush_queued_packets(qemu_get_queue(gmac->nic));
> }
> break;
>
> diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
> index c97eb6fe6e..d0a37e6988 100644
> --- a/include/hw/net/npcm_gmac.h
> +++ b/include/hw/net/npcm_gmac.h
> @@ -136,7 +136,7 @@ struct NPCMGMACTxDesc {
> #define TX_DESC_TDES1_INTERR_COMP_MASK BIT(31)
> /* Last Segment */
> #define TX_DESC_TDES1_LAST_SEG_MASK BIT(30)
> -/* Last Segment */
> +/* First Segment */
> #define TX_DESC_TDES1_FIRST_SEG_MASK BIT(29)
> /* Checksum Insertion Control */
> #define TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(word) extract32(word, 27, 2)
> @@ -176,32 +176,32 @@ OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
> #define NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT 20
> /* Transmit States */
> #define NPCM_DMA_STATUS_TX_STOPPED_STATE \
> - (0b000 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b000)
> #define NPCM_DMA_STATUS_TX_RUNNING_FETCHING_STATE \
> - (0b001 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b001)
> #define NPCM_DMA_STATUS_TX_RUNNING_WAITING_STATE \
> - (0b010 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b010)
> #define NPCM_DMA_STATUS_TX_RUNNING_READ_STATE \
> - (0b011 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b011)
> #define NPCM_DMA_STATUS_TX_SUSPENDED_STATE \
> - (0b110 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b110)
> #define NPCM_DMA_STATUS_TX_RUNNING_CLOSING_STATE \
> - (0b111 << NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT)
> + (0b111)
> /* Transmit Process State */
> #define NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT 17
> /* Receive States */
> #define NPCM_DMA_STATUS_RX_STOPPED_STATE \
> - (0b000 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b000)
> #define NPCM_DMA_STATUS_RX_RUNNING_FETCHING_STATE \
> - (0b001 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b001)
> #define NPCM_DMA_STATUS_RX_RUNNING_WAITING_STATE \
> - (0b011 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b011)
> #define NPCM_DMA_STATUS_RX_SUSPENDED_STATE \
> - (0b100 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b100)
> #define NPCM_DMA_STATUS_RX_RUNNING_CLOSING_STATE \
> - (0b101 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b101)
> #define NPCM_DMA_STATUS_RX_RUNNING_TRANSFERRING_STATE \
> - (0b111 << NPCM_DMA_STATUS_RX_PROCESS_STATE_SHIFT)
> + (0b111)
>
>
> /* Early Receive Interrupt */
> @@ -302,6 +302,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(NPCMGMACState, NPCM_GMAC)
> #define NPCM_DMA_CONTROL_FLUSH_MASK BIT(24)
> /* Start/stop Transmit */
> #define NPCM_DMA_CONTROL_START_STOP_TX BIT(13)
> +/* Start/stop Receive */
> +#define NPCM_DMA_CONTROL_START_STOP_RX BIT(1)
> /* Next receive descriptor start address */
> #define NPCM_DMA_HOST_RX_DESC_MASK(word) ((uint32_t) (word) & ~3u)
> /* Next transmit descriptor start address */
> --
> 2.42.0.655.g421f12c284-goog
>
>
[-- Attachment #2: Type: text/html, Size: 30054 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 10/11] hw/net: GMAC Tx Implementation
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (8 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 09/11] hw/net: GMAC Rx Implementation Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-17 23:03 ` [PATCH v3 11/11] tests/qtest: Adding PCS Module test to GMAC Qtest Nabih Estefan
10 siblings, 0 replies; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- Implementation of Transmit function for packets
- Implementation for reading and writing from and to descriptors in
memory for Tx
NOTE: This function implements the steps detailed in the datasheet for
transmitting messages from the GMAC.
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
---
hw/net/npcm_gmac.c | 152 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 152 insertions(+)
diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
index a7c8b67223..688ac4be44 100644
--- a/hw/net/npcm_gmac.c
+++ b/hw/net/npcm_gmac.c
@@ -266,6 +266,7 @@ static int gmac_write_tx_desc(dma_addr_t addr, struct NPCMGMACTxDesc *desc)
}
return 0;
}
+
static int gmac_rx_transfer_frame_to_buffer(uint32_t rx_buf_len,
uint32_t *left_frame,
uint32_t rx_buf_addr,
@@ -487,6 +488,157 @@ static ssize_t gmac_receive(NetClientState *nc, const uint8_t *buf, size_t len)
gmac->regs[R_NPCM_DMA_HOST_RX_DESC] = desc_addr;
return len;
}
+
+static int gmac_tx_get_csum(uint32_t tdes1)
+{
+ uint32_t mask = TX_DESC_TDES1_CHKSM_INS_CTRL_MASK(tdes1);
+ int csum = 0;
+
+ if (likely(mask > 0)) {
+ csum |= CSUM_IP;
+ }
+ if (likely(mask > 1)) {
+ csum |= CSUM_TCP | CSUM_UDP;
+ }
+
+ return csum;
+}
+
+static void gmac_try_send_next_packet(NPCMGMACState *gmac)
+{
+ /*
+ * Comments about steps refer to steps for
+ * transmitting in page 384 of datasheet
+ */
+ uint16_t tx_buffer_size = 2048;
+ g_autofree uint8_t *tx_send_buffer = g_malloc(tx_buffer_size);
+ uint32_t desc_addr;
+ struct NPCMGMACTxDesc tx_desc;
+ uint32_t tx_buf_addr, tx_buf_len;
+ uint16_t length = 0;
+ uint8_t *buf = tx_send_buffer;
+ uint32_t prev_buf_size = 0;
+ int csum = 0;
+
+ /* steps 1&2 */
+ if (!gmac->regs[R_NPCM_DMA_HOST_TX_DESC]) {
+ gmac->regs[R_NPCM_DMA_HOST_TX_DESC] =
+ NPCM_DMA_HOST_TX_DESC_MASK(gmac->regs[R_NPCM_DMA_TX_BASE_ADDR]);
+ }
+ desc_addr = gmac->regs[R_NPCM_DMA_HOST_TX_DESC];
+
+ while (true) {
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_TX_RUNNING_FETCHING_STATE);
+ trace_npcm_gmac_packet_transmit(DEVICE(gmac)->canonical_path, length);
+ if (gmac_read_tx_desc(desc_addr, &tx_desc)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "TX Descriptor @ 0x%x can't be read\n",
+ desc_addr);
+ return;
+ }
+ /* step 3 */
+
+ trace_npcm_gmac_packet_desc_read(DEVICE(gmac)->canonical_path,
+ desc_addr);
+ trace_npcm_gmac_debug_desc_data(DEVICE(gmac)->canonical_path, &tx_desc,
+ tx_desc.tdes0, tx_desc.tdes1, tx_desc.tdes2, tx_desc.tdes3);
+
+ /* 1 = DMA Owned, 0 = Software Owned */
+ if (!(tx_desc.tdes0 & TX_DESC_TDES0_OWN)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "TX Descriptor @ 0x%x is owned by software\n",
+ desc_addr);
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_TU;
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_TX_SUSPENDED_STATE);
+ gmac_update_irq(gmac);
+ return;
+ }
+
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_TX_RUNNING_READ_STATE);
+ /* Give the descriptor back regardless of what happens. */
+ tx_desc.tdes0 &= ~TX_DESC_TDES0_OWN;
+
+ if (tx_desc.tdes1 & TX_DESC_TDES1_FIRST_SEG_MASK) {
+ csum = gmac_tx_get_csum(tx_desc.tdes1);
+ }
+
+ /* step 4 */
+ tx_buf_addr = tx_desc.tdes2;
+ gmac->regs[R_NPCM_DMA_CUR_TX_BUF_ADDR] = tx_buf_addr;
+ tx_buf_len = TX_DESC_TDES1_BFFR1_SZ_MASK(tx_desc.tdes1);
+ buf = &tx_send_buffer[prev_buf_size];
+
+ if ((prev_buf_size + tx_buf_len) > sizeof(buf)) {
+ tx_buffer_size = prev_buf_size + tx_buf_len;
+ tx_send_buffer = g_realloc(tx_send_buffer, tx_buffer_size);
+ buf = &tx_send_buffer[prev_buf_size];
+ }
+
+ /* step 5 */
+ if (dma_memory_read(&address_space_memory, tx_buf_addr, buf,
+ tx_buf_len, MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to read packet @ 0x%x\n",
+ __func__, tx_buf_addr);
+ return;
+ }
+ length += tx_buf_len;
+ prev_buf_size += tx_buf_len;
+
+ /* If not chained we'll have a second buffer. */
+ if (!(tx_desc.tdes1 & TX_DESC_TDES1_SEC_ADDR_CHND_MASK)) {
+ tx_buf_addr = tx_desc.tdes3;
+ gmac->regs[R_NPCM_DMA_CUR_TX_BUF_ADDR] = tx_buf_addr;
+ tx_buf_len = TX_DESC_TDES1_BFFR2_SZ_MASK(tx_desc.tdes1);
+ buf = &tx_send_buffer[prev_buf_size];
+
+ if ((prev_buf_size + tx_buf_len) > sizeof(buf)) {
+ tx_buffer_size = prev_buf_size + tx_buf_len;
+ tx_send_buffer = g_realloc(tx_send_buffer, tx_buffer_size);
+ buf = &tx_send_buffer[prev_buf_size];
+ }
+
+ if (dma_memory_read(&address_space_memory, tx_buf_addr, buf,
+ tx_buf_len, MEMTXATTRS_UNSPECIFIED)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Failed to read packet @ 0x%x\n",
+ __func__, tx_buf_addr);
+ return;
+ }
+ length += tx_buf_len;
+ prev_buf_size += tx_buf_len;
+ }
+ if (tx_desc.tdes1 & TX_DESC_TDES1_LAST_SEG_MASK) {
+ net_checksum_calculate(tx_send_buffer, length, csum);
+ qemu_send_packet(qemu_get_queue(gmac->nic), tx_send_buffer, length);
+ trace_npcm_gmac_packet_sent(DEVICE(gmac)->canonical_path, length);
+ buf = tx_send_buffer;
+ length = 0;
+ }
+
+ /* step 6 */
+ gmac_dma_set_state(gmac, NPCM_DMA_STATUS_TX_PROCESS_STATE_SHIFT,
+ NPCM_DMA_STATUS_TX_RUNNING_CLOSING_STATE);
+ gmac_write_tx_desc(desc_addr, &tx_desc);
+ if (tx_desc.tdes1 & TX_DESC_TDES1_TX_END_RING_MASK) {
+ desc_addr = gmac->regs[R_NPCM_DMA_TX_BASE_ADDR];
+ } else if (tx_desc.tdes1 & TX_DESC_TDES1_SEC_ADDR_CHND_MASK) {
+ desc_addr = tx_desc.tdes3;
+ } else {
+ desc_addr += sizeof(tx_desc);
+ }
+ gmac->regs[R_NPCM_DMA_HOST_TX_DESC] = desc_addr;
+
+ /* step 7 */
+ if (tx_desc.tdes1 & TX_DESC_TDES1_INTERR_COMP_MASK) {
+ gmac->regs[R_NPCM_DMA_STATUS] |= NPCM_DMA_STATUS_TI;
+ gmac_update_irq(gmac);
+ }
+ }
+}
+
static void gmac_cleanup(NetClientState *nc)
{
/* Nothing to do yet. */
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v3 11/11] tests/qtest: Adding PCS Module test to GMAC Qtest
2023-10-17 23:03 [PATCH v3 00/11] Implementation of NPI Mailbox and GMAC Networking Module Nabih Estefan
` (9 preceding siblings ...)
2023-10-17 23:03 ` [PATCH v3 10/11] hw/net: GMAC Tx Implementation Nabih Estefan
@ 2023-10-17 23:03 ` Nabih Estefan
2023-10-18 0:25 ` Hao Wu
10 siblings, 1 reply; 17+ messages in thread
From: Nabih Estefan @ 2023-10-17 23:03 UTC (permalink / raw)
To: peter.maydell
Cc: qemu-arm, qemu-devel, kfting, wuhaotsh, jasonwang, avi.fishman,
Nabih Estefan Diaz
From: Nabih Estefan Diaz <nabihestefan@google.com>
- Add PCS Register check to npcm_gmac-test
Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
---
tests/qtest/npcm_gmac-test.c | 134 ++++++++++++++++++++++++++++++++++-
1 file changed, 133 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
index 84511fd915..1f0ad664f4 100644
--- a/tests/qtest/npcm_gmac-test.c
+++ b/tests/qtest/npcm_gmac-test.c
@@ -20,6 +20,10 @@
/* Name of the GMAC Device */
#define TYPE_NPCM_GMAC "npcm-gmac"
+/* Address of the PCS Module */
+#define PCS_BASE_ADDRESS 0xf0780000
+#define NPCM_PCS_IND_AC_BA 0x1fe
+
typedef struct GMACModule {
int irq;
uint64_t base_addr;
@@ -111,6 +115,62 @@ typedef enum NPCMRegister {
NPCM_GMAC_PTP_STNSUR = 0x714,
NPCM_GMAC_PTP_TAR = 0x718,
NPCM_GMAC_PTP_TTSR = 0x71c,
+
+ /* PCS Registers */
+ NPCM_PCS_SR_CTL_ID1 = 0x3c0008,
+ NPCM_PCS_SR_CTL_ID2 = 0x3c000a,
+ NPCM_PCS_SR_CTL_STS = 0x3c0010,
+
+ NPCM_PCS_SR_MII_CTRL = 0x3e0000,
+ NPCM_PCS_SR_MII_STS = 0x3e0002,
+ NPCM_PCS_SR_MII_DEV_ID1 = 0x3e0004,
+ NPCM_PCS_SR_MII_DEV_ID2 = 0x3e0006,
+ NPCM_PCS_SR_MII_AN_ADV = 0x3e0008,
+ NPCM_PCS_SR_MII_LP_BABL = 0x3e000a,
+ NPCM_PCS_SR_MII_AN_EXPN = 0x3e000c,
+ NPCM_PCS_SR_MII_EXT_STS = 0x3e001e,
+
+ NPCM_PCS_SR_TIM_SYNC_ABL = 0x3e0e10,
+ NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_LWR = 0x3e0e12,
+ NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_UPR = 0x3e0e14,
+ NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_LWR = 0x3e0e16,
+ NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_UPR = 0x3e0e18,
+ NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_LWR = 0x3e0e1a,
+ NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_UPR = 0x3e0e1c,
+ NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_LWR = 0x3e0e1e,
+ NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_UPR = 0x3e0e20,
+
+ NPCM_PCS_VR_MII_MMD_DIG_CTRL1 = 0x3f0000,
+ NPCM_PCS_VR_MII_AN_CTRL = 0x3f0002,
+ NPCM_PCS_VR_MII_AN_INTR_STS = 0x3f0004,
+ NPCM_PCS_VR_MII_TC = 0x3f0006,
+ NPCM_PCS_VR_MII_DBG_CTRL = 0x3f000a,
+ NPCM_PCS_VR_MII_EEE_MCTRL0 = 0x3f000c,
+ NPCM_PCS_VR_MII_EEE_TXTIMER = 0x3f0010,
+ NPCM_PCS_VR_MII_EEE_RXTIMER = 0x3f0012,
+ NPCM_PCS_VR_MII_LINK_TIMER_CTRL = 0x3f0014,
+ NPCM_PCS_VR_MII_EEE_MCTRL1 = 0x3f0016,
+ NPCM_PCS_VR_MII_DIG_STS = 0x3f0020,
+ NPCM_PCS_VR_MII_ICG_ERRCNT1 = 0x3f0022,
+ NPCM_PCS_VR_MII_MISC_STS = 0x3f0030,
+ NPCM_PCS_VR_MII_RX_LSTS = 0x3f0040,
+ NPCM_PCS_VR_MII_MP_TX_BSTCTRL0 = 0x3f0070,
+ NPCM_PCS_VR_MII_MP_TX_LVLCTRL0 = 0x3f0074,
+ NPCM_PCS_VR_MII_MP_TX_GENCTRL0 = 0x3f007a,
+ NPCM_PCS_VR_MII_MP_TX_GENCTRL1 = 0x3f007c,
+ NPCM_PCS_VR_MII_MP_TX_STS = 0x3f0090,
+ NPCM_PCS_VR_MII_MP_RX_GENCTRL0 = 0x3f00b0,
+ NPCM_PCS_VR_MII_MP_RX_GENCTRL1 = 0x3f00b2,
+ NPCM_PCS_VR_MII_MP_RX_LOS_CTRL0 = 0x3f00ba,
+ NPCM_PCS_VR_MII_MP_MPLL_CTRL0 = 0x3f00f0,
+ NPCM_PCS_VR_MII_MP_MPLL_CTRL1 = 0x3f00f2,
+ NPCM_PCS_VR_MII_MP_MPLL_STS = 0x3f0110,
+ NPCM_PCS_VR_MII_MP_MISC_CTRL2 = 0x3f0126,
+ NPCM_PCS_VR_MII_MP_LVL_CTRL = 0x3f0130,
+ NPCM_PCS_VR_MII_MP_MISC_CTRL0 = 0x3f0132,
+ NPCM_PCS_VR_MII_MP_MISC_CTRL1 = 0x3f0134,
+ NPCM_PCS_VR_MII_DIG_CTRL2 = 0x3f01c2,
+ NPCM_PCS_VR_MII_DIG_ERRCNT_SEL = 0x3f01c4,
} NPCMRegister;
static uint32_t gmac_read(QTestState *qts, const GMACModule *mod,
@@ -119,6 +179,15 @@ static uint32_t gmac_read(QTestState *qts, const GMACModule *mod,
return qtest_readl(qts, mod->base_addr + regno);
}
+static uint16_t pcs_read(QTestState *qts, const GMACModule *mod,
+ NPCMRegister regno)
+{
+ uint32_t write_value = (regno & 0x3ffe00) >> 9;
+ qtest_writel(qts, PCS_BASE_ADDRESS + NPCM_PCS_IND_AC_BA, write_value);
+ uint32_t read_offset = regno & 0x1ff;
+ return qtest_readl(qts, PCS_BASE_ADDRESS + read_offset);
+}
+
/* Check that GMAC registers are reset to default value */
static void test_init(gconstpointer test_data)
{
@@ -129,7 +198,12 @@ static void test_init(gconstpointer test_data)
#define CHECK_REG32(regno, value) \
do { \
g_assert_cmphex(gmac_read(qts, mod, (regno)), ==, (value)); \
- } while (0)
+ } while (0) ;
+
+#define CHECK_REG_PCS(regno, value) \
+ do { \
+ g_assert_cmphex(pcs_read(qts, mod, (regno)), ==, (value)); \
+ } while (0) ;
CHECK_REG32(NPCM_DMA_BUS_MODE, 0x00020100);
CHECK_REG32(NPCM_DMA_XMT_POLL_DEMAND, 0);
@@ -180,6 +254,64 @@ static void test_init(gconstpointer test_data)
CHECK_REG32(NPCM_GMAC_PTP_TAR, 0);
CHECK_REG32(NPCM_GMAC_PTP_TTSR, 0);
+ /* TODO Add registers PCS */
+ if (mod->base_addr == 0xf0802000) {
+ CHECK_REG_PCS(NPCM_PCS_SR_CTL_ID1, 0x699e)
+ CHECK_REG_PCS(NPCM_PCS_SR_CTL_ID2, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_CTL_STS, 0x8000)
+
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_CTRL, 0x1140)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_STS, 0x0109)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_DEV_ID1, 0x699e)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_DEV_ID2, 0x0ced0)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_AN_ADV, 0x0020)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_LP_BABL, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_AN_EXPN, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_MII_EXT_STS, 0xc000)
+
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_ABL, 0x0003)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_LWR, 0x0038)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_UPR, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_LWR, 0x0038)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_UPR, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_LWR, 0x0058)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_UPR, 0)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_LWR, 0x0048)
+ CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_UPR, 0)
+
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MMD_DIG_CTRL1, 0x2400)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_AN_CTRL, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_AN_INTR_STS, 0x000a)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_TC, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_DBG_CTRL, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_MCTRL0, 0x899c)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_TXTIMER, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_RXTIMER, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_LINK_TIMER_CTRL, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_MCTRL1, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_STS, 0x0010)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_ICG_ERRCNT1, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MISC_STS, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_RX_LSTS, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_BSTCTRL0, 0x00a)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_LVLCTRL0, 0x007f)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_GENCTRL0, 0x0001)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_GENCTRL1, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_STS, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_GENCTRL0, 0x0100)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_GENCTRL1, 0x1100)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_LOS_CTRL0, 0x000e)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_CTRL0, 0x0100)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_CTRL1, 0x0032)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_STS, 0x0001)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL2, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_LVL_CTRL, 0x0019)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL0, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL1, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_CTRL2, 0)
+ CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_ERRCNT_SEL, 0)
+ }
+
qtest_quit(qts);
}
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v3 11/11] tests/qtest: Adding PCS Module test to GMAC Qtest
2023-10-17 23:03 ` [PATCH v3 11/11] tests/qtest: Adding PCS Module test to GMAC Qtest Nabih Estefan
@ 2023-10-18 0:25 ` Hao Wu
0 siblings, 0 replies; 17+ messages in thread
From: Hao Wu @ 2023-10-18 0:25 UTC (permalink / raw)
To: Nabih Estefan
Cc: peter.maydell, qemu-arm, qemu-devel, kfting, jasonwang,
avi.fishman
[-- Attachment #1: Type: text/plain, Size: 8292 bytes --]
On Tue, Oct 17, 2023 at 4:04 PM Nabih Estefan <nabihestefan@google.com>
wrote:
> From: Nabih Estefan Diaz <nabihestefan@google.com>
>
> - Add PCS Register check to npcm_gmac-test
>
> Signed-off-by: Nabih Estefan Diaz <nabihestefan@google.com>
>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
> ---
> tests/qtest/npcm_gmac-test.c | 134 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 133 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c
> index 84511fd915..1f0ad664f4 100644
> --- a/tests/qtest/npcm_gmac-test.c
> +++ b/tests/qtest/npcm_gmac-test.c
> @@ -20,6 +20,10 @@
> /* Name of the GMAC Device */
> #define TYPE_NPCM_GMAC "npcm-gmac"
>
> +/* Address of the PCS Module */
> +#define PCS_BASE_ADDRESS 0xf0780000
> +#define NPCM_PCS_IND_AC_BA 0x1fe
> +
> typedef struct GMACModule {
> int irq;
> uint64_t base_addr;
> @@ -111,6 +115,62 @@ typedef enum NPCMRegister {
> NPCM_GMAC_PTP_STNSUR = 0x714,
> NPCM_GMAC_PTP_TAR = 0x718,
> NPCM_GMAC_PTP_TTSR = 0x71c,
> +
> + /* PCS Registers */
> + NPCM_PCS_SR_CTL_ID1 = 0x3c0008,
> + NPCM_PCS_SR_CTL_ID2 = 0x3c000a,
> + NPCM_PCS_SR_CTL_STS = 0x3c0010,
> +
> + NPCM_PCS_SR_MII_CTRL = 0x3e0000,
> + NPCM_PCS_SR_MII_STS = 0x3e0002,
> + NPCM_PCS_SR_MII_DEV_ID1 = 0x3e0004,
> + NPCM_PCS_SR_MII_DEV_ID2 = 0x3e0006,
> + NPCM_PCS_SR_MII_AN_ADV = 0x3e0008,
> + NPCM_PCS_SR_MII_LP_BABL = 0x3e000a,
> + NPCM_PCS_SR_MII_AN_EXPN = 0x3e000c,
> + NPCM_PCS_SR_MII_EXT_STS = 0x3e001e,
> +
> + NPCM_PCS_SR_TIM_SYNC_ABL = 0x3e0e10,
> + NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_LWR = 0x3e0e12,
> + NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_UPR = 0x3e0e14,
> + NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_LWR = 0x3e0e16,
> + NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_UPR = 0x3e0e18,
> + NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_LWR = 0x3e0e1a,
> + NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_UPR = 0x3e0e1c,
> + NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_LWR = 0x3e0e1e,
> + NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_UPR = 0x3e0e20,
> +
> + NPCM_PCS_VR_MII_MMD_DIG_CTRL1 = 0x3f0000,
> + NPCM_PCS_VR_MII_AN_CTRL = 0x3f0002,
> + NPCM_PCS_VR_MII_AN_INTR_STS = 0x3f0004,
> + NPCM_PCS_VR_MII_TC = 0x3f0006,
> + NPCM_PCS_VR_MII_DBG_CTRL = 0x3f000a,
> + NPCM_PCS_VR_MII_EEE_MCTRL0 = 0x3f000c,
> + NPCM_PCS_VR_MII_EEE_TXTIMER = 0x3f0010,
> + NPCM_PCS_VR_MII_EEE_RXTIMER = 0x3f0012,
> + NPCM_PCS_VR_MII_LINK_TIMER_CTRL = 0x3f0014,
> + NPCM_PCS_VR_MII_EEE_MCTRL1 = 0x3f0016,
> + NPCM_PCS_VR_MII_DIG_STS = 0x3f0020,
> + NPCM_PCS_VR_MII_ICG_ERRCNT1 = 0x3f0022,
> + NPCM_PCS_VR_MII_MISC_STS = 0x3f0030,
> + NPCM_PCS_VR_MII_RX_LSTS = 0x3f0040,
> + NPCM_PCS_VR_MII_MP_TX_BSTCTRL0 = 0x3f0070,
> + NPCM_PCS_VR_MII_MP_TX_LVLCTRL0 = 0x3f0074,
> + NPCM_PCS_VR_MII_MP_TX_GENCTRL0 = 0x3f007a,
> + NPCM_PCS_VR_MII_MP_TX_GENCTRL1 = 0x3f007c,
> + NPCM_PCS_VR_MII_MP_TX_STS = 0x3f0090,
> + NPCM_PCS_VR_MII_MP_RX_GENCTRL0 = 0x3f00b0,
> + NPCM_PCS_VR_MII_MP_RX_GENCTRL1 = 0x3f00b2,
> + NPCM_PCS_VR_MII_MP_RX_LOS_CTRL0 = 0x3f00ba,
> + NPCM_PCS_VR_MII_MP_MPLL_CTRL0 = 0x3f00f0,
> + NPCM_PCS_VR_MII_MP_MPLL_CTRL1 = 0x3f00f2,
> + NPCM_PCS_VR_MII_MP_MPLL_STS = 0x3f0110,
> + NPCM_PCS_VR_MII_MP_MISC_CTRL2 = 0x3f0126,
> + NPCM_PCS_VR_MII_MP_LVL_CTRL = 0x3f0130,
> + NPCM_PCS_VR_MII_MP_MISC_CTRL0 = 0x3f0132,
> + NPCM_PCS_VR_MII_MP_MISC_CTRL1 = 0x3f0134,
> + NPCM_PCS_VR_MII_DIG_CTRL2 = 0x3f01c2,
> + NPCM_PCS_VR_MII_DIG_ERRCNT_SEL = 0x3f01c4,
> } NPCMRegister;
>
> static uint32_t gmac_read(QTestState *qts, const GMACModule *mod,
> @@ -119,6 +179,15 @@ static uint32_t gmac_read(QTestState *qts, const
> GMACModule *mod,
> return qtest_readl(qts, mod->base_addr + regno);
> }
>
> +static uint16_t pcs_read(QTestState *qts, const GMACModule *mod,
> + NPCMRegister regno)
> +{
> + uint32_t write_value = (regno & 0x3ffe00) >> 9;
> + qtest_writel(qts, PCS_BASE_ADDRESS + NPCM_PCS_IND_AC_BA, write_value);
> + uint32_t read_offset = regno & 0x1ff;
> + return qtest_readl(qts, PCS_BASE_ADDRESS + read_offset);
> +}
> +
> /* Check that GMAC registers are reset to default value */
> static void test_init(gconstpointer test_data)
> {
> @@ -129,7 +198,12 @@ static void test_init(gconstpointer test_data)
> #define CHECK_REG32(regno, value) \
> do { \
> g_assert_cmphex(gmac_read(qts, mod, (regno)), ==, (value)); \
> - } while (0)
> + } while (0) ;
> +
> +#define CHECK_REG_PCS(regno, value) \
> + do { \
> + g_assert_cmphex(pcs_read(qts, mod, (regno)), ==, (value)); \
> + } while (0) ;
>
> CHECK_REG32(NPCM_DMA_BUS_MODE, 0x00020100);
> CHECK_REG32(NPCM_DMA_XMT_POLL_DEMAND, 0);
> @@ -180,6 +254,64 @@ static void test_init(gconstpointer test_data)
> CHECK_REG32(NPCM_GMAC_PTP_TAR, 0);
> CHECK_REG32(NPCM_GMAC_PTP_TTSR, 0);
>
> + /* TODO Add registers PCS */
> + if (mod->base_addr == 0xf0802000) {
> + CHECK_REG_PCS(NPCM_PCS_SR_CTL_ID1, 0x699e)
> + CHECK_REG_PCS(NPCM_PCS_SR_CTL_ID2, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_CTL_STS, 0x8000)
> +
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_CTRL, 0x1140)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_STS, 0x0109)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_DEV_ID1, 0x699e)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_DEV_ID2, 0x0ced0)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_AN_ADV, 0x0020)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_LP_BABL, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_AN_EXPN, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_MII_EXT_STS, 0xc000)
> +
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_ABL, 0x0003)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_LWR, 0x0038)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MAX_DLY_UPR, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_LWR, 0x0038)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_TX_MIN_DLY_UPR, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_LWR, 0x0058)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MAX_DLY_UPR, 0)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_LWR, 0x0048)
> + CHECK_REG_PCS(NPCM_PCS_SR_TIM_SYNC_RX_MIN_DLY_UPR, 0)
> +
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MMD_DIG_CTRL1, 0x2400)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_AN_CTRL, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_AN_INTR_STS, 0x000a)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_TC, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_DBG_CTRL, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_MCTRL0, 0x899c)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_TXTIMER, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_RXTIMER, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_LINK_TIMER_CTRL, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_EEE_MCTRL1, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_STS, 0x0010)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_ICG_ERRCNT1, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MISC_STS, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_RX_LSTS, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_BSTCTRL0, 0x00a)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_LVLCTRL0, 0x007f)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_GENCTRL0, 0x0001)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_GENCTRL1, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_TX_STS, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_GENCTRL0, 0x0100)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_GENCTRL1, 0x1100)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_RX_LOS_CTRL0, 0x000e)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_CTRL0, 0x0100)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_CTRL1, 0x0032)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MPLL_STS, 0x0001)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL2, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_LVL_CTRL, 0x0019)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL0, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_MP_MISC_CTRL1, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_CTRL2, 0)
> + CHECK_REG_PCS(NPCM_PCS_VR_MII_DIG_ERRCNT_SEL, 0)
> + }
> +
> qtest_quit(qts);
> }
>
> --
> 2.42.0.655.g421f12c284-goog
>
>
[-- Attachment #2: Type: text/html, Size: 9727 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread