[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 3/5] cadence_gem: fix interrupt events
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v1 3/5] cadence_gem: fix interrupt events |
Date: |
Fri, 15 Feb 2013 14:51:38 +1000 |
Bits in the ISR were continually mirroring their corresponding TX/RX SR bits.
This is incorrect. The ISR bits are only every set at the time their
corresponding event occurs.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/cadence_gem.c | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c
index 966ab4f..a1ac069 100644
--- a/hw/cadence_gem.c
+++ b/hw/cadence_gem.c
@@ -427,32 +427,9 @@ static int gem_can_receive(NetClientState *nc)
*/
static void gem_update_int_status(GemState *s)
{
- uint32_t new_interrupts = 0;
- /* Packet transmitted ? */
- if (s->regs[GEM_TXSTATUS] & GEM_TXSTATUS_TXCMPL) {
- new_interrupts |= GEM_INT_TXCMPL;
- }
- /* End of TX ring ? */
- if (s->regs[GEM_TXSTATUS] & GEM_TXSTATUS_USED) {
- new_interrupts |= GEM_INT_TXUSED;
- }
-
- /* Frame received ? */
- if (s->regs[GEM_RXSTATUS] & GEM_RXSTATUS_FRMRCVD) {
- new_interrupts |= GEM_INT_RXCMPL;
- }
- /* RX ring full ? */
- if (s->regs[GEM_RXSTATUS] & GEM_RXSTATUS_NOBUF) {
- new_interrupts |= GEM_INT_RXUSED;
- }
-
- s->regs[GEM_ISR] |= new_interrupts & ~(s->regs[GEM_IMR]);
-
if (s->regs[GEM_ISR]) {
DB_PRINT("asserting int. (0x%08x)\n", s->regs[GEM_ISR]);
qemu_set_irq(s->irq, 1);
- } else {
- qemu_set_irq(s->irq, 0);
}
}
@@ -697,6 +674,7 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
DB_PRINT("descriptor 0x%x owned by sw.\n",
(unsigned)packet_desc_addr);
s->regs[GEM_RXSTATUS] |= GEM_RXSTATUS_NOBUF;
+ s->regs[GEM_ISR] |= GEM_INT_RXUSED & ~(s->regs[GEM_IMR]);
/* Handle interrupt consequences */
gem_update_int_status(s);
return -1;
@@ -765,6 +743,7 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
(uint8_t *)&desc[0], sizeof(desc));
s->regs[GEM_RXSTATUS] |= GEM_RXSTATUS_FRMRCVD;
+ s->regs[GEM_ISR] |= GEM_INT_RXCMPL & ~(s->regs[GEM_IMR]);
/* Handle interrupt consequences */
gem_update_int_status(s);
@@ -894,6 +873,7 @@ static void gem_transmit(GemState *s)
DB_PRINT("TX descriptor next: 0x%08x\n", s->tx_desc_addr);
s->regs[GEM_TXSTATUS] |= GEM_TXSTATUS_TXCMPL;
+ s->regs[GEM_ISR] |= GEM_INT_TXCMPL & ~(s->regs[GEM_IMR]);
/* Handle interrupt consequences */
gem_update_int_status(s);
@@ -931,6 +911,7 @@ static void gem_transmit(GemState *s)
if (tx_desc_get_used(desc)) {
s->regs[GEM_TXSTATUS] |= GEM_TXSTATUS_USED;
+ s->regs[GEM_ISR] |= GEM_INT_TXUSED & ~(s->regs[GEM_IMR]);
gem_update_int_status(s);
}
}
--
1.7.0.4
- [Qemu-devel] [PATCH v1 0/5] Zynq GEM updates, Peter Crosthwaite, 2013/02/14
- [Qemu-devel] [PATCH v1 1/5] cadence_gem: Flush queued packets, Peter Crosthwaite, 2013/02/14
- [Qemu-devel] [PATCH v1 2/5] cadence_gem: factor out can_rx() logic replication, Peter Crosthwaite, 2013/02/14
- [Qemu-devel] [PATCH v1 3/5] cadence_gem: fix interrupt events,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v1 4/5] cadence_gem: Dont reset rx desc pointer on rx_en, Peter Crosthwaite, 2013/02/14
- [Qemu-devel] [PATCH v1 5/5] cadence_gem: Add debug msgs for rx desc movement, Peter Crosthwaite, 2013/02/14
- Re: [Qemu-devel] [PATCH v1 0/5] Zynq GEM updates, Peter Crosthwaite, 2013/02/20
- Re: [Qemu-devel] [PATCH v1 0/5] Zynq GEM updates, Peter Maydell, 2013/02/28