UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpiolib: Add init_valid_mask exported function 

Add a function that allows initializing the valid_mask from
gpiochip_add_data.

This prevents race conditions during gpiochip initialization.

If the function is not exported, then the old behaviour is respected,
this is, set all gpios as valid.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Tested-by: Jeffrey Hugo <jhugo@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Ricardo Ribalda Delgado 2018-10-05 08:52:58 +02:00 committed by Linus Walleij
parent 2505c7b012
commit f8ec92a9f6
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/gpiolib.c
View File

@ -360,7 +360,7 @@ static unsigned long *gpiochip_allocate_mask(struct gpio_chip *chip)
return p; return p;
} }
static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip) static int gpiochip_alloc_valid_mask(struct gpio_chip *gpiochip)
{ {
#ifdef CONFIG_OF_GPIO #ifdef CONFIG_OF_GPIO
int size; int size;
@ -381,6 +381,14 @@ static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)
return 0; return 0;
} }
static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)
{
if (gpiochip->init_valid_mask)
return gpiochip->init_valid_mask(gpiochip);
return 0;
}
static void gpiochip_free_valid_mask(struct gpio_chip *gpiochip) static void gpiochip_free_valid_mask(struct gpio_chip *gpiochip)
{ {
kfree(gpiochip->valid_mask); kfree(gpiochip->valid_mask);
@ -1369,7 +1377,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
if (status) if (status)
goto err_remove_from_list; goto err_remove_from_list;
status = gpiochip_init_valid_mask(chip); status = gpiochip_alloc_valid_mask(chip);
if (status) if (status)
goto err_remove_irqchip_mask; goto err_remove_irqchip_mask;
@ -1381,6 +1389,10 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
if (status) if (status)
goto err_remove_chip; goto err_remove_chip;
status = gpiochip_init_valid_mask(chip);
if (status)
goto err_remove_chip;
acpi_gpiochip_add(chip); acpi_gpiochip_add(chip);
machine_gpiochip_add(chip); machine_gpiochip_add(chip);

7
include/linux/gpio/driver.h
View File

@ -280,6 +280,9 @@ struct gpio_chip {
void (*dbg_show)(struct seq_file *s, void (*dbg_show)(struct seq_file *s,
struct gpio_chip *chip); struct gpio_chip *chip);
int (*init_valid_mask)(struct gpio_chip *chip);
int base; int base;
u16 ngpio; u16 ngpio;
const char *const *names; const char *const *names;
@ -318,7 +321,9 @@ struct gpio_chip {
/** /**
* @need_valid_mask: * @need_valid_mask:
* *
* If set core allocates @valid_mask with all bits set to one. * If set core allocates @valid_mask with all its values initialized
* with init_valid_mask() or set to one if init_valid_mask() is not
* defined
*/ */
bool need_valid_mask; bool need_valid_mask;