Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / drivers / edac / synopsys_edac.c

diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index 880ffd83371871032513e15a94bc5719d57ef1c8..12211dc040e8f1050e59b61c420e2bff03b4a0be 100644 (file)
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -477,16 +477,16 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
 
        if (p->ce_cnt) {
                pinf = &p->ceinfo;
-               if (!priv->p_data->quirks) {
+               if (priv->p_data->quirks & DDR_ECC_INTR_SUPPORT) {
                        snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-                                "DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x",
-                                "CE", pinf->row, pinf->bank, pinf->col,
+                                "DDR ECC error type:%s Row %d Bank %d BankGroup Number %d Block Number %d Bit Position: %d Data: 0x%08x",
+                                "CE", pinf->row, pinf->bank,
+                                pinf->bankgrpnr, pinf->blknr,
                                 pinf->bitpos, pinf->data);
                } else {
                        snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-                                "DDR ECC error type:%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d Bit Position: %d Data: 0x%08x",
+                                "DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x",
                                 "CE", pinf->row, pinf->bank, pinf->col,
-                                pinf->bankgrpnr, pinf->blknr,
                                 pinf->bitpos, pinf->data);
                }
 
@@ -497,15 +497,15 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
 
        if (p->ue_cnt) {
                pinf = &p->ueinfo;
-               if (!priv->p_data->quirks) {
+               if (priv->p_data->quirks & DDR_ECC_INTR_SUPPORT) {
                        snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-                                "DDR ECC error type :%s Row %d Bank %d Col %d ",
-                               "UE", pinf->row, pinf->bank, pinf->col);
+                                "DDR ECC error type :%s Row %d Bank %d BankGroup Number %d Block Number %d",
+                                "UE", pinf->row, pinf->bank,
+                                pinf->bankgrpnr, pinf->blknr);
                } else {
                        snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
-                                "DDR ECC error type :%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d",
-                                "UE", pinf->row, pinf->bank, pinf->col,
-                                pinf->bankgrpnr, pinf->blknr);
+                                "DDR ECC error type :%s Row %d Bank %d Col %d ",
+                                "UE", pinf->row, pinf->bank, pinf->col);
                }
 
                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,