openstlinux/uboot-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm: gpio: Add GPIOF_PROTECTED flag

Browse Source 
Declare the GPIOF_PROTECTED flag, to identify a GPIO which can't be used
because it has a protected access.
This can be used to flag a GPIO that can be accessed only from the Secure
world.

Add a test and support in the gpio sandbox.

Signed-off-by: Fabien Dessenne <fabien.dessenne@foss.st.com>
Change-Id: Ic990ca6a02f9cc6f9e84bd94732ea62cfbafb301
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/u-boot/+/252039
Reviewed-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: CIBUILD <MDG-smet-aci-builds@list.st.com>
Reviewed-by: Patrice CHOTARD <patrice.chotard@foss.st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@foss.st.com>
This commit is contained in:
Fabien Dessenne
2022-05-12 18:21:26 +02:00
committed by Patrick Delaunay
parent 975f629eb4
commit a33d8e2f83
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sandbox/include/asm/gpio.h
View File

@ -28,9 +28,10 @@
#define GPIOD_EXT_DRIVEN BIT(30) /* external source is driven */
#define GPIOD_EXT_PULL_UP BIT(29) /* GPIO has external pull-up */
#define GPIOD_EXT_PULL_DOWN BIT(28) /* GPIO has external pull-down */
#define GPIOD_EXT_PROTECTED BIT(27) /* GPIO is access protected */
#define GPIOD_EXT_PULL (BIT(28) | BIT(29))
#define GPIOD_SANDBOX_MASK GENMASK(31, 28)
#define GPIOD_SANDBOX_MASK GENMASK(31, 27)
/**
* Return the simulated value of a GPIO (used only in sandbox test code)

1
drivers/gpio/gpio-uclass.c
View File

@ -824,6 +824,7 @@ static const char * const gpio_function[GPIOF_COUNT] = {
"unused",
"unknown",
"func",
"protected",
};
static int get_function(struct udevice *dev, int offset, bool skip_unused,

16
drivers/gpio/sandbox.c
View File

@ -192,12 +192,14 @@ static int sb_gpio_set_value(struct udevice *dev, unsigned offset, int value)
static int sb_gpio_get_function(struct udevice *dev, unsigned offset)
{
if (get_gpio_flag(dev, offset, GPIOD_EXT_PROTECTED))
return GPIOF_PROTECTED;
if (get_gpio_flag(dev, offset, GPIOD_IS_OUT))
return GPIOF_OUTPUT;
if (get_gpio_flag(dev, offset, GPIOD_IS_IN))
return GPIOF_INPUT;
return GPIOF_INPUT; /*GPIO is not configurated */
return GPIOF_INPUT; /* GPIO is not configured */
}
static int sb_gpio_xlate(struct udevice *dev, struct gpio_desc *desc,
@ -519,6 +521,14 @@ static int sb_pinctrl_get_pin_muxing(struct udevice *dev,
unsigned int gpio_idx;
ulong flags;
int function;
static const char * const gpio_function[GPIOF_COUNT] = {
"input",
"output",
"unused",
"unknown",
"func",
"protected",
};
/* look up for the bank which owns the requested pin */
gpio_dev = sb_pinctrl_get_gpio_dev(dev, selector, &gpio_idx);
@ -527,9 +537,7 @@ static int sb_pinctrl_get_pin_muxing(struct udevice *dev,
} else {
function = sb_gpio_get_function(gpio_dev, gpio_idx);
flags = *get_gpio_flags(gpio_dev, gpio_idx);
snprintf(buf, size, "gpio %s %s",
function == GPIOF_OUTPUT ? "output" : "input",
snprintf(buf, size, "gpio %s %s", gpio_function[function],
get_flags_string(flags));
}

1
include/asm-generic/gpio.h
View File

@ -110,6 +110,7 @@ enum gpio_func_t {
GPIOF_UNUSED, /* Not claimed */
GPIOF_UNKNOWN, /* Not known */
GPIOF_FUNC, /* Not used as a GPIO */
GPIOF_PROTECTED, /* Protected access */
GPIOF_COUNT,
};

5
test/dm/gpio.c
View File

@ -113,6 +113,11 @@ static int dm_test_gpio(struct unit_test_state *uts)
ut_asserteq_str("a", name);
ut_asserteq(20, offset_count);
/* Flag a pin as protected, and check its status */
ut_assertok(gpio_lookup_name("a1", &dev, &offset, &gpio));
sandbox_gpio_set_flags(dev, 1, GPIOD_EXT_PROTECTED);
ut_asserteq(GPIOF_PROTECTED, gpio_get_raw_function(dev, 1, NULL));
/* add gpio hog tests */
ut_assertok(gpio_hog_lookup_name("hog_input_active_low", &desc));
ut_asserteq(GPIOD_IS_IN | GPIOD_ACTIVE_LOW, desc->flags);