Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d5631f authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: pfc: Verify pin type encoding size at build time. 



The encoding is tightly packed, and future changes (such as
pinconf-generic support) can easily lead to a situation where we violate
the encoding constraints and trample data bit/reg bits. This plugs in
some sanity checks by way of a BUILD_BUG_ON() to blow up if we fail to
fit.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 9f65b2b6

drivers/sh/pfc.c

+5 −0
Original line number Diff line number Diff line
@@ -549,6 +549,11 @@ int register_sh_pfc(struct sh_pfc *pfc) 
	int (*initroutine)(struct sh_pfc *) = NULL;

	int ret;



	/*

	 * Ensure that the type encoding fits

	 */

	BUILD_BUG_ON(PINMUX_FLAG_TYPE > ((1 << PINMUX_FLAG_DBIT_SHIFT) - 1));



	if (sh_pfc)

		return -EBUSY;

include/linux/sh_pfc.h

+14 −9
Original line number Diff line number Diff line
@@ -16,15 +16,18 @@ 
typedef unsigned short pinmux_enum_t;

typedef unsigned short pinmux_flag_t;



#define PINMUX_TYPE_NONE            0

#define PINMUX_TYPE_FUNCTION        1

#define PINMUX_TYPE_GPIO            2

#define PINMUX_TYPE_OUTPUT          3

#define PINMUX_TYPE_INPUT           4

#define PINMUX_TYPE_INPUT_PULLUP    5

#define PINMUX_TYPE_INPUT_PULLDOWN  6

enum {

	PINMUX_TYPE_NONE,



#define PINMUX_FLAG_TYPE            (0x7)

	PINMUX_TYPE_FUNCTION,

	PINMUX_TYPE_GPIO,

	PINMUX_TYPE_OUTPUT,

	PINMUX_TYPE_INPUT,

	PINMUX_TYPE_INPUT_PULLUP,

	PINMUX_TYPE_INPUT_PULLDOWN,



	PINMUX_FLAG_TYPE,	/* must be last */

};



#define PINMUX_FLAG_DBIT_SHIFT      5

#define PINMUX_FLAG_DBIT            (0x1f << PINMUX_FLAG_DBIT_SHIFT)
@@ -36,7 +39,9 @@ struct pinmux_gpio { 
	pinmux_flag_t flags;

};



#define PINMUX_GPIO(gpio, data_or_mark) [gpio] = { data_or_mark }

#define PINMUX_GPIO(gpio, data_or_mark) \

	[gpio] = { .enum_id = data_or_mark, .flags = PINMUX_TYPE_NONE }



#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0



struct pinmux_cfg_reg {