Commit fa4d3671 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: Validate enum IDs for regs with variable-width fields 



Add a run-time check to the PINMUX_CFG_REG_VAR() macro, to ensure the
number of provided enum IDs is correct.  This cannot be done at build
time, as the number of values depends on the variable-width fields in
the config register.

This helps catching bugs early.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent c481c817

drivers/pinctrl/sh-pfc/core.c

+6 −0
Original line number Diff line number Diff line
@@ -756,6 +756,12 @@ static void sh_pfc_check_cfg_reg(const char *drvname, 
		       drvname, cfg_reg->reg, rw, cfg_reg->reg_width);

		sh_pfc_errors++;

	}



	if (n != cfg_reg->nr_enum_ids) {

		pr_err("%s: reg 0x%x: enum_ids[] has %u instead of %u values\n",

		       drvname, cfg_reg->reg, cfg_reg->nr_enum_ids, n);

		sh_pfc_errors++;

	}

}



static void sh_pfc_check_info(const struct sh_pfc_soc_info *info)

drivers/pinctrl/sh-pfc/sh_pfc.h

+7 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ struct pinmux_func { 
struct pinmux_cfg_reg {

	u32 reg;

	u8 reg_width, field_width;

#ifdef DEBUG

	u16 nr_enum_ids;	/* for variable width regs only */

#define SET_NR_ENUM_IDS(n)	.nr_enum_ids = n,

#else

#define SET_NR_ENUM_IDS(n)

#endif

	const u16 *enum_ids;

	const u8 *var_field_width;

};
@@ -151,6 +157,7 @@ struct pinmux_cfg_reg { 
#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 },		\

	SET_NR_ENUM_IDS(sizeof((const u16 []) { ids }) / sizeof(u16))	\

	.enum_ids = (const u16 []) { ids }



struct pinmux_drive_reg_field {

CRA Git | Maintained and supported by SUSTech CRA and CCSE