Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge tag 'edac_urgent-2020-03-08' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Borislav Petkov:
"Error reporting fix for synopsys_edac: do not overwrite partial
decoded error message (Sherry Sun)"
* tag 'edac_urgent-2020-03-08' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/synopsys: Do not print an error with back-to-back snprintf() calls
+7
-15
drivers/edac/synopsys_edac.c
+7
-15
drivers/edac/synopsys_edac.c
···
479
pinf = &p->ceinfo;
480
if (!priv->p_data->quirks) {
481
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
482
-
"DDR ECC error type:%s Row %d Bank %d Col %d ",
483
-
"CE", pinf->row, pinf->bank, pinf->col);
484
-
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
485
-
"Bit Position: %d Data: 0x%08x\n",
486
pinf->bitpos, pinf->data);
487
} else {
488
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
489
-
"DDR ECC error type:%s Row %d Bank %d Col %d ",
490
-
"CE", pinf->row, pinf->bank, pinf->col);
491
-
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
492
-
"BankGroup Number %d Block Number %d ",
493
-
pinf->bankgrpnr, pinf->blknr);
494
-
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
495
-
"Bit Position: %d Data: 0x%08x\n",
496
pinf->bitpos, pinf->data);
497
}
498
···
503
"UE", pinf->row, pinf->bank, pinf->col);
504
} else {
505
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
506
-
"DDR ECC error type :%s Row %d Bank %d Col %d ",
507
-
"UE", pinf->row, pinf->bank, pinf->col);
508
-
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
509
-
"BankGroup Number %d Block Number %d",
510
pinf->bankgrpnr, pinf->blknr);
511
}
512
···
479
pinf = &p->ceinfo;
480
if (!priv->p_data->quirks) {
481
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
482
+
"DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x",
483
+
"CE", pinf->row, pinf->bank, pinf->col,
484
pinf->bitpos, pinf->data);
485
} else {
486
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
487
+
"DDR ECC error type:%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d Bit Position: %d Data: 0x%08x",
488
+
"CE", pinf->row, pinf->bank, pinf->col,
489
+
pinf->bankgrpnr, pinf->blknr,
490
pinf->bitpos, pinf->data);
491
}
492
···
509
"UE", pinf->row, pinf->bank, pinf->col);
510
} else {
511
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
512
+
"DDR ECC error type :%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d",
513
+
"UE", pinf->row, pinf->bank, pinf->col,
514
pinf->bankgrpnr, pinf->blknr);
515
}
516