michaelh/zephyr
1
0
Fork 0
Code Releases Activity

edac: shell: Refactor edac shell

Browse source 
Removing code duplicates.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2022-04-14 16:10:38 +03:00 • committed by Johan Hedberg
commit d0d87a213b
1 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

82
drivers/edac/shell.c
View file

@ -56,10 +56,45 @@ static void decode_ecc_error(const struct shell *shell, uint64_t ecc_error)
} }
} }
static int ecc_error_show(const struct shell *sh, const struct device *dev)
{
uint64_t error;
int err;
err = edac_ecc_error_log_get(dev, &error);
if (err != 0) {
shell_error(sh, "Error getting error log (err %d)", err);
return err;
}
shell_fprintf(sh, SHELL_NORMAL, "ECC Error: 0x%llx\n", error);
if (error != 0) {
decode_ecc_error(sh, error);
}
return err;
}
static int parity_error_show(const struct shell *sh, const struct device *dev)
{
uint64_t error;
int err;
err = edac_parity_error_log_get(dev, &error);
if (err != 0) {
shell_error(sh, "Error getting parity error log (err %d)", err);
return err;
}
shell_fprintf(sh, SHELL_NORMAL, "Parity Error: 0x%llx\n", error);
return err;
}
static int cmd_edac_info(const struct shell *shell, size_t argc, char **argv) static int cmd_edac_info(const struct shell *shell, size_t argc, char **argv)
{ {
const struct device *dev; const struct device *dev;
uint64_t error;
int err; int err;
dev = DEVICE_DT_GET(DT_NODELABEL(ibecc)); dev = DEVICE_DT_GET(DT_NODELABEL(ibecc));
@ -70,28 +105,16 @@ static int cmd_edac_info(const struct shell *shell, size_t argc, char **argv)
shell_fprintf(shell, SHELL_NORMAL, "Show EDAC status\n"); shell_fprintf(shell, SHELL_NORMAL, "Show EDAC status\n");
err = edac_ecc_error_log_get(dev, &error); err = ecc_error_show(shell, dev);
if (err != 0) { if (err != 0) {
shell_error(shell, "Error getting ecc error log (err %d)",
err);
return err; return err;
} }
shell_fprintf(shell, SHELL_NORMAL, "ECC Error Log 0x%llx\n", error); err = parity_error_show(shell, dev);
if (error != 0) {
decode_ecc_error(shell, error);
}
err = edac_parity_error_log_get(dev, &error);
if (err != 0) { if (err != 0) {
shell_error(shell, "Error getting parity error log (err %d)",
err);
return err; return err;
} }
shell_fprintf(shell, SHELL_NORMAL, "Parity Error Log 0x%llx\n", error);
shell_fprintf(shell, SHELL_NORMAL, shell_fprintf(shell, SHELL_NORMAL,
"Errors correctable: %d Errors uncorrectable %d\n", "Errors correctable: %d Errors uncorrectable %d\n",
edac_errors_cor_get(dev), edac_errors_uc_get(dev)); edac_errors_cor_get(dev), edac_errors_uc_get(dev));
@ -338,8 +361,6 @@ static int cmd_ecc_error_show(const struct shell *shell, size_t argc,
char **argv) char **argv)
{ {
const struct device *dev; const struct device *dev;
uint64_t error;
int err;
dev = DEVICE_DT_GET(DT_NODELABEL(ibecc)); dev = DEVICE_DT_GET(DT_NODELABEL(ibecc));
if (!device_is_ready(dev)) { if (!device_is_ready(dev)) {
@ -347,19 +368,7 @@ static int cmd_ecc_error_show(const struct shell *shell, size_t argc,
return -ENODEV; return -ENODEV;
} }
err = edac_ecc_error_log_get(dev, &error); return ecc_error_show(shell, dev);
if (err != 0) {
shell_error(shell, "Error getting error log (err %d)", err);
return err;
}
shell_fprintf(shell, SHELL_NORMAL, "ECC Error: 0x%llx\n", error);
if (error != 0) {
decode_ecc_error(shell, error);
}
return err;
} }
static int cmd_ecc_error_clear(const struct shell *shell, size_t argc, static int cmd_ecc_error_clear(const struct shell *shell, size_t argc,
@ -396,8 +405,6 @@ static int cmd_parity_error_show(const struct shell *shell, size_t argc,
char **argv) char **argv)
{ {
const struct device *dev; const struct device *dev;
uint64_t error;
int err;
dev = DEVICE_DT_GET(DT_NODELABEL(ibecc)); dev = DEVICE_DT_GET(DT_NODELABEL(ibecc));
if (!device_is_ready(dev)) { if (!device_is_ready(dev)) {
@ -405,16 +412,7 @@ static int cmd_parity_error_show(const struct shell *shell, size_t argc,
return -ENODEV; return -ENODEV;
} }
err = edac_parity_error_log_get(dev, &error); return parity_error_show(shell, dev);
if (err != 0) {
shell_error(shell, "Error getting parity error log (err %d)",
err);
return err;
}
shell_fprintf(shell, SHELL_NORMAL, "Parity Error: 0x%llx\n", error);
return 0;
} }
static int cmd_parity_error_clear(const struct shell *shell, size_t argc, static int cmd_parity_error_clear(const struct shell *shell, size_t argc,