[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V4 31/31] Add ENET device to i.MX6 SOC.
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V4 31/31] Add ENET device to i.MX6 SOC. |
Date: |
Thu, 2 Jun 2016 14:48:22 +0800 |
From: Jean-Christophe Dubois <address@hidden>
This adds the ENET device to the i.MX6 SOC.
This was tested by booting Linux on an Qemu i.MX6 instance and accessing
the internet from the linux guest.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/arm/fsl-imx6.c | 17 +++++++++++++++++
include/hw/arm/fsl-imx6.h | 6 ++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index a5331bf..0c00e7a 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -105,6 +105,10 @@ static void fsl_imx6_init(Object *obj)
snprintf(name, NAME_SIZE, "spi%d", i + 1);
object_property_add_child(obj, name, OBJECT(&s->spi[i]), NULL);
}
+
+ object_initialize(&s->eth, sizeof(s->eth), TYPE_IMX_ENET);
+ qdev_set_parent_bus(DEVICE(&s->eth), sysbus_get_default());
+ object_property_add_child(obj, "eth", OBJECT(&s->eth), NULL);
}
static void fsl_imx6_realize(DeviceState *dev, Error **errp)
@@ -381,6 +385,19 @@ static void fsl_imx6_realize(DeviceState *dev, Error
**errp)
spi_table[i].irq));
}
+ object_property_set_bool(OBJECT(&s->eth), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth), 0, FSL_IMX6_ENET_ADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->eth), 0,
+ qdev_get_gpio_in(DEVICE(&s->a9mpcore),
+ FSL_IMX6_ENET_MAC_IRQ));
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->eth), 1,
+ qdev_get_gpio_in(DEVICE(&s->a9mpcore),
+ FSL_IMX6_ENET_MAC_1588_IRQ));
+
/* ROM memory */
memory_region_init_rom_device(&s->rom, NULL, NULL, NULL, "imx6.rom",
FSL_IMX6_ROM_SIZE, &err);
diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index e9157ea..ec6c509 100644
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -28,6 +28,7 @@
#include "hw/gpio/imx_gpio.h"
#include "hw/sd/sdhci.h"
#include "hw/ssi/imx_spi.h"
+#include "hw/net/imx_fec.h"
#include "exec/memory.h"
#include "cpu.h"
@@ -58,6 +59,7 @@ typedef struct FslIMX6State {
IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS];
SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS];
IMXSPIState spi[FSL_IMX6_NUM_ECSPIS];
+ IMXFECState eth;
MemoryRegion rom;
MemoryRegion caam;
MemoryRegion ocram;
@@ -436,8 +438,8 @@ typedef struct FslIMX6State {
#define FSL_IMX6_HDMI_MASTER_IRQ 115
#define FSL_IMX6_HDMI_CEC_IRQ 116
#define FSL_IMX6_MLB150_LOW_IRQ 117
-#define FSL_IMX6_ENET_MAC_IRQ 118
-#define FSL_IMX6_ENET_MAC_1588_IRQ 119
+#define FSL_IMX6_ENET_MAC_1588_IRQ 118
+#define FSL_IMX6_ENET_MAC_IRQ 119
#define FSL_IMX6_PCIE1_IRQ 120
#define FSL_IMX6_PCIE2_IRQ 121
#define FSL_IMX6_PCIE3_IRQ 122
--
2.7.4
- [Qemu-devel] [PULL V4 22/31] net: improve UDP/TCP checksum computation., (continued)
- [Qemu-devel] [PULL V4 22/31] net: improve UDP/TCP checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 21/31] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 24/31] i.MX: Fix FEC code for MDIO operation selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 26/31] i.MX: Fix FEC code for ECR register reset value., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 25/31] i.MX: Fix FEC code for MDIO address selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 27/31] i.MX: reset TX/RX descriptors when FEC is disabled., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 28/31] i.MX: Rename i.MX FEC defines to ENET_XXX, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 20/31] net: Introduce e1000e device emulation, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 29/31] i.MX: move FEC device to a register array structure., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 31/31] Add ENET device to i.MX6 SOC.,
Jason Wang <=
- [Qemu-devel] [PULL V4 30/31] Add ENET/Gbps Ethernet support to FEC device, Jason Wang, 2016/06/02
- Re: [Qemu-devel] [PULL V4 00/31] Net patches, Peter Maydell, 2016/06/02