ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/net/can: interrupt cleanup 

Define two functions to update the interrupt state, and call them
on loadvm.  This removes the need to migrate the state as part of
vmstate_kvaser_pci.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-01-29 23:30:17 +01:00
parent e73e09481c
commit a62ed5d106
2 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/can/can_kvaser_pci.c
View File

@ -264,10 +264,10 @@ static const VMStateDescription vmstate_kvaser_pci = {
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, KvaserPCIState), VMSTATE_PCI_DEVICE(dev, KvaserPCIState),
/* Load this before sja_state. */
VMSTATE_UINT32(s5920_intcsr, KvaserPCIState),
VMSTATE_STRUCT(sja_state, KvaserPCIState, 0, vmstate_can_sja, VMSTATE_STRUCT(sja_state, KvaserPCIState, 0, vmstate_can_sja,
CanSJA1000State), CanSJA1000State),
VMSTATE_UINT32(s5920_intcsr, KvaserPCIState),
VMSTATE_UINT32(s5920_irqstate, KvaserPCIState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };

82
hw/net/can/can_sja1000.c
View File

@ -378,6 +378,24 @@ static int frame2buff_bas(const qemu_can_frame *frame, uint8_t *buff)
return frame->can_dlc + 2; return frame->can_dlc + 2;
} }
static void can_sja_update_pel_irq(CanSJA1000State *s)
{
if (s->interrupt_en & s->interrupt_pel) {
qemu_irq_raise(s->irq);
} else {
qemu_irq_lower(s->irq);
}
}
static void can_sja_update_bas_irq(CanSJA1000State *s)
{
if ((s->control >> 1) & s->interrupt_bas) {
qemu_irq_raise(s->irq);
} else {
qemu_irq_lower(s->irq);
}
}
void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val, void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
unsigned size) unsigned size)
{ {
@ -457,9 +475,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
/* Clear transmit status. */ /* Clear transmit status. */
s->status_pel &= ~(1 << 5); s->status_pel &= ~(1 << 5);
s->interrupt_pel |= 0x02; s->interrupt_pel |= 0x02;
if (s->interrupt_en & 0x02) { can_sja_update_pel_irq(s);
qemu_irq_raise(s->irq);
}
} }
if (0x04 & val) { /* Release Receive Buffer */ if (0x04 & val) { /* Release Receive Buffer */
if (s->rxmsg_cnt <= 0) { if (s->rxmsg_cnt <= 0) {
@ -488,19 +504,13 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
if (s->rxmsg_cnt == 0) { if (s->rxmsg_cnt == 0) {
s->status_pel &= ~(1 << 0); s->status_pel &= ~(1 << 0);
s->interrupt_pel &= ~(1 << 0); s->interrupt_pel &= ~(1 << 0);
} can_sja_update_pel_irq(s);
if ((s->interrupt_en & 0x01) && (s->interrupt_pel == 0)) {
/* no other interrupts. */
qemu_irq_lower(s->irq);
} }
} }
if (0x08 & val) { /* Clear data overrun */ if (0x08 & val) { /* Clear data overrun */
s->status_pel &= ~(1 << 1); s->status_pel &= ~(1 << 1);
s->interrupt_pel &= ~(1 << 3); s->interrupt_pel &= ~(1 << 3);
if ((s->interrupt_en & 0x80) && (s->interrupt_pel == 0)) { can_sja_update_pel_irq(s);
/* no other interrupts. */
qemu_irq_lower(s->irq);
}
} }
break; break;
case SJA_SR: /* Status register */ case SJA_SR: /* Status register */
@ -568,9 +578,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
/* Clear transmit status. */ /* Clear transmit status. */
s->status_bas &= ~(1 << 5); s->status_bas &= ~(1 << 5);
s->interrupt_bas |= 0x02; s->interrupt_bas |= 0x02;
if (s->control & 0x04) { can_sja_update_bas_irq(s);
qemu_irq_raise(s->irq);
}
} }
if (0x04 & val) { /* Release Receive Buffer */ if (0x04 & val) { /* Release Receive Buffer */
if (s->rxmsg_cnt <= 0) { if (s->rxmsg_cnt <= 0) {
@ -593,19 +601,13 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
if (s->rxmsg_cnt == 0) { if (s->rxmsg_cnt == 0) {
s->status_bas &= ~(1 << 0); s->status_bas &= ~(1 << 0);
s->interrupt_bas &= ~(1 << 0); s->interrupt_bas &= ~(1 << 0);
} can_sja_update_bas_irq(s);
if ((s->control & 0x02) && (s->interrupt_bas == 0)) {
/* no other interrupts. */
qemu_irq_lower(s->irq);
} }
} }
if (0x08 & val) { /* Clear data overrun */ if (0x08 & val) { /* Clear data overrun */
s->status_bas &= ~(1 << 1); s->status_bas &= ~(1 << 1);
s->interrupt_bas &= ~(1 << 3); s->interrupt_bas &= ~(1 << 3);
if ((s->control & 0x10) && (s->interrupt_bas == 0)) { can_sja_update_bas_irq(s);
/* no other interrupts. */
qemu_irq_lower(s->irq);
}
} }
break; break;
case 4: case 4:
@ -654,9 +656,8 @@ uint64_t can_sja_mem_read(CanSJA1000State *s, hwaddr addr, unsigned size)
s->interrupt_pel = 0; s->interrupt_pel = 0;
if (s->rxmsg_cnt) { if (s->rxmsg_cnt) {
s->interrupt_pel |= (1 << 0); /* Receive interrupt. */ s->interrupt_pel |= (1 << 0); /* Receive interrupt. */
break;
} }
qemu_irq_lower(s->irq); can_sja_update_pel_irq(s);
break; break;
case SJA_IER: /* Interrupt enable register, addr 4 */ case SJA_IER: /* Interrupt enable register, addr 4 */
temp = s->interrupt_en; temp = s->interrupt_en;
@ -704,9 +705,8 @@ uint64_t can_sja_mem_read(CanSJA1000State *s, hwaddr addr, unsigned size)
s->interrupt_bas = 0; s->interrupt_bas = 0;
if (s->rxmsg_cnt) { if (s->rxmsg_cnt) {
s->interrupt_bas |= (1 << 0); /* Receive interrupt. */ s->interrupt_bas |= (1 << 0); /* Receive interrupt. */
break;
} }
qemu_irq_lower(s->irq); can_sja_update_bas_irq(s);
break; break;
case 4: case 4:
temp = s->code; temp = s->code;
@ -789,13 +789,11 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
if (s->rx_cnt + ret > SJA_RCV_BUF_LEN) { /* Data overrun. */ if (s->rx_cnt + ret > SJA_RCV_BUF_LEN) { /* Data overrun. */
s->status_pel |= (1 << 1); /* Overrun status */ s->status_pel |= (1 << 1); /* Overrun status */
s->interrupt_pel |= (1 << 3); s->interrupt_pel |= (1 << 3);
if (s->interrupt_en & (1 << 3)) { /* Overrun interrupt enable */
qemu_irq_raise(s->irq);
}
s->status_pel &= ~(1 << 4); s->status_pel &= ~(1 << 4);
if (DEBUG_FILTER) { if (DEBUG_FILTER) {
qemu_log("[cansja]: receive FIFO overrun\n"); qemu_log("[cansja]: receive FIFO overrun\n");
} }
can_sja_update_pel_irq(s);
return ret; return ret;
} }
s->rx_cnt += ret; s->rx_cnt += ret;
@ -813,9 +811,7 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
s->interrupt_pel |= 0x01; s->interrupt_pel |= 0x01;
s->status_pel &= ~(1 << 4); s->status_pel &= ~(1 << 4);
s->status_pel |= (1 << 0); s->status_pel |= (1 << 0);
if (s->interrupt_en & 0x01) { /* Receive Interrupt enable. */ can_sja_update_pel_irq(s);
qemu_irq_raise(s->irq);
}
} else { /* BasicCAN mode */ } else { /* BasicCAN mode */
/* the CAN controller is receiving a message */ /* the CAN controller is receiving a message */
@ -834,9 +830,7 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
s->status_bas |= (1 << 1); /* Overrun status */ s->status_bas |= (1 << 1); /* Overrun status */
s->status_bas &= ~(1 << 4); s->status_bas &= ~(1 << 4);
s->interrupt_bas |= (1 << 3); s->interrupt_bas |= (1 << 3);
if (s->control & (1 << 4)) { /* Overrun interrupt enable */ can_sja_update_bas_irq(s);
qemu_irq_raise(s->irq);
}
if (DEBUG_FILTER) { if (DEBUG_FILTER) {
qemu_log("[cansja]: receive FIFO overrun\n"); qemu_log("[cansja]: receive FIFO overrun\n");
} }
@ -856,10 +850,8 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
s->status_bas |= 0x01; /* Set the Receive Buffer Status. DS-p15 */ s->status_bas |= 0x01; /* Set the Receive Buffer Status. DS-p15 */
s->status_bas &= ~(1 << 4); s->status_bas &= ~(1 << 4);
s->interrupt_bas |= 0x01; s->interrupt_bas |= (1 << 0);
if (s->control & 0x02) { /* Receive Interrupt enable. */ can_sja_update_bas_irq(s);
qemu_irq_raise(s->irq);
}
} }
return 1; return 1;
} }
@ -909,12 +901,24 @@ const VMStateDescription vmstate_qemu_can_filter = {
} }
}; };
static int can_sja_post_load(void *opaque, int version_id)
{
CanSJA1000State *s = opaque;
if (s->clock & 0x80) { /* PeliCAN Mode */
can_sja_update_pel_irq(s);
} else {
can_sja_update_bas_irq(s);
}
return 0;
}
/* VMState is needed for live migration of QEMU images */ /* VMState is needed for live migration of QEMU images */
const VMStateDescription vmstate_can_sja = { const VMStateDescription vmstate_can_sja = {
.name = "can_sja", .name = "can_sja",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.post_load = can_sja_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT8(mode, CanSJA1000State), VMSTATE_UINT8(mode, CanSJA1000State),