Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45851C433EF for ; Mon, 11 Apr 2022 17:59:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5CE183E5F; Mon, 11 Apr 2022 19:57:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649699834; bh=FRS356bG8By1FwqiBnfuw4r7AVmSu/ptZFQlsEDPHA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=XjRO05B+VFxwfZ4jTxta+fthSeob+LlEo4IuRXuUNL77CuAWtkvLFkqQ32BYugKWq qLbIbMccUlaYHoExhnH1AfcHyfasddWQvr/ySn0i6EPLwjKq0DN8DJ3kNVptHAblY1 Zlr1/UqbeO77cZaEY5s7kWlaseu6WqhXgPspJamQQOYusGFkBPrcI/s9FCPCrQxcR3 mX+tBeJV+azQ+lvqG+kkUyQMGzXrXb6DPUNnLZLoS9POLGBL8YjcxYT8ddrXtvYEaO t0xMRKIqLrAfFmRX7D9njNMePKK/i5W3Ev6lCvuTr9TpaUhqCcbdvoWM8kShk/dxFs G1cNHmeh6vnqg== Received: from tr.lan (ip-86-49-12-201.net.upcbroadband.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 0236F83BEF; Mon, 11 Apr 2022 19:56:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649699798; bh=FRS356bG8By1FwqiBnfuw4r7AVmSu/ptZFQlsEDPHA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GL3Ls7Fi7zLR0IsgMD0YFn2oq63i/yb+mumNsQS4S3WuUzLAew0V3DgLcRjbh5Lm9 uGFPjie7PCdEaOl7dIcctefQbkDt9T8psgqcWtGVWh1QzUgc+78mrjQOMGnhpbKd+Z fkEc9BwcOh45rmSsIwYeofDESljNLdu9q+3aX2K3tKd+mLa2TTpj+Qi+K14wwC7sQP AugvnQaChrj5APrdawBCreMIiHQfhbcrghjJjeq7GPUIPAs7ozPePBDXdIehq7Lf11 xENv+Pdl3fpNBDPF0en06/BNkSAUAzaopGbfnG2MCg/vMjPAQCQSyhQVtYQHyBsuHU NyqseqNScAgoQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: marcel.ziswiler@toradex.com, trini@konsulko.com, Marek Vasut , Joe Hershberger , Ramon Fried Subject: [PATCH 14/16] net: dm9000: Receive one packet per recv call Date: Mon, 11 Apr 2022 19:56:05 +0200 Message-Id: <20220411175607.626034-14-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411175607.626034-1-marex@denx.de> References: <20220411175607.626034-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Instead of reading out the entire FIFO and possibly overwriting U-Boot memory, read out one packet per recv call, pass it to U-Boot network stack, and repeat. Signed-off-by: Marek Vasut Cc: Joe Hershberger Cc: Ramon Fried --- drivers/net/dm9000x.c | 102 +++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 97084d16ffa..84b012ec65d 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -480,10 +480,9 @@ static void dm9000_halt_common(struct dm9000_priv *db) /* * Received a packet and pass to upper layer */ -static int dm9000_recv_common(struct dm9000_priv *db) +static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr) { u8 rxbyte; - u8 *rdptr = (u8 *)net_rx_packets[0]; u16 rxstatus, rxlen = 0; /* @@ -496,58 +495,52 @@ static int dm9000_recv_common(struct dm9000_priv *db) dm9000_iow(db, DM9000_ISR, 0x01); /* clear PR status latched in bit 0 */ /* There is _at least_ 1 package in the fifo, read them all */ - for (;;) { - dm9000_ior(db, DM9000_MRCMDX); /* Dummy read */ - - /* - * Get most updated data, - * only look at bits 0:1, See application notes DM9000 - */ - rxbyte = dm9000_inb(db->base_data) & 0x03; - - /* Status check: this byte must be 0 or 1 */ - if (rxbyte > DM9000_PKT_RDY) { - dm9000_iow(db, DM9000_RCR, 0x00); /* Stop Device */ - dm9000_iow(db, DM9000_ISR, 0x80); /* Stop INT request */ - printf("DM9000 error: status check fail: 0x%x\n", - rxbyte); - return 0; - } + dm9000_ior(db, DM9000_MRCMDX); /* Dummy read */ + + /* + * Get most updated data, + * only look at bits 0:1, See application notes DM9000 + */ + rxbyte = dm9000_inb(db->base_data) & 0x03; + + /* Status check: this byte must be 0 or 1 */ + if (rxbyte > DM9000_PKT_RDY) { + dm9000_iow(db, DM9000_RCR, 0x00); /* Stop Device */ + dm9000_iow(db, DM9000_ISR, 0x80); /* Stop INT request */ + printf("DM9000 error: status check fail: 0x%x\n", + rxbyte); + return -EINVAL; + } + + if (rxbyte != DM9000_PKT_RDY) + return 0; /* No packet received, ignore */ - if (rxbyte != DM9000_PKT_RDY) - return 0; /* No packet received, ignore */ - - debug("receiving packet\n"); - - /* A packet ready now & Get status/length */ - db->rx_status(db, &rxstatus, &rxlen); - - debug("rx status: 0x%04x rx len: %d\n", rxstatus, rxlen); - - /* Move data from DM9000 */ - /* Read received packet from RX SRAM */ - db->inblk(db, rdptr, rxlen); - - if (rxstatus & 0xbf00 || rxlen < 0x40 || - rxlen > DM9000_PKT_MAX) { - if (rxstatus & 0x100) - printf("rx fifo error\n"); - if (rxstatus & 0x200) - printf("rx crc error\n"); - if (rxstatus & 0x8000) - printf("rx length error\n"); - if (rxlen > DM9000_PKT_MAX) { - printf("rx length too big\n"); - dm9000_reset(db); - } - } else { - dm9000_dump_packet(__func__, rdptr, rxlen); - - debug("passing packet to upper layer\n"); - net_process_received_packet(net_rx_packets[0], rxlen); + debug("receiving packet\n"); + + /* A packet ready now & Get status/length */ + db->rx_status(db, &rxstatus, &rxlen); + + debug("rx status: 0x%04x rx len: %d\n", rxstatus, rxlen); + + /* Move data from DM9000 */ + /* Read received packet from RX SRAM */ + db->inblk(db, rdptr, rxlen); + + if (rxstatus & 0xbf00 || rxlen < 0x40 || rxlen > DM9000_PKT_MAX) { + if (rxstatus & 0x100) + printf("rx fifo error\n"); + if (rxstatus & 0x200) + printf("rx crc error\n"); + if (rxstatus & 0x8000) + printf("rx length error\n"); + if (rxlen > DM9000_PKT_MAX) { + printf("rx length too big\n"); + dm9000_reset(db); } + return -EINVAL; } - return 0; + + return rxlen; } /* @@ -599,8 +592,13 @@ static int dm9000_send(struct eth_device *dev, void *packet, int length) static int dm9000_recv(struct eth_device *dev) { struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); + int ret; + + ret = dm9000_recv_common(db, net_rx_packets[0]); + if (ret > 0) + net_process_received_packet(net_rx_packets[0], ret); - return dm9000_recv_common(db); + return ret; } int dm9000_initialize(struct bd_info *bis) -- 2.35.1