From nobody Sat May 18 21:00:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586258375; cv=none; d=zohomail.com; s=zohoarc; b=H0HBNk9RZRhoTdG7ey9dVzzhpRUTCPK1I/97RJUYWAhg4EJpXYWQriUVyGBu06P90jEQ8ogSNrdToMsHgpN1DoYa4CgH9j/U7ISm9eJG1J6iFASbpN/vR7aPuKkCUlI3URb3KOszniXiTXIVgHqiwcVWXrvOwozmDPzCx8A4OOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586258375; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=N19ox6n2hP/Cd//RXKwtO3ERR4qrjvGMwYIwl0Ou7Sk=; b=VFaM8ZDx0Uct+NeHZixH1ME1E01cMOpssr/JsHz1giayI2c4vopVdpOZH1yJR7grcaDDwVRm+IluMZIYYm3/j1WEHHiQMSDL8A4MLvww35k2E2w1HWqksNmgNmpRz+5Md94AN738SQfd0Hd9tyuMRduiGLx5QQLOSXkPEX/oesM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586258375933411.79138347178593; Tue, 7 Apr 2020 04:19:35 -0700 (PDT) Received: from localhost ([::1]:45434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmGU-0004aU-LZ for importer@patchew.org; Tue, 07 Apr 2020 07:19:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50621) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmFW-00038n-F7 for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLmFT-0002Jw-6m for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:34 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:38084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLmFR-0002Il-EN; Tue, 07 Apr 2020 07:18:31 -0400 Received: by mail-pj1-x102f.google.com with SMTP id m15so620757pje.3; Tue, 07 Apr 2020 04:18:28 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s137sm14357855pfs.45.2020.04.07.04.18.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 04:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N19ox6n2hP/Cd//RXKwtO3ERR4qrjvGMwYIwl0Ou7Sk=; b=nPV4/Y4Qdq0xfR8LB3PIfqLDS6Yj9vSq5kvdNunUO4iBlEeVjueZZ6zWPoM5M4VIv9 7ZYSIsb9aLCxFPcSdUIm1yk1KR+EXHWCdAXqdzRnb2F5ytDMtUioEU9l3BdEKOKmuwlY SdZuBB3X2EmiKjfxwuFDi0WBP/CFy+8zpYgOQ4oXJpDKME97d6F+PumqaYUf/CA5fPUG mhiSHoc86vl+cVlkQP8mkjGP7T3t34hHtuQf55SQVVNcgFraoTuCUYU3g56VvEA/wtrp XYCKG8BocQPepwcDTacwn8D10RS+imcPeuN+8aVnnFfGyF8hV5z0hfQicjXE5QPyL0Y5 h4Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N19ox6n2hP/Cd//RXKwtO3ERR4qrjvGMwYIwl0Ou7Sk=; b=h8JHdM5u0Gzd+5h4LhvTle6rS+vsdRwydcAh8+prFBKHahh1Fjjr1cIIcMxUtfKdcD ho3m05+sdKtcpH2EKTqFXILj8Qw4MoIZ/lom525rdlqCC1F2dfM7UQQnFQWWjMld16Lc /G5wl4YFu8pL7VEeudQdC61NFRP+02OKCHRSIviv+pkpe1B6uhOuxTV6f1mJ2e1x78hX 3VU4X3DAvG9Re3Gwwa7K3sl2nd4xgLua2gyKO2Wltu5ixTnSRFZZ3j15OJa4aUvrYoa0 cdK0ihljoekGEgWTNZoYYJQZOyrErZ7oFPsqiyuEjSIFm+SqHqo0ncvVOccXwwacLz8n 7eFw== X-Gm-Message-State: AGi0PualOLMeZvNAmoUuZ8mIRt6+/i881Qpjn9HVarNYp029VEMxwZsX ZEhWEWoip9ydU59cY7a0taQ4FliI X-Google-Smtp-Source: APiQypK4B0u+gTlC+Jnt1vkpqJc8D+yoYYAAcCsPJYQ45F32P48QJOWQjRvkh6gU2kn00kQ5UBVp/A== X-Received: by 2002:a17:90a:21ce:: with SMTP id q72mr2150906pjc.160.1586258307523; Tue, 07 Apr 2020 04:18:27 -0700 (PDT) From: sundeep.lkml@gmail.com To: jasowang@redhat.com, peter.maydell@linaro.org, philmd@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: [Qemu devel PATCH v3 1/3] hw/net: Add Smartfusion2 emac block Date: Tue, 7 Apr 2020 16:45:32 +0530 Message-Id: <1586258134-6932-2-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> References: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::102f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Subbaraya Sundeep Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Subbaraya Sundeep Modelled Ethernet MAC of Smartfusion2 SoC. Micrel KSZ8051 PHY is present on Emcraft's SOM kit hence same PHY is emulated. Signed-off-by: Subbaraya Sundeep --- MAINTAINERS | 2 + hw/net/Makefile.objs | 1 + hw/net/msf2-emac.c | 556 +++++++++++++++++++++++++++++++++++++++++= ++++ include/hw/net/msf2-emac.h | 50 ++++ 4 files changed, 609 insertions(+) create mode 100644 hw/net/msf2-emac.c create mode 100644 include/hw/net/msf2-emac.h diff --git a/MAINTAINERS b/MAINTAINERS index 9d156d7..6a103f2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -918,6 +918,8 @@ F: include/hw/arm/msf2-soc.h F: include/hw/misc/msf2-sysreg.h F: include/hw/timer/mss-timer.h F: include/hw/ssi/mss-spi.h +F: hw/net/msf2-emac.c +F: include/hw/net/msf2-emac.h =20 Emcraft M2S-FG484 M: Subbaraya Sundeep diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index af4d194..f2b7398 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -55,3 +55,4 @@ common-obj-$(CONFIG_ROCKER) +=3D rocker/rocker.o rocker/r= ocker_fp.o \ obj-$(call lnot,$(CONFIG_ROCKER)) +=3D rocker/qmp-norocker.o =20 common-obj-$(CONFIG_CAN_BUS) +=3D can/ +common-obj-$(CONFIG_MSF2) +=3D msf2-emac.o diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c new file mode 100644 index 0000000..cb80e19 --- /dev/null +++ b/hw/net/msf2-emac.c @@ -0,0 +1,556 @@ +/* + * QEMU model of the Smartfusion2 Ethernet MAC. + * + * Copyright (c) 2020 Subbaraya Sundeep . + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + * + * Refer to section Ethernet MAC in the document: + * UG0331: SmartFusion2 Microcontroller Subsystem User Guide + * Datasheet URL: + * https://www.microsemi.com/document-portal/cat_view/56661-internal-docum= ents/ + * 56758-soc?lang=3Den&limit=3D20&limitstart=3D220 + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qemu/log.h" +#include "exec/address-spaces.h" +#include "hw/registerfields.h" +#include "hw/net/msf2-emac.h" +#include "hw/net/mii.h" +#include "hw/irq.h" +#include "net/net.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" + +REG32(CFG1, 0x0) +REG32(CFG2, 0x4) +REG32(IFG, 0x8) +REG32(HALF_DUPLEX, 0xc) +REG32(FRM_LEN, 0x10) +REG32(MII_CMD, 0x24) +REG32(MII_ADDR, 0x28) +REG32(MII_CTL, 0x2c) +REG32(MII_STS, 0x30) +REG32(STA1, 0x40) +REG32(STA2, 0x44) +REG32(FIFO_CFG0, 0x48) +REG32(DMA_TX_CTL, 0x180) +REG32(DMA_TX_DESC, 0x184) +REG32(DMA_TX_STATUS, 0x188) +REG32(DMA_RX_CTL, 0x18c) +REG32(DMA_RX_DESC, 0x190) +REG32(DMA_RX_STATUS, 0x194) +REG32(DMA_IRQ_MASK, 0x198) +REG32(DMA_IRQ, 0x19c) + +FIELD(DMA, PKTCNT, 16, 8) + +#define R_DMA_PKT_TXRX (1 << 0) +#define DMA_TX_UNDERRUN (1 << 1) +#define DMA_RX_OVERFLOW (1 << 2) + +#define EMPTY_MASK (1 << 31) +#define PKT_SIZE 0x7FF + +#define CFG1_RESET (1 << 31) +#define CFG1_RX_EN (1 << 2) +#define CFG1_TX_EN (1 << 0) + +#define DMA_TX_CTL_EN (1 << 0) +#define DMA_RX_CTL_EN (1 << 0) + +#define MII_CMD_READ (1 << 0) + +#define PHYADDR 0x1 +#define MII_ADDR_MASK 0x1F +#define PHY_ADDR_SHIFT 8 +#define MAX_PKT_SIZE 2048 + +typedef struct { + uint32_t pktaddr; + uint32_t pktsize; + uint32_t next; +} EmacDesc; + +static uint32_t emac_get_isr(MSF2EmacState *s) +{ + uint32_t ier =3D s->regs[R_DMA_IRQ_MASK]; + uint32_t tx =3D s->regs[R_DMA_TX_STATUS] & 0xF; + uint32_t rx =3D s->regs[R_DMA_RX_STATUS] & 0xF; + uint32_t isr =3D (rx << 4) | tx; + + s->regs[R_DMA_IRQ] =3D ier & isr; + return s->regs[R_DMA_IRQ]; +} + +static void emac_update_irq(MSF2EmacState *s) +{ + bool intr =3D emac_get_isr(s); + + qemu_set_irq(s->irq, intr); +} + +static void emac_load_desc(MSF2EmacState *s, EmacDesc *d, hwaddr desc) +{ + address_space_read(&s->dma_as, desc, MEMTXATTRS_UNSPECIFIED, + (uint8_t *)d, sizeof *d); + /* Convert from LE into host endianness. */ + d->pktaddr =3D le32_to_cpu(d->pktaddr); + d->pktsize =3D le32_to_cpu(d->pktsize); + d->next =3D le32_to_cpu(d->next); +} + +static void emac_store_desc(MSF2EmacState *s, EmacDesc *d, hwaddr desc) +{ + /* Convert from host endianness into LE. */ + d->pktaddr =3D cpu_to_le32(d->pktaddr); + d->pktsize =3D cpu_to_le32(d->pktsize); + d->next =3D cpu_to_le32(d->next); + + address_space_write(&s->dma_as, desc, MEMTXATTRS_UNSPECIFIED, + (uint8_t *)d, sizeof *d); +} + +static void msf2_dma_tx(MSF2EmacState *s) +{ + hwaddr desc =3D s->regs[R_DMA_TX_DESC]; + uint8_t buf[MAX_PKT_SIZE]; + EmacDesc d; + int size; + uint8_t pktcnt; + uint32_t status; + + if (!(s->regs[R_CFG1] & CFG1_TX_EN)) { + return; + } + + while (1) { + emac_load_desc(s, &d, desc); + if (d.pktsize & EMPTY_MASK) { + break; + } + size =3D d.pktsize & PKT_SIZE; + address_space_read(&s->dma_as, d.pktaddr, MEMTXATTRS_UNSPECIFIED, + buf, size); + /* + * This is very basic way to send packets. Ideally there should be + * a FIFO and packets should be sent out from FIFO only when + * R_CFG1 bit 0 is set. + */ + qemu_send_packet(qemu_get_queue(s->nic), buf, size); + d.pktsize |=3D EMPTY_MASK; + emac_store_desc(s, &d, desc); + /* update sent packets count */ + status =3D s->regs[R_DMA_TX_STATUS]; + pktcnt =3D extract32(status, R_DMA_PKTCNT_SHIFT, 8); + pktcnt++; + s->regs[R_DMA_TX_STATUS] =3D deposit32(status, R_DMA_PKTCNT_SHIFT, + 8, pktcnt); + s->regs[R_DMA_TX_STATUS] |=3D R_DMA_PKT_TXRX; + desc =3D d.next; + } + s->regs[R_DMA_TX_STATUS] |=3D DMA_TX_UNDERRUN; + s->regs[R_DMA_TX_CTL] &=3D ~DMA_TX_CTL_EN; +} + +static void msf2_phy_update_link(MSF2EmacState *s) +{ + /* Autonegotiation status mirrors link status. */ + if (qemu_get_queue(s->nic)->link_down) { + s->phy_regs[MII_BMSR] &=3D ~(MII_BMSR_AN_COMP | + MII_BMSR_LINK_ST); + } else { + s->phy_regs[MII_BMSR] |=3D (MII_BMSR_AN_COMP | + MII_BMSR_LINK_ST); + } +} + +static void msf2_phy_reset(MSF2EmacState *s) +{ + memset(&s->phy_regs[0], 0, sizeof(s->phy_regs)); + s->phy_regs[MII_BMCR] =3D 0x1140; + s->phy_regs[MII_BMSR] =3D 0x7968; + s->phy_regs[MII_PHYID1] =3D 0x0022; + s->phy_regs[MII_PHYID2] =3D 0x1550; + s->phy_regs[MII_ANAR] =3D 0x01E1; + s->phy_regs[MII_ANLPAR] =3D 0xCDE1; + + msf2_phy_update_link(s); +} + +static void write_to_phy(MSF2EmacState *s) +{ + uint8_t reg_addr =3D s->regs[R_MII_ADDR] & MII_ADDR_MASK; + uint8_t phy_addr =3D (s->regs[R_MII_ADDR] >> PHY_ADDR_SHIFT) & MII_ADD= R_MASK; + uint16_t data =3D s->regs[R_MII_CTL] & 0xFFFF; + + if (phy_addr !=3D PHYADDR) { + return; + } + + switch (reg_addr) { + case MII_BMCR: + if (data & MII_BMCR_RESET) { + /* Phy reset */ + msf2_phy_reset(s); + data &=3D ~MII_BMCR_RESET; + } + if (data & MII_BMCR_AUTOEN) { + /* Complete autonegotiation immediately */ + data &=3D ~MII_BMCR_AUTOEN; + s->phy_regs[MII_BMSR] |=3D MII_BMSR_AN_COMP; + } + break; + } + + s->phy_regs[reg_addr] =3D data; +} + +static uint16_t read_from_phy(MSF2EmacState *s) +{ + uint8_t reg_addr =3D s->regs[R_MII_ADDR] & MII_ADDR_MASK; + uint8_t phy_addr =3D (s->regs[R_MII_ADDR] >> PHY_ADDR_SHIFT) & MII_ADD= R_MASK; + + if (phy_addr =3D=3D PHYADDR) { + return s->phy_regs[reg_addr]; + } else { + return 0xFFFF; + } +} + +static void msf2_emac_do_reset(MSF2EmacState *s) +{ + memset(&s->regs[0], 0, sizeof(s->regs)); + s->regs[R_CFG1] =3D 0x80000000; + s->regs[R_CFG2] =3D 0x00007000; + s->regs[R_IFG] =3D 0x40605060; + s->regs[R_HALF_DUPLEX] =3D 0x00A1F037; + s->regs[R_FRM_LEN] =3D 0x00000600; + + msf2_phy_reset(s); +} + +static uint64_t emac_read(void *opaque, hwaddr addr, unsigned int size) +{ + MSF2EmacState *s =3D opaque; + uint32_t r =3D 0; + + addr >>=3D 2; + + switch (addr) { + case R_DMA_IRQ: + r =3D emac_get_isr(s); + break; + default: + if (addr < ARRAY_SIZE(s->regs)) { + r =3D s->regs[addr]; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad offset 0x%" HWADDR_PRIx "\n", __func__, + addr * 4); + return r; + } + break; + } + return r; +} + +static void emac_write(void *opaque, hwaddr addr, uint64_t val64, + unsigned int size) +{ + MSF2EmacState *s =3D opaque; + uint32_t value =3D val64; + uint32_t enreqbits; + uint8_t pktcnt; + + addr >>=3D 2; + switch (addr) { + case R_DMA_TX_CTL: + s->regs[addr] =3D value; + if (value & DMA_TX_CTL_EN) { + msf2_dma_tx(s); + } + break; + case R_DMA_RX_CTL: + s->regs[addr] =3D value; + if (value & DMA_RX_CTL_EN) { + s->rx_desc =3D s->regs[R_DMA_RX_DESC]; + qemu_flush_queued_packets(qemu_get_queue(s->nic)); + } + break; + case R_CFG1: + if (value & CFG1_RESET) { + msf2_emac_do_reset(s); + } + case R_FIFO_CFG0: + /* + * For our implementation, turning on modules is instantaneous, + * so the states requested via the *ENREQ bits appear in the + * *ENRPLY bits immediately. Also the reset bits to reset PE-MCXMAC + * module are not emulated here since it deals with start of frames, + * inter-packet gap and control frames. + */ + enreqbits =3D extract32(value, 8, 5); + value =3D deposit32(value, 16, 5, enreqbits); + s->regs[addr] =3D value; + break; + case R_DMA_TX_DESC: + if (value & 0x3) { + qemu_log_mask(LOG_GUEST_ERROR, "Tx Descriptor address should b= e" + " 32 bit aligned\n"); + } + /* Ignore [1:0] bits */ + s->regs[addr] =3D value & 0xFFFFFFFC; + break; + case R_DMA_RX_DESC: + if (value & 0x3) { + qemu_log_mask(LOG_GUEST_ERROR, "Rx Descriptor address should b= e" + " 32 bit aligned\n"); + } + /* Ignore [1:0] bits */ + s->regs[addr] =3D value & 0xFFFFFFFC; + break; + case R_DMA_TX_STATUS: + if (value & DMA_TX_UNDERRUN) { + s->regs[addr] &=3D ~DMA_TX_UNDERRUN; + } + if (value & R_DMA_PKT_TXRX) { + pktcnt =3D extract32(s->regs[addr], R_DMA_PKTCNT_SHIFT, + R_DMA_PKTCNT_LENGTH); + pktcnt--; + s->regs[addr] =3D deposit32(s->regs[addr], R_DMA_PKTCNT_SHIFT, + 8, pktcnt); + if (pktcnt =3D=3D 0) { + s->regs[addr] &=3D ~R_DMA_PKT_TXRX; + } + } + break; + case R_DMA_RX_STATUS: + if (value & DMA_RX_OVERFLOW) { + s->regs[addr] &=3D ~DMA_RX_OVERFLOW; + } + if (value & R_DMA_PKT_TXRX) { + pktcnt =3D extract32(s->regs[addr], R_DMA_PKTCNT_SHIFT, + R_DMA_PKTCNT_LENGTH); + pktcnt--; + s->regs[addr] =3D deposit32(s->regs[addr], R_DMA_PKTCNT_SHIFT, + 8, pktcnt); + if (pktcnt =3D=3D 0) { + s->regs[addr] &=3D ~R_DMA_PKT_TXRX; + } + } + break; + case R_DMA_IRQ: + break; + case R_MII_CMD: + if (value & MII_CMD_READ) { + s->regs[R_MII_STS] =3D read_from_phy(s); + } + break; + case R_MII_CTL: + s->regs[addr] =3D value; + write_to_phy(s); + break; + default: + if (addr < ARRAY_SIZE(s->regs)) { + s->regs[addr] =3D value; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad offset 0x%" HWADDR_PRIx "\n", __func__, + addr * 4); + return; + } + break; + } + emac_update_irq(s); +} + +static const MemoryRegionOps emac_ops =3D { + .read =3D emac_read, + .write =3D emac_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + } +}; + +static bool emac_can_rx(NetClientState *nc) +{ + MSF2EmacState *s =3D qemu_get_nic_opaque(nc); + + return (s->regs[R_CFG1] & CFG1_RX_EN) && + (s->regs[R_DMA_RX_CTL] & DMA_RX_CTL_EN); +} + +static bool match_addr(MSF2EmacState *s, const uint8_t *buf) +{ + /* The broadcast MAC address: FF:FF:FF:FF:FF:FF */ + static const uint8_t broadcast_addr[] =3D { 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF }; + uint8_t addr[6]; + + if (!memcmp(buf, broadcast_addr, sizeof(broadcast_addr))) { + return true; + } + + /* + * R_STA1 [31:24] : octet 1 of mac address + * R_STA1 [23:16] : octet 2 of mac address + * . + * . + * R_STA2 [31:24] : octet 5 of mac address + * R_STA2 [23:16] : octet 6 of mac address + */ + stl_le_p(addr, s->regs[R_STA1]); + stw_le_p(addr + 4, s->regs[R_STA2] >> 16); + + if (!memcmp(buf, addr, sizeof(addr))) { + return false; + } + + return true; +} + +static ssize_t emac_rx(NetClientState *nc, const uint8_t *buf, size_t size) +{ + MSF2EmacState *s =3D qemu_get_nic_opaque(nc); + EmacDesc d; + uint8_t pktcnt; + uint32_t status; + + if (size > (s->regs[R_FRM_LEN] & 0xFFFF)) { + return -1; + } + if (!match_addr(s, buf)) { + return -1; + } + + emac_load_desc(s, &d, s->rx_desc); + + if (d.pktsize & EMPTY_MASK) { + address_space_write(&s->dma_as, d.pktaddr, MEMTXATTRS_UNSPECIFIED, + buf, size & PKT_SIZE); + d.pktsize =3D size & PKT_SIZE; + emac_store_desc(s, &d, s->rx_desc); + /* update received packets count */ + status =3D s->regs[R_DMA_RX_STATUS]; + pktcnt =3D extract32(status, R_DMA_PKTCNT_SHIFT, 8); + pktcnt++; + s->regs[R_DMA_RX_STATUS] =3D deposit32(status, R_DMA_PKTCNT_SHIFT, + 8, pktcnt); + s->regs[R_DMA_RX_STATUS] |=3D R_DMA_PKT_TXRX; + s->rx_desc =3D d.next; + } else { + s->regs[R_DMA_RX_CTL] &=3D ~DMA_RX_CTL_EN; + s->regs[R_DMA_RX_STATUS] |=3D DMA_RX_OVERFLOW; + } + emac_update_irq(s); + return size; +} + +static void msf2_emac_reset(DeviceState *dev) +{ + MSF2EmacState *s =3D MSS_EMAC(dev); + + msf2_emac_do_reset(s); +} + +static void emac_set_link(NetClientState *nc) +{ + MSF2EmacState *s =3D qemu_get_nic_opaque(nc); + + msf2_phy_update_link(s); +} + +static NetClientInfo net_msf2_emac_info =3D { + .type =3D NET_CLIENT_DRIVER_NIC, + .size =3D sizeof(NICState), + .can_receive =3D emac_can_rx, + .receive =3D emac_rx, + .link_status_changed =3D emac_set_link, +}; + +static void msf2_emac_realize(DeviceState *dev, Error **errp) +{ + MSF2EmacState *s =3D MSS_EMAC(dev); + + address_space_init(&s->dma_as, + s->dma_mr ? s->dma_mr : get_system_memory(), "dma"); + + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->nic =3D qemu_new_nic(&net_msf2_emac_info, &s->conf, + object_get_typename(OBJECT(dev)), dev->id, s); + qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); +} + +static void msf2_emac_init(Object *obj) +{ + MSF2EmacState *s =3D MSS_EMAC(obj); + + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); + + memory_region_init_io(&s->mmio, obj, &emac_ops, s, + "msf2-emac", R_MAX * 4); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static Property msf2_emac_properties[] =3D { + DEFINE_NIC_PROPERTIES(MSF2EmacState, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static const VMStateDescription vmstate_msf2_emac =3D { + .name =3D TYPE_MSS_EMAC, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(rx_desc, MSF2EmacState), + VMSTATE_UINT16_ARRAY(phy_regs, MSF2EmacState, PHY_MAX_REGS), + VMSTATE_UINT32_ARRAY(regs, MSF2EmacState, R_MAX), + VMSTATE_END_OF_LIST() + } +}; + +static void msf2_emac_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D msf2_emac_realize; + dc->reset =3D msf2_emac_reset; + dc->vmsd =3D &vmstate_msf2_emac; + device_class_set_props(dc, msf2_emac_properties); +} + +static const TypeInfo msf2_emac_info =3D { + .name =3D TYPE_MSS_EMAC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(MSF2EmacState), + .instance_init =3D msf2_emac_init, + .class_init =3D msf2_emac_class_init, +}; + +static void msf2_emac_register_types(void) +{ + type_register_static(&msf2_emac_info); +} + +type_init(msf2_emac_register_types) diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h new file mode 100644 index 0000000..ab0da62 --- /dev/null +++ b/include/hw/net/msf2-emac.h @@ -0,0 +1,50 @@ +/* + * QEMU model of the Smartfusion2 Ethernet MAC. + * + * Copyright (c) 2020 Subbaraya Sundeep . + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "hw/sysbus.h" +#include "net/net.h" + +#define TYPE_MSS_EMAC "msf2-emac" +#define MSS_EMAC(obj) \ + OBJECT_CHECK(MSF2EmacState, (obj), TYPE_MSS_EMAC) + +#define R_MAX (0x1a0 / 4) +#define PHY_MAX_REGS 32 + +typedef struct MSF2EmacState { + SysBusDevice parent; + + MemoryRegion mmio; + MemoryRegion *dma_mr; + AddressSpace dma_as; + + qemu_irq irq; + NICState *nic; + NICConf conf; + + uint32_t rx_desc; + uint16_t phy_regs[PHY_MAX_REGS]; + + uint32_t regs[R_MAX]; +} MSF2EmacState; --=20 2.7.4 From nobody Sat May 18 21:00:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586258378; cv=none; d=zohomail.com; s=zohoarc; b=gfiZdPSEmSo/N3Jd0uPNIr87IDGtdWWF5GY+qovet8XSmqyB4hhMTbM+WpT9vdtmQcbYSfWsQyC6MDzyY7TRDmKOlP2WVNA6VeWPFuaccJ80U/bERR2QIe2eGY6fqglMwTGqTdzZQg+abH0GFjIZ9oKNJJauNODdLRmWAFMKqxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586258378; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=bH/TVrbUH5Ze3DAXFfwxmJ+jVj75XcHyr/YCnr9aWPI=; b=dYf0b2AucWCoP9YsRnMeBYGzC0gCyqWgNyEYIZ4lOBkwxJuxujQSBWCk7zbVbUNyLqdNR5wtHhHJinbY94g0yleI/GstD5MDnTIzEunVxpXkZhsRQSLrUo9CoiASCppOBSJIHwjVtPeI4hmdErcykLYrienlvzW6Kl/9UfXygc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586258378264312.0814717872843; Tue, 7 Apr 2020 04:19:38 -0700 (PDT) Received: from localhost ([::1]:45436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmGW-0004iR-Se for importer@patchew.org; Tue, 07 Apr 2020 07:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50620) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmFW-00038m-Em for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLmFU-0002Kf-Kv for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:34 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:33523) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLmFT-0002Jp-Cz; Tue, 07 Apr 2020 07:18:32 -0400 Received: by mail-pj1-x1042.google.com with SMTP id cp9so1082007pjb.0; Tue, 07 Apr 2020 04:18:31 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s137sm14357855pfs.45.2020.04.07.04.18.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 04:18:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bH/TVrbUH5Ze3DAXFfwxmJ+jVj75XcHyr/YCnr9aWPI=; b=s7h3Zq9goAj/R4/ExK3LHWYH+/Hxh+w3faSUN0LdfYt4OJF5A7H7bdf3QFYKEAPHNs C+VZrEKFYSV8jjpB5X2THAixfJ9ZnfsJ9F9e1oPWNSa5Y5MIjFBwsNKlpZ/VStlnSQmF hs0JzI9KSW+gBacyVXMhTyW8fiP5+zKG793H0mCLQH2XHmSdv5RUIX0bCVaBXKudA4in B77g61Z+dUv94gEpQeuKMvHklfU4NgoLeunuGMSAcSLUaSFk3JuYW4IiOjiy3IW7Fx+8 Uum/gkPd8LlMRys3EV/OA08YJLD9j6rSxSOHTpK8RzVGkNSE9M9f/GxyTG44eX2EdP6U OiOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bH/TVrbUH5Ze3DAXFfwxmJ+jVj75XcHyr/YCnr9aWPI=; b=XzMVISzzK/8+B93nnnMrq1tLL1K8Qr90RVTLm4hY7lEGFgGOdcl1zAwojr8YMumRca PlZtx1/S/XtE8gWjBVUmBAhpPJdioZHYoZQutcRCAE1CCdrMZUBmYC1A6xb3RlEhC2fJ 16rPfAt+jL2l3D2gK43B5N4rNdg93kibxY8ItpjeheMGGGhrKQYHxf26oee8mzunPOUm wWysY+v3P1b7PHtWSF7nrq5vzm26q50qHrCaRXT2CImB7Lqpr8+t6r0uqAmUZsCwYklT Q+yh5ESWlPjc1maTLjy84PGQy4AE46s8lUBH190a0VFWJ2LRAgdjGxhuNGd0kzv7MFBx r3hw== X-Gm-Message-State: AGi0PuazwO/yuBckE8Ke+9Q1pq2AemOA2EgTC9sktwXmf9hYJKKpR3zO Vu9oRlx6OPXCJXbu1Lojfhc= X-Google-Smtp-Source: APiQypL73Q6rkqLxmcjTbsS/n4x3Rtrz40I8lsz/TSI7WKDX3sV0vurUeaGoStafL5sdVRfFRLy3VA== X-Received: by 2002:a17:902:d915:: with SMTP id c21mr1974623plz.177.1586258310526; Tue, 07 Apr 2020 04:18:30 -0700 (PDT) From: sundeep.lkml@gmail.com To: jasowang@redhat.com, peter.maydell@linaro.org, philmd@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: [Qemu devel PATCH v3 2/3] msf2: Add EMAC block to SmartFusion2 SoC Date: Tue, 7 Apr 2020 16:45:33 +0530 Message-Id: <1586258134-6932-3-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> References: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1042 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Subbaraya Sundeep Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Subbaraya Sundeep With SmartFusion2 Ethernet MAC model in place this patch adds the same to SoC. Signed-off-by: Subbaraya Sundeep --- hw/arm/msf2-soc.c | 21 ++++++++++++++++++++- include/hw/arm/msf2-soc.h | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 588d643..2f2db6d 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -35,6 +35,7 @@ =20 #define MSF2_TIMER_BASE 0x40004000 #define MSF2_SYSREG_BASE 0x40038000 +#define MSF2_EMAC_BASE 0x40041000 =20 #define ENVM_BASE_ADDRESS 0x60000000 =20 @@ -55,6 +56,7 @@ static const uint32_t uart_addr[MSF2_NUM_UARTS] =3D { 0x4= 0000000 , 0x40010000 }; static const int spi_irq[MSF2_NUM_SPIS] =3D { 2, 3 }; static const int uart_irq[MSF2_NUM_UARTS] =3D { 10, 11 }; static const int timer_irq[MSF2_NUM_TIMERS] =3D { 14, 15 }; +static const int emac_irq[MSF2_NUM_EMACS] =3D { 12 }; =20 static void do_sys_reset(void *opaque, int n, int level) { @@ -81,6 +83,13 @@ static void m2sxxx_soc_initfn(Object *obj) sysbus_init_child_obj(obj, "spi[*]", &s->spi[i], sizeof(s->spi[i]), TYPE_MSS_SPI); } + + sysbus_init_child_obj(obj, "eth", &s->emac, sizeof(s->emac), + TYPE_MSS_EMAC); + if (nd_table[0].used) { + qemu_check_nic_model(&nd_table[0], TYPE_MSS_EMAC); + qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); + } } =20 static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) @@ -192,6 +201,17 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, E= rror **errp) g_free(bus_name); } =20 + dev =3D DEVICE(&s->emac); + object_property_set_bool(OBJECT(&s->emac), true, "realized", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + busdev =3D SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, MSF2_EMAC_BASE); + sysbus_connect_irq(busdev, 0, + qdev_get_gpio_in(armv7m, emac_irq[0])); + /* Below devices are not modelled yet. */ create_unimplemented_device("i2c_0", 0x40002000, 0x1000); create_unimplemented_device("dma", 0x40003000, 0x1000); @@ -202,7 +222,6 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Er= ror **errp) create_unimplemented_device("can", 0x40015000, 0x1000); create_unimplemented_device("rtc", 0x40017000, 0x1000); create_unimplemented_device("apb_config", 0x40020000, 0x10000); - create_unimplemented_device("emac", 0x40041000, 0x1000); create_unimplemented_device("usb", 0x40043000, 0x1000); } =20 diff --git a/include/hw/arm/msf2-soc.h b/include/hw/arm/msf2-soc.h index 3cfe5c7..296ed03 100644 --- a/include/hw/arm/msf2-soc.h +++ b/include/hw/arm/msf2-soc.h @@ -29,12 +29,14 @@ #include "hw/timer/mss-timer.h" #include "hw/misc/msf2-sysreg.h" #include "hw/ssi/mss-spi.h" +#include "hw/net/msf2-emac.h" =20 #define TYPE_MSF2_SOC "msf2-soc" #define MSF2_SOC(obj) OBJECT_CHECK(MSF2State, (obj), TYPE_MSF2_SOC) =20 #define MSF2_NUM_SPIS 2 #define MSF2_NUM_UARTS 2 +#define MSF2_NUM_EMACS 1 =20 /* * System timer consists of two programmable 32-bit @@ -62,6 +64,7 @@ typedef struct MSF2State { MSF2SysregState sysreg; MSSTimerState timer; MSSSpiState spi[MSF2_NUM_SPIS]; + MSF2EmacState emac; } MSF2State; =20 #endif --=20 2.7.4 From nobody Sat May 18 21:00:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586258444; cv=none; d=zohomail.com; s=zohoarc; b=MVjdtqL9l/fY2Gjg6lIuxaJ9+5B2Mn40b4MW95zp/v2lpYbGZttxnx3e3Zoc14wsafOWwqqQM+ZLYANtXB3HuwjbZhU7vrX5x53HTOPZBWtJw4s1t+nFx0eL0bwddAkJLuhoiOQD3rC990OdsHIUaIkdcVEqjI9g8dvIi8/nSGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586258444; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=oC4LI+rsC3AfaHKWa06ELH+UcID+dQ6LdmleZ0eZwSQ=; b=SMaU1GsQ7L2Oc+TS2U4lN0W8LDckMwcNuZFLHsFEgvOM5FVfASwa6HsuJ0y2Fo4SOOXcmQTWh5SIGc77ESEUkz5SOQ0BdDsSkPD1HCVTVKCi/hCCClVnicPAbq/KXE1aItDxbObA2pg1VPo/mUpecG1oJmH3oE0HiMpIe0xrppM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158625844449920.28178024363683; Tue, 7 Apr 2020 04:20:44 -0700 (PDT) Received: from localhost ([::1]:45452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmHb-0006id-9v for importer@patchew.org; Tue, 07 Apr 2020 07:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50634) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLmFY-00039X-1Y for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLmFW-0002Lr-Je for qemu-devel@nongnu.org; Tue, 07 Apr 2020 07:18:35 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:43247) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLmFW-0002LP-DR; Tue, 07 Apr 2020 07:18:34 -0400 Received: by mail-pg1-x542.google.com with SMTP id s4so1562096pgk.10; Tue, 07 Apr 2020 04:18:34 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s137sm14357855pfs.45.2020.04.07.04.18.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 04:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oC4LI+rsC3AfaHKWa06ELH+UcID+dQ6LdmleZ0eZwSQ=; b=KuGpDYbbtfb5Cf99k+/n+7CnaaIPFoJX8UuZRSxE2wC94n+k0+N4XsziDe20YEf4Vk F4zCxMHbDQL66nmPGhMWSVGtKA3Qoj1fb3CRGqSUAFzJkgi2JeyheWzvvriBEayysiPf E3Rbf4H7ty3OQoqbZUCIw9B1+sftvSvN4K2iVQvcK4ObsZYjwY4RYB2abGA0miL5qqhk sqvxfSqyOWXlpkTyvzzxA7jhMkVq6G6QoqzFv++kJhXCZhsOdYkqnZmAHQX0TyxjOsJs 3PKRzCKTeL90elEc8L6fl/zx+9l+85eRRMt2Mz0/3/aO8JVSweYbQx64VydL632COZVA yb7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oC4LI+rsC3AfaHKWa06ELH+UcID+dQ6LdmleZ0eZwSQ=; b=PLKlFSS5n2HOVFQbrG12kg3BLNtAJ6h9ZP89Y3k4xPcjNTx+g+Z7DQANCOoINrz/mw HqWarLmRrVQ05JehCkhxAmjWWMetMer8sw6EM+YvsehJB7WYSJCf47688rnInhkP31pd XEFDQlzNJ/Hd0VCmlsc7OuDp88EphMSj83ZFpuoRZCRnkkB0s+XcSIbj4iObc1enf2Vy 1utAuyU7mbkXTluQha0hQVPmssqudva18lvcx7PcXK3SW1PYgTeMx+YbP3L71HxGXtYR o8RWYxRnj6VTyNWeJEDGoens45RJPdBL5mxnp6WBAxDGtIDWqt1nr/ioPKqhIR3SYHGp jpug== X-Gm-Message-State: AGi0PuZYaranYBBO6NXAEgnj6i53/+60shsb513EEbo6m7/RBTF3EMDF rO8jKR1bBxxCRK7gnEDg03M= X-Google-Smtp-Source: APiQypKLBqaoL8pcfuQgI1QXdw3au9xiQbDhV3o1qjg0kZ6dZsUMPe3MUqhqKUL24a1YbNbCVRAnXw== X-Received: by 2002:a63:a361:: with SMTP id v33mr1552496pgn.324.1586258313490; Tue, 07 Apr 2020 04:18:33 -0700 (PDT) From: sundeep.lkml@gmail.com To: jasowang@redhat.com, peter.maydell@linaro.org, philmd@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: [Qemu devel PATCH v3 3/3] tests/boot_linux_console: Add ethernet test to SmartFusion2 Date: Tue, 7 Apr 2020 16:45:34 +0530 Message-Id: <1586258134-6932-4-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> References: <1586258134-6932-1-git-send-email-sundeep.lkml@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Subbaraya Sundeep Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Subbaraya Sundeep In addition to simple serial test this patch uses ping to test the ethernet block modelled in SmartFusion2 SoC. Signed-off-by: Subbaraya Sundeep --- tests/acceptance/boot_linux_console.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index f825cd9..c6b06a1 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -336,13 +336,13 @@ class BootLinuxConsole(Test): """ uboot_url =3D ('https://raw.githubusercontent.com/' 'Subbaraya-Sundeep/qemu-test-binaries/' - 'fa030bd77a014a0b8e360d3b7011df89283a2f0b/u-boot') - uboot_hash =3D 'abba5d9c24cdd2d49cdc2a8aa92976cf20737eff' + 'fe371d32e50ca682391e1e70ab98c2942aeffb01/u-boot') + uboot_hash =3D 'cbb8cbab970f594bf6523b9855be209c08374ae2' uboot_path =3D self.fetch_asset(uboot_url, asset_hash=3Duboot_hash) spi_url =3D ('https://raw.githubusercontent.com/' 'Subbaraya-Sundeep/qemu-test-binaries/' - 'fa030bd77a014a0b8e360d3b7011df89283a2f0b/spi.bin') - spi_hash =3D '85f698329d38de63aea6e884a86fbde70890a78a' + 'fe371d32e50ca682391e1e70ab98c2942aeffb01/spi.bin') + spi_hash =3D '65523a1835949b6f4553be96dec1b6a38fb05501' spi_path =3D self.fetch_asset(spi_url, asset_hash=3Dspi_hash) =20 self.vm.set_console() @@ -352,7 +352,12 @@ class BootLinuxConsole(Test): '-drive', 'file=3D' + spi_path + ',if=3Dmtd,forma= t=3Draw', '-no-reboot') self.vm.launch() - self.wait_for_console_pattern('init started: BusyBox') + self.wait_for_console_pattern('Enter \'help\' for a list') + + exec_command_and_wait_for_pattern(self, 'ifconfig eth0 10.0.2.15', + 'eth0: link becomes ready= ') + exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2', + '3 packets transmitted, 3 packets received, 0% packet loss') =20 def do_test_arm_raspi2(self, uart_id): """ --=20 2.7.4