From nobody Thu May 16 15:12:18 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=1587049079; cv=none; d=zohomail.com; s=zohoarc; b=GYkB0Mc4JdGiyrfwkjk0FhQWyeMDpNYqaEY50g+9qhCydBlZdze0XnStgYqS5xz4MgyRRSyUOAMzRUYI6BzIEv4is65l1MhnW1bGn0Rxj9vRpb3JH/Cz+4HI7zoSUnO4We3U8yAFmqIpogfGb0l2DL4tRoITITGzQEABcSJEWbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587049079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VuK6rtJXSoUbE2O4N/5UXyI7+rWopctpS8DNyIpYGr4=; b=ZslY6IuyBORRrn8WEQU+/9AtQ65mAW0AUKN9PORMSlo+WqPNZMOlOGSNgp3YHLGOYtawGfnD5mfoCR4HjhZAIIT8f6PexsRb85BrvaxMuEllciVzOfH5Bx6PSCC/hGXTKLwopn6Rhr8dv68ISniSptaVuD3Gy6HxUrX8jyxywsw= 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 1587049079119913.3120099717893; Thu, 16 Apr 2020 07:57:59 -0700 (PDT) Received: from localhost ([::1]:35556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5xl-00073Z-Fz for importer@patchew.org; Thu, 16 Apr 2020 10:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46231) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5v7-0002RX-IB for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jP5v4-0005Xy-NA for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:13 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:40252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jP5v4-0005Xk-Ei; Thu, 16 Apr 2020 10:55:10 -0400 Received: by mail-pg1-x531.google.com with SMTP id n16so1747321pgb.7; Thu, 16 Apr 2020 07:55:10 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s63sm3671973pfb.44.2020.04.16.07.55.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2020 07:55:07 -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 :mime-version:content-transfer-encoding; bh=VuK6rtJXSoUbE2O4N/5UXyI7+rWopctpS8DNyIpYGr4=; b=fFqV+jpl9ybR6/zZNq/7i5/lSwLARWQoLC1TKP/AOiEbbGkznrDOBnXmqr8nfnOgfQ p5nt5fKmefkAmG6hJE/3smbAlSv4+KfbnSwqAQIVGKS+jMgJJIDGSkJayzRMFVxKQ2B9 ObWa7Z7ht2ZE87gaTkNOoaKfeZ59tf+Vkqp/VtrOL+7EV8pxX85EDH+i6m/RMQK6n61+ BwOA6NB8I4ec7ckH0DrqIZ3fE7AitmNDV38il4OBhPupS3KUWGnZUeFIbwm6IoVSxoPk bqHIXG3FSc1GSG/sdoeORsRs6MLR81M2w5e749IP1UUIchyZKg0akgva0U2I6TumjK0d 9cow== 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:mime-version:content-transfer-encoding; bh=VuK6rtJXSoUbE2O4N/5UXyI7+rWopctpS8DNyIpYGr4=; b=Q5eZc7J1aWltQps5xni0XeU0o38W1mtLmPqvU9BE2RL2coUR7GpEjOLoIJ9I87/+ZP Cs4qbavKhgAtsN/rkMIY+BrCUgdCH9KdjIdFM0Iy6BbNTiD2nUL/VFpB/2VbTNZWHMgL BnQJmPiCCdz3EyVt2/YLISJZts6LuoP2sJmI1/PO2K+0/guo73qvcDVH6t8C4goq/tDf RtCAiYi4Why02uA9WQD6uikapPKvmvQmhU3Vwa5Nl3PMSjVbKFOBD2AZghmOMlYbefDe Jl8xJ53emGprPj0ZVmM1IRze12K50RJOLPgkLVnaQ7f+l2gd46o8tZK3zB4e6fu88cb/ mmaQ== X-Gm-Message-State: AGi0PuYHF0fz/Z2/f/1Co7vNB8obxN/cyllGJNNBFX1p1MWJAxSkwLYM WVJdw1W91oTI+a/cp04N9kg= X-Google-Smtp-Source: APiQypJC/nhCmf5HleFOiIkFMhuPF7zbmffwrOMG5xJZTfoIdTOTigMOxb0uJ5AeCmdUZKcr2jsP0w== X-Received: by 2002:a63:7801:: with SMTP id t1mr18530624pgc.192.1587048908286; Thu, 16 Apr 2020 07:55:08 -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 v6 1/3] hw/net: Add Smartfusion2 emac block Date: Thu, 16 Apr 2020 20:24:49 +0530 Message-Id: <1587048891-30493-2-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> References: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::531 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) 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 + hw/net/Makefile.objs | 1 + hw/net/msf2-emac.c | 589 +++++++++++++++++++++++++++++++++++++++++= ++++ include/hw/net/msf2-emac.h | 53 ++++ 4 files changed, 645 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 8cbc1fa..cea5733 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -919,6 +919,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..32ba9e8 --- /dev/null +++ b/hw/net/msf2-emac.c @@ -0,0 +1,589 @@ +/* + * 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 "qapi/error.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 "hw/qdev-properties.h" +#include "migration/vmstate.h" + +REG32(CFG1, 0x0) + FIELD(CFG1, RESET, 31, 1) + FIELD(CFG1, RX_EN, 2, 1) + FIELD(CFG1, TX_EN, 0, 1) + FIELD(CFG1, LB_EN, 8, 1) +REG32(CFG2, 0x4) +REG32(IFG, 0x8) +REG32(HALF_DUPLEX, 0xc) +REG32(MAX_FRAME_LENGTH, 0x10) +REG32(MII_CMD, 0x24) + FIELD(MII_CMD, READ, 0, 1) +REG32(MII_ADDR, 0x28) + FIELD(MII_ADDR, REGADDR, 0, 5) + FIELD(MII_ADDR, PHYADDR, 8, 5) +REG32(MII_CTL, 0x2c) +REG32(MII_STS, 0x30) +REG32(STA1, 0x40) +REG32(STA2, 0x44) +REG32(FIFO_CFG0, 0x48) +REG32(FIFO_CFG4, 0x58) + FIELD(FIFO_CFG4, BCAST, 9, 1) + FIELD(FIFO_CFG4, MCAST, 8, 1) +REG32(FIFO_CFG5, 0x5C) + FIELD(FIFO_CFG5, BCAST, 9, 1) + FIELD(FIFO_CFG5, MCAST, 8, 1) +REG32(DMA_TX_CTL, 0x180) + FIELD(DMA_TX_CTL, EN, 0, 1) +REG32(DMA_TX_DESC, 0x184) +REG32(DMA_TX_STATUS, 0x188) + FIELD(DMA_TX_STATUS, PKTCNT, 16, 8) + FIELD(DMA_TX_STATUS, UNDERRUN, 1, 1) + FIELD(DMA_TX_STATUS, PKT_SENT, 0, 1) +REG32(DMA_RX_CTL, 0x18c) + FIELD(DMA_RX_CTL, EN, 0, 1) +REG32(DMA_RX_DESC, 0x190) +REG32(DMA_RX_STATUS, 0x194) + FIELD(DMA_RX_STATUS, PKTCNT, 16, 8) + FIELD(DMA_RX_STATUS, OVERFLOW, 2, 1) + FIELD(DMA_RX_STATUS, PKT_RCVD, 0, 1) +REG32(DMA_IRQ_MASK, 0x198) +REG32(DMA_IRQ, 0x19c) + +#define EMPTY_MASK (1 << 31) +#define PKT_SIZE 0x7FF +#define PHYADDR 0x1 +#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, 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, d, sizeo= f *d); +} + +static void msf2_dma_tx(MSF2EmacState *s) +{ + NetClientState *nc =3D qemu_get_queue(s->nic); + 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] & R_CFG1_TX_EN_MASK)) { + 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. + */ + if (s->regs[R_CFG1] & R_CFG1_LB_EN_MASK) { + nc->info->receive(nc, buf, size); + } else { + qemu_send_packet(nc, 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 FIELD_EX32(status, DMA_TX_STATUS, PKTCNT); + pktcnt++; + s->regs[R_DMA_TX_STATUS] =3D FIELD_DP32(status, DMA_TX_STATUS, + PKTCNT, pktcnt); + s->regs[R_DMA_TX_STATUS] |=3D R_DMA_TX_STATUS_PKT_SENT_MASK; + desc =3D d.next; + } + s->regs[R_DMA_TX_STATUS] |=3D R_DMA_TX_STATUS_UNDERRUN_MASK; + s->regs[R_DMA_TX_CTL] &=3D ~R_DMA_TX_CTL_EN_MASK; +} + +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] & R_MII_ADDR_REGADDR_MASK; + uint8_t phy_addr =3D (s->regs[R_MII_ADDR] >> R_MII_ADDR_PHYADDR_SHIFT)= & + R_MII_ADDR_REGADDR_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] & R_MII_ADDR_REGADDR_MASK; + uint8_t phy_addr =3D (s->regs[R_MII_ADDR] >> R_MII_ADDR_PHYADDR_SHIFT)= & + R_MII_ADDR_REGADDR_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_MAX_FRAME_LENGTH] =3D 0x00000600; + s->regs[R_FIFO_CFG5] =3D 0X3FFFF; + + 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 >=3D ARRAY_SIZE(s->regs)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad offset 0x%" HWADDR_PRIx "\n", __func__, + addr * 4); + return r; + } + r =3D s->regs[addr]; + 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 & R_DMA_TX_CTL_EN_MASK) { + msf2_dma_tx(s); + } + break; + case R_DMA_RX_CTL: + s->regs[addr] =3D value; + if (value & R_DMA_RX_CTL_EN_MASK) { + s->rx_desc =3D s->regs[R_DMA_RX_DESC]; + qemu_flush_queued_packets(qemu_get_queue(s->nic)); + } + break; + case R_CFG1: + s->regs[addr] =3D value; + if (value & R_CFG1_RESET_MASK) { + msf2_emac_do_reset(s); + } + break; + 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); + s->regs[addr] =3D deposit32(value, 16, 5, enreqbits); + 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 & ~3; + 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 & ~3; + break; + case R_DMA_TX_STATUS: + if (value & R_DMA_TX_STATUS_UNDERRUN_MASK) { + s->regs[addr] &=3D ~R_DMA_TX_STATUS_UNDERRUN_MASK; + } + if (value & R_DMA_TX_STATUS_PKT_SENT_MASK) { + pktcnt =3D FIELD_EX32(s->regs[addr], DMA_TX_STATUS, PKTCNT); + pktcnt--; + s->regs[addr] =3D FIELD_DP32(s->regs[addr], DMA_TX_STATUS, + PKTCNT, pktcnt); + if (pktcnt =3D=3D 0) { + s->regs[addr] &=3D ~R_DMA_TX_STATUS_PKT_SENT_MASK; + } + } + break; + case R_DMA_RX_STATUS: + if (value & R_DMA_RX_STATUS_OVERFLOW_MASK) { + s->regs[addr] &=3D ~R_DMA_RX_STATUS_OVERFLOW_MASK; + } + if (value & R_DMA_RX_STATUS_PKT_RCVD_MASK) { + pktcnt =3D FIELD_EX32(s->regs[addr], DMA_RX_STATUS, PKTCNT); + pktcnt--; + s->regs[addr] =3D FIELD_DP32(s->regs[addr], DMA_RX_STATUS, + PKTCNT, pktcnt); + if (pktcnt =3D=3D 0) { + s->regs[addr] &=3D ~R_DMA_RX_STATUS_PKT_RCVD_MASK; + } + } + break; + case R_DMA_IRQ: + break; + case R_MII_CMD: + if (value & R_MII_CMD_READ_MASK) { + 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; + case R_STA1: + s->regs[addr] =3D value; + /* + * R_STA1 [31:24] : octet 1 of mac address + * R_STA1 [23:16] : octet 2 of mac address + * R_STA1 [15:8] : octet 3 of mac address + * R_STA1 [7:0] : octet 4 of mac address + */ + stl_be_p(s->mac_addr, value); + break; + case R_STA2: + s->regs[addr] =3D value; + /* + * R_STA2 [31:24] : octet 5 of mac address + * R_STA2 [23:16] : octet 6 of mac address + */ + stw_be_p(s->mac_addr + 4, value >> 16); + break; + default: + if (addr >=3D ARRAY_SIZE(s->regs)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad offset 0x%" HWADDR_PRIx "\n", __func__, + addr * 4); + return; + } + s->regs[addr] =3D value; + break; + } + emac_update_irq(s); +} + +static const MemoryRegionOps emac_ops =3D { + .read =3D emac_read, + .write =3D emac_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .impl =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] & R_CFG1_RX_EN_MASK) && + (s->regs[R_DMA_RX_CTL] & R_DMA_RX_CTL_EN_MASK); +} + +static bool addr_filter_ok(MSF2EmacState *s, const uint8_t *buf) +{ + /* The broadcast MAC address: FF:FF:FF:FF:FF:FF */ + const uint8_t broadcast_addr[] =3D { 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF }; + bool bcast_en =3D true; + bool mcast_en =3D true; + + if (s->regs[R_FIFO_CFG5] & R_FIFO_CFG5_BCAST_MASK) { + bcast_en =3D true; /* Broadcast dont care for drop circuitry */ + } else if (s->regs[R_FIFO_CFG4] & R_FIFO_CFG4_BCAST_MASK) { + bcast_en =3D false; + } + + if (s->regs[R_FIFO_CFG5] & R_FIFO_CFG5_MCAST_MASK) { + mcast_en =3D true; /* Multicast dont care for drop circuitry */ + } else if (s->regs[R_FIFO_CFG4] & R_FIFO_CFG4_MCAST_MASK) { + mcast_en =3D false; + } + + if (!memcmp(buf, broadcast_addr, sizeof(broadcast_addr))) { + return bcast_en; + } + + if (buf[0] & 1) { + return mcast_en; + } + + return !memcmp(buf, s->mac_addr, sizeof(s->mac_addr)); +} + +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_MAX_FRAME_LENGTH] & 0xFFFF)) { + return size; + } + if (!addr_filter_ok(s, buf)) { + return size; + } + + 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 FIELD_EX32(status, DMA_RX_STATUS, PKTCNT); + pktcnt++; + s->regs[R_DMA_RX_STATUS] =3D FIELD_DP32(status, DMA_RX_STATUS, + PKTCNT, pktcnt); + s->regs[R_DMA_RX_STATUS] |=3D R_DMA_RX_STATUS_PKT_RCVD_MASK; + s->rx_desc =3D d.next; + } else { + s->regs[R_DMA_RX_CTL] &=3D ~R_DMA_RX_CTL_EN_MASK; + s->regs[R_DMA_RX_STATUS] |=3D R_DMA_RX_STATUS_OVERFLOW_MASK; + } + 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); + + if (!s->dma_mr) { + error_setg(errp, "MSS_EMAC 'ahb-bus' link not set"); + return; + } + + address_space_init(&s->dma_as, s->dma_mr, "emac-ahb"); + + 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_PROP_LINK("ahb-bus", MSF2EmacState, dma_mr, + TYPE_MEMORY_REGION, MemoryRegion *), + 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_UINT8_ARRAY(mac_addr, MSF2EmacState, ETH_ALEN), + 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..37966d3 --- /dev/null +++ b/include/hw/net/msf2-emac.h @@ -0,0 +1,53 @@ +/* + * 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 "exec/memory.h" +#include "net/net.h" +#include "net/eth.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; + + uint8_t mac_addr[ETH_ALEN]; + uint32_t rx_desc; + uint16_t phy_regs[PHY_MAX_REGS]; + + uint32_t regs[R_MAX]; +} MSF2EmacState; --=20 2.7.4 From nobody Thu May 16 15:12:18 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=1587049013; cv=none; d=zohomail.com; s=zohoarc; b=a9ec+tsMNFBoVLoICh97YJ0gs0/+utX4IlpRina4eIYuUGEXr1bQLQ+6Ch3dokl7BOfNvGcrdx3t4Fai4rZz6hy+tXGL723RwsWeuFS2TDwq9+BGESneIAhOaUZniaC84azAgbJuIkJ759sXQXcamrkYtKK0/d3dwEN0llXypyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587049013; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CUyXXTyShFlx2/maCp5HGaaaIrvw4HRoNrxDU7Mf/kQ=; b=GEXOxoJy9JW8qKlL5t+lDGu/IWTzi3sIB1ktLC4lKYI2+9f+KHggaLZvX1iYsTmNgafEgm12nbu+wMdzGgze/b2Rw8aJWr+kAX/JqNRPrx/Y8wOEjrZ2J5FoXUfJPgnnPLH5i21C5rQ6F1ArD1hxttKdZY1CCIp9XJDZeiT4C1o= 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 1587049013827378.2116063874113; Thu, 16 Apr 2020 07:56:53 -0700 (PDT) Received: from localhost ([::1]:35532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5wi-0004Sm-KJ for importer@patchew.org; Thu, 16 Apr 2020 10:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46228) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5v7-0002QP-3M for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jP5v5-0005YG-SX for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:13 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:41111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jP5v5-0005Y5-NC; Thu, 16 Apr 2020 10:55:11 -0400 Received: by mail-pl1-x643.google.com with SMTP id d24so1440708pll.8; Thu, 16 Apr 2020 07:55:11 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s63sm3671973pfb.44.2020.04.16.07.55.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2020 07:55:10 -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 :mime-version:content-transfer-encoding; bh=CUyXXTyShFlx2/maCp5HGaaaIrvw4HRoNrxDU7Mf/kQ=; b=TFo9BX/JiUgY2i7sIny2sbGnmuUkXgnw4r8gv5ogjIgfbCi3y41zD6/QoFUqmsAkpU yWRgUrVgAqg31l8f8wCpV8ksXllB2dgZggDwK9p2PFERJRYL5Pyn7NwTDr95ZEbLA47C KXrZqvfwoP2EPEf3Hrw6nqiCNfoyweLLcxKgo4jc8CysjHfmvaLzUaooOVQ+7jLlDaAw qsaiNCZerciOkaahyHt9EovpAm0g13cTFPC9ju4v1ncEStFmDcQeJl6Zh9T/FPXmECEp IqzdUCBGv1qfxulA2crwMZn/af3ZEYdLU2XnTrvsK0C0XommRj4oC/V907MNlVyR+CJY 9sfw== 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:mime-version:content-transfer-encoding; bh=CUyXXTyShFlx2/maCp5HGaaaIrvw4HRoNrxDU7Mf/kQ=; b=cFnFlueKkXs1g1coNxIWUsbA4nG9cF9FR7MfzwD9q7r1a2R9z2bf5g4pfv/tBpct/q fWvysAH+sh10H3Ksj11n35vieX2gu6hJpj+Jc1OLDkJO5B4w0j1mw3d7WjCVp/LlT3R1 AN+yfz2dxKMa557knNMV75u+zukR0ljnvUMmm+pZsYHLFeoxMwrqjIcfw3NVBwAmxlEf aauVCsUmzbvXhba17o6OvQAjNJzyNxVh9LHnLTh3eE3HSHAYKmh/B4yMKCUK7z7qwgOx i7Oy5XZlNEsQWlTjNU62bWzlWxyiUf+2R2dqSm1DOxQhXK0WNwa3TXZcGJYdwRxoMJqi UvXQ== X-Gm-Message-State: AGi0PuYlNl5hi2Zf9vbzLZQYkPhxjFaytVXl9tCJMkLqZrRXZbAZq1YU KRVQg6otMFa3oeOYjSz3CC0= X-Google-Smtp-Source: APiQypL/lqKI6jQZ24xcheHkkOsXQvMqgj3Wp+Qr+B9Jy5NoviN7hVdt83B/+bo8MaVHnVdGx99PWw== X-Received: by 2002:a17:90a:fe18:: with SMTP id ck24mr5926762pjb.57.1587048910844; Thu, 16 Apr 2020 07:55:10 -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 v6 2/3] msf2: Add EMAC block to SmartFusion2 SoC Date: Thu, 16 Apr 2020 20:24:50 +0530 Message-Id: <1587048891-30493-3-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> References: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 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) From: Subbaraya Sundeep With SmartFusion2 Ethernet MAC model in place this patch adds the same to SoC. Signed-off-by: Subbaraya Sundeep Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/msf2-soc.c | 26 ++++++++++++++++++++++++-- include/hw/arm/msf2-soc.h | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 588d643..a455b88 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -1,7 +1,7 @@ /* * SmartFusion2 SoC emulation. * - * Copyright (c) 2017 Subbaraya Sundeep + * Copyright (c) 2017-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 @@ -35,11 +35,14 @@ =20 #define MSF2_TIMER_BASE 0x40004000 #define MSF2_SYSREG_BASE 0x40038000 +#define MSF2_EMAC_BASE 0x40041000 =20 #define ENVM_BASE_ADDRESS 0x60000000 =20 #define SRAM_BASE_ADDRESS 0x20000000 =20 +#define MSF2_EMAC_IRQ 12 + #define MSF2_ENVM_MAX_SIZE (512 * KiB) =20 /* @@ -81,6 +84,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, "emac", &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 +202,19 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, E= rror **errp) g_free(bus_name); } =20 + dev =3D DEVICE(&s->emac); + object_property_set_link(OBJECT(&s->emac), OBJECT(get_system_memory()), + "ahb-bus", &error_abort); + 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, MSF2_EMAC_IRQ)); + /* Below devices are not modelled yet. */ create_unimplemented_device("i2c_0", 0x40002000, 0x1000); create_unimplemented_device("dma", 0x40003000, 0x1000); @@ -202,7 +225,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..c9cb214 100644 --- a/include/hw/arm/msf2-soc.h +++ b/include/hw/arm/msf2-soc.h @@ -29,6 +29,7 @@ #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) @@ -62,6 +63,7 @@ typedef struct MSF2State { MSF2SysregState sysreg; MSSTimerState timer; MSSSpiState spi[MSF2_NUM_SPIS]; + MSF2EmacState emac; } MSF2State; =20 #endif --=20 2.7.4 From nobody Thu May 16 15:12:18 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=1587049013; cv=none; d=zohomail.com; s=zohoarc; b=NsrDlXpH8YKit7dwgyew8nJKkma0ItgkKVpfuK/gZ7s592nuMcOtN+zSFeoMiip2VDD95jr7OHyFoHJyNMhm2vQZZHmxYceFSPsWkJnJuY3A8d9oFR3cEjnLeRyILI7R4lZ4JNtO/mQ+xWJFvKLaVp9U2ffBUrQyxqwe3tZKz1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587049013; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gXNblUO4SiKtKIE29/5D+Fmm4HZBRwhfz9A4bbnSMB4=; b=AIyEP0JwHJJd6yxkXay+uGxAOaYYmgoMRz0isjSJCBJcU1H3x9XHTtduF3B9VqJdeaK+dV9nTWOqsD7JkbDggCMFmy/7XSDZgNXMOGOsrAMaySo1msoNc+OdWHG8RucFP2awCD96hoAUMPYLKcWkqizvJ21Z87TyPMq2PCA2l+8= 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 1587049013476295.06532654197895; Thu, 16 Apr 2020 07:56:53 -0700 (PDT) Received: from localhost ([::1]:35530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5wi-0004Pt-7F for importer@patchew.org; Thu, 16 Apr 2020 10:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46248) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jP5v9-0002WS-KW for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jP5v8-0005Yx-G9 for qemu-devel@nongnu.org; Thu, 16 Apr 2020 10:55:15 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:45307) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jP5v8-0005Ym-AN; Thu, 16 Apr 2020 10:55:14 -0400 Received: by mail-pl1-x642.google.com with SMTP id t4so1429833plq.12; Thu, 16 Apr 2020 07:55:14 -0700 (PDT) Received: from hyd1358.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id s63sm3671973pfb.44.2020.04.16.07.55.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2020 07:55:13 -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 :mime-version:content-transfer-encoding; bh=gXNblUO4SiKtKIE29/5D+Fmm4HZBRwhfz9A4bbnSMB4=; b=GxS235H1iUMxWW4h9nKIN9JA12k1F2bLXo/mfe0qriugoyPBVvwAsQn23g/RYfMRgH 1Ar+DzwGMPWipFUXB/wD60Wj114A1jc2ODSCHVOFaDf8s9s2pQbMiAangsaVDeDnydf6 gEmEoGjbjNKmL9uyN0CYNX6bKBUM58OUZq1Qng65yB+5BFKQ+ujW4uzWSRUwuH8GENBz FEY/TkYWQRp2zrmxbeRLy5ySjeJDg7JQFq6PWyKURvqo+m50a+oHhtbcBZeisRht+PJf eN2IPyTkvSd2CIs2biGYRIavbRVfgdjv/CpdWwu563h+FHKkolfz3DeNhPCzJZQW/I0+ wI2g== 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:mime-version:content-transfer-encoding; bh=gXNblUO4SiKtKIE29/5D+Fmm4HZBRwhfz9A4bbnSMB4=; b=hMVkAPgNWpaDKOWWautXw9LeXVTDcVoVZXoGopDyHxHVxFndBo204XxTa6TdzacI1J CCX/iuAVCX98atyTaAo0TzERUIzIUS/kr4EEn0Da73Zpa/RJ7QtPC09vlCPgXkN6PveR xS8DQyUILq98FmsjNyKqWyIDgIJK1tTqCcGizIqgyf2XEUVIDshbYvFmk1MO6medxmTg MBw8fuKnnjj29pSnENCdJeLwybfLh+Xs0oxcE3j681Dbb4VOA7IeuetIphzq8hK7TwZx nvRzXUwfJrWfCixx5Zz0xHi/PePOGp5d/iZcGemcRv8vVh0TeVq7YuIw7tjYr/kyAUL+ EJRg== X-Gm-Message-State: AGi0PuZmxS9xmGf7kx1Esp7PEEpWv7sllgw0f41l8t6YdVAgwZyd29Bz fx1LjWBlDGEl7Ojgqp3pgd//mpJ6Ug0= X-Google-Smtp-Source: APiQypIU+gex4tMx6+52c1OjML0h8kzlrOlaD3kZwUgSmwusNSA5j3rAAkhElEgIGP7BYdUkhUonNg== X-Received: by 2002:a17:90b:97:: with SMTP id bb23mr5427950pjb.59.1587048913432; Thu, 16 Apr 2020 07:55:13 -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 v6 3/3] tests/boot_linux_console: Add ethernet test to SmartFusion2 Date: Thu, 16 Apr 2020 20:24:51 +0530 Message-Id: <1587048891-30493-4-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> References: <1587048891-30493-1-git-send-email-sundeep.lkml@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 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) 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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