@@ -22,182 +22,146 @@ config PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_EMEV2
def_bool y
- depends on ARCH_EMEV2
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A73A4
def_bool y
- depends on ARCH_R8A73A4
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_R8A7740
def_bool y
- depends on ARCH_R8A7740
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_R8A7743
def_bool y
- depends on ARCH_R8A7743
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7744
def_bool y
- depends on ARCH_R8A7744
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7745
def_bool y
- depends on ARCH_R8A7745
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77470
def_bool y
- depends on ARCH_R8A77470
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A774A1
def_bool y
- depends on ARCH_R8A774A1
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A774C0
def_bool y
- depends on ARCH_R8A774C0
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7778
def_bool y
- depends on ARCH_R8A7778
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7779
def_bool y
- depends on ARCH_R8A7779
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7790
def_bool y
- depends on ARCH_R8A7790
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7791
def_bool y
- depends on ARCH_R8A7791
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7792
def_bool y
- depends on ARCH_R8A7792
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7793
def_bool y
- depends on ARCH_R8A7793
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7794
def_bool y
- depends on ARCH_R8A7794
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7795
def_bool y
- depends on ARCH_R8A7795
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A7796
def_bool y
- depends on ARCH_R8A7796
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77965
def_bool y
- depends on ARCH_R8A77965
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77970
def_bool y
- depends on ARCH_R8A77970
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77980
def_bool y
- depends on ARCH_R8A77980
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77990
def_bool y
- depends on ARCH_R8A77990
select PINCTRL_SH_PFC
config PINCTRL_PFC_R8A77995
def_bool y
- depends on ARCH_R8A77995
select PINCTRL_SH_PFC
config PINCTRL_PFC_SH7203
def_bool y
- depends on CPU_SUBTYPE_SH7203
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7264
def_bool y
- depends on CPU_SUBTYPE_SH7264
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7269
def_bool y
- depends on CPU_SUBTYPE_SH7269
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH73A0
def_bool y
- depends on ARCH_SH73A0
select PINCTRL_SH_PFC_GPIO
select REGULATOR
config PINCTRL_PFC_SH7720
def_bool y
- depends on CPU_SUBTYPE_SH7720
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7722
def_bool y
- depends on CPU_SUBTYPE_SH7722
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7723
def_bool y
- depends on CPU_SUBTYPE_SH7723
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7724
def_bool y
- depends on CPU_SUBTYPE_SH7724
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7734
def_bool y
- depends on CPU_SUBTYPE_SH7734
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7757
def_bool y
- depends on CPU_SUBTYPE_SH7757
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7785
def_bool y
- depends on CPU_SUBTYPE_SH7785
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SH7786
def_bool y
- depends on CPU_SUBTYPE_SH7786
select PINCTRL_SH_PFC_GPIO
config PINCTRL_PFC_SHX3
def_bool y
- depends on CPU_SUBTYPE_SHX3
select PINCTRL_SH_PFC_GPIO
endif
@@ -38,3 +38,16 @@ obj-$(CONFIG_PINCTRL_PFC_SH7757) += pfc-sh7757.o
obj-$(CONFIG_PINCTRL_PFC_SH7785) += pfc-sh7785.o
obj-$(CONFIG_PINCTRL_PFC_SH7786) += pfc-sh7786.o
obj-$(CONFIG_PINCTRL_PFC_SHX3) += pfc-shx3.o
+
+CFLAGS_pfc-sh7203.o += -I$(srctree)/arch/sh/include/cpu-sh2a
+CFLAGS_pfc-sh7264.o += -I$(srctree)/arch/sh/include/cpu-sh2a
+CFLAGS_pfc-sh7269.o += -I$(srctree)/arch/sh/include/cpu-sh2a
+CFLAGS_pfc-sh7720.o += -I$(srctree)/arch/sh/include/cpu-sh3
+CFLAGS_pfc-sh7722.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7723.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7724.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7734.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7757.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7785.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-sh7786.o += -I$(srctree)/arch/sh/include/cpu-sh4
+CFLAGS_pfc-shx3.o += -I$(srctree)/arch/sh/include/cpu-sh4
@@ -571,6 +571,13 @@ static const struct of_device_id sh_pfc_of_table[] = {
.compatible = "renesas,pfc-r8a7795",
.data = &r8a7795_pinmux_info,
},
+#ifdef DEBUG
+ {
+ /* Exercise sanity checks (nothing matches against this) */
+ .compatible = "renesas,pfc-r8a77950", /* R-Car H3 ES1.0 */
+ .data = &r8a7795es1_pinmux_info,
+ },
+#endif /* DEBUG */
#endif
#ifdef CONFIG_PINCTRL_PFC_R8A7796
{
@@ -709,6 +716,100 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; }
#define DEV_PM_OPS NULL
#endif /* CONFIG_PM_SLEEP && CONFIG_ARM_PSCI_FW */
+#ifdef DEBUG
+static bool is0s(const u16 *enum_ids, unsigned int n)
+{
+ unsigned int i;
+
+ for (i = 0; i < n; i++)
+ if (enum_ids[i])
+ return false;
+
+ return true;
+}
+
+static unsigned int sh_pfc_errors;
+static unsigned int sh_pfc_warnings;
+
+static void sh_pfc_validate_cfg_reg(const char *name,
+ const struct pinmux_cfg_reg *cfg_reg)
+{
+ unsigned int rw, fw, i, n;
+
+ fw = cfg_reg->field_width;
+ if (fw) {
+ rw = cfg_reg->reg_width;
+ if (rw % fw) {
+ pr_err("%s reg 0x%x: reg_width %u is not a multiple of field_width %u\n",
+ name, cfg_reg->reg, rw, fw);
+ sh_pfc_errors++;
+ }
+ n = rw / fw * (1 << fw);
+ } else {
+ 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)) {
+ pr_warn("%s reg %x: Reserved field [%u:%u] should be split to reduce table size\n",
+ name, cfg_reg->reg, rw, rw + fw - 1);
+ sh_pfc_warnings++;
+ }
+ n += 1 << fw;
+ rw += fw;
+ }
+
+ if (rw != cfg_reg->reg_width) {
+ pr_err("%s reg 0x%x: var_field_width declares %u instead of %u bits\n",
+ name, cfg_reg->reg, rw, cfg_reg->reg_width);
+ sh_pfc_errors++;
+ }
+
+ }
+ if (cfg_reg->nr_enum_ids != n) {
+ pr_err("%s reg 0x%x: enum_ids[] contains %u instead of %u values\n",
+ name, cfg_reg->reg, cfg_reg->nr_enum_ids, n);
+ sh_pfc_errors++;
+ }
+}
+
+static void sh_pfc_validate_info(const char *name,
+ const struct sh_pfc_soc_info *info)
+{
+ const struct pinmux_cfg_reg *cfg_regs;
+ unsigned int i;
+
+ pr_info("%s: Validating %s/%s (%ps)\n", __func__, name, info->name,
+ info);
+
+ cfg_regs = info->cfg_regs;
+ for (i = 0; cfg_regs && cfg_regs[i].reg; i++)
+ sh_pfc_validate_cfg_reg(info->name, &cfg_regs[i]);
+}
+
+static void sh_pfc_validate_driver(const struct device_driver *drv)
+{
+ const struct platform_driver *pdrv = to_platform_driver(drv);
+ unsigned int i;
+
+ pr_warn("%s: Checking builtin pinmux tables\n", __func__);
+
+ for (i = 0; pdrv->id_table[i].name[0]; i++)
+ sh_pfc_validate_info(pdrv->id_table[i].name,
+ (void *)pdrv->id_table[i].driver_data);
+
+#ifdef CONFIG_OF
+ for (i = 0; drv->of_match_table[i].compatible[0]; i++)
+ sh_pfc_validate_info(drv->of_match_table[i].compatible,
+ drv->of_match_table[i].data);
+#endif
+
+ pr_warn("%s: Detected %u errors and %u warnings\n", __func__,
+ sh_pfc_errors, sh_pfc_warnings);
+}
+
+#else
+static inline void sh_pfc_validate_driver(struct device_driver *driver) {}
+#endif
+
static int sh_pfc_probe(struct platform_device *pdev)
{
#ifdef CONFIG_OF
@@ -718,6 +819,7 @@ static int sh_pfc_probe(struct platform_device *pdev)
struct sh_pfc *pfc;
int ret;
+ sh_pfc_validate_driver(pdev->dev.driver);
#ifdef CONFIG_OF
if (np)
info = of_device_get_match_data(&pdev->dev);
@@ -113,6 +113,9 @@ struct pinmux_cfg_reg {
u8 reg_width, field_width;
const u16 *enum_ids;
const u8 *var_field_width;
+#ifdef DEBUG
+ unsigned int nr_enum_ids;
+#endif
};
#define GROUP(...) __VA_ARGS__
@@ -128,10 +131,21 @@ struct pinmux_cfg_reg {
* combination of the register field bit values, wrapped using the
* GROUP() macro.
*/
+#ifdef DEBUG
+
+#define PINMUX_CFG_REG(name, r, r_width, f_width, ids) \
+ .reg = r, .reg_width = r_width, .field_width = f_width, \
+ .enum_ids = (const u16 [(r_width / f_width) * (1 << f_width)]) \
+ { ids }, \
+ .nr_enum_ids = sizeof((const u16 []) { ids }) / sizeof(u16)
+
+#else
+
#define PINMUX_CFG_REG(name, r, r_width, f_width, ids) \
.reg = r, .reg_width = r_width, .field_width = f_width, \
.enum_ids = (const u16 [(r_width / f_width) * (1 << f_width)]) \
{ ids }
+#endif
/*
* Describe a config register consisting of several fields of different widths
@@ -145,11 +159,23 @@ struct pinmux_cfg_reg {
* combination of the register field bit values, wrapped using the
* GROUP() macro.
*/
+#ifdef DEBUG
+
+#define PINMUX_CFG_REG_VAR(name, r, r_width, f_widths, ids) \
+ .reg = r, .reg_width = r_width, \
+ .var_field_width = (const u8 []) { f_widths, 0 }, \
+ .enum_ids = (const u16 []) { ids }, \
+ .nr_enum_ids = sizeof((const u16 []) { ids }) / sizeof(u16)
+
+#else
+
#define PINMUX_CFG_REG_VAR(name, r, r_width, f_widths, ids) \
.reg = r, .reg_width = r_width, \
.var_field_width = (const u8 []) { f_widths, 0 }, \
.enum_ids = (const u16 []) { ids }
+#endif
+
struct pinmux_drive_reg_field {
u16 pin;
u8 offset;
@@ -265,7 +291,7 @@ struct sh_pfc_soc_info {
const struct sh_pfc_function *functions;
unsigned int nr_functions;
-#ifdef CONFIG_SUPERH
+#if 1 //def CONFIG_SUPERH
const struct pinmux_func *func_gpios;
unsigned int nr_func_gpios;
#endif
Do some basic sanity checks on all built-in pinmux tables (for SuperH and Renesas ARM) when DEBUG is defined. For now this is limited to checking config register descriptors: - Fixed-width and variable-width field checks, - Number of enum_ids must match the number of possible configurations, - Suggestions for reducing table sizes: reserved fields of more than 3 bits can better be split in smaller subfields, as the storage need is proportional to the square of the width of the (sub)field). This helps catching bugs early. Probably the individual pinctrl Kconfig symbols should start depending on COMPILE_TEST, instead of always enabling all of them. Not-yet-signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/sh-pfc/Kconfig | 36 ----------- drivers/pinctrl/sh-pfc/Makefile | 13 ++++ drivers/pinctrl/sh-pfc/core.c | 102 ++++++++++++++++++++++++++++++++ drivers/pinctrl/sh-pfc/sh_pfc.h | 28 ++++++++- 4 files changed, 142 insertions(+), 37 deletions(-)