Re: [PATCH] gpiolib: tighten up ACPI legacy gpio lookups

[Dmitry Torokhov]

On Fri, Nov 6, 2015 at 12:08 AM, Mika Westerberg
<mika.westerberg@xxxxxxxxxxxxxxx> wrote:
> On Thu, Nov 05, 2015 at 11:38:38AM -0800, Dmitry Torokhov wrote:
>> We should not fall back to the legacy unnamed gpio lookup style if the
>> driver requests gpios with different names, because we'll give out the same
>> gpio twice. Let's keep track of the names that were used for the device and
>> only do the fallback for the first name used.
>>
>> Also disable fallback to _CRS gpios if ACPI device has DT-like
>> properties or driver-supplied gpio mappings.
>
> Thanks for taking care of this!
>
>> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
>> ---
>>
>> This version incorporates changes suggested by Mika Westerberg in
>> response to the draft patch I posted in Goodix thread.
>>
>>  drivers/gpio/gpiolib.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 47 insertions(+)
>>
>> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
>> index a18f00f..9631ee8 100644
>> --- a/drivers/gpio/gpiolib.c
>> +++ b/drivers/gpio/gpiolib.c
>> @@ -1841,6 +1841,50 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
>>       return desc;
>>  }
>>
>> +struct acpi_gpio_lookup {
>> +     struct list_head node;
>> +     struct acpi_device *adev;
>> +     const char *con_id;
>> +};
>> +
>> +static DEFINE_MUTEX(acpi_gpio_lookup_lock);
>> +static LIST_HEAD(acpi_gpio_lookup_list);
>> +
>> +static bool acpi_can_fallback_to_crs(struct acpi_device *adev,
>> +                                  const char *con_id)
>> +{
>> +     struct acpi_gpio_lookup *l, *lookup = NULL;
>> +
>> +     /* Never fallback if the device has properties */
>> +     if (adev->data.properties || adev->driver_gpios)
>> +             return false;
>
> I missed the fact that struct acpi_device is declared in
> <acpi/acpi_bus.h> so we can't use the two fields directly here when
> !CONFIG_ACPI. Sorry about that.
>
> Do you think we can just add
>
> #ifdef CONFIG_ACPI
>
> #endif
>
> around the above check?
>
> Alternatively we could add an inline function to drivers/gpio/gpiolib.h
> like:
>
> #ifdef CONFIG_ACPI
> static inline bool acpi_gpio_has_properties(struct acpi_device *adev)
> {
>         return adev->data.properties || adev->driver_gpios;
> }
> #else
> static inline bool acpi_gpio_has_properties(struct acpi_device *adev)
> {
>         return false;
> }
> #endif
>

I wonder if I should move acpi_can_fallback_to_crs() into
gpiolib-acpi.c and provide a stub for it...

Thanks.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/