| Message ID | 20241112181044.92193-4-philmd@linaro.org |
|---|---|
| State | Superseded |
| 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:27PM +0100, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> > --- > hw/net/xilinx_ethlite.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c > index bb330a233f..2b52597f03 100644 > --- a/hw/net/xilinx_ethlite.c > +++ b/hw/net/xilinx_ethlite.c > @@ -32,7 +32,6 @@ > #include "net/net.h" > #include "trace.h" > > -#define D(x) > #define R_TX_BUF0 0 > #define R_TX_LEN0 (0x07f4 / 4) > #define R_TX_GIE0 (0x07f8 / 4) > @@ -100,7 +99,6 @@ eth_read(void *opaque, hwaddr addr, unsigned int size) > case R_RX_CTRL1: > case R_RX_CTRL0: > r = s->regs[addr]; > - D(qemu_log("%s " HWADDR_FMT_plx "=%x\n", __func__, addr * 4, r)); > break; > > default: > @@ -126,13 +124,10 @@ eth_write(void *opaque, hwaddr addr, > if (addr == R_TX_CTRL1) > base = 0x800 / 4; > > - D(qemu_log("%s addr=" HWADDR_FMT_plx " val=%x\n", > - __func__, addr * 4, value)); > if ((value & (CTRL_P | CTRL_S)) == CTRL_S) { > qemu_send_packet(qemu_get_queue(s->nic), > (void *) &s->regs[base], > s->regs[base + R_TX_LEN0]); > - D(qemu_log("eth_tx %d\n", s->regs[base + R_TX_LEN0])); > if (s->regs[base + R_TX_CTRL0] & CTRL_I) > eth_pulse_irq(s); > } else if ((value & (CTRL_P | CTRL_S)) == (CTRL_P | CTRL_S)) { > @@ -156,8 +151,6 @@ eth_write(void *opaque, hwaddr addr, > case R_TX_LEN0: > case R_TX_LEN1: > case R_TX_GIE0: > - D(qemu_log("%s addr=" HWADDR_FMT_plx " val=%x\n", > - __func__, addr * 4, value)); > s->regs[addr] = value; > break; > > @@ -203,7 +196,6 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) > return -1; > } > > - D(qemu_log("%s %zd rxbase=%x\n", __func__, size, rxbase)); > if (size > (R_MAX - R_RX_BUF0 - rxbase) * 4) { > trace_ethlite_pkt_size_too_big(size); > return -1; > -- > 2.45.2 >
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index bb330a233f..2b52597f03 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -32,7 +32,6 @@ #include "net/net.h" #include "trace.h" -#define D(x) #define R_TX_BUF0 0 #define R_TX_LEN0 (0x07f4 / 4) #define R_TX_GIE0 (0x07f8 / 4) @@ -100,7 +99,6 @@ eth_read(void *opaque, hwaddr addr, unsigned int size) case R_RX_CTRL1: case R_RX_CTRL0: r = s->regs[addr]; - D(qemu_log("%s " HWADDR_FMT_plx "=%x\n", __func__, addr * 4, r)); break; default: @@ -126,13 +124,10 @@ eth_write(void *opaque, hwaddr addr, if (addr == R_TX_CTRL1) base = 0x800 / 4; - D(qemu_log("%s addr=" HWADDR_FMT_plx " val=%x\n", - __func__, addr * 4, value)); if ((value & (CTRL_P | CTRL_S)) == CTRL_S) { qemu_send_packet(qemu_get_queue(s->nic), (void *) &s->regs[base], s->regs[base + R_TX_LEN0]); - D(qemu_log("eth_tx %d\n", s->regs[base + R_TX_LEN0])); if (s->regs[base + R_TX_CTRL0] & CTRL_I) eth_pulse_irq(s); } else if ((value & (CTRL_P | CTRL_S)) == (CTRL_P | CTRL_S)) { @@ -156,8 +151,6 @@ eth_write(void *opaque, hwaddr addr, case R_TX_LEN0: case R_TX_LEN1: case R_TX_GIE0: - D(qemu_log("%s addr=" HWADDR_FMT_plx " val=%x\n", - __func__, addr * 4, value)); s->regs[addr] = value; break; @@ -203,7 +196,6 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) return -1; } - D(qemu_log("%s %zd rxbase=%x\n", __func__, size, rxbase)); if (size > (R_MAX - R_RX_BUF0 - rxbase) * 4) { trace_ethlite_pkt_size_too_big(size); return -1;
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/net/xilinx_ethlite.c | 8 -------- 1 file changed, 8 deletions(-)