| Message ID | 20241112181044.92193-8-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/net/xilinx_ethlite: Map RAM buffers as RAM and remove tswap() calls | expand |
On Tue, Nov 12, 2024 at 07:10:31PM +0100, Philippe Mathieu-Daudé wrote: > 'rxbuf' is the index of the port used. Rename it as 'port_index'. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/net/xilinx_ethlite.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c > index 76b1e7d826..20919b4f54 100644 > --- a/hw/net/xilinx_ethlite.c > +++ b/hw/net/xilinx_ethlite.c > @@ -72,8 +72,7 @@ struct XlnxXpsEthLite > > uint32_t c_tx_pingpong; > uint32_t c_rx_pingpong; > - unsigned int txbuf; > - unsigned int rxbuf; > + unsigned int port_index; May want to add a comment that you're refering to the dual port RAM index and not some other port... Either way: Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> > > UnimplementedDeviceState mdio; > uint32_t regs[R_MAX]; > @@ -183,7 +182,7 @@ static const MemoryRegionOps eth_ops = { > static bool eth_can_rx(NetClientState *nc) > { > XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); > - unsigned int rxbase = s->rxbuf * (0x800 / 4); > + unsigned int rxbase = s->port_index * (0x800 / 4); > > return !(s->regs[rxbase + R_RX_CTRL0] & CTRL_S); > } > @@ -191,7 +190,7 @@ static bool eth_can_rx(NetClientState *nc) > static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) > { > XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); > - unsigned int rxbase = s->rxbuf * (0x800 / 4); > + unsigned int rxbase = s->port_index * (0x800 / 4); > > /* DA filter. */ > if (!(buf[0] & 0x80) && memcmp(&s->conf.macaddr.a[0], buf, 6)) > @@ -214,7 +213,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) > } > > /* If c_rx_pingpong was set flip buffers. */ > - s->rxbuf ^= s->c_rx_pingpong; > + s->port_index ^= s->c_rx_pingpong; > return size; > } > > @@ -222,7 +221,7 @@ static void xilinx_ethlite_reset(DeviceState *dev) > { > XlnxXpsEthLite *s = XILINX_ETHLITE(dev); > > - s->rxbuf = 0; > + s->port_index = 0; > } > > static NetClientInfo net_xilinx_ethlite_info = { > -- > 2.45.2 >
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 76b1e7d826..20919b4f54 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -72,8 +72,7 @@ struct XlnxXpsEthLite uint32_t c_tx_pingpong; uint32_t c_rx_pingpong; - unsigned int txbuf; - unsigned int rxbuf; + unsigned int port_index; UnimplementedDeviceState mdio; uint32_t regs[R_MAX]; @@ -183,7 +182,7 @@ static const MemoryRegionOps eth_ops = { static bool eth_can_rx(NetClientState *nc) { XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); - unsigned int rxbase = s->rxbuf * (0x800 / 4); + unsigned int rxbase = s->port_index * (0x800 / 4); return !(s->regs[rxbase + R_RX_CTRL0] & CTRL_S); } @@ -191,7 +190,7 @@ static bool eth_can_rx(NetClientState *nc) static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) { XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); - unsigned int rxbase = s->rxbuf * (0x800 / 4); + unsigned int rxbase = s->port_index * (0x800 / 4); /* DA filter. */ if (!(buf[0] & 0x80) && memcmp(&s->conf.macaddr.a[0], buf, 6)) @@ -214,7 +213,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) } /* If c_rx_pingpong was set flip buffers. */ - s->rxbuf ^= s->c_rx_pingpong; + s->port_index ^= s->c_rx_pingpong; return size; } @@ -222,7 +221,7 @@ static void xilinx_ethlite_reset(DeviceState *dev) { XlnxXpsEthLite *s = XILINX_ETHLITE(dev); - s->rxbuf = 0; + s->port_index = 0; } static NetClientInfo net_xilinx_ethlite_info = {
'rxbuf' is the index of the port used. Rename it as 'port_index'. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/net/xilinx_ethlite.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)