[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] ftgmac100: fix dblac write test
From: |
Jason Wang |
Subject: |
[PULL 7/7] ftgmac100: fix dblac write test |
Date: |
Wed, 15 Jul 2020 21:53:21 +0800 |
From: erik-smit <erik.lucas.smit@gmail.com>
The test of the write of the dblac register was testing the old value
instead of the new value. This would accept the write of an invalid value
but subsequently refuse any following valid writes.
Signed-off-by: erik-smit <erik.lucas.smit@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/ftgmac100.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 043ba61..5f4b26f 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -810,16 +810,18 @@ static void ftgmac100_write(void *opaque, hwaddr addr,
s->phydata = value & 0xffff;
break;
case FTGMAC100_DBLAC: /* DMA Burst Length and Arbitration Control */
- if (FTGMAC100_DBLAC_TXDES_SIZE(s->dblac) < sizeof(FTGMAC100Desc)) {
+ if (FTGMAC100_DBLAC_TXDES_SIZE(value) < sizeof(FTGMAC100Desc)) {
qemu_log_mask(LOG_GUEST_ERROR,
- "%s: transmit descriptor too small : %d bytes\n",
- __func__, FTGMAC100_DBLAC_TXDES_SIZE(s->dblac));
+ "%s: transmit descriptor too small: %" PRIx64
+ " bytes\n", __func__,
+ FTGMAC100_DBLAC_TXDES_SIZE(value));
break;
}
- if (FTGMAC100_DBLAC_RXDES_SIZE(s->dblac) < sizeof(FTGMAC100Desc)) {
+ if (FTGMAC100_DBLAC_RXDES_SIZE(value) < sizeof(FTGMAC100Desc)) {
qemu_log_mask(LOG_GUEST_ERROR,
- "%s: receive descriptor too small : %d bytes\n",
- __func__, FTGMAC100_DBLAC_RXDES_SIZE(s->dblac));
+ "%s: receive descriptor too small : %" PRIx64
+ " bytes\n", __func__,
+ FTGMAC100_DBLAC_RXDES_SIZE(value));
break;
}
s->dblac = value;
--
2.5.0
- [PULL 0/7] Net patches, Jason Wang, 2020/07/15
- [PULL 1/7] virtio-net: fix removal of failover device, Jason Wang, 2020/07/15
- [PULL 2/7] hw/net: Added CSO for IPv6, Jason Wang, 2020/07/15
- [PULL 3/7] net/colo-compare.c: Expose compare "max_queue_size" to users, Jason Wang, 2020/07/15
- [PULL 4/7] qemu-options.hx: Clean up and fix typo for colo-compare, Jason Wang, 2020/07/15
- [PULL 5/7] net: check if the file descriptor is valid before using it, Jason Wang, 2020/07/15
- [PULL 6/7] net: detect errors from probing vnet hdr flag for TAP devices, Jason Wang, 2020/07/15
- [PULL 7/7] ftgmac100: fix dblac write test,
Jason Wang <=
- Re: [PULL 0/7] Net patches, Peter Maydell, 2020/07/15
- Re: [PULL 0/7] Net patches, Peter Maydell, 2020/07/16