[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.4 12/16] milkymist-minimac2: Flush queued packe
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.4 12/16] milkymist-minimac2: Flush queued packets when link comes up |
Date: |
Mon, 27 Jul 2015 14:51:57 +0100 |
From: Fam Zheng <address@hidden>
Drop .can_receive and move the semantics into minimac2_rx, by returning
0.
That is once minimac2_rx returns 0, incoming packets will be queued
until the queue is explicitly flushed. We do this when s->regs[R_STATE0]
or s->regs[R_STATE1] is changed in minimac2_write.
Also drop the unused trace point.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/net/milkymist-minimac2.c | 33 ++++++++++++++++-----------------
trace-events | 1 -
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index f06afaa..5d1cf08 100644
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -303,8 +303,7 @@ static ssize_t minimac2_rx(NetClientState *nc, const
uint8_t *buf, size_t size)
r_state = R_STATE1;
rx_buf = s->rx1_buf;
} else {
- trace_milkymist_minimac2_drop_rx_frame(buf);
- return size;
+ return 0;
}
/* assemble frame */
@@ -354,6 +353,18 @@ minimac2_read(void *opaque, hwaddr addr, unsigned size)
return r;
}
+static int minimac2_can_rx(MilkymistMinimac2State *s)
+{
+ if (s->regs[R_STATE0] == STATE_LOADED) {
+ return 1;
+ }
+ if (s->regs[R_STATE1] == STATE_LOADED) {
+ return 1;
+ }
+
+ return 0;
+}
+
static void
minimac2_write(void *opaque, hwaddr addr, uint64_t value,
unsigned size)
@@ -387,6 +398,9 @@ minimac2_write(void *opaque, hwaddr addr, uint64_t value,
case R_STATE1:
s->regs[addr] = value;
update_rx_interrupt(s);
+ if (minimac2_can_rx(s)) {
+ qemu_flush_queued_packets(qemu_get_queue(s->nic));
+ }
break;
case R_SETUP:
case R_COUNT0:
@@ -411,20 +425,6 @@ static const MemoryRegionOps minimac2_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int minimac2_can_rx(NetClientState *nc)
-{
- MilkymistMinimac2State *s = qemu_get_nic_opaque(nc);
-
- if (s->regs[R_STATE0] == STATE_LOADED) {
- return 1;
- }
- if (s->regs[R_STATE1] == STATE_LOADED) {
- return 1;
- }
-
- return 0;
-}
-
static void milkymist_minimac2_reset(DeviceState *d)
{
MilkymistMinimac2State *s = MILKYMIST_MINIMAC2(d);
@@ -445,7 +445,6 @@ static void milkymist_minimac2_reset(DeviceState *d)
static NetClientInfo net_milkymist_minimac2_info = {
.type = NET_CLIENT_OPTIONS_KIND_NIC,
.size = sizeof(NICState),
- .can_receive = minimac2_can_rx,
.receive = minimac2_rx,
};
diff --git a/trace-events b/trace-events
index 2d395c5..94bf3bb 100644
--- a/trace-events
+++ b/trace-events
@@ -828,7 +828,6 @@ milkymist_minimac2_mdio_write(uint8_t phy_addr, uint8_t
addr, uint16_t value) "p
milkymist_minimac2_mdio_read(uint8_t phy_addr, uint8_t addr, uint16_t value)
"phy_addr %02x addr %02x value %04x"
milkymist_minimac2_tx_frame(uint32_t length) "length %u"
milkymist_minimac2_rx_frame(const void *buf, uint32_t length) "buf %p length
%u"
-milkymist_minimac2_drop_rx_frame(const void *buf) "buf %p"
milkymist_minimac2_rx_transfer(const void *buf, uint32_t length) "buf %p
length %d"
milkymist_minimac2_raise_irq_rx(void) "Raise IRQ RX"
milkymist_minimac2_lower_irq_rx(void) "Lower IRQ RX"
--
2.4.3
- [Qemu-devel] [PULL for-2.4 00/16] Net patches, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 03/16] hw/net: add simple phy support to mcf_fec driver, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 01/16] hw/net: create common collection of MII definitions, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 02/16] hw/net: add ANLPAR bit definitions to generic mii, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 04/16] hw/net: fix mcf_fec driver receiver, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 05/16] xgmac: Drop packets with eth_can_rx is false., Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 08/16] usbnet: Drop usbnet_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 06/16] pcnet: Drop pcnet_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 07/16] eepro100: Drop nic_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 10/16] etsec: Flush queue when rx buffer is consumed, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 12/16] milkymist-minimac2: Flush queued packets when link comes up,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.4 11/16] mcf_fec: Drop mcf_fec_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 13/16] mipsnet: Flush queued packets when receiving is enabled, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 14/16] stellaris_enet: Flush queued packets when read done, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 09/16] etsec: Move etsec_can_receive into etsec_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 15/16] dp8393x: Flush packets when link comes up, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 16/16] axienet: Flush queued packets when rx is done, Stefan Hajnoczi, 2015/07/27
- Re: [Qemu-devel] [PULL for-2.4 00/16] Net patches, Peter Maydell, 2015/07/27