From: David Gibson <david@gibson.dropbear.id.au>
To: peter.maydell@linaro.org
Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org,
aik@ozlabs.ru, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PULL 08/14] cuda.c: fix CUDA SR interrupt clearing
Date: Thu, 12 Nov 2015 15:38:37 +1100 [thread overview]
Message-ID: <1447303123-4446-10-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1447303123-4446-1-git-send-email-david@gibson.dropbear.id.au>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Make sure that we also clear the data and clock interrupts at the same time.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
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
next prev parent reply other threads:[~2015-11-12 4:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-12 4:38 [Qemu-devel] [PULL 00/14] ppc-next queue 20151112 David Gibson
2015-11-12 4:38 ` David Gibson
2015-11-12 14:15 ` Peter Maydell
2015-11-12 4:38 ` [Qemu-devel] [PULL 01/14] PPC: Allow Rc bit to be set on mtspr David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 02/14] PPC: Fix lswx bounds checks David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 03/14] PPC: mac99: Always add USB controller David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 04/14] cuda.c: fix CUDA ADB error packet format David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 05/14] cuda.c: fix CUDA_PACKET response " David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 06/14] cuda.c: implement simple CUDA_GET_6805_ADDR command David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 07/14] cuda.c: implement dummy IIC access commands David Gibson
2015-11-12 4:38 ` David Gibson [this message]
2015-11-12 4:38 ` [Qemu-devel] [PULL 09/14] cuda.c: add defines for CUDA registers David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 10/14] cuda.c: refactor get_tb() so that the time can be passed in David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 11/14] cuda.c: rename get_counter() state variable from s to ti for consistency David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 12/14] cuda.c: fix T2 timer and enable its interrupt David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 13/14] cuda.c: add delay to setting of SR_INT bit David Gibson
2015-11-12 4:38 ` [Qemu-devel] [PULL 14/14] monitor/target-ppc: Define target_get_monitor_def David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447303123-4446-10-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=lvivier@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mdroth@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).