Commit 2c107d76 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 Thu 02 Jun 2016 07:23:18 BST using RSA key ID 398D6211
# 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: (31 commits)
  Add ENET device to i.MX6 SOC.
  Add ENET/Gbps Ethernet support to FEC device
  i.MX: move FEC device to a register array structure.
  i.MX: Rename i.MX FEC defines to ENET_XXX
  i.MX: reset TX/RX descriptors when FEC is disabled.
  i.MX: Fix FEC code for ECR register reset value.
  i.MX: Fix FEC code for MDIO address selection
  i.MX: Fix FEC code for MDIO operation selection
  net: handle optional VLAN header in checksum computation.
  net: improve UDP/TCP checksum computation.
  e1000e: Introduce qtest for e1000e device
  net: Introduce e1000e device emulation
  e1000: Move out code that will be reused in e1000e
  e1000_regs: Add definitions for Intel 82574-specific bits
  vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*
  net_pkt: Extend packet abstraction as required by e1000e functionality
  rtl8139: Move more TCP definitions to common header
  net_pkt: Name vmxnet3 packet abstractions more generic
  vmxnet3: Use common MAC address tracing macros
  net: Add macros for MAC address tracing
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cbd61487 517b5e9a

MAINTAINERS

+18 −0
Original line number Diff line number Diff line
@@ -954,6 +954,14 @@ S: Maintained 
F: hw/*/xilinx_*

F: include/hw/xilinx.h



Network packet abstractions

M: Dmitry Fleytman <dmitry@daynix.com>

S: Maintained

F: include/net/eth.h

F: net/eth.c

F: hw/net/net_rx_pkt*

F: hw/net/net_tx_pkt*



Vmware

M: Dmitry Fleytman <dmitry@daynix.com>

S: Maintained
@@ -973,6 +981,16 @@ F: hw/acpi/nvdimm.c 
F: hw/mem/nvdimm.c

F: include/hw/mem/nvdimm.h



e1000x

M: Dmitry Fleytman <dmitry@daynix.com>

S: Maintained

F: hw/net/e1000x*



e1000e

M: Dmitry Fleytman <dmitry@daynix.com>

S: Maintained

F: hw/net/e1000e*



Subsystems

----------

Audio

default-configs/pci.mak

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CONFIG_MEGASAS_SCSI_PCI=y 
CONFIG_MPTSAS_SCSI_PCI=y

CONFIG_RTL8139_PCI=y

CONFIG_E1000_PCI=y

CONFIG_E1000E_PCI=y

CONFIG_VMXNET3_PCI=y

CONFIG_IDE_CORE=y

CONFIG_IDE_QDEV=y

hw/arm/fsl-imx25.c

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
    }



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



    object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

hw/arm/fsl-imx6.c

+17 −0
Original line number Diff line number Diff line
@@ -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);

hw/net/Makefile.objs

+3 −2
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ common-obj-$(CONFIG_NE2000_PCI) += ne2000.o 
common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o

common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o

common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o

common-obj-$(CONFIG_E1000_PCI) += e1000.o

common-obj-$(CONFIG_E1000_PCI) += e1000.o e1000x_common.o

common-obj-$(CONFIG_E1000E_PCI) += e1000e.o e1000e_core.o e1000x_common.o

common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o

common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet_tx_pkt.o vmxnet_rx_pkt.o

common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o

common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o



common-obj-$(CONFIG_SMC91C111) += smc91c111.o