[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/18] hw/arm/mps2: Add ethernet
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 17/18] hw/arm/mps2: Add ethernet |
Date: |
Mon, 17 Jul 2017 13:44:53 +0100 |
The MPS2 FPGA images support ethernet via a LAN9220. We use
QEMU's LAN9118 model, which is software compatible except
that it is missing the checksum-offload feature.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/mps2.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 80ee79e..f727b43 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -35,6 +35,8 @@
#include "hw/char/cmsdk-apb-uart.h"
#include "hw/timer/cmsdk-apb-timer.h"
#include "hw/misc/mps2-scc.h"
+#include "hw/devices.h"
+#include "net/net.h"
typedef enum MPS2FPGAType {
FPGA_AN385,
@@ -209,7 +211,6 @@ static void mps2_common_init(MachineState *machine)
create_unimplemented_device("Extra peripheral region @0x40020000",
0x40020000, 0x00010000);
create_unimplemented_device("RESERVED 4", 0x40030000, 0x001D0000);
- create_unimplemented_device("Ethernet", 0x40200000, 0x00100000);
create_unimplemented_device("VGA", 0x41000000, 0x0200000);
switch (mmc->fpga_type) {
@@ -310,6 +311,13 @@ static void mps2_common_init(MachineState *machine)
&error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(sccdev), 0, 0x4002f000);
+ /* In hardware this is a LAN9220; the LAN9118 is software compatible
+ * except that it doesn't support the checksum-offload feature.
+ */
+ lan9118_init(&nd_table[0], 0x40200000,
+ qdev_get_gpio_in(armv7m,
+ mmc->fpga_type == FPGA_AN385 ? 13 : 47));
+
system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ;
armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
--
2.7.4
- [Qemu-devel] [PULL 00/18] target-arm queue, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 16/18] hw/arm/mps2: Add SCC, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 17/18] hw/arm/mps2: Add ethernet,
Peter Maydell <=
- [Qemu-devel] [PULL 14/18] hw/arm/mps2: Add timers, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 18/18] MAINTAINERS: Add entries for MPS2 board, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 12/18] hw/arm/mps2: Add UARTs, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 06/18] target/arm/translate.h: expand comment on DISAS_EXIT, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 15/18] hw/misc/mps2_scc: Implement MPS2 Serial Communication Controller, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 13/18] hw/char/cmsdk-apb-timer: Implement CMSDK APB timer device, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 08/18] target/arm: use gen_goto_tb for ISB handling, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 07/18] target/arm/translate: ensure gen_goto_tb sets exit flags, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 10/18] hw/arm/mps2: Implement skeleton mps2-an385 and mps2-an511 board models, Peter Maydell, 2017/07/17
- [Qemu-devel] [PULL 04/18] include/exec/exec-all: document common exit conditions, Peter Maydell, 2017/07/17