From nobody Mon Feb 9 23:40:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1573039664; cv=none; d=zoho.com; s=zohoarc; b=HpFK5prbf0VFrhAmj8DJ7IvDPef3I6wxjSvdbf9KG4Rjq8q+4sYBC6WAMrBL2HxuhIvVOlXLcphjj6A9Y3tPP383x70pWBIEDomAoz/9Wxsf/yovOGuQGUN79BCmKjZSLthIOsLjVS/xHZFVhBvIDDqX8h4Cr0mTcYHm30wZUcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573039664; 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=hGPvMmSms6lisez9Z7gdZcWK6Mghs0gfiXFv2LGytSA=; b=M6jEZwb6QTSt7+GvQGP9u8yRbi0sJ5ALCR1I2R/ZHBbxdtXaSIJGWUO8SW0qnEQzqvgJDviTE1l/97XZS7lbnKLeyI8RHozKUJGKABqdF7tPGeKuNvHaQhV9GuU27229qLXR+AUPyMVYPTnI51oTgS3zYhTLKQL43GdsxQD4wRk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573039664942128.4957111593493; Wed, 6 Nov 2019 03:27:44 -0800 (PST) Received: from localhost ([::1]:56196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSJTT-0002Xm-Rg for importer@patchew.org; Wed, 06 Nov 2019 06:27:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35277) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSJPn-0007zu-Bd for qemu-devel@nongnu.org; Wed, 06 Nov 2019 06:23:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSJPl-0000as-G4 for qemu-devel@nongnu.org; Wed, 06 Nov 2019 06:23:55 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:39173) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSJPl-0000X2-5o for qemu-devel@nongnu.org; Wed, 06 Nov 2019 06:23:53 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N49d1-1hkUCW3Spl-0105wm; Wed, 06 Nov 2019 12:23:46 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] dp8393x: put the DMA buffer in the state structure Date: Wed, 6 Nov 2019 12:23:40 +0100 Message-Id: <20191106112341.23735-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191106112341.23735-1-laurent@vivier.eu> References: <20191106112341.23735-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Ph0vUdpbQKMk9zryzaiBGsmREIV/etHPXOiTtByPQA85xQyyenV hHBmw+cvBqFC7GxPn9g/1DdCpQWfLPMM35FWmdCQgPlnLARiy546vNLP3qwMScD7VGS3+aP 9Oa64wl+Z7JBmgyqElX2VEAkiEWop/mg+LViKukW5KcxE5q9eVRJ4jE1zTLmP6BtY5rVyaR gMld9qUGtH73rRowsrpvQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:y5GFsLTs9dk=:QMSvxEnXql/i7ICvF6sDgt A6sqtEMdBnpcPwT67ABcr6gdG4eXzCsjmf4FNjitP9e50TE9HgcXwV0zo1MODNxTX54PEDeXL HzbEwVFQSDJW1jPUzfVa9/NkdLi3qYbWGFhUWAfSYNPTU6aq5GypvDmFTeN9Xy4goLLdt0Y9S 6xplWg4YVj2ViIkmXrS8m4Whr7JYIvIkPh4yI4NA3+o7wzGMsZmQuSbcjwwTXc0a4XAPbq6s6 4S5tC51IQXQGeGdaMU9kydfQ6EPWHWHry0bOCXNo61Kgqryd5NlomR2tgwxQW4wlSoEtohztI QBQF3HSmtluZ35DvCiWoSmtdtdqcai2yjUUc5vuXQEcY+LTq1IXjr48QDyFIEhtGD9GeP9tyE WTKminHWd7OGCjyjCl2mBCPyNfTu6dljGui9rueKlDLH4ml6tprvgOtdo5cXIQzZc/tAiWHyR A5QS3HMjqZAwUGTJagwTePNJlb9/L0oO8Js08PFPzBLVmh+pneZYOK/ITcAO4iwgrZhj36h2S aUwmZiBXJlMHynttsJWm0H7u1ML3wqva4BBzHFVRZPiSvkFXNsNQS6YjVHruA8JdjXduwuUCB Y3LGC0fCYzzVGeun5u53xo8ozjVYc2tU0MPUlOrSmUAoTwtiVXj5SfBh8oOsXPTEWK3KSJlpz DJQCk/E1xkV1ivhvdudzTqeGNUluf0LVZKfceHRBSiL3X8F4lVITtPPSyxzp60ll88Ng9t9zm bS7UPxjsP2r4nSWdaYdGmnu+F0oUIZdNb31kCZwOpZde0sT7YOhc9jinqwyqSw2W3TOo7YGF+ OP06QHrpSi/DMYwb2UILhQAk76UC3ErpTIyH4DA0a0tWnl9dE+//y4g/YgImlKtLdifF4urYi h+nHhh3uTL96ZkXiUiVw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 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: Jason Wang , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Move it from the stack. It's only 24 bytes, and this simplifies the dp8393x_get()/ dp8393x_put() interface. Signed-off-by: Laurent Vivier Reviewed-by: Herv=C3=A9 Poussineau --- hw/net/dp8393x.c | 105 ++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 693e244ce6..85d3f3788e 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -171,6 +171,7 @@ typedef struct dp8393xState { =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; + uint16_t data[12]; int loopback_packet; =20 /* Memory access */ @@ -224,26 +225,25 @@ static uint32_t dp8393x_wt(dp8393xState *s) return s->regs[SONIC_WT1] << 16 | s->regs[SONIC_WT0]; } =20 -static uint16_t dp8393x_get(dp8393xState *s, int width, uint16_t *base, - int offset) +static uint16_t dp8393x_get(dp8393xState *s, int width, int offset) { uint16_t val; =20 if (s->big_endian) { - val =3D be16_to_cpu(base[offset * width + width - 1]); + val =3D be16_to_cpu(s->data[offset * width + width - 1]); } else { - val =3D le16_to_cpu(base[offset * width]); + val =3D le16_to_cpu(s->data[offset * width]); } return val; } =20 -static void dp8393x_put(dp8393xState *s, int width, uint16_t *base, int of= fset, +static void dp8393x_put(dp8393xState *s, int width, int offset, uint16_t val) { if (s->big_endian) { - base[offset * width + width - 1] =3D cpu_to_be16(val); + s->data[offset * width + width - 1] =3D cpu_to_be16(val); } else { - base[offset * width] =3D cpu_to_le16(val); + s->data[offset * width] =3D cpu_to_le16(val); } } =20 @@ -267,7 +267,6 @@ static void dp8393x_update_irq(dp8393xState *s) =20 static void dp8393x_do_load_cam(dp8393xState *s) { - uint16_t data[8]; int width, size; uint16_t index =3D 0; =20 @@ -277,13 +276,13 @@ static void dp8393x_do_load_cam(dp8393xState *s) while (s->regs[SONIC_CDC] & 0x1f) { /* Fill current entry */ address_space_rw(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); - s->cam[index][0] =3D dp8393x_get(s, width, data, 1) & 0xff; - s->cam[index][1] =3D dp8393x_get(s, width, data, 1) >> 8; - s->cam[index][2] =3D dp8393x_get(s, width, data, 2) & 0xff; - s->cam[index][3] =3D dp8393x_get(s, width, data, 2) >> 8; - s->cam[index][4] =3D dp8393x_get(s, width, data, 3) & 0xff; - s->cam[index][5] =3D dp8393x_get(s, width, data, 3) >> 8; + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); + s->cam[index][0] =3D dp8393x_get(s, width, 1) & 0xff; + s->cam[index][1] =3D dp8393x_get(s, width, 1) >> 8; + s->cam[index][2] =3D dp8393x_get(s, width, 2) & 0xff; + s->cam[index][3] =3D dp8393x_get(s, width, 2) >> 8; + s->cam[index][4] =3D dp8393x_get(s, width, 3) & 0xff; + s->cam[index][5] =3D dp8393x_get(s, width, 3) >> 8; DPRINTF("load cam[%d] with %02x%02x%02x%02x%02x%02x\n", index, s->cam[index][0], s->cam[index][1], s->cam[index][2], s->cam[index][3], s->cam[index][4], s->cam[index][5]); @@ -295,8 +294,8 @@ static void dp8393x_do_load_cam(dp8393xState *s) =20 /* Read CAM enable */ address_space_rw(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); - s->regs[SONIC_CE] =3D dp8393x_get(s, width, data, 0); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); + s->regs[SONIC_CE] =3D dp8393x_get(s, width, 0); DPRINTF("load cam done. cam enable mask 0x%04x\n", s->regs[SONIC_CE]); =20 /* Done */ @@ -307,20 +306,19 @@ static void dp8393x_do_load_cam(dp8393xState *s) =20 static void dp8393x_do_read_rra(dp8393xState *s) { - uint16_t data[8]; int width, size; =20 /* Read memory */ width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; size =3D sizeof(uint16_t) * 4 * width; address_space_rw(&s->as, dp8393x_rrp(s), - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); =20 /* Update SONIC registers */ - s->regs[SONIC_CRBA0] =3D dp8393x_get(s, width, data, 0); - s->regs[SONIC_CRBA1] =3D dp8393x_get(s, width, data, 1); - s->regs[SONIC_RBWC0] =3D dp8393x_get(s, width, data, 2); - s->regs[SONIC_RBWC1] =3D dp8393x_get(s, width, data, 3); + s->regs[SONIC_CRBA0] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_CRBA1] =3D dp8393x_get(s, width, 1); + s->regs[SONIC_RBWC0] =3D dp8393x_get(s, width, 2); + s->regs[SONIC_RBWC1] =3D dp8393x_get(s, width, 3); DPRINTF("CRBA0/1: 0x%04x/0x%04x, RBWC0/1: 0x%04x/0x%04x\n", s->regs[SONIC_CRBA0], s->regs[SONIC_CRBA1], s->regs[SONIC_RBWC0], s->regs[SONIC_RBWC1]); @@ -417,7 +415,6 @@ static void dp8393x_do_receiver_disable(dp8393xState *s) static void dp8393x_do_transmit_packets(dp8393xState *s) { NetClientState *nc =3D qemu_get_queue(s->nic); - uint16_t data[12]; int width, size; int tx_len, len; uint16_t i; @@ -429,18 +426,17 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) size =3D sizeof(uint16_t) * 6 * width; s->regs[SONIC_TTDA] =3D s->regs[SONIC_CTDA]; DPRINTF("Transmit packet at %08x\n", dp8393x_ttda(s)); - address_space_rw(&s->as, - dp8393x_ttda(s) + sizeof(uint16_t) * width, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); + address_space_rw(&s->as, dp8393x_ttda(s) + sizeof(uint16_t) * widt= h, + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); tx_len =3D 0; =20 /* Update registers */ - s->regs[SONIC_TCR] =3D dp8393x_get(s, width, data, 0) & 0xf000; - s->regs[SONIC_TPS] =3D dp8393x_get(s, width, data, 1); - s->regs[SONIC_TFC] =3D dp8393x_get(s, width, data, 2); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, data, 3); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, data, 4); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, data, 5); + s->regs[SONIC_TCR] =3D dp8393x_get(s, width, 0) & 0xf000; + s->regs[SONIC_TPS] =3D dp8393x_get(s, width, 1); + s->regs[SONIC_TFC] =3D dp8393x_get(s, width, 2); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 3); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 4); + s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 5); =20 /* Handle programmable interrupt */ if (s->regs[SONIC_TCR] & SONIC_TCR_PINT) { @@ -465,10 +461,10 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) size =3D sizeof(uint16_t) * 3 * width; address_space_rw(&s->as, dp8393x_ttda(s) + sizeof(uint16_t) * (4 + 3 * i) * wid= th, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, data, 0); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, data, 1); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, data, 2); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 1); + s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 2); } } =20 @@ -495,12 +491,12 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) s->regs[SONIC_TCR] |=3D SONIC_TCR_PTX; =20 /* Write status */ - dp8393x_put(s, width, data, 0, + dp8393x_put(s, width, 0, s->regs[SONIC_TCR] & 0x0fff); /* status */ size =3D sizeof(uint16_t) * width; address_space_rw(&s->as, dp8393x_ttda(s), - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 1); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 1); =20 if (!(s->regs[SONIC_CR] & SONIC_CR_HTX)) { /* Read footer of packet */ @@ -509,9 +505,9 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) dp8393x_ttda(s) + sizeof(uint16_t) * (4 + 3 * s->regs[SONIC_TFC]) * width, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); - s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, data, 0) & ~0x1; - if (dp8393x_get(s, width, data, 0) & 0x1) { + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); + s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, 0) & ~0x1; + if (dp8393x_get(s, width, 0) & 0x1) { /* EOL detected */ break; } @@ -748,7 +744,6 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, size_t size) { dp8393xState *s =3D qemu_get_nic_opaque(nc); - uint16_t data[10]; int packet_type; uint32_t available, address; int width, rx_len =3D size; @@ -773,8 +768,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, size =3D sizeof(uint16_t) * 1 * width; address =3D dp8393x_crda(s) + sizeof(uint16_t) * 5 * width; address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, - (uint8_t *)data, size, 0); - if (dp8393x_get(s, width, data, 0) & 0x1) { + (uint8_t *)s->data, size, 0); + if (dp8393x_get(s, width, 0) & 0x1) { /* Still EOL ; stop reception */ return -1; } else { @@ -818,27 +813,27 @@ static ssize_t dp8393x_receive(NetClientState *nc, co= nst uint8_t * buf, =20 /* Write status to memory */ DPRINTF("Write status at %08x\n", dp8393x_crda(s)); - dp8393x_put(s, width, data, 0, s->regs[SONIC_RCR]); /* status */ - dp8393x_put(s, width, data, 1, rx_len); /* byte count */ - dp8393x_put(s, width, data, 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 */ - dp8393x_put(s, width, data, 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 */ - dp8393x_put(s, width, data, 4, s->regs[SONIC_RSC]); /* seq_no */ + dp8393x_put(s, width, 0, s->regs[SONIC_RCR]); /* status */ + dp8393x_put(s, width, 1, rx_len); /* byte count */ + dp8393x_put(s, width, 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 */ + dp8393x_put(s, width, 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 */ + dp8393x_put(s, width, 4, s->regs[SONIC_RSC]); /* seq_no */ size =3D sizeof(uint16_t) * 5 * width; address_space_rw(&s->as, dp8393x_crda(s), - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 1); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 1); =20 /* Move to next descriptor */ size =3D sizeof(uint16_t) * width; address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 5 * widt= h, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); - s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, data, 0); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0); + s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, 0); if (s->regs[SONIC_LLFA] & 0x1) { /* EOL detected */ s->regs[SONIC_ISR] |=3D SONIC_ISR_RDE; } else { - dp8393x_put(s, width, data, 0, 0); /* in_use */ + dp8393x_put(s, width, 0, 0); /* in_use */ address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 6 * = width, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, sizeof(uint16_t), 1); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, sizeof(uint16_t), = 1); s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; s->regs[SONIC_ISR] |=3D SONIC_ISR_PKTRX; s->regs[SONIC_RSC] =3D (s->regs[SONIC_RSC] & 0xff00) | (((s->regs[= SONIC_RSC] & 0x00ff) + 1) & 0x00ff); --=20 2.21.0