2 files changed, 13 insertions, 0 deletions

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 0691e6d9c1e4..00e4fed4a39b 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -169,6 +169,9 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                 err_reg = readl_relaxed(base + flag_mux->offset +
                                         L3_FLAGMUX_REGERR0 + (inttype << 3));
 
+                err_reg &= ~(inttype ? flag_mux->mask_app_bits :
+                                flag_mux->mask_dbg_bits);
+
                 /* Get the corresponding error and analyse */
                 if (err_reg) {
                         /* Identify the source from control status register */
@@ -193,6 +196,12 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                                 mask_val = readl_relaxed(mask_reg);
                                 mask_val &= ~(1 << err_src);
                                 writel_relaxed(mask_val, mask_reg);
+
+                                /* Mark these bits as to be ignored */
+                                if (inttype)
+                                        flag_mux->mask_app_bits |= 1 << err_src;
+                                else
+                                        flag_mux->mask_dbg_bits |= 1 << err_src;
                         }
 
                         /* Error found so break the for loop */
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index ea2f51c984f1..4e18307470f6 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -66,11 +66,15 @@ struct l3_target_data {
  *              target data. unsupported ones are marked with
  *              L3_TARGET_NOT_SUPPORTED
  * @num_targ_data: number of entries in target data
+ * @mask_app_bits: ignore these from raw application irq status
+ * @mask_dbg_bits: ignore these from raw debug irq status
  */
 struct l3_flagmux_data {
         u32 offset;
         struct l3_target_data *l3_targ;
         u8 num_targ_data;
+        u32 mask_app_bits;
+        u32 mask_dbg_bits;
 };