qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v2 8/9] hw/arm/mps2: Add ethernet


From: Philippe Mathieu-Daudé
Subject: Re: [Qemu-devel] [PATCH v2 8/9] hw/arm/mps2: Add ethernet
Date: Fri, 14 Jul 2017 13:23:09 -0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1

On 07/14/2017 07:51 AM, Peter Maydell wrote:
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>

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 bdc631a..6adfb22 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,
@@ -210,7 +212,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) {
@@ -309,6 +310,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,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]