From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmEdd-0000gS-6y for qemu-devel@nongnu.org; Fri, 21 Dec 2012 21:16:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TmEda-0006GD-1V for qemu-devel@nongnu.org; Fri, 21 Dec 2012 21:16:33 -0500 From: Scott Wood Date: Fri, 21 Dec 2012 20:15:45 -0600 Message-ID: <1356142552-13453-9-git-send-email-scottwood@freescale.com> In-Reply-To: <1356142552-13453-1-git-send-email-scottwood@freescale.com> References: <1356142552-13453-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 08/15] openpic/fsl: critical interrupts ignore mask before v4.1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Scott Wood , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Signed-off-by: Scott Wood --- hw/openpic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/openpic.c b/hw/openpic.c index 9d22e9c..268f312 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -194,6 +194,7 @@ typedef struct IRQ_src_t { bool level; /* level-triggered */ bool fslint; /* FSL internal interrupt -- level only */ bool fslspecial; /* FSL timer/IPI interrupt, edge, no polarity */ + bool nomask; /* critical interrupts ignore mask on some FSL MPICs */ } IRQ_src_t; #define IVPR_MASK_SHIFT 31 @@ -390,7 +391,7 @@ static void openpic_update_irq(OpenPICState *opp, int n_IRQ) DPRINTF("%s: IRQ %d is not pending\n", __func__, n_IRQ); return; } - if (src->ivpr & IVPR_MASK_MASK) { + if ((src->ivpr & IVPR_MASK_MASK) && !src->nomask) { /* Interrupt source is disabled */ DPRINTF("%s: IRQ %d is disabled\n", __func__, n_IRQ); return; @@ -536,6 +537,7 @@ static inline void write_IRQreg_idr(OpenPICState *opp, int n_IRQ, uint32_t val) } src->output = OPENPIC_OUTPUT_CINT; + src->nomask = true; src->destmask = 0; for (i = 0; i < opp->nb_cpus; i++) { @@ -547,6 +549,7 @@ static inline void write_IRQreg_idr(OpenPICState *opp, int n_IRQ, uint32_t val) } } else { src->output = OPENPIC_OUTPUT_INT; + src->nomask = false; src->destmask = src->idr & normal_mask; } } else { -- 1.7.9.5