From patchwork Sun Sep 20 11:35:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 33959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 90A6BB7334 for ; Sun, 20 Sep 2009 21:36:34 +1000 (EST) Received: from localhost ([127.0.0.1]:40201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MpKiV-0005BW-3o for incoming@patchwork.ozlabs.org; Sun, 20 Sep 2009 07:36:31 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MpKi2-0005BQ-US for qemu-devel@nongnu.org; Sun, 20 Sep 2009 07:36:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MpKhy-0005BE-Bp for qemu-devel@nongnu.org; Sun, 20 Sep 2009 07:36:02 -0400 Received: from [199.232.76.173] (port=50934 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MpKhy-0005BB-8s for qemu-devel@nongnu.org; Sun, 20 Sep 2009 07:35:58 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:50045) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MpKhx-00076j-Gc for qemu-devel@nongnu.org; Sun, 20 Sep 2009 07:35:58 -0400 Received: from flocke.weilnetz.de (p54ADD7A0.dip.t-dialin.net [84.173.215.160]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MKsym-1MpKhw1BfV-000QaR; Sun, 20 Sep 2009 13:35:56 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1MpKhu-0003vL-Qj; Sun, 20 Sep 2009 13:35:54 +0200 From: Stefan Weil To: QEMU Developers Date: Sun, 20 Sep 2009 13:35:54 +0200 Message-Id: <1253446554-15061-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.5.6.5 X-Provags-ID: V01U2FsdGVkX19H9u31389mY22mrvOlE8VdoQLjGuaSy04tegL vdc2tyLf3QedI4RS+sasogLhOCYzAkTnHiW9TqjpnTs8EPzTf4 Cn7FFhxGmBR7lnqWVyY+euzeWFq+zrArfY8xwK7N7JPax35j97 Dmw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] eepro100: Fix multicast support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org * Handling of multicast list was missing. * Multicast all was missing. * Promiscuous mode for multicast frames was wrong. This patch is a step to synchronize my maintainer version of eepro100.c (git://repo.or.cz/qemu/ar7.git) with the version integrated in QEMU. Signed-off-by: Stefan Weil --- hw/eepro100.c | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 12 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 34c2bcf..6aafbef 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -140,7 +140,7 @@ typedef struct { uint16_t status; uint16_t command; uint32_t link; /* void * */ - uint32_t tx_desc_addr; /* transmit buffer decsriptor array address. */ + uint32_t tbd_array_addr; /* transmit buffer descriptor array address. */ uint16_t tcb_bytes; /* transmit command block byte count (in lower 14 bits */ uint8_t tx_threshold; /* transmit threshold */ uint8_t tbd_count; /* TBD number */ @@ -259,7 +259,7 @@ static const uint16_t eepro100_mdi_mask[] = { /* From FreeBSD */ /* XXX: optimize */ -static int compute_mcast_idx(const uint8_t * ep) +static unsigned compute_mcast_idx(const uint8_t * ep) { uint32_t crc; int carry, i, j; @@ -277,7 +277,7 @@ static int compute_mcast_idx(const uint8_t * ep) } } } - return (crc >> 26); + return (crc & BITS(7, 2)) >> 2; } #if defined(DEBUG_EEPRO100) @@ -515,6 +515,8 @@ static void nic_reset(void *opaque) { EEPRO100State *s = opaque; TRACE(OTHER, logout("%p\n", s)); + /* TODO: Clearing of multicast table for selective reset, too? */ + memset(&s->mult[0], 0, sizeof(s->mult)); nic_selective_reset(s); } @@ -638,7 +640,7 @@ static void dump_statistics(EEPRO100State * s) static void tx_command(EEPRO100State *s) { - uint32_t tbd_array = le32_to_cpu(s->tx.tx_desc_addr); + uint32_t tbd_array = le32_to_cpu(s->tx.tbd_array_addr); uint16_t tcb_bytes = (le16_to_cpu(s->tx.tcb_bytes) & 0x3fff); TRACE(RXTX, logout ("transmit, TBD array address 0x%08x, TCB byte count 0x%04x, TBD count %u\n", @@ -720,6 +722,22 @@ static void tx_command(EEPRO100State *s) //~ eepro100_cx_interrupt(s); } +static void set_multicast_list(EEPRO100State *s) +{ + uint16_t multicast_count = s->tx.tbd_array_addr & BITS(13, 0); + uint16_t i; + memset(&s->mult[0], 0, sizeof(s->mult)); + TRACE(OTHER, logout("multicast list, multicast count = %u\n", multicast_count)); + for (i = 0; i < multicast_count; i += 6) { + uint8_t multicast_addr[6]; + cpu_physical_memory_read(s->cb_address + 10 + i, multicast_addr, 6); + TRACE(OTHER, logout("multicast entry %s\n", nic_dump(multicast_addr, 6))); + unsigned mcast_idx = compute_mcast_idx(multicast_addr); + assert(mcast_idx < 64); + s->mult[mcast_idx >> 3] |= (1 << (mcast_idx & 7)); + } +} + static void action_command(EEPRO100State *s) { for (;;) { @@ -751,7 +769,7 @@ static void action_command(EEPRO100State *s) TRACE(OTHER, logout("configuration: %s\n", nic_dump(&s->configuration[0], 16))); break; case CmdMulticastList: - //~ missing("multicast list"); + set_multicast_list(s); break; case CmdTx: tx_command(s); @@ -1526,15 +1544,25 @@ static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t size /* Broadcast frame. */ TRACE(RXTX, logout("%p received broadcast, len=%zu\n", s, size)); rfd_status |= 0x0002; - } else if (buf[0] & 0x01) { // !!! + } else if (buf[0] & 0x01) { /* Multicast frame. */ - TRACE(RXTX, logout("%p received multicast, len=%zu\n", s, size)); - /* TODO: check multicast all bit. */ - assert(!(s->configuration[21] & BIT(3))); - int mcast_idx = compute_mcast_idx(buf); - if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7)))) { - return size; + TRACE(RXTX, logout("%p received multicast, len=%zu,%s\n", s, size, nic_dump(buf, size))); + if (s->configuration[21] & BIT(3)) { + /* Multicast all bit is set, receive all multicast frames. */ + } else { + unsigned mcast_idx = compute_mcast_idx(buf); + assert(mcast_idx < 64); + if (s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))) { + /* Multicast frame is allowed in hash table. */ + } else if (s->configuration[15] & 1) { + /* Promiscuous: receive all. */ + rfd_status |= 0x0004; + } else { + TRACE(RXTX, logout("%p multicast ignored\n", s)); + return -1; + } } + /* TODO: Next not for promiscuous mode? */ rfd_status |= 0x0002; } else if (s->configuration[15] & 1) { /* Promiscuous: receive all. */