Changeset 602 for trunk

Timestamp:

Dec 17, 2013, 1:45:08 PM (11 years ago)

Author:

cfuguet

Message:

Adding IRQ from memory cache for error signalization.

In the tsar_xbar_generic platform, the IRQ has been
connected to the port HWI 30.

In the tsar_mono_mmu, the IRQ has been connected to
the port HWI 2.

Location:

trunk/platforms

Files:

• tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h (modified) (1 diff)
• tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (4 diffs)
• tsar_mono_mmu/top.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

@@ -68 +68 @@
     sc_signal<bool>         signal_irq_mnic_tx[8];  // unused
     sc_signal<bool>         signal_irq_chbuf[8];  // unused
+    sc_signal<bool>         signal_irq_memc;
     sc_signal<bool>         signal_irq_bdev;
 

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -594 +594 @@
         xicu->p_irq[p]                 (signal_proc_it[p]);
     }
+
     for (size_t i = 0; i < 32; i++)
     {
@@ -602 +603 @@
             else if (i < 16)                 xicu->p_hwi[i] (signal_false);
             else if (i < (16 + nb_ttys))     xicu->p_hwi[i] (signal_irq_mtty[i - 16]);
-            else if (i < 31)                 xicu->p_hwi[i] (signal_false);
+            else if (i < 30)                 xicu->p_hwi[i] (signal_false);
+            else if (i < 31)                 xicu->p_hwi[i] (signal_irq_memc);
             else                             xicu->p_hwi[i] (signal_irq_bdev);
         }
@@ -609 +611 @@
             if      (i < 8)                  xicu->p_hwi[i] (signal_false);
             else if (i < (8 + nb_dmas))      xicu->p_hwi[i] (signal_irq_mdma[i - 8]);
+            else if (i < 30)                 xicu->p_hwi[i] (signal_false);
+            else if (i < 31)                 xicu->p_hwi[i] (signal_irq_memc);
             else                             xicu->p_hwi[i] (signal_false);
         }
@@ -625 +629 @@
     memc->p_clk                        (this->p_clk);
     memc->p_resetn                     (this->p_resetn);
+    memc->p_irq                        (signal_irq_memc);
     memc->p_vci_ixr                    (signal_vci_xram);
     memc->p_vci_tgt                    (signal_vci_tgt_memc);

trunk/platforms/tsar_mono_mmu/top.cpp

@@ -225 +225 @@
         sc_signal<bool> signal_icu_irq0("signal_icu_irq0");
         sc_signal<bool> signal_icu_irq1("signal_icu_irq1");
+        sc_signal<bool> signal_icu_irq2("signal_icu_irq2");
 
         soclib::common::Loader loader("test.elf");
@@ -357 +358 @@
         vcixicu->p_hwi[0](signal_icu_irq0);
         vcixicu->p_hwi[1](signal_icu_irq1);
+        vcixicu->p_hwi[2](signal_icu_irq2);
         vcixicu->p_irq[0](signal_proc0_it0);
         vcixicu->p_irq[1](signal_proc0_it1);
@@ -424 +426 @@
         memc->p_clk(signal_clk);
         memc->p_resetn(signal_resetn);
+        memc->p_irq(signal_icu_irq2);
         memc->p_vci_tgt(signal_vci_tgt_memc);
         memc->p_dspin_p2m(signal_dspin_p2m_memc);