From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Aurelien Jarno" <aurelien@aurel32.net>,
qemu-block@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Andreas Färber" <afaerber@suse.de>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Yongbok Kim" <yongbok.kim@mips.com>,
"Fam Zheng" <famz@redhat.com>, "Max Reitz" <mreitz@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [Qemu-devel] [RFC 12/13] dp8393x: put DMA temp buffer in the state, not in the stack
Date: Fri, 8 Jun 2018 22:05:57 +0200 [thread overview]
Message-ID: <20180608200558.386-13-laurent@vivier.eu> (raw)
In-Reply-To: <20180608200558.386-1-laurent@vivier.eu>
It's only 32 bytes, and this simplifies the dp8393x_get()/
dp8393x_put() interface.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/net/dp8393x.c | 107 ++++++++++++++++++++++++++-----------------------------
1 file changed, 51 insertions(+), 56 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 5061474e6b..40e5f8257b 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -168,6 +168,7 @@ typedef struct dp8393xState {
/* Temporaries */
uint8_t tx_buffer[0x10000];
+ uint16_t data[16];
int loopback_packet;
/* Memory access */
@@ -227,15 +228,14 @@ static uint32_t dp8393x_wt(dp8393xState *s)
return s->regs[SONIC_WT1] << 16 | s->regs[SONIC_WT0];
}
-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;
if (s->big_endian) {
- val = base[offset * width + width - 1];
+ val = s->data[offset * width + width - 1];
} else {
- val = base[offset * width];
+ val = s->data[offset * width];
}
if (s->big_endian != host_big_endian) {
val = bswap16(val);
@@ -243,7 +243,7 @@ static uint16_t dp8393x_get(dp8393xState *s, int width, uint16_t *base,
return val;
}
-static void dp8393x_put(dp8393xState *s, int width, uint16_t *base, int offset,
+static void dp8393x_put(dp8393xState *s, int width, int offset,
uint16_t val)
{
if (s->big_endian != host_big_endian) {
@@ -251,9 +251,9 @@ static void dp8393x_put(dp8393xState *s, int width, uint16_t *base, int offset,
}
if (s->big_endian) {
- base[offset * width + width - 1] = val;
+ s->data[offset * width + width - 1] = val;
} else {
- base[offset * width] = val;
+ s->data[offset * width] = val;
}
}
@@ -277,7 +277,6 @@ static void dp8393x_update_irq(dp8393xState *s)
static void dp8393x_do_load_cam(dp8393xState *s)
{
- uint16_t data[8];
int width, size;
uint16_t index = 0;
@@ -287,13 +286,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] = dp8393x_get(s, width, data, 1) & 0xff;
- s->cam[index][1] = dp8393x_get(s, width, data, 1) >> 8;
- s->cam[index][2] = dp8393x_get(s, width, data, 2) & 0xff;
- s->cam[index][3] = dp8393x_get(s, width, data, 2) >> 8;
- s->cam[index][4] = dp8393x_get(s, width, data, 3) & 0xff;
- s->cam[index][5] = dp8393x_get(s, width, data, 3) >> 8;
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
+ s->cam[index][0] = dp8393x_get(s, width, 1) & 0xff;
+ s->cam[index][1] = dp8393x_get(s, width, 1) >> 8;
+ s->cam[index][2] = dp8393x_get(s, width, 2) & 0xff;
+ s->cam[index][3] = dp8393x_get(s, width, 2) >> 8;
+ s->cam[index][4] = dp8393x_get(s, width, 3) & 0xff;
+ s->cam[index][5] = 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]);
@@ -305,8 +304,8 @@ static void dp8393x_do_load_cam(dp8393xState *s)
/* Read CAM enable */
address_space_rw(&s->as, dp8393x_cdp(s),
- MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
- s->regs[SONIC_CE] = dp8393x_get(s, width, data, 0);
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
+ s->regs[SONIC_CE] = dp8393x_get(s, width, 0);
DPRINTF("load cam done. cam enable mask 0x%04x\n", s->regs[SONIC_CE]);
/* Done */
@@ -317,20 +316,19 @@ static void dp8393x_do_load_cam(dp8393xState *s)
static void dp8393x_do_read_rra(dp8393xState *s)
{
- uint16_t data[8];
int width, size;
/* Read memory */
width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1;
size = 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);
/* Update SONIC registers */
- s->regs[SONIC_CRBA0] = dp8393x_get(s, width, data, 0);
- s->regs[SONIC_CRBA1] = dp8393x_get(s, width, data, 1);
- s->regs[SONIC_RBWC0] = dp8393x_get(s, width, data, 2);
- s->regs[SONIC_RBWC1] = dp8393x_get(s, width, data, 3);
+ s->regs[SONIC_CRBA0] = dp8393x_get(s, width, 0);
+ s->regs[SONIC_CRBA1] = dp8393x_get(s, width, 1);
+ s->regs[SONIC_RBWC0] = dp8393x_get(s, width, 2);
+ s->regs[SONIC_RBWC1] = 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]);
@@ -427,7 +425,6 @@ static void dp8393x_do_receiver_disable(dp8393xState *s)
static void dp8393x_do_transmit_packets(dp8393xState *s)
{
NetClientState *nc = qemu_get_queue(s->nic);
- uint16_t data[12];
int width, size;
int tx_len, len;
uint16_t i;
@@ -436,21 +433,20 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
while (1) {
/* Read memory */
- size = sizeof(uint16_t) * 6 * width;
+ size = sizeof(uint16_t) * 7 * width;
s->regs[SONIC_TTDA] = 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),
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
tx_len = 0;
/* Update registers */
- s->regs[SONIC_TCR] = dp8393x_get(s, width, data, 0) & 0xf000;
- s->regs[SONIC_TPS] = dp8393x_get(s, width, data, 1);
- s->regs[SONIC_TFC] = dp8393x_get(s, width, data, 2);
- s->regs[SONIC_TSA0] = dp8393x_get(s, width, data, 3);
- s->regs[SONIC_TSA1] = dp8393x_get(s, width, data, 4);
- s->regs[SONIC_TFS] = dp8393x_get(s, width, data, 5);
+ s->regs[SONIC_TCR] = dp8393x_get(s, width, 1) & 0xf000;
+ s->regs[SONIC_TPS] = dp8393x_get(s, width, 2);
+ s->regs[SONIC_TFC] = dp8393x_get(s, width, 3);
+ s->regs[SONIC_TSA0] = dp8393x_get(s, width, 4);
+ s->regs[SONIC_TSA1] = dp8393x_get(s, width, 5);
+ s->regs[SONIC_TFS] = dp8393x_get(s, width, 6);
/* Handle programmable interrupt */
if (s->regs[SONIC_TCR] & SONIC_TCR_PINT) {
@@ -475,10 +471,10 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
size = sizeof(uint16_t) * 3 * width;
address_space_rw(&s->as,
dp8393x_ttda(s) + sizeof(uint16_t) * (4 + 3 * i) * width,
- MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
- s->regs[SONIC_TSA0] = dp8393x_get(s, width, data, 0);
- s->regs[SONIC_TSA1] = dp8393x_get(s, width, data, 1);
- s->regs[SONIC_TFS] = dp8393x_get(s, width, data, 2);
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
+ s->regs[SONIC_TSA0] = dp8393x_get(s, width, 0);
+ s->regs[SONIC_TSA1] = dp8393x_get(s, width, 1);
+ s->regs[SONIC_TFS] = dp8393x_get(s, width, 2);
}
}
@@ -505,12 +501,12 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
s->regs[SONIC_TCR] |= SONIC_TCR_PTX;
/* Write status */
- dp8393x_put(s, width, data, 0,
+ dp8393x_put(s, width, 0,
s->regs[SONIC_TCR] & 0x0fff); /* status */
size = 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);
if (!(s->regs[SONIC_CR] & SONIC_CR_HTX)) {
/* Read footer of packet */
@@ -519,9 +515,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] = 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] = dp8393x_get(s, width, 0) & ~0x1;
+ if (dp8393x_get(s, width, 0) & 0x1) {
/* EOL detected */
break;
}
@@ -758,7 +754,6 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
size_t size)
{
dp8393xState *s = qemu_get_nic_opaque(nc);
- uint16_t data[10];
int packet_type;
uint32_t available, address;
int width, rx_len = size;
@@ -783,8 +778,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
size = sizeof(uint16_t) * 1 * width;
address = 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 {
@@ -828,29 +823,29 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
/* 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 = 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);
/* Move to next descriptor */
size = sizeof(uint16_t) * width;
address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 5 * width,
- MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
- s->regs[SONIC_LLFA] = dp8393x_get(s, width, data, 0);
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
+ s->regs[SONIC_LLFA] = dp8393x_get(s, width, 0);
if (s->regs[SONIC_LLFA] & 0x1) {
/* EOL detected */
s->regs[SONIC_ISR] |= SONIC_ISR_RDE;
} else {
size = sizeof(uint16_t) * width;
- 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, size, 1);
+ MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 1);
s->regs[SONIC_CRDA] = s->regs[SONIC_LLFA];
s->regs[SONIC_ISR] |= SONIC_ISR_PKTRX;
s->regs[SONIC_RSC] = (s->regs[SONIC_RSC] & 0xff00) | (((s->regs[SONIC_RSC] & 0x00ff) + 1) & 0x00ff);
--
2.14.4
next prev parent reply other threads:[~2018-06-08 20:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 20:05 [Qemu-devel] [RFC 00/13] hw/m68k: add Apple Machintosh Quadra 800 machine Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 01/13] hw/m68k: add via support Laurent Vivier
2018-06-09 10:01 ` Mark Cave-Ayland
2018-06-09 15:48 ` Mark Cave-Ayland
2018-06-10 8:22 ` Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 02/13] ADB: VIA probes ADB bus when it is idle Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 03/13] escc: introduce a selector for the register bit Laurent Vivier
2018-06-09 10:05 ` Mark Cave-Ayland
2018-06-08 20:05 ` [Qemu-devel] [RFC 04/13] hw/m68k: add video card Laurent Vivier
2018-06-09 10:14 ` Mark Cave-Ayland
2018-06-08 20:05 ` [Qemu-devel] [RFC 05/13] hw/m68k: Apple Sound Chip (ASC) emulation Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 06/13] ESP: add pseudo-DMA as used by Macintosh Laurent Vivier
2018-06-09 8:57 ` Hervé Poussineau
2018-06-09 10:19 ` Mark Cave-Ayland
2018-06-08 20:05 ` [Qemu-devel] [RFC 07/13] hw/m68k: add Nubus support Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 08/13] hw/m68k: add a dummy SWIM floppy controller Laurent Vivier
2018-06-08 20:05 ` [Qemu-devel] [RFC 09/13] hw/m68k: define Macintosh Quadra 800 Laurent Vivier
2018-06-09 10:24 ` Mark Cave-Ayland
2018-06-08 20:05 ` [Qemu-devel] [RFC 10/13] dp8393x: fix dp8393x_receive Laurent Vivier
2018-06-09 8:47 ` Hervé Poussineau
2018-06-08 20:05 ` [Qemu-devel] [RFC 11/13] dp8393x: manage big endian bus Laurent Vivier
2018-06-09 8:55 ` Hervé Poussineau
2018-06-09 18:25 ` Thomas Huth
2018-06-08 20:05 ` Laurent Vivier [this message]
2018-06-09 8:55 ` [Qemu-devel] [RFC 12/13] dp8393x: put DMA temp buffer in the state, not in the stack Hervé Poussineau
2018-06-09 18:36 ` Thomas Huth
2018-06-08 20:05 ` [Qemu-devel] [RFC 13/13] dp8393x: fix receiving buffer exhaustion Laurent Vivier
2018-06-09 8:55 ` Hervé Poussineau
2018-06-08 20:34 ` [Qemu-devel] [RFC 00/13] hw/m68k: add Apple Machintosh Quadra 800 machine no-reply
2018-06-09 3:26 ` Philippe Mathieu-Daudé
2018-06-09 8:34 ` Laurent Vivier
2018-06-09 14:25 ` Philippe Mathieu-Daudé
2018-06-09 18:14 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180608200558.386-13-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=afaerber@suse.de \
--cc=aurelien@aurel32.net \
--cc=dgilbert@redhat.com \
--cc=famz@redhat.com \
--cc=hpoussin@reactos.org \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=yongbok.kim@mips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).