From patchwork Mon Jul 17 12:44:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107915 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4466667qge; Mon, 17 Jul 2017 05:45:31 -0700 (PDT) X-Received: by 10.237.60.80 with SMTP id u16mr28642780qte.100.1500295531706; Mon, 17 Jul 2017 05:45:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500295531; cv=none; d=google.com; s=arc-20160816; b=G48ssZPH6RarXcVf1ZG8gJrMSEeJmi1TJ8J72RdamdW4edXc5Aazekdwzq4bqccp8n YKXequzdbwEg9GwnFMhrWmeCGKrwv0RgaphfdeHQXSo8j0i9HQC6Dy4gWrdccfyk197a tYzNHRP6kp8DWQlrUq3cCUkLs3y+gLn/G6+25XfwfUxYM0F55I5cbuZiJspN8neQgfF/ /VG0cfqe4zDGxlOpKdy4SAkeIk+ASiDf9vEO+O4vrngMr7c76k8yLX3bMkujQIOnMqCw 538QVHibK+TQB94zw4DKC0SNYlMnLM4HXR8RpW9cIoDNIlTTN98/TaBSN7nkOsNAEdOi K9xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=Jf1sAXG+6dfFxDiguScHy0ANJebIetufxt8zJF/d3/I=; b=PvOaNFc9hhGm+Oa8qdmWROk6PaEYrbCMsg0Oqb7quxhhToQQdTaquJNXK0JFHsyW4m ftPG/cl3GvhajIS8U+cBDy4y/xXITnm0tXl8fdhG5JoUiNlkViPIBsh11nnUOjDGRQf7 xVVLB05fifyKAbuRZMZJh02Nf3WlU9AuW+0DK9cacNvFvADwwLJq7HqhX4KY8mzCSsK9 6GJYvPPkvimK29YqCd+trEKodHbUmnTgm5heyS5qVNSZgpkyUFg0SGZJVDKFQiEO2CNS azFkvNWp8COzQMNw4LZhksqbCEKT3m6L5YtqLFqjnGJVQG58kVXLS5d1V7jv1R/avfZE +EPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s29si15230031qkl.56.2017.07.17.05.45.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 05:45:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5Oz-0007tM-5x for patch@linaro.org; Mon, 17 Jul 2017 08:45:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5Ob-0007qm-EA for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX5Oa-0002D9-JA for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:05 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37640) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX5Oa-0002Ci-BV for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:04 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dX5OZ-0003XV-Ee for qemu-devel@nongnu.org; Mon, 17 Jul 2017 13:45:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 13:44:53 +0100 Message-Id: <1500295494-8991-18-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> References: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 17/18] hw/arm/mps2: Add ethernet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Message-id: 1500029487-14822-9-git-send-email-peter.maydell@linaro.org Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/mps2.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 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,