AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 09:37:38 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: sh-pfc: checker: Add helpers for reporting

Browse Source 
Add helpers to report errors and warnings, and to increase the
corresponding counters.  This simplifies callers.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20200110131927.1029-3-geert+renesas@glider.be
This commit is contained in:
Geert Uytterhoeven 2020-01-10 14:19:16 +01:00
parent 264716935e
commit c3f8dcee7a
1 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
drivers/pinctrl/sh-pfc/core.c
View File

@ -729,6 +729,17 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; }
static unsigned int sh_pfc_errors __initdata = 0; static unsigned int sh_pfc_errors __initdata = 0;
static unsigned int sh_pfc_warnings __initdata = 0; static unsigned int sh_pfc_warnings __initdata = 0;
#define sh_pfc_err(fmt, ...) \
do { \
pr_err("%s: " fmt, drvname, ##__VA_ARGS__); \
sh_pfc_errors++; \
} while (0)
#define sh_pfc_warn(fmt, ...) \
do { \
pr_warn("%s: " fmt, drvname, ##__VA_ARGS__); \
sh_pfc_warnings++; \
} while (0)
static bool __init is0s(const u16 *enum_ids, unsigned int n) static bool __init is0s(const u16 *enum_ids, unsigned int n)
{ {
unsigned int i; unsigned int i;
@ -751,26 +762,20 @@ static void __init sh_pfc_check_cfg_reg(const char *drvname,
} }
for (i = 0, n = 0, rw = 0; (fw = cfg_reg->var_field_width[i]); i++) { for (i = 0, n = 0, rw = 0; (fw = cfg_reg->var_field_width[i]); i++) {
if (fw > 3 && is0s(&cfg_reg->enum_ids[n], 1 << fw)) { if (fw > 3 && is0s(&cfg_reg->enum_ids[n], 1 << fw))
pr_warn("%s: reg 0x%x: reserved field [%u:%u] can be split to reduce table size\n", sh_pfc_warn("reg 0x%x: reserved field [%u:%u] can be split to reduce table size\n",
drvname, cfg_reg->reg, rw, rw + fw - 1); cfg_reg->reg, rw, rw + fw - 1);
sh_pfc_warnings++;
}
n += 1 << fw; n += 1 << fw;
rw += fw; rw += fw;
} }
if (rw != cfg_reg->reg_width) { if (rw != cfg_reg->reg_width)
pr_err("%s: reg 0x%x: var_field_width declares %u instead of %u bits\n", sh_pfc_err("reg 0x%x: var_field_width declares %u instead of %u bits\n",
drvname, cfg_reg->reg, rw, cfg_reg->reg_width); cfg_reg->reg, rw, cfg_reg->reg_width);
sh_pfc_errors++;
}
if (n != cfg_reg->nr_enum_ids) { if (n != cfg_reg->nr_enum_ids)
pr_err("%s: reg 0x%x: enum_ids[] has %u instead of %u values\n", sh_pfc_err("reg 0x%x: enum_ids[] has %u instead of %u values\n",
drvname, cfg_reg->reg, cfg_reg->nr_enum_ids, n); cfg_reg->reg, cfg_reg->nr_enum_ids, n);
sh_pfc_errors++;
}
} }
static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info) static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info)
@ -785,29 +790,24 @@ static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info)
/* Check pins */ /* Check pins */
for (i = 0; i < info->nr_pins; i++) { for (i = 0; i < info->nr_pins; i++) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
if (!strcmp(info->pins[i].name, info->pins[j].name)) { if (!strcmp(info->pins[i].name, info->pins[j].name))
pr_err("%s: pin %s/%s: name conflict\n", sh_pfc_err("pin %s/%s: name conflict\n",
drvname, info->pins[i].name, info->pins[i].name,
info->pins[j].name); info->pins[j].name);
sh_pfc_errors++;
}
if (info->pins[i].pin != (u16)-1 && if (info->pins[i].pin != (u16)-1 &&
info->pins[i].pin == info->pins[j].pin) { info->pins[i].pin == info->pins[j].pin)
pr_err("%s: pin %s/%s: pin %u conflict\n", sh_pfc_err("pin %s/%s: pin %u conflict\n",
drvname, info->pins[i].name, info->pins[i].name,
info->pins[j].name, info->pins[i].pin); info->pins[j].name,
sh_pfc_errors++; info->pins[i].pin);
}
if (info->pins[i].enum_id && if (info->pins[i].enum_id &&
info->pins[i].enum_id == info->pins[j].enum_id) { info->pins[i].enum_id == info->pins[j].enum_id)
pr_err("%s: pin %s/%s: enum_id %u conflict\n", sh_pfc_err("pin %s/%s: enum_id %u conflict\n",
drvname, info->pins[i].name, info->pins[i].name,
info->pins[j].name, info->pins[j].name,
info->pins[i].enum_id); info->pins[i].enum_id);
sh_pfc_errors++;
}
} }
} }
@ -819,8 +819,7 @@ static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info)
for (i = 0; i < info->nr_functions; i++) { for (i = 0; i < info->nr_functions; i++) {
func = &info->functions[i]; func = &info->functions[i];
if (!func->name) { if (!func->name) {
pr_err("%s: empty function %u\n", drvname, i); sh_pfc_err("empty function %u\n", i);
sh_pfc_errors++;
continue; continue;
} }
for (j = 0; j < func->nr_groups; j++) { for (j = 0; j < func->nr_groups; j++) {
@ -833,29 +832,22 @@ static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info)
} }
} }
if (k == info->nr_groups) { if (k == info->nr_groups)
pr_err("%s: function %s: group %s not found\n", sh_pfc_err("function %s: group %s not found\n",
drvname, func->name, func->groups[j]); func->name, func->groups[j]);
sh_pfc_errors++;
}
} }
} }
for (i = 0; i < info->nr_groups; i++) { for (i = 0; i < info->nr_groups; i++) {
if (!info->groups[i].name) { if (!info->groups[i].name) {
pr_err("%s: empty group %u\n", drvname, i); sh_pfc_err("empty group %u\n", i);
sh_pfc_errors++;
continue; continue;
} }
if (!refcnts[i]) { if (!refcnts[i])
pr_err("%s: orphan group %s\n", drvname, sh_pfc_err("orphan group %s\n", info->groups[i].name);
info->groups[i].name); else if (refcnts[i] > 1)
sh_pfc_errors++; sh_pfc_warn("group %s referenced by %u functions\n",
} else if (refcnts[i] > 1) { info->groups[i].name, refcnts[i]);
pr_warn("%s: group %s referenced by %u functions\n",
drvname, info->groups[i].name, refcnts[i]);
sh_pfc_warnings++;
}
} }
kfree(refcnts); kfree(refcnts);