haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse source 
Version: GnuPG v1
 
 iQEcBAABAgAGBQJV+qd8AAoJEJykq7OBq3PI6wUIAKzR4WteJjo9qRApJvGtlxXW
 Rpt1RxmM9TaMrYCYxtSbnd3reSJfBR23ByQdwRi/iIko9CyylNJ+tIGrj5iOoRAq
 r7Fs/VK+C7AcaqEkyIgHeCbR4FpynJYPjPt1arv3MwFGh6xIEDXGj9IMC2T49WQR
 1DzW2OQa0q+lJtXVOfuTwQctw8QC/DLIGkCIbAiqfmucQpmMmbQUvuuk21R3KEnU
 HzhtJ87QMTq7cFL15ZQ/Ag8zATO6c827L23zO4GX1WMp0A/rvMybiLVbpT0U5MAO
 dObk7WzAWUy3/0edpOUUlMZpedfogpMTuCoO+H+slz+L1GqD1AuYqqjDI663SXw=
 =rCDA
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

# gpg: Signature made Thu 17 Sep 2015 12:43:56 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  net: smc91c111: flush packets on RCR register changes
  net: smc91c111: gate can_receive() on rx FIFO having a slot
  net: smc91c111: guard flush_queued_packets() on can_rx()
  MAINTAINERS: Stefan will not maintain net subsystem

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-09-17 13:07:50 +01:00
parent 1c9f03b81c 271a234a23
commit cc450bfdc0
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MAINTAINERS
View file

@ -955,11 +955,10 @@ F: hmp-commands.hx
T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
Network device layer
M: Stefan Hajnoczi <stefanha@redhat.com>
M: Jason Wang <jasowang@redhat.com>
S: Maintained
F: net/
T: git git://github.com/stefanha/qemu.git net
T: git git://github.com/jasowang/qemu.git net
Netmap network backend
M: Luigi Rizzo <rizzo@iet.unipi.it>

33
hw/net/smc91c111.c
View file

@ -124,6 +124,25 @@ static void smc91c111_update(smc91c111_state *s)
qemu_set_irq(s->irq, level);
}
static int smc91c111_can_receive(smc91c111_state *s)
{
if ((s->rcr & RCR_RXEN) == 0 || (s->rcr & RCR_SOFT_RST)) {
return 1;
}
if (s->allocated == (1 << NUM_PACKETS) - 1 ||
s->rx_fifo_len == NUM_PACKETS) {
return 0;
}
return 1;
}
static inline void smc91c111_flush_queued_packets(smc91c111_state *s)
{
if (smc91c111_can_receive(s)) {
qemu_flush_queued_packets(qemu_get_queue(s->nic));
}
}
/* Try to allocate a packet. Returns 0x80 on failure. */
static int smc91c111_allocate_packet(smc91c111_state *s)
{
@ -164,6 +183,7 @@ static void smc91c111_pop_rx_fifo(smc91c111_state *s)
} else {
s->int_level &= ~INT_RCV;
}
smc91c111_flush_queued_packets(s);
smc91c111_update(s);
}
@ -185,7 +205,7 @@ static void smc91c111_release_packet(smc91c111_state *s, int packet)
s->allocated &= ~(1 << packet);
if (s->tx_alloc == 0x80)
smc91c111_tx_alloc(s);
qemu_flush_queued_packets(qemu_get_queue(s->nic));
smc91c111_flush_queued_packets(s);
}
/* Flush the TX FIFO. */
@ -311,6 +331,7 @@ static void smc91c111_writeb(void *opaque, hwaddr offset,
if (s->rcr & RCR_SOFT_RST) {
smc91c111_reset(DEVICE(s));
}
smc91c111_flush_queued_packets(s);
return;
case 10: case 11: /* RPCR */
/* Ignored */
@ -636,15 +657,11 @@ static uint32_t smc91c111_readl(void *opaque, hwaddr offset)
return val;
}
static int smc91c111_can_receive(NetClientState *nc)
static int smc91c111_can_receive_nc(NetClientState *nc)
{
smc91c111_state *s = qemu_get_nic_opaque(nc);
if ((s->rcr & RCR_RXEN) == 0 || (s->rcr & RCR_SOFT_RST))
return 1;
if (s->allocated == (1 << NUM_PACKETS) - 1)
return 0;
return 1;
return smc91c111_can_receive(s);
}
static ssize_t smc91c111_receive(NetClientState *nc, const uint8_t *buf, size_t size)
@ -739,7 +756,7 @@ static const MemoryRegionOps smc91c111_mem_ops = {
static NetClientInfo net_smc91c111_info = {
.type = NET_CLIENT_OPTIONS_KIND_NIC,
.size = sizeof(NICState),
.can_receive = smc91c111_can_receive,
.can_receive = smc91c111_can_receive_nc,
.receive = smc91c111_receive,
};