The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 15:59:27 +0100)

for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff:

COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800)

Cédric Le Goater (5):

hw/net: add MII definitions

net: add FTGMAC100 support

net/ftgmac100: add a 'aspeed' property

aspeed: add a FTGMAC100 nic

slirp: add a fake NC-SI backend

Zhang Chen (3):

colo-compare: Fix old packet check bug.

COLO-compare: Optimize tcp compare for option field

COLO-compare: Optimize tcp compare trace event

default-configs/arm-softmmu.mak | 1 +

hw/arm/aspeed_soc.c | 21 +

hw/net/Makefile.objs | 1 +

hw/net/ftgmac100.c | 1016 +++++++++++++++++++++++++++++++++++++++

include/hw/arm/aspeed_soc.h | 2 +

include/hw/net/ftgmac100.h | 64 +++

include/hw/net/mii.h | 71 ++-

include/net/eth.h | 1 +

net/colo-compare.c | 69 ++-

net/trace-events | 3 +-

slirp/Makefile.objs | 2 +-

slirp/ncsi-pkt.h | 419 ++++++++++++++++

slirp/ncsi.c | 130 +++++

slirp/slirp.c | 4 +

slirp/slirp.h | 3 +

15 files changed, 1770 insertions(+), 37 deletions(-)

create mode 100644 hw/net/ftgmac100.c

create mode 100644 include/hw/net/ftgmac100.h

create mode 100644 slirp/ncsi-pkt.h

create mode 100644 slirp/ncsi.c

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Optimize two trace events as one, adjust print format make

it easy to read. rename trace_colo_compare_pkt_info_src/dst

to trace_colo_compare_tcp_info.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

net/colo-compare.c | 29 +++++++++++++++++------------

net/trace-events | 3 +--

2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)

res = -1;

- if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

- trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src),

- ntohl(stcp->th_seq),

- ntohl(stcp->th_ack),

- res, stcp->th_flags,

- spkt->size);

-

- trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst),

- ntohl(ptcp->th_seq),

- ntohl(ptcp->th_ack),

- res, ptcp->th_flags,

- ppkt->size);

+ if (res && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

+ char ip_src[20], ip_dst[20];

+

+ strcpy(ip_src, inet_ntoa(ppkt->ip->ip_src));

+ strcpy(ip_dst, inet_ntoa(ppkt->ip->ip_dst));

+

+ trace_colo_compare_tcp_info(ip_src,

+ ip_dst,

+ ntohl(ptcp->th_seq),

+ ntohl(stcp->th_seq),

+ ntohl(ptcp->th_ack),

+ ntohl(stcp->th_ack),

+ res,

+ ptcp->th_flags,

+ stcp->th_flags,

+ ppkt->size,

+ spkt->size);

qemu_hexdump((char *)ppkt->data, stderr,

"colo-compare ppkt", ppkt->size);

diff --git a/net/trace-events b/net/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/net/trace-events

+++ b/net/trace-events

@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"

colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"

colo_old_packet_check_found(int64_t old_time) "%" PRId64

colo_compare_miscompare(void) ""

-colo_compare_pkt_info_src(const char *src, uint32_t sseq, uint32_t sack, int res, uint32_t sflag, int ssize) "src/dst: %s s: seq/ack=%u/%u res=%d flags=%x spkt_size: %d\n"

-colo_compare_pkt_info_dst(const char *dst, uint32_t dseq, uint32_t dack, int res, uint32_t dflag, int dsize) "src/dst: %s d: seq/ack=%u/%u res=%d flags=%x dpkt_size: %d\n"

+colo_compare_tcp_info(const char *src, const char *dst, uint32_t pseq, uint32_t sseq, uint32_t pack, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s pseq/sseq:%u/%u pack/sack:%u/%u res=%d pflags/sflag:%x/%x psize/ssize:%d/%d \n"

# net/filter-rewriter.c

colo_filter_rewriter_debug(void) ""

2.7.4

From: Cédric Le Goater <clg@kaod.org>

The FTGMAC100 device is an Ethernet controller with DMA function that

can be found on Aspeed SoCs (which include NCSI).

It is fully compliant with IEEE 802.3 specification for 10/100 Mbps

Ethernet and IEEE 802.3z specification for 1000 Mbps Ethernet and

includes Reduced Media Independent Interface (RMII) and Reduced

Gigabit Media Independent Interface (RGMII) interfaces. It adopts an

AHB bus interface and integrates a link list DMA engine with direct

M-Bus accesses for transmitting and receiving packets. It has

independent TX/RX fifos, supports half and full duplex (1000 Mbps mode

only supports full duplex), flow control for full duplex and

backpressure for half duplex.

The FTGMAC100 also implements IP, TCP, UDP checksum offloads and

supports IEEE 802.1Q VLAN tag insertion and removal. It offers

high-priority transmit queue for QoS and CoS applications

This model is backed with a RealTek 8211E PHY which is the chip found

on the AST2500 EVB. It is complete enough to satisfy two different

Linux drivers and a U-Boot driver. Not supported features are :

- IEEE 802.1Q VLAN

- High Priority Transmit Queue

- Wake-On-LAN functions

The code is based on the Coldfire Fast Ethernet Controller model.

Signed-off-by: Cédric Le Goater <clg@kaod.org>

default-configs/arm-softmmu.mak | 1 +

hw/net/Makefile.objs | 1 +

hw/net/ftgmac100.c | 1003 +++++++++++++++++++++++++++++++++++++++

include/hw/net/ftgmac100.h | 60 +++

4 files changed, 1065 insertions(+)

create mode 100644 hw/net/ftgmac100.c

create mode 100644 include/hw/net/ftgmac100.h

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak

--- a/default-configs/arm-softmmu.mak

+++ b/default-configs/arm-softmmu.mak

@@ -XXX,XX +XXX,XX @@ 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

diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/Makefile.objs

+++ b/hw/net/Makefile.objs

@@ -XXX,XX +XXX,XX @@ 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

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/hw/net/ftgmac100.c

@@ -XXX,XX +XXX,XX @@

+/*

+ * Faraday FTGMAC100 Gigabit Ethernet

+ *

+ * Copyright (C) 2016-2017, IBM Corporation.

+ *

+ * Based on Coldfire Fast Ethernet Controller emulation.

+ *

+ * Copyright (c) 2007 CodeSourcery.

+ *

+ * This code is licensed under the GPL version 2 or later. See the

+ * COPYING file in the top-level directory.

+ */

+

+#include "qemu/osdep.h"

+#include "hw/net/ftgmac100.h"

+#include "sysemu/dma.h"

+#include "qemu/log.h"

+#include "net/checksum.h"

+#include "net/eth.h"

+#include "hw/net/mii.h"

+

+/* For crc32 */

+#include <zlib.h>

+

+/*

+ * FTGMAC100 registers

+ */

+#define FTGMAC100_ISR 0x00

+#define FTGMAC100_IER 0x04

+#define FTGMAC100_MAC_MADR 0x08

+#define FTGMAC100_MAC_LADR 0x0c

+#define FTGMAC100_MATH0 0x10

+#define FTGMAC100_MATH1 0x14

+#define FTGMAC100_NPTXPD 0x18

+#define FTGMAC100_RXPD 0x1C

+#define FTGMAC100_NPTXR_BADR 0x20

+#define FTGMAC100_RXR_BADR 0x24

+#define FTGMAC100_HPTXPD 0x28

+#define FTGMAC100_HPTXR_BADR 0x2c

+#define FTGMAC100_ITC 0x30

+#define FTGMAC100_APTC 0x34

+#define FTGMAC100_DBLAC 0x38

+#define FTGMAC100_REVR 0x40

+#define FTGMAC100_FEAR1 0x44

+#define FTGMAC100_RBSR 0x4c

+#define FTGMAC100_TPAFCR 0x48

+

+#define FTGMAC100_MACCR 0x50

+#define FTGMAC100_MACSR 0x54

+#define FTGMAC100_PHYCR 0x60

+#define FTGMAC100_PHYDATA 0x64

+#define FTGMAC100_FCR 0x68

+

+/*

+ * Interrupt status register & interrupt enable register

+ */

+#define FTGMAC100_INT_RPKT_BUF (1 << 0)

+#define FTGMAC100_INT_RPKT_FIFO (1 << 1)

+#define FTGMAC100_INT_NO_RXBUF (1 << 2)

+#define FTGMAC100_INT_RPKT_LOST (1 << 3)

+#define FTGMAC100_INT_XPKT_ETH (1 << 4)

+#define FTGMAC100_INT_XPKT_FIFO (1 << 5)

+#define FTGMAC100_INT_NO_NPTXBUF (1 << 6)

+#define FTGMAC100_INT_XPKT_LOST (1 << 7)

+#define FTGMAC100_INT_AHB_ERR (1 << 8)

+#define FTGMAC100_INT_PHYSTS_CHG (1 << 9)

+#define FTGMAC100_INT_NO_HPTXBUF (1 << 10)

+

+/*

+ * Automatic polling timer control register

+ */

+#define FTGMAC100_APTC_RXPOLL_CNT(x) ((x) & 0xf)

+#define FTGMAC100_APTC_RXPOLL_TIME_SEL (1 << 4)

+#define FTGMAC100_APTC_TXPOLL_CNT(x) (((x) >> 8) & 0xf)

+#define FTGMAC100_APTC_TXPOLL_TIME_SEL (1 << 12)

+

+/*

+ * PHY control register

+ */

+#define FTGMAC100_PHYCR_MIIRD (1 << 26)

+#define FTGMAC100_PHYCR_MIIWR (1 << 27)

+

+#define FTGMAC100_PHYCR_DEV(x) (((x) >> 16) & 0x1f)

+#define FTGMAC100_PHYCR_REG(x) (((x) >> 21) & 0x1f)

+

+/*

+ * PHY data register

+ */

+#define FTGMAC100_PHYDATA_MIIWDATA(x) ((x) & 0xffff)

+#define FTGMAC100_PHYDATA_MIIRDATA(x) (((x) >> 16) & 0xffff)

+

+/*

+ * Feature Register

+ */

+#define FTGMAC100_REVR_NEW_MDIO_INTERFACE (1 << 31)

+

+/*

+ * MAC control register

+ */

+#define FTGMAC100_MACCR_TXDMA_EN (1 << 0)

+#define FTGMAC100_MACCR_RXDMA_EN (1 << 1)

+#define FTGMAC100_MACCR_TXMAC_EN (1 << 2)

+#define FTGMAC100_MACCR_RXMAC_EN (1 << 3)

+#define FTGMAC100_MACCR_RM_VLAN (1 << 4)

+#define FTGMAC100_MACCR_HPTXR_EN (1 << 5)

+#define FTGMAC100_MACCR_LOOP_EN (1 << 6)

+#define FTGMAC100_MACCR_ENRX_IN_HALFTX (1 << 7)

+#define FTGMAC100_MACCR_FULLDUP (1 << 8)

+#define FTGMAC100_MACCR_GIGA_MODE (1 << 9)

+#define FTGMAC100_MACCR_CRC_APD (1 << 10) /* not needed */

+#define FTGMAC100_MACCR_RX_RUNT (1 << 12)

+#define FTGMAC100_MACCR_JUMBO_LF (1 << 13)

+#define FTGMAC100_MACCR_RX_ALL (1 << 14)

+#define FTGMAC100_MACCR_HT_MULTI_EN (1 << 15)

+#define FTGMAC100_MACCR_RX_MULTIPKT (1 << 16)

+#define FTGMAC100_MACCR_RX_BROADPKT (1 << 17)

+#define FTGMAC100_MACCR_DISCARD_CRCERR (1 << 18)

+#define FTGMAC100_MACCR_FAST_MODE (1 << 19)

+#define FTGMAC100_MACCR_SW_RST (1 << 31)

+

+/*

+ * Transmit descriptor

+ */

+#define FTGMAC100_TXDES0_TXBUF_SIZE(x) ((x) & 0x3fff)

+#define FTGMAC100_TXDES0_EDOTR (1 << 15)

+#define FTGMAC100_TXDES0_CRC_ERR (1 << 19)

+#define FTGMAC100_TXDES0_LTS (1 << 28)

+#define FTGMAC100_TXDES0_FTS (1 << 29)

+#define FTGMAC100_TXDES0_TXDMA_OWN (1 << 31)

+

+#define FTGMAC100_TXDES1_VLANTAG_CI(x) ((x) & 0xffff)

+#define FTGMAC100_TXDES1_INS_VLANTAG (1 << 16)

+#define FTGMAC100_TXDES1_TCP_CHKSUM (1 << 17)

+#define FTGMAC100_TXDES1_UDP_CHKSUM (1 << 18)

+#define FTGMAC100_TXDES1_IP_CHKSUM (1 << 19)

+#define FTGMAC100_TXDES1_LLC (1 << 22)

+#define FTGMAC100_TXDES1_TX2FIC (1 << 30)

+#define FTGMAC100_TXDES1_TXIC (1 << 31)

+

+/*

+ * Receive descriptor

+ */

+#define FTGMAC100_RXDES0_VDBC 0x3fff

+#define FTGMAC100_RXDES0_EDORR (1 << 15)

+#define FTGMAC100_RXDES0_MULTICAST (1 << 16)

+#define FTGMAC100_RXDES0_BROADCAST (1 << 17)

+#define FTGMAC100_RXDES0_RX_ERR (1 << 18)

+#define FTGMAC100_RXDES0_CRC_ERR (1 << 19)

+#define FTGMAC100_RXDES0_FTL (1 << 20)

+#define FTGMAC100_RXDES0_RUNT (1 << 21)

+#define FTGMAC100_RXDES0_RX_ODD_NB (1 << 22)

+#define FTGMAC100_RXDES0_FIFO_FULL (1 << 23)

+#define FTGMAC100_RXDES0_PAUSE_OPCODE (1 << 24)

+#define FTGMAC100_RXDES0_PAUSE_FRAME (1 << 25)

+#define FTGMAC100_RXDES0_LRS (1 << 28)

+#define FTGMAC100_RXDES0_FRS (1 << 29)

+#define FTGMAC100_RXDES0_RXPKT_RDY (1 << 31)

+

+#define FTGMAC100_RXDES1_VLANTAG_CI 0xffff

+#define FTGMAC100_RXDES1_PROT_MASK (0x3 << 20)

+#define FTGMAC100_RXDES1_PROT_NONIP (0x0 << 20)

+#define FTGMAC100_RXDES1_PROT_IP (0x1 << 20)

+#define FTGMAC100_RXDES1_PROT_TCPIP (0x2 << 20)

+#define FTGMAC100_RXDES1_PROT_UDPIP (0x3 << 20)

+#define FTGMAC100_RXDES1_LLC (1 << 22)

+#define FTGMAC100_RXDES1_DF (1 << 23)

+#define FTGMAC100_RXDES1_VLANTAG_AVAIL (1 << 24)

+#define FTGMAC100_RXDES1_TCP_CHKSUM_ERR (1 << 25)

+#define FTGMAC100_RXDES1_UDP_CHKSUM_ERR (1 << 26)

+#define FTGMAC100_RXDES1_IP_CHKSUM_ERR (1 << 27)

+

+/*

+ * Receive and transmit Buffer Descriptor

+ */

+typedef struct {

+ uint32_t des0;

+ uint32_t des1;

+ uint32_t des2; /* not used by HW */

+ uint32_t des3;

+} FTGMAC100Desc;

+

+/*

+ * Specific RTL8211E MII Registers

+ */

+#define RTL8211E_MII_PHYCR 16 /* PHY Specific Control */

+#define RTL8211E_MII_PHYSR 17 /* PHY Specific Status */

+#define RTL8211E_MII_INER 18 /* Interrupt Enable */

+#define RTL8211E_MII_INSR 19 /* Interrupt Status */

+#define RTL8211E_MII_RXERC 24 /* Receive Error Counter */

+#define RTL8211E_MII_LDPSR 27 /* Link Down Power Saving */

+#define RTL8211E_MII_EPAGSR 30 /* Extension Page Select */

+#define RTL8211E_MII_PAGSEL 31 /* Page Select */

+

+/*

+ * RTL8211E Interrupt Status

+ */

+#define PHY_INT_AUTONEG_ERROR (1 << 15)

+#define PHY_INT_PAGE_RECV (1 << 12)

+#define PHY_INT_AUTONEG_COMPLETE (1 << 11)

+#define PHY_INT_LINK_STATUS (1 << 10)

+#define PHY_INT_ERROR (1 << 9)

+#define PHY_INT_DOWN (1 << 8)

+#define PHY_INT_JABBER (1 << 0)

+

+/*

+ * Max frame size for the receiving buffer

+ */

+#define FTGMAC100_MAX_FRAME_SIZE 10240

+

+/* Limits depending on the type of the frame

+ *

+ * 9216 for Jumbo frames (+ 4 for VLAN)

+ * 1518 for other frames (+ 4 for VLAN)

+ */

+static int ftgmac100_max_frame_size(FTGMAC100State *s)

+{

+ return (s->maccr & FTGMAC100_MACCR_JUMBO_LF ? 9216 : 1518) + 4;

+}

+

+static void ftgmac100_update_irq(FTGMAC100State *s)

+{

+ qemu_set_irq(s->irq, s->isr & s->ier);

+}

+

+/*

+ * The MII phy could raise a GPIO to the processor which in turn

+ * could be handled as an interrpt by the OS.

+ * For now we don't handle any GPIO/interrupt line, so the OS will

+ * have to poll for the PHY status.

+ */

+static void phy_update_irq(FTGMAC100State *s)

+{

+ ftgmac100_update_irq(s);

+}

+

+static void phy_update_link(FTGMAC100State *s)

+{

+ /* Autonegotiation status mirrors link status. */

+ if (qemu_get_queue(s->nic)->link_down) {

+ s->phy_status &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);

+ s->phy_int |= PHY_INT_DOWN;

+ } else {

+ s->phy_status |= (MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);

+ s->phy_int |= PHY_INT_AUTONEG_COMPLETE;

+ }

+ phy_update_irq(s);

+}

+

+static void ftgmac100_set_link(NetClientState *nc)

+{

+ phy_update_link(FTGMAC100(qemu_get_nic_opaque(nc)));

+}

+

+static void phy_reset(FTGMAC100State *s)

+{

+ s->phy_status = (MII_BMSR_100TX_FD | MII_BMSR_100TX_HD | MII_BMSR_10T_FD |

+ MII_BMSR_10T_HD | MII_BMSR_EXTSTAT | MII_BMSR_MFPS |

+ MII_BMSR_AN_COMP | MII_BMSR_AUTONEG | MII_BMSR_LINK_ST |

+ MII_BMSR_EXTCAP);

+ s->phy_control = (MII_BMCR_AUTOEN | MII_BMCR_FD | MII_BMCR_SPEED1000);

+ s->phy_advertise = (MII_ANAR_PAUSE_ASYM | MII_ANAR_PAUSE | MII_ANAR_TXFD |

+ MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |

+ MII_ANAR_CSMACD);

+ s->phy_int_mask = 0;

+ s->phy_int = 0;

+}

+

+static uint32_t do_phy_read(FTGMAC100State *s, int reg)

+{

+ uint32_t val;

+

+ switch (reg) {

+ case MII_BMCR: /* Basic Control */

+ val = s->phy_control;

+ break;

+ case MII_BMSR: /* Basic Status */

+ val = s->phy_status;

+ break;

+ case MII_PHYID1: /* ID1 */

+ val = RTL8211E_PHYID1;

+ break;

+ case MII_PHYID2: /* ID2 */

+ val = RTL8211E_PHYID2;

+ break;

+ case MII_ANAR: /* Auto-neg advertisement */

+ val = s->phy_advertise;

+ break;

+ case MII_ANLPAR: /* Auto-neg Link Partner Ability */

+ val = (MII_ANLPAR_ACK | MII_ANLPAR_PAUSE | MII_ANLPAR_TXFD |

+ MII_ANLPAR_TX | MII_ANLPAR_10FD | MII_ANLPAR_10 |

+ MII_ANLPAR_CSMACD);

+ break;

+ case MII_ANER: /* Auto-neg Expansion */

+ val = MII_ANER_NWAY;

+ break;

+ case MII_CTRL1000: /* 1000BASE-T control */

+ val = (MII_CTRL1000_HALF | MII_CTRL1000_FULL);

+ break;

+ case MII_STAT1000: /* 1000BASE-T status */

+ val = MII_STAT1000_FULL;

+ break;

+ case RTL8211E_MII_INSR: /* Interrupt status. */

+ val = s->phy_int;

+ s->phy_int = 0;

+ phy_update_irq(s);

+ break;

+ case RTL8211E_MII_INER: /* Interrupt enable */

+ val = s->phy_int_mask;

+ break;

+ case RTL8211E_MII_PHYCR:

+ case RTL8211E_MII_PHYSR:

+ case RTL8211E_MII_RXERC:

+ case RTL8211E_MII_LDPSR:

+ case RTL8211E_MII_EPAGSR:

+ case RTL8211E_MII_PAGSEL:

+ qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",

+ __func__, reg);

+ val = 0;

+ break;

+ default:

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",

+ __func__, reg);

+ val = 0;

+ break;

+ }

+

+ return val;

+}

+

+#define MII_BMCR_MASK (MII_BMCR_LOOPBACK | MII_BMCR_SPEED100 | \

+ MII_BMCR_SPEED | MII_BMCR_AUTOEN | MII_BMCR_PDOWN | \

+ MII_BMCR_FD | MII_BMCR_CTST)

+#define MII_ANAR_MASK 0x2d7f

+

+static void do_phy_write(FTGMAC100State *s, int reg, uint32_t val)

+{

+ switch (reg) {

+ case MII_BMCR: /* Basic Control */

+ if (val & MII_BMCR_RESET) {

+ phy_reset(s);

+ } else {

+ s->phy_control = val & MII_BMCR_MASK;

+ /* Complete autonegotiation immediately. */

+ if (val & MII_BMCR_AUTOEN) {

+ s->phy_status |= MII_BMSR_AN_COMP;

+ }

+ }

+ break;

+ case MII_ANAR: /* Auto-neg advertisement */

+ s->phy_advertise = (val & MII_ANAR_MASK) | MII_ANAR_TX;

+ break;

+ case RTL8211E_MII_INER: /* Interrupt enable */

+ s->phy_int_mask = val & 0xff;

+ phy_update_irq(s);

+ break;

+ case RTL8211E_MII_PHYCR:

+ case RTL8211E_MII_PHYSR:

+ case RTL8211E_MII_RXERC:

+ case RTL8211E_MII_LDPSR:

+ case RTL8211E_MII_EPAGSR:

+ case RTL8211E_MII_PAGSEL:

+ qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",

+ __func__, reg);

+ break;

+ default:

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",

+ __func__, reg);

+ break;

+ }

+}

+

+static int ftgmac100_read_bd(FTGMAC100Desc *bd, dma_addr_t addr)

+{

+ if (dma_memory_read(&address_space_memory, addr, bd, sizeof(*bd))) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read descriptor @ 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ return -1;

+ }

+ bd->des0 = le32_to_cpu(bd->des0);

+ bd->des1 = le32_to_cpu(bd->des1);

+ bd->des2 = le32_to_cpu(bd->des2);

+ bd->des3 = le32_to_cpu(bd->des3);

+ return 0;

+}

+

+static int ftgmac100_write_bd(FTGMAC100Desc *bd, dma_addr_t addr)

+{

+ FTGMAC100Desc lebd;

+

+ lebd.des0 = cpu_to_le32(bd->des0);

+ lebd.des1 = cpu_to_le32(bd->des1);

+ lebd.des2 = cpu_to_le32(bd->des2);

+ lebd.des3 = cpu_to_le32(bd->des3);

+ if (dma_memory_write(&address_space_memory, addr, &lebd, sizeof(lebd))) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to write descriptor @ 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ return -1;

+ }

+ return 0;

+}

+

+static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring,

+ uint32_t tx_descriptor)

+{

+ int frame_size = 0;

+ uint8_t *ptr = s->frame;

+ uint32_t addr = tx_descriptor;

+ uint32_t flags = 0;

+ int max_frame_size = ftgmac100_max_frame_size(s);

+

+ while (1) {

+ FTGMAC100Desc bd;

+ int len;

+

+ if (ftgmac100_read_bd(&bd, addr) ||

+ ((bd.des0 & FTGMAC100_TXDES0_TXDMA_OWN) == 0)) {

+ /* Run out of descriptors to transmit. */

+ s->isr |= FTGMAC100_INT_NO_NPTXBUF;

+ break;

+ }

+

+ /* record transmit flags as they are valid only on the first

+ * segment */

+ if (bd.des0 & FTGMAC100_TXDES0_FTS) {

+ flags = bd.des1;

+ }

+

+ len = bd.des0 & 0x3FFF;

+ if (frame_size + len > max_frame_size) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %d bytes\n",

+ __func__, len);

+ len = max_frame_size - frame_size;

+ }

+

+ if (dma_memory_read(&address_space_memory, bd.des3, ptr, len)) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read packet @ 0x%x\n",

+ __func__, bd.des3);

+ s->isr |= FTGMAC100_INT_NO_NPTXBUF;

+ break;

+ }

+

+ ptr += len;

+ frame_size += len;

+ if (bd.des0 & FTGMAC100_TXDES0_LTS) {

+ if (flags & FTGMAC100_TXDES1_IP_CHKSUM) {

+ net_checksum_calculate(s->frame, frame_size);

+ }

+ /* Last buffer in frame. */

+ qemu_send_packet(qemu_get_queue(s->nic), s->frame, frame_size);

+ ptr = s->frame;

+ frame_size = 0;

+ if (flags & FTGMAC100_TXDES1_TXIC) {

+ s->isr |= FTGMAC100_INT_XPKT_ETH;

+ }

+ }

+

+ if (flags & FTGMAC100_TXDES1_TX2FIC) {

+ s->isr |= FTGMAC100_INT_XPKT_FIFO;

+ }

+ bd.des0 &= ~FTGMAC100_TXDES0_TXDMA_OWN;

+

+ /* Write back the modified descriptor. */

+ ftgmac100_write_bd(&bd, addr);

+ /* Advance to the next descriptor. */

+ if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {

+ addr = tx_ring;

+ } else {

+ addr += sizeof(FTGMAC100Desc);

+ }

+ }

+

+ s->tx_descriptor = addr;

+

+ ftgmac100_update_irq(s);

+}

+

+static int ftgmac100_can_receive(NetClientState *nc)

+{

+ FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));

+ FTGMAC100Desc bd;

+

+ if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))

+ != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {

+ return 0;

+ }

+

+ if (ftgmac100_read_bd(&bd, s->rx_descriptor)) {

+ return 0;

+ }

+ return !(bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY);

+}

+

+/*

+ * This is purely informative. The HW can poll the RW (and RX) ring

+ * buffers for available descriptors but we don't need to trigger a

+ * timer for that in qemu.

+ */

+static uint32_t ftgmac100_rxpoll(FTGMAC100State *s)

+{

+ /* Polling times :

+ *

+ * Speed TIME_SEL=0 TIME_SEL=1

+ *

+ * 10 51.2 ms 819.2 ms

+ * 100 5.12 ms 81.92 ms

+ * 1000 1.024 ms 16.384 ms

+ */

+ static const int div[] = { 20, 200, 1000 };

+

+ uint32_t cnt = 1024 * FTGMAC100_APTC_RXPOLL_CNT(s->aptcr);

+ uint32_t speed = (s->maccr & FTGMAC100_MACCR_FAST_MODE) ? 1 : 0;

+ uint32_t period;

+

+ if (s->aptcr & FTGMAC100_APTC_RXPOLL_TIME_SEL) {

+ cnt <<= 4;

+ }

+

+ if (s->maccr & FTGMAC100_MACCR_GIGA_MODE) {

+ speed = 2;

+ }

+

+ period = cnt / div[speed];

+

+ return period;

+}

+

+static void ftgmac100_reset(DeviceState *d)

+{

+ FTGMAC100State *s = FTGMAC100(d);

+

+ /* Reset the FTGMAC100 */

+ s->isr = 0;

+ s->ier = 0;

+ s->rx_enabled = 0;

+ s->rx_ring = 0;

+ s->rbsr = 0x640;

+ s->rx_descriptor = 0;

+ s->tx_ring = 0;

+ s->tx_descriptor = 0;

+ s->math[0] = 0;

+ s->math[1] = 0;

+ s->itc = 0;

+ s->aptcr = 1;

+ s->dblac = 0x00022f00;

+ s->revr = 0;

+ s->fear1 = 0;

+ s->tpafcr = 0xf1;

+

+ s->maccr = 0;

+ s->phycr = 0;

+ s->phydata = 0;

+ s->fcr = 0x400;

+

+ /* and the PHY */

+ phy_reset(s);

+}

+

+static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size)

+{

+ FTGMAC100State *s = FTGMAC100(opaque);

+

+ switch (addr & 0xff) {

+ case FTGMAC100_ISR:

+ return s->isr;

+ case FTGMAC100_IER:

+ return s->ier;

+ case FTGMAC100_MAC_MADR:

+ return (s->conf.macaddr.a[0] << 8) | s->conf.macaddr.a[1];

+ case FTGMAC100_MAC_LADR:

+ return ((uint32_t) s->conf.macaddr.a[2] << 24) |

+ (s->conf.macaddr.a[3] << 16) | (s->conf.macaddr.a[4] << 8) |

+ s->conf.macaddr.a[5];

+ case FTGMAC100_MATH0:

+ return s->math[0];

+ case FTGMAC100_MATH1:

+ return s->math[1];

+ case FTGMAC100_ITC:

+ return s->itc;

+ case FTGMAC100_DBLAC:

+ return s->dblac;

+ case FTGMAC100_REVR:

+ return s->revr;

+ case FTGMAC100_FEAR1:

+ return s->fear1;

+ case FTGMAC100_TPAFCR:

+ return s->tpafcr;

+ case FTGMAC100_FCR:

+ return s->fcr;

+ case FTGMAC100_MACCR:

+ return s->maccr;

+ case FTGMAC100_PHYCR:

+ return s->phycr;

+ case FTGMAC100_PHYDATA:

+ return s->phydata;

+

+ /* We might want to support these one day */

+ case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */

+ case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */

+ case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */

+ qemu_log_mask(LOG_UNIMP, "%s: read to unimplemented register 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ return 0;

+ default:

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ return 0;

+ }

+}

+

+static void ftgmac100_write(void *opaque, hwaddr addr,

+ uint64_t value, unsigned size)

+{

+ FTGMAC100State *s = FTGMAC100(opaque);

+ int reg;

+

+ switch (addr & 0xff) {

+ case FTGMAC100_ISR: /* Interrupt status */

+ s->isr &= ~value;

+ break;

+ case FTGMAC100_IER: /* Interrupt control */

+ s->ier = value;

+ break;

+ case FTGMAC100_MAC_MADR: /* MAC */

+ s->conf.macaddr.a[0] = value >> 8;

+ s->conf.macaddr.a[1] = value;

+ break;

+ case FTGMAC100_MAC_LADR:

+ s->conf.macaddr.a[2] = value >> 24;

+ s->conf.macaddr.a[3] = value >> 16;

+ s->conf.macaddr.a[4] = value >> 8;

+ s->conf.macaddr.a[5] = value;

+ break;

+ case FTGMAC100_MATH0: /* Multicast Address Hash Table 0 */

+ s->math[0] = value;

+ break;

+ case FTGMAC100_MATH1: /* Multicast Address Hash Table 1 */

+ s->math[1] = value;

+ break;

+ case FTGMAC100_ITC: /* TODO: Interrupt Timer Control */

+ s->itc = value;

+ break;

+ case FTGMAC100_RXR_BADR: /* Ring buffer address */

+ s->rx_ring = value;

+ s->rx_descriptor = s->rx_ring;

+ break;

+

+ case FTGMAC100_RBSR: /* DMA buffer size */

+ s->rbsr = value;

+ break;

+

+ case FTGMAC100_NPTXR_BADR: /* Transmit buffer address */

+ s->tx_ring = value;

+ s->tx_descriptor = s->tx_ring;

+ break;

+

+ case FTGMAC100_NPTXPD: /* Trigger transmit */

+ if ((s->maccr & (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN))

+ == (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN)) {

+ /* TODO: high priority tx ring */

+ ftgmac100_do_tx(s, s->tx_ring, s->tx_descriptor);

+ }

+ if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {

+ qemu_flush_queued_packets(qemu_get_queue(s->nic));

+ }

+ break;

+

+ case FTGMAC100_RXPD: /* Receive Poll Demand Register */

+ if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {

+ qemu_flush_queued_packets(qemu_get_queue(s->nic));

+ }

+ break;

+

+ case FTGMAC100_APTC: /* Automatic polling */

+ s->aptcr = value;

+

+ if (FTGMAC100_APTC_RXPOLL_CNT(s->aptcr)) {

+ ftgmac100_rxpoll(s);

+ }

+

+ if (FTGMAC100_APTC_TXPOLL_CNT(s->aptcr)) {

+ qemu_log_mask(LOG_UNIMP, "%s: no transmit polling\n", __func__);

+ }

+ break;

+

+ case FTGMAC100_MACCR: /* MAC Device control */

+ s->maccr = value;

+ if (value & FTGMAC100_MACCR_SW_RST) {

+ ftgmac100_reset(DEVICE(s));

+ }

+

+ if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {

+ qemu_flush_queued_packets(qemu_get_queue(s->nic));

+ }

+ break;

+

+ case FTGMAC100_PHYCR: /* PHY Device control */

+ reg = FTGMAC100_PHYCR_REG(value);

+ s->phycr = value;

+ if (value & FTGMAC100_PHYCR_MIIWR) {

+ do_phy_write(s, reg, s->phydata & 0xffff);

+ s->phycr &= ~FTGMAC100_PHYCR_MIIWR;

+ } else {

+ s->phydata = do_phy_read(s, reg) << 16;

+ s->phycr &= ~FTGMAC100_PHYCR_MIIRD;

+ }

+ break;

+ case FTGMAC100_PHYDATA:

+ s->phydata = value & 0xffff;

+ break;

+ case FTGMAC100_DBLAC: /* DMA Burst Length and Arbitration Control */

+ s->dblac = value;

+ break;

+ case FTGMAC100_REVR: /* Feature Register */

+ /* TODO: Only Old MDIO interface is supported */

+ s->revr = value & ~FTGMAC100_REVR_NEW_MDIO_INTERFACE;

+ break;

+ case FTGMAC100_FEAR1: /* Feature Register 1 */

+ s->fear1 = value;

+ break;

+ case FTGMAC100_TPAFCR: /* Transmit Priority Arbitration and FIFO Control */

+ s->tpafcr = value;

+ break;

+ case FTGMAC100_FCR: /* Flow Control */

+ s->fcr = value;

+ break;

+

+ case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */

+ case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */

+ case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */

+ qemu_log_mask(LOG_UNIMP, "%s: write to unimplemented register 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ break;

+ default:

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"

+ HWADDR_PRIx "\n", __func__, addr);

+ break;

+ }

+

+ ftgmac100_update_irq(s);

+}

+

+static int ftgmac100_filter(FTGMAC100State *s, const uint8_t *buf, size_t len)

+{

+ unsigned mcast_idx;

+

+ if (s->maccr & FTGMAC100_MACCR_RX_ALL) {

+ return 1;

+ }

+

+ switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {

+ case ETH_PKT_BCAST:

+ if (!(s->maccr & FTGMAC100_MACCR_RX_BROADPKT)) {

+ return 0;

+ }

+ break;

+ case ETH_PKT_MCAST:

+ if (!(s->maccr & FTGMAC100_MACCR_RX_MULTIPKT)) {

+ if (!(s->maccr & FTGMAC100_MACCR_HT_MULTI_EN)) {

+ return 0;

+ }

+

+ /* TODO: this does not seem to work for ftgmac100 */

+ mcast_idx = compute_mcast_idx(buf);

+ if (!(s->math[mcast_idx / 32] & (1 << (mcast_idx % 32)))) {

+ return 0;

+ }

+ }

+ break;

+ case ETH_PKT_UCAST:

+ if (memcmp(s->conf.macaddr.a, buf, 6)) {

+ return 0;

+ }

+ break;

+ }

+

+ return 1;

+}

+

+static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,

+ size_t len)

+{

+ FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));

+ FTGMAC100Desc bd;

+ uint32_t flags = 0;

+ uint32_t addr;

+ uint32_t crc;

+ uint32_t buf_addr;

+ uint8_t *crc_ptr;

+ uint32_t buf_len;

+ size_t size = len;

+ uint32_t first = FTGMAC100_RXDES0_FRS;

+ int max_frame_size = ftgmac100_max_frame_size(s);

+

+ if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))

+ != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {

+ return -1;

+ }

+

+ /* TODO : Pad to minimum Ethernet frame length */

+ /* handle small packets. */

+ if (size < 10) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped frame of %zd bytes\n",

+ __func__, size);

+ return size;

+ }

+

+ if (size < 64 && !(s->maccr && FTGMAC100_MACCR_RX_RUNT)) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped runt frame of %zd bytes\n",

+ __func__, size);

+ return size;

+ }

+

+ if (!ftgmac100_filter(s, buf, size)) {

+ return size;

+ }

+

+ /* 4 bytes for the CRC. */

+ size += 4;

+ crc = cpu_to_be32(crc32(~0, buf, size));

+ crc_ptr = (uint8_t *) &crc;

+

+ /* Huge frames are truncated. */

+ if (size > max_frame_size) {

+ size = max_frame_size;

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %zd bytes\n",

+ __func__, size);

+ flags |= FTGMAC100_RXDES0_FTL;

+ }

+

+ switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {

+ case ETH_PKT_BCAST:

+ flags |= FTGMAC100_RXDES0_BROADCAST;

+ break;

+ case ETH_PKT_MCAST:

+ flags |= FTGMAC100_RXDES0_MULTICAST;

+ break;

+ case ETH_PKT_UCAST:

+ break;

+ }

+

+ addr = s->rx_descriptor;

+ while (size > 0) {

+ if (!ftgmac100_can_receive(nc)) {

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Unexpected packet\n", __func__);

+ if (ftgmac100_read_bd(&bd, addr) ||

+ (bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY)) {

+ /* No descriptors available. Bail out. */

+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Lost end of frame\n",

+ __func__);

+ s->isr |= FTGMAC100_INT_NO_RXBUF;

+ break;

+ }

+ buf_len = (size <= s->rbsr) ? size : s->rbsr;

+ bd.des0 |= buf_len & 0x3fff;

+ size -= buf_len;

+

+ /* The last 4 bytes are the CRC. */

+ if (size < 4) {

+ buf_len += size - 4;

+ }

+ buf_addr = bd.des3;

+ dma_memory_write(&address_space_memory, buf_addr, buf, buf_len);

+ buf += buf_len;

+ if (size < 4) {

+ dma_memory_write(&address_space_memory, buf_addr + buf_len,

+ crc_ptr, 4 - size);

+ crc_ptr += 4 - size;

+ }

+

+ bd.des0 |= first | FTGMAC100_RXDES0_RXPKT_RDY;

+ first = 0;

+ if (size == 0) {

+ /* Last buffer in frame. */

+ bd.des0 |= flags | FTGMAC100_RXDES0_LRS;

+ s->isr |= FTGMAC100_INT_RPKT_BUF;

+ } else {

+ s->isr |= FTGMAC100_INT_RPKT_FIFO;

+ }

+ ftgmac100_write_bd(&bd, addr);

+ if (bd.des0 & FTGMAC100_RXDES0_EDORR) {

+ addr = s->rx_ring;

+ } else {

+ addr += sizeof(FTGMAC100Desc);

+ }

+ s->rx_descriptor = addr;

+

+ ftgmac100_update_irq(s);

+ return len;

+}

+

+static const MemoryRegionOps ftgmac100_ops = {

+ .read = ftgmac100_read,

+ .write = ftgmac100_write,

+ .valid.min_access_size = 4,

+ .valid.max_access_size = 4,

+ .endianness = DEVICE_LITTLE_ENDIAN,

+};

+

+static void ftgmac100_cleanup(NetClientState *nc)

+{

+ FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));

+

+ s->nic = NULL;

+}

+

+static NetClientInfo net_ftgmac100_info = {

+ .type = NET_CLIENT_DRIVER_NIC,

+ .size = sizeof(NICState),

+ .can_receive = ftgmac100_can_receive,

+ .receive = ftgmac100_receive,

+ .cleanup = ftgmac100_cleanup,

+ .link_status_changed = ftgmac100_set_link,

+};

+

+static void ftgmac100_realize(DeviceState *dev, Error **errp)

+{

+ FTGMAC100State *s = FTGMAC100(dev);

+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

+

+ memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,

+ TYPE_FTGMAC100, 0x2000);

+ sysbus_init_mmio(sbd, &s->iomem);

+ sysbus_init_irq(sbd, &s->irq);

+ qemu_macaddr_default_if_unset(&s->conf.macaddr);

+

+ s->conf.peers.ncs[0] = nd_table[0].netdev;

+

+ s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,

+ object_get_typename(OBJECT(dev)), DEVICE(dev)->id,

+ s);

+ qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);

+

+ s->frame = g_malloc(FTGMAC100_MAX_FRAME_SIZE);

+}

+

+static const VMStateDescription vmstate_ftgmac100 = {

+ .name = TYPE_FTGMAC100,

+ .version_id = 1,

+ .minimum_version_id = 1,

+ .fields = (VMStateField[]) {

+ VMSTATE_UINT32(irq_state, FTGMAC100State),

+ VMSTATE_UINT32(isr, FTGMAC100State),

+ VMSTATE_UINT32(ier, FTGMAC100State),

+ VMSTATE_UINT32(rx_enabled, FTGMAC100State),

+ VMSTATE_UINT32(rx_ring, FTGMAC100State),

+ VMSTATE_UINT32(rbsr, FTGMAC100State),

+ VMSTATE_UINT32(tx_ring, FTGMAC100State),

+ VMSTATE_UINT32(rx_descriptor, FTGMAC100State),

+ VMSTATE_UINT32(tx_descriptor, FTGMAC100State),

+ VMSTATE_UINT32_ARRAY(math, FTGMAC100State, 2),

+ VMSTATE_UINT32(itc, FTGMAC100State),

+ VMSTATE_UINT32(aptcr, FTGMAC100State),

+ VMSTATE_UINT32(dblac, FTGMAC100State),

+ VMSTATE_UINT32(revr, FTGMAC100State),

+ VMSTATE_UINT32(fear1, FTGMAC100State),

+ VMSTATE_UINT32(tpafcr, FTGMAC100State),

+ VMSTATE_UINT32(maccr, FTGMAC100State),

+ VMSTATE_UINT32(phycr, FTGMAC100State),

+ VMSTATE_UINT32(phydata, FTGMAC100State),

+ VMSTATE_UINT32(fcr, FTGMAC100State),

+ VMSTATE_UINT32(phy_status, FTGMAC100State),

+ VMSTATE_UINT32(phy_control, FTGMAC100State),

+ VMSTATE_UINT32(phy_advertise, FTGMAC100State),

+ VMSTATE_UINT32(phy_int, FTGMAC100State),

+ VMSTATE_UINT32(phy_int_mask, FTGMAC100State),

+ VMSTATE_END_OF_LIST()

+ }

+};

+

+static Property ftgmac100_properties[] = {

+ DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),

+ DEFINE_PROP_END_OF_LIST(),

+};

+

+static void ftgmac100_class_init(ObjectClass *klass, void *data)

+{

+ DeviceClass *dc = DEVICE_CLASS(klass);

+

+ dc->vmsd = &vmstate_ftgmac100;

+ dc->reset = ftgmac100_reset;

+ dc->props = ftgmac100_properties;

+ set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);

+ dc->realize = ftgmac100_realize;

+ dc->desc = "Faraday FTGMAC100 Gigabit Ethernet emulation";

+}

+

+static const TypeInfo ftgmac100_info = {

+ .name = TYPE_FTGMAC100,

+ .parent = TYPE_SYS_BUS_DEVICE,

+ .instance_size = sizeof(FTGMAC100State),

+ .class_init = ftgmac100_class_init,

+};

+

+static void ftgmac100_register_types(void)

+{

+ type_register_static(&ftgmac100_info);

+}

+

+type_init(ftgmac100_register_types)

diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/include/hw/net/ftgmac100.h

@@ -XXX,XX +XXX,XX @@

+/*

+ * Faraday FTGMAC100 Gigabit Ethernet

+ *

+ * Copyright (C) 2016-2017, IBM Corporation.

+ *

+ * This code is licensed under the GPL version 2 or later. See the

+ * COPYING file in the top-level directory.

+ */

+

+#ifndef FTGMAC100_H

+#define FTGMAC100_H

+

+#define TYPE_FTGMAC100 "ftgmac100"

+#define FTGMAC100(obj) OBJECT_CHECK(FTGMAC100State, (obj), TYPE_FTGMAC100)

+

+#include "hw/sysbus.h"

+#include "net/net.h"

+

+typedef struct FTGMAC100State {

+ /*< private >*/

+ SysBusDevice parent_obj;

+

+ /*< public >*/

+ NICState *nic;

+ NICConf conf;

+ qemu_irq irq;

+ MemoryRegion iomem;

+

+ uint8_t *frame;

+

+ uint32_t irq_state;

+ uint32_t isr;

+ uint32_t ier;

+ uint32_t rx_enabled;

+ uint32_t rx_ring;

+ uint32_t rx_descriptor;

+ uint32_t tx_ring;

+ uint32_t tx_descriptor;

+ uint32_t math[2];

+ uint32_t rbsr;

+ uint32_t itc;

+ uint32_t aptcr;

+ uint32_t dblac;

+ uint32_t revr;

+ uint32_t fear1;

+ uint32_t tpafcr;

+ uint32_t maccr;

+ uint32_t phycr;

+ uint32_t phydata;

+ uint32_t fcr;

+

+

+ uint32_t phy_status;

+ uint32_t phy_control;

+ uint32_t phy_advertise;

+ uint32_t phy_int;

+ uint32_t phy_int_mask;

+} FTGMAC100State;

+

+#endif

2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

In this patch we support packet that have tcp options field.

Add tcp options field check, If the packet have options

field we just skip it and compare tcp payload,

Avoid unnecessary checkpoint, optimize performance.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

net/colo-compare.c | 27 ++++++++++++++++++++++++++-

1 file changed, 26 insertions(+), 1 deletion(-)