The following changes since commit 7993b0f83fe5c3f8555e79781d5d098f99751a94:

Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-03-29 18:45:12 +0100)

https://git.linaro.org/people/pmaydell/qemu-arm.git pull-target-arm-20210330

for you to fetch changes up to b9e3f1579a4b06fc63dfa8cdb68df1c58eeb0cf1:

hw/timer/renesas_tmr: Add default-case asserts in read_tcnt() (2021-03-30 14:05:34 +0100)

* net/npcm7xx_emc.c: Fix handling of receiving packets when RSDR not set

* hw/display/xlnx_dp: Free FIFOs adding xlnx_dp_finalize()

* hw/arm/smmuv3: Drop unused CDM_VALID() and is_cd_valid()

* target/arm: Make number of counters in PMCR follow the CPU

* hw/timer/renesas_tmr: Add default-case asserts in read_tcnt()

Doug Evans (1):

net/npcm7xx_emc.c: Fix handling of receiving packets when RSDR not set

Peter Maydell (2):

target/arm: Make number of counters in PMCR follow the CPU

hw/timer/renesas_tmr: Add default-case asserts in read_tcnt()

From: Doug Evans <dje@google.com>

Turning REG_MCMDR_RXON is enough to start receiving packets.

Signed-off-by: Doug Evans <dje@google.com>

Message-id: 20210319195044.741821-1-dje@google.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

hw/net/npcm7xx_emc.c | 4 +++-

tests/qtest/npcm7xx_emc-test.c | 30 +++++++++++++++++++++---------

2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c

--- a/hw/net/npcm7xx_emc.c

+++ b/hw/net/npcm7xx_emc.c

@@ -XXX,XX +XXX,XX @@ static void npcm7xx_emc_write(void *opaque, hwaddr offset,

!(value & REG_MCMDR_RXON)) {

emc->regs[REG_MGSTA] |= REG_MGSTA_RXHA;

-

- /* Prod the device to send the packet. */

- emc_write(qts, mod, REG_TSDR, 1);

}

static void emc_send_verify1(QTestState *qts, const EMCModule *mod, int fd,

@@ -XXX,XX +XXX,XX @@ static void emc_send_verify(QTestState *qts, const EMCModule *mod, int fd,

enable_tx(qts, mod, &desc[0], NUM_TX_DESCRIPTORS, desc_addr,

with_irq ? REG_MIEN_ENTXINTR : 0);

+ /* Prod the device to send the packet. */

+ emc_write(qts, mod, REG_TSDR, 1);

+

/*

* It's problematic to observe the interrupt for each packet.

* Instead just wait until all the packets go out.

@@ -XXX,XX +XXX,XX @@ static void enable_rx(QTestState *qts, const EMCModule *mod,

mcmdr |= REG_MCMDR_RXON | mcmdr_flags;

emc_write(qts, mod, REG_MCMDR, mcmdr);

-

- /* Prod the device to accept a packet. */

- emc_write(qts, mod, REG_RSDR, 1);

}

static void emc_recv_verify(QTestState *qts, const EMCModule *mod, int fd,

- bool with_irq)

+ bool with_irq, bool pump_rsdr)

{

NPCM7xxEMCRxDesc desc[NUM_RX_DESCRIPTORS];

uint32_t desc_addr = DESC_ADDR;

@@ -XXX,XX +XXX,XX @@ static void emc_recv_verify(QTestState *qts, const EMCModule *mod, int fd,

enable_rx(qts, mod, &desc[0], NUM_RX_DESCRIPTORS, desc_addr,

with_irq ? REG_MIEN_ENRXINTR : 0, 0);

+ /*

+ * If requested, prod the device to accept a packet.

+ * This isn't necessary, the linux driver doesn't do this.

+ * Test doing/not-doing this for robustness.

+ */

+ if (pump_rsdr) {

+ emc_write(qts, mod, REG_RSDR, 1);

+ }

+

/* Send test packet to device's socket. */

ret = iov_send(fd, iov, 2, 0, sizeof(len) + sizeof(test));

g_assert_cmpint(ret, == , sizeof(test) + sizeof(len));

@@ -XXX,XX +XXX,XX @@ static void test_rx(gconstpointer test_data)

qtest_irq_intercept_in(qts, "/machine/soc/a9mpcore/gic");

- emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/false);

- emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/true);

+ emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/false,

+ /*pump_rsdr=*/false);

+ emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/false,

+ /*pump_rsdr=*/true);

+ emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/true,

+ /*pump_rsdr=*/false);

+ emc_recv_verify(qts, td->module, test_sockets[0], /*with_irq=*/true,

+ /*pump_rsdr=*/true);

emc_test_ptle(qts, td->module, test_sockets[0]);

qtest_quit(qts);

2.20.1