[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 08/14] cuda.c: fix CUDA SR interrupt clearing
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 08/14] cuda.c: fix CUDA SR interrupt clearing |
Date: |
Thu, 12 Nov 2015 15:38:37 +1100 |
From: Mark Cave-Ayland <address@hidden>
Make sure that we also clear the data and clock interrupts at the same time.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/misc/macio/cuda.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index b7e9dee..364473f 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -57,6 +57,8 @@
#define IER_SET 0x80 /* set bits in IER */
#define IER_CLR 0 /* clear bits in IER */
#define SR_INT 0x04 /* Shift register full/empty */
+#define SR_DATA_INT 0x08
+#define SR_CLOCK_INT 0x10
#define T1_INT 0x40 /* Timer 1 interrupt */
#define T2_INT 0x20 /* Timer 2 interrupt */
@@ -261,7 +263,7 @@ static uint32_t cuda_readb(void *opaque, hwaddr addr)
break;
case 10:
val = s->sr;
- s->ifr &= ~SR_INT;
+ s->ifr &= ~(SR_INT | SR_CLOCK_INT | SR_DATA_INT);
cuda_update_irq(s);
break;
case 11:
--
2.5.0
- [Qemu-ppc] [PULL 00/14] ppc-next queue 20151112, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 01/14] PPC: Allow Rc bit to be set on mtspr, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 00/14] ppc-next queue 20151112, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 02/14] PPC: Fix lswx bounds checks, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 07/14] cuda.c: implement dummy IIC access commands, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 04/14] cuda.c: fix CUDA ADB error packet format, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 08/14] cuda.c: fix CUDA SR interrupt clearing,
David Gibson <=
- [Qemu-ppc] [PULL 05/14] cuda.c: fix CUDA_PACKET response packet format, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 03/14] PPC: mac99: Always add USB controller, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 06/14] cuda.c: implement simple CUDA_GET_6805_ADDR command, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 09/14] cuda.c: add defines for CUDA registers, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 12/14] cuda.c: fix T2 timer and enable its interrupt, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 13/14] cuda.c: add delay to setting of SR_INT bit, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 11/14] cuda.c: rename get_counter() state variable from s to ti for consistency, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 10/14] cuda.c: refactor get_tb() so that the time can be passed in, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 14/14] monitor/target-ppc: Define target_get_monitor_def, David Gibson, 2015/11/11