EDAC, altera: Add Arria10 Ethernet EDAC support

Add Altera Arria10 Ethernet FIFO memory EDAC support. Update to support
a common compatibility string for all Ethernet FIFOs in the DT.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1466603939-7526-8-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 6ca7474baf4aec4990c7e03d2df71289ca4940b7..d0c1dab9b435480bef9d6c61f42cac9dbea0107f 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -391,6 +391,13 @@ config EDAC_ALTERA_OCRAM
          Support for error detection and correction on the
          Altera On-Chip RAM Memory for Altera SoCs.
 
          Support for error detection and correction on the
          Altera On-Chip RAM Memory for Altera SoCs.
 

+config EDAC_ALTERA_ETHERNET
+       bool "Altera Ethernet FIFO ECC"
+       depends on EDAC_ALTERA=y
+       help
+         Support for error detection and correction on the
+         Altera Ethernet FIFO Memory for Altera SoCs.
+

 config EDAC_SYNOPSYS
        tristate "Synopsys DDR Memory Controller"
        depends on EDAC_MM_EDAC && ARCH_ZYNQ
 config EDAC_SYNOPSYS
        tristate "Synopsys DDR Memory Controller"
        depends on EDAC_MM_EDAC && ARCH_ZYNQ

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index 6091b76646c4be458a80499c50be15bc48571191..2398d0701f5b0dad1f5eb98a32f093a668c95844 100644 (file)
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -1258,6 +1258,33 @@ static const struct edac_device_prv_data a10_l2ecc_data = {
 
 #endif /* CONFIG_EDAC_ALTERA_L2C */
 
 
 #endif /* CONFIG_EDAC_ALTERA_L2C */
 

+/********************* Ethernet Device Functions ********************/
+
+#ifdef CONFIG_EDAC_ALTERA_ETHERNET
+
+static const struct edac_device_prv_data a10_enetecc_data = {
+       .setup = altr_check_ecc_deps,
+       .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
+       .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
+       .dbgfs_name = "altr_trigger",
+       .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
+       .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
+       .ce_set_mask = ALTR_A10_ECC_TSERRA,
+       .ue_set_mask = ALTR_A10_ECC_TDERRA,
+       .set_err_ofst = ALTR_A10_ECC_INTTEST_OFST,
+       .ecc_irq_handler = altr_edac_a10_ecc_irq,
+       .inject_fops = &altr_edac_a10_device_inject_fops,
+};
+
+static int __init socfpga_init_ethernet_ecc(void)
+{
+       return altr_init_a10_ecc_device_type("altr,socfpga-eth-mac-ecc");
+}
+
+early_initcall(socfpga_init_ethernet_ecc);
+
+#endif /* CONFIG_EDAC_ALTERA_ETHERNET */
+

 /********************* Arria10 EDAC Device Functions *************************/
 static const struct of_device_id altr_edac_a10_device_of_match[] = {
 #ifdef CONFIG_EDAC_ALTERA_L2C
 /********************* Arria10 EDAC Device Functions *************************/
 static const struct of_device_id altr_edac_a10_device_of_match[] = {
 #ifdef CONFIG_EDAC_ALTERA_L2C


@@ -1266,6 +1293,10 @@ static const struct of_device_id altr_edac_a10_device_of_match[] = {
 #ifdef CONFIG_EDAC_ALTERA_OCRAM
        { .compatible = "altr,socfpga-a10-ocram-ecc",
          .data = &a10_ocramecc_data },
 #ifdef CONFIG_EDAC_ALTERA_OCRAM
        { .compatible = "altr,socfpga-a10-ocram-ecc",
          .data = &a10_ocramecc_data },

+#endif
+#ifdef CONFIG_EDAC_ALTERA_ETHERNET
+       { .compatible = "altr,socfpga-eth-mac-ecc",
+         .data = &a10_enetecc_data },

 #endif
        {},
 };
 #endif
        {},
 };


@@ -1555,8 +1586,10 @@ static int altr_edac_a10_probe(struct platform_device *pdev)
                        continue;
                if (of_device_is_compatible(child, "altr,socfpga-a10-l2-ecc"))
                        altr_edac_a10_device_add(edac, child);
                        continue;
                if (of_device_is_compatible(child, "altr,socfpga-a10-l2-ecc"))
                        altr_edac_a10_device_add(edac, child);

-               else if (of_device_is_compatible(child,
-                                                "altr,socfpga-a10-ocram-ecc"))
+               else if ((of_device_is_compatible(child,
+                                       "altr,socfpga-a10-ocram-ecc")) ||
+                        (of_device_is_compatible(child,
+                                       "altr,socfpga-eth-mac-ecc")))

                        altr_edac_a10_device_add(edac, child);
                else if (of_device_is_compatible(child,
                                                 "altr,sdram-edac-a10"))
                        altr_edac_a10_device_add(edac, child);
                else if (of_device_is_compatible(child,
                                                 "altr,sdram-edac-a10"))

diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h
index aa7c6906d0d5e1bee729fb7233e70907f1d7812f..687d8e754d36c3a9afb3affec273b6daecdb3ccb 100644 (file)
--- a/drivers/edac/altera_edac.h
+++ b/drivers/edac/altera_edac.h
@@ -285,6 +285,9 @@ struct altr_sdram_mc_data {
 /* Arria 10 OCRAM ECC Management Group Defines */
 #define ALTR_A10_OCRAM_ECC_EN_CTL       (BIT(1) | BIT(0))
 
 /* Arria 10 OCRAM ECC Management Group Defines */
 #define ALTR_A10_OCRAM_ECC_EN_CTL       (BIT(1) | BIT(0))
 

+/* Arria 10 Ethernet ECC Management Group Defines */
+#define ALTR_A10_COMMON_ECC_EN_CTL      BIT(0)
+

 /* A10 ECC Controller memory initialization timeout */
 #define ALTR_A10_ECC_INIT_WATCHDOG_10US      10000
 
 /* A10 ECC Controller memory initialization timeout */
 #define ALTR_A10_ECC_INIT_WATCHDOG_10US      10000