]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
edac: synopsys: Add ecc error injection support
authorNaga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
Fri, 1 Apr 2016 09:47:37 +0000 (15:17 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 1 Apr 2016 11:00:16 +0000 (13:00 +0200)
The ZynqMP DDRC controller has data poisoning support
to inject CE or UE errors. this patch adds this support
using sysfs attributes.

created the following sysfs entries to support this.
-> /sys/devices/system/edac/mc/mc0/inject_data_poison
-> /sys/devices/system/edac/mc/mc0/inject_data_error

Signed-off-by: Naga Sureshkumar Relli <nagasure@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/edac/synopsys_edac.c

index 66744e97139ef7a9d9b84dc5c55d53e917991306..97eb29e78e24adf32bdb751c7592eebf304c4078 100644 (file)
@@ -99,6 +99,7 @@
 
 /* DDR ECC Quirks */
 #define DDR_ECC_INTR_SUPPORT    BIT(0)
+#define DDR_ECC_DATA_POISON_SUPPORT BIT(1)
 
 /* ZynqMP Enhanced DDR memory controller registers that are relevant to ECC */
 /* ECC Configuration Registers */
 #define ECC_CEADDR1_BNKGRP_SHIFT       24
 #define ECC_CEADDR1_BNKNR_SHIFT        16
 
+/* ECC Poison register shifts */
+#define ECC_POISON0_RANK_SHIFT 24
+#define ECC_POISON1_BANKGRP_SHIFT 28
+#define ECC_POISON1_BANKNR_SHIFT 24
+
 /* DDR Memory type defines */
 #define MEM_TYPE_DDR3 0x1
 #define MEM_TYPE_LPDDR3 0x1
 #define MEM_TYPE_DDR4 0x10
 #define MEM_TYPE_LPDDR4 0x10
 
+/* DDRC Software control register */
+#define DDRC_SWCTL 0x320
+
+/* DDRC ECC CE & UE poison mask */
+#define ECC_CEPOISON_MASK 0x3
+#define ECC_UEPOISON_MASK 0x1
+
+/* DDRC Device config masks */
+#define DDRC_MSTR_DEV_CONFIG_MASK 0xC0000000
+#define DDRC_MSTR_DEV_CONFIG_SHIFT     30
+#define DDRC_MSTR_DEV_CONFIG_X4_MASK   0
+#define DDRC_MSTR_DEV_CONFIG_X8_MASK   1
+#define DDRC_MSTR_DEV_CONFIG_X16_MASK  0x10
+#define DDRC_MSTR_DEV_CONFIG_X32_MASK  0X11
+
+/* DDR4 and DDR3 device Row,Column,Bank Mapping */
+#define DDR4_COL_SHIFT         3
+#define DDR4_BANKGRP_SHIFT     13
+#define DDR4_BANK_SHIFT        15
+#define DDR4_ROW_SHIFT         17
+#define DDR4_COL_MASK          0x3FF
+#define DDR4_BANKGRP_MASK      0x3
+#define DDR4_BANK_MASK         0x3
+#define DDR4_ROW_MASK          0x7FFF
+
+#define DDR3_COL_SHIFT 3
+#define DDR3_BANK_SHIFT 13
+#define DDR3_ROW_SHIFT 16
+#define DDR3_COL_MASK  0x3FF
+#define DDR3_BANK_MASK 0x7
+#define DDR3_ROW_MASK  0x3FFF
+
 /**
  * struct ecc_error_info - ECC error log information
  * @row:       Row number
@@ -223,6 +261,7 @@ struct synps_ecc_status {
  * @p_data:    Pointer to platform data
  * @ce_cnt:    Correctable Error count
  * @ue_cnt:    Uncorrectable Error count
+ * @poison_addr:Data poison address
  */
 struct synps_edac_priv {
        void __iomem *baseaddr;
@@ -231,6 +270,7 @@ struct synps_edac_priv {
        const struct synps_platform_data *p_data;
        u32 ce_cnt;
        u32 ue_cnt;
+       ulong poison_addr;
 };
 
 /**
@@ -627,6 +667,7 @@ static enum mem_type synps_enh_edac_get_mtype(const void __iomem *base)
 
        memtype = readl(base + CTRL_OFST);
 
+       mt = MEM_UNKNOWN;
        if ((memtype & MEM_TYPE_DDR3) || (memtype & MEM_TYPE_LPDDR3))
                mt = MEM_DDR3;
        else if (memtype & MEM_TYPE_DDR2)
@@ -731,7 +772,8 @@ static const struct synps_platform_data zynqmp_enh_edac_def = {
        .synps_edac_get_mtype           = synps_enh_edac_get_mtype,
        .synps_edac_get_dtype           = synps_enh_edac_get_dtype,
        .synps_edac_get_eccstate        = synps_enh_edac_get_eccstate,
-       .quirks                         = DDR_ECC_INTR_SUPPORT,
+       .quirks                         = (DDR_ECC_INTR_SUPPORT |
+                                          DDR_ECC_DATA_POISON_SUPPORT),
 };
 
 static const struct of_device_id synps_edac_match[] = {
@@ -743,6 +785,242 @@ static const struct of_device_id synps_edac_match[] = {
 
 MODULE_DEVICE_TABLE(of, synps_edac_match);
 
+#define to_mci(k) container_of(k, struct mem_ctl_info, dev)
+
+/**
+ * ddr4_poison_setup - update poison registers
+ * @dttype:            Device structure variable
+ * @device_config:     Device configuration
+ * @priv:              Pointer to synps_edac_priv struct
+ *
+ * Update poison registers as per ddr4 mapping
+ * Return: none.
+ */
+static void ddr4_poison_setup(enum dev_type dttype, int device_config,
+                               struct synps_edac_priv *priv)
+{
+       int col, row, bank, bankgrp, regval, shift_val = 0, col_shift;
+
+       /* Check the Configuration of the device */
+       if (device_config & DDRC_MSTR_DEV_CONFIG_X8_MASK) {
+               /* For Full Dq bus */
+               if (dttype == DEV_X8)
+                       shift_val = 0;
+               /* For Half Dq bus */
+               else if (dttype == DEV_X4)
+                       shift_val = 1;
+               col_shift = 0;
+       } else if (device_config & DDRC_MSTR_DEV_CONFIG_X16_MASK) {
+               if (dttype == DEV_X8)
+                       shift_val = 1;
+               else if (dttype == DEV_X4)
+                       shift_val = 2;
+               col_shift = 1;
+       }
+
+       col = (priv->poison_addr >> (DDR4_COL_SHIFT -
+                               (shift_val - col_shift))) &
+                               DDR4_COL_MASK;
+       row = priv->poison_addr >> (DDR4_ROW_SHIFT - shift_val);
+       row &= DDR4_ROW_MASK;
+       bank = priv->poison_addr >> (DDR4_BANK_SHIFT - shift_val);
+       bank &= DDR4_BANK_MASK;
+       bankgrp = (priv->poison_addr >> (DDR4_BANKGRP_SHIFT -
+                               (shift_val - col_shift))) &
+                               DDR4_BANKGRP_MASK;
+
+       writel(col, priv->baseaddr + ECC_POISON0_OFST);
+       regval = (bankgrp << ECC_POISON1_BANKGRP_SHIFT) |
+                (bank << ECC_POISON1_BANKNR_SHIFT) | row;
+       writel(regval, priv->baseaddr + ECC_POISON1_OFST);
+}
+
+/**
+ * ddr3_poison_setup - update poison registers
+ * @dttype:            Device structure variable
+ * @device_config:     Device configuration
+ * @priv:              Pointer to synps_edac_priv struct
+ *
+ * Update poison registers as per ddr3 mapping
+ * Return: none.
+ */
+static void ddr3_poison_setup(enum dev_type dttype, int device_config,
+                               struct synps_edac_priv *priv)
+{
+       int col, row, bank, bankgrp, regval, shift_val = 0;
+
+       if (dttype == DEV_X8)
+               /* For Full Dq bus */
+               shift_val = 0;
+       else if (dttype == DEV_X4)
+               /* For Half Dq bus */
+               shift_val = 1;
+
+       col = (priv->poison_addr >> (DDR3_COL_SHIFT - shift_val)) &
+               DDR3_COL_MASK;
+       row = priv->poison_addr >> (DDR3_ROW_SHIFT - shift_val);
+       row &= DDR3_ROW_MASK;
+       bank = priv->poison_addr >> (DDR3_BANK_SHIFT - shift_val);
+       bank &= DDR3_BANK_MASK;
+       bankgrp = 0;
+       writel(col, priv->baseaddr + ECC_POISON0_OFST);
+       regval = (bankgrp << ECC_POISON1_BANKGRP_SHIFT) |
+                        (bank << ECC_POISON1_BANKNR_SHIFT) | row;
+       writel(regval, priv->baseaddr + ECC_POISON1_OFST);
+}
+
+/**
+ * synps_edac_mc_inject_data_error_show - Get Poison0 & 1 register contents
+ * @dev:       Pointer to the device struct
+ * @mattr:     Pointer to device attributes
+ * @data:      Pointer to user data
+ *
+ * Get the Poison0 and Poison1 register contents
+ * Return: Number of bytes copied.
+ */
+static ssize_t synps_edac_mc_inject_data_error_show(struct device *dev,
+                                             struct device_attribute *mattr,
+                                             char *data)
+{
+       struct mem_ctl_info *mci = to_mci(dev);
+       struct synps_edac_priv *priv = mci->pvt_info;
+
+       return sprintf(data, "Poison0 Addr: 0x%08x\n\rPoison1 Addr: 0x%08x\n\r"
+                       "Error injection Address: 0x%lx\n\r",
+                       readl(priv->baseaddr + ECC_POISON0_OFST),
+                       readl(priv->baseaddr + ECC_POISON1_OFST),
+                       priv->poison_addr);
+}
+
+/**
+ * synps_edac_mc_inject_data_error_store - Configure Poison0 Poison1 registers
+ * @dev:       Pointer to the device struct
+ * @mattr:     Pointer to device attributes
+ * @data:      Pointer to user data
+ * @count:     read the size bytes from buffer
+ *
+ * Configures the Poison0 and Poison1 register contents as per user given
+ * address
+ * Return: Number of bytes copied.
+ */
+static ssize_t synps_edac_mc_inject_data_error_store(struct device *dev,
+                                              struct device_attribute *mattr,
+                                              const char *data, size_t count)
+{
+       struct mem_ctl_info *mci = to_mci(dev);
+       struct synps_edac_priv *priv = mci->pvt_info;
+       int device_config;
+       enum mem_type mttype;
+       enum dev_type dttype;
+
+       mttype = priv->p_data->synps_edac_get_mtype(
+                                               priv->baseaddr);
+       dttype = priv->p_data->synps_edac_get_dtype(
+                                               priv->baseaddr);
+       if (kstrtoul(data, 0, &priv->poison_addr))
+               return -EINVAL;
+
+       device_config = readl(priv->baseaddr + CTRL_OFST);
+       device_config = (device_config & DDRC_MSTR_DEV_CONFIG_MASK) >>
+                                       DDRC_MSTR_DEV_CONFIG_SHIFT;
+       if (mttype == MEM_DDR4)
+               ddr4_poison_setup(dttype, device_config, priv);
+       else if (mttype == MEM_DDR3)
+               ddr3_poison_setup(dttype, device_config, priv);
+
+       return count;
+}
+
+/**
+ * synps_edac_mc_inject_data_poison_show - Shows type of Data poison
+ * @dev:       Pointer to the device struct
+ * @mattr:     Pointer to device attributes
+ * @data:      Pointer to user data
+ *
+ * Shows the type of Error injection enabled, either UE or CE
+ * Return: Number of bytes copied.
+ */
+static ssize_t synps_edac_mc_inject_data_poison_show(struct device *dev,
+                                             struct device_attribute *mattr,
+                                             char *data)
+{
+       struct mem_ctl_info *mci = to_mci(dev);
+       struct synps_edac_priv *priv = mci->pvt_info;
+
+       return sprintf(data, "Data Poisoning: %s\n\r",
+                       ((readl(priv->baseaddr + ECC_CFG1_OFST)) & 0x3) ?
+                       ("Correctable Error"):("UnCorrectable Error"));
+}
+
+/**
+ * synps_edac_mc_inject_data_poison_store - Enbles Data poison CE/UE
+ * @dev:       Pointer to the device struct
+ * @mattr:     Pointer to device attributes
+ * @data:      Pointer to user data
+ * @count:     read the size bytes from buffer
+ *
+ * Enables the CE or UE Data poison
+ * Return: Number of bytes copied.
+ */
+static ssize_t synps_edac_mc_inject_data_poison_store(struct device *dev,
+                                              struct device_attribute *mattr,
+                                              const char *data, size_t count)
+{
+       struct mem_ctl_info *mci = to_mci(dev);
+       struct synps_edac_priv *priv = mci->pvt_info;
+
+       writel(0, priv->baseaddr + DDRC_SWCTL);
+       if (strncmp(data, "CE", 2) == 0)
+               writel(ECC_CEPOISON_MASK, priv->baseaddr + ECC_CFG1_OFST);
+       else
+               writel(ECC_UEPOISON_MASK, priv->baseaddr + ECC_CFG1_OFST);
+       writel(1, priv->baseaddr + DDRC_SWCTL);
+
+       return count;
+}
+
+static DEVICE_ATTR(inject_data_error, S_IRUGO | S_IWUSR,
+           synps_edac_mc_inject_data_error_show,
+           synps_edac_mc_inject_data_error_store);
+static DEVICE_ATTR(inject_data_poison, S_IRUGO | S_IWUSR,
+           synps_edac_mc_inject_data_poison_show,
+           synps_edac_mc_inject_data_poison_store);
+
+/**
+ * synps_edac_create_sysfs_attributes - Create sysfs entries
+ * @mci:       Pointer to the edac memory controller instance
+ *
+ * Create sysfs attributes for injecting ECC errors using data poison.
+ *
+ * Return: 0 if sysfs creation was successful, else return negative error code.
+ */
+static int synps_edac_create_sysfs_attributes(struct mem_ctl_info *mci)
+{
+       int rc;
+
+       rc = device_create_file(&mci->dev, &dev_attr_inject_data_error);
+       if (rc < 0)
+               return rc;
+       rc = device_create_file(&mci->dev, &dev_attr_inject_data_poison);
+       if (rc < 0)
+               return rc;
+       return 0;
+}
+
+/**
+ * synps_edac_remove_sysfs_attributes - Removes sysfs entries
+ * @mci:       Pointer to the edac memory controller instance
+ *
+ * Removes sysfs attributes.
+ *
+ * Return: none.
+ */
+static void synps_edac_remove_sysfs_attributes(struct mem_ctl_info *mci)
+{
+       device_remove_file(&mci->dev, &dev_attr_inject_data_error);
+       device_remove_file(&mci->dev, &dev_attr_inject_data_poison);
+}
+
 /**
  * synps_edac_mc_probe - Check controller and bind driver
  * @pdev:      Pointer to the platform_device struct
@@ -830,6 +1108,13 @@ static int synps_edac_mc_probe(struct platform_device *pdev)
                goto free_edac_mc;
        }
 
+       if (priv->p_data->quirks & DDR_ECC_DATA_POISON_SUPPORT) {
+               if (synps_edac_create_sysfs_attributes(mci)) {
+                       edac_printk(KERN_ERR, EDAC_MC,
+                                       "Failed to create sysfs entries\n");
+                       goto free_edac_mc;
+               }
+       }
        /*
         * Start capturing the correctable and uncorrectable errors. A write of
         * 0 starts the counters.
@@ -853,8 +1138,12 @@ free_edac_mc:
 static int synps_edac_mc_remove(struct platform_device *pdev)
 {
        struct mem_ctl_info *mci = platform_get_drvdata(pdev);
+       struct synps_edac_priv *priv;
 
+       priv = mci->pvt_info;
        edac_mc_del_mc(&pdev->dev);
+       if (priv->p_data->quirks & DDR_ECC_DATA_POISON_SUPPORT)
+               synps_edac_remove_sysfs_attributes(mci);
        edac_mc_free(mci);
 
        return 0;