Commit b8c7193f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Tue 25 Apr 2017 12:22:03 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  COLO-compare: Optimize tcp compare trace event
  COLO-compare: Optimize tcp compare for option field
  slirp: add a fake NC-SI backend
  aspeed: add a FTGMAC100 nic
  net/ftgmac100: add a 'aspeed' property
  net: add FTGMAC100 support
  hw/net: add MII definitions
  colo-compare: Fix old packet check bug.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4ba967ad 0fc8aec7

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ CONFIG_LAN9118=y 
CONFIG_SMC91C111=y

CONFIG_ALLWINNER_EMAC=y

CONFIG_IMX_FEC=y

CONFIG_FTGMAC100=y

CONFIG_DS1338=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

hw/arm/aspeed_soc.c

+21 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "hw/char/serial.h"

#include "qemu/log.h"

#include "hw/i2c/aspeed_i2c.h"

#include "net/net.h"



#define ASPEED_SOC_UART_5_BASE      0x00184000

#define ASPEED_SOC_IOMEM_SIZE       0x00200000
@@ -33,6 +34,8 @@ 
#define ASPEED_SOC_TIMER_BASE       0x1E782000

#define ASPEED_SOC_WDT_BASE         0x1E785000

#define ASPEED_SOC_I2C_BASE         0x1E78A000

#define ASPEED_SOC_ETH1_BASE        0x1E660000

#define ASPEED_SOC_ETH2_BASE        0x1E680000



static const int uart_irqs[] = { 9, 32, 33, 34, 10 };

static const int timer_irqs[] = { 16, 17, 18, 35, 36, 37, 38, 39, };
@@ -175,6 +178,10 @@ static void aspeed_soc_init(Object *obj) 
    object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);

    object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);

    qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());



    object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);

    object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);

    qdev_set_parent_bus(DEVICE(&s->ftgmac100), sysbus_get_default());

}



static void aspeed_soc_realize(DeviceState *dev, Error **errp)
@@ -299,6 +306,20 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
        return;

    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);



    /* Net */

    qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);

    object_property_set_bool(OBJECT(&s->ftgmac100), true, "aspeed", &err);

    object_property_set_bool(OBJECT(&s->ftgmac100), true, "realized",

                             &local_err);

    error_propagate(&err, local_err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100), 0, ASPEED_SOC_ETH1_BASE);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100), 0,

                       qdev_get_gpio_in(DEVICE(&s->vic), 2));

}



static void aspeed_soc_class_init(ObjectClass *oc, void *data)

hw/net/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ common-obj-$(CONFIG_IMX_FEC) += imx_fec.o 
common-obj-$(CONFIG_CADENCE) += cadence_gem.o

common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o

common-obj-$(CONFIG_LANCE) += lance.o

common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o



obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o

obj-$(CONFIG_COLDFIRE) += mcf_fec.o

hw/net/ftgmac100.c

0 → 100644
+1016 −0

File added.

Preview size limit exceeded, changes collapsed.

include/hw/arm/aspeed_soc.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "hw/i2c/aspeed_i2c.h"

#include "hw/ssi/aspeed_smc.h"

#include "hw/watchdog/wdt_aspeed.h"

#include "hw/net/ftgmac100.h"



#define ASPEED_SPIS_NUM  2
@@ -39,6 +40,7 @@ typedef struct AspeedSoCState { 
    AspeedSMCState spi[ASPEED_SPIS_NUM];

    AspeedSDMCState sdmc;

    AspeedWDTState wdt;

    FTGMAC100State ftgmac100;

} AspeedSoCState;



#define TYPE_ASPEED_SOC "aspeed-soc"