Skip to contentSkip to conversation

extcon: int3496: Set the id pin to direction-input if necessary

PATCH Applied Hans de Goede 3 participants 3 messages Mar 13, 2017 External connector subsystem (extcon)

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 extcon: int3496: Set the id pin to direction-input if necessary

With the new more strict ACPI gpio code the dsdt's IoRestriction flags are honored on gpiod_get, but in some dsdt's it is wrong, so explicitly call gpiod_direction_input on the id gpio if necessary.

This fixes the following errors when the int3496 code is used together with the new more strict ACPI gpio code:

[ 2382.484415] gpio gpiochip1: (INT33FF:01): gpiochip_lock_as_irq: tried to flag a GPIO set as output for IRQ
[ 2382.484425] gpio gpiochip1: (INT33FF:01): unable to lock HW IRQ 3 for IRQ
[ 2382.484429] genirq: Failed to request resources for INT3496:00 (irq 174) on irqchip chv-gpio
[ 2382.484518] intel-int3496 INT3496:00: can't request IRQ for USB ID GPIO: -22
[ 2382.500359] intel-int3496: probe of INT3496:00 failed with error -22
Cc Andy Shevchenko <[email protected]>

---
Changes in v2:
-Warn about firmware bug when the dsdt's IoRestriction does not allow input Changes in v3:
-Use FW_BUG macro
-Group check together with gpiodesc error check
-Keep lines within 80 chars limit

---
 drivers/extcon/extcon-intel-int3496.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/extcon/extcon-intel-int3496.c +3 -0
index b8ac947..d9f9afe 100644
@@ -112,6 +112,9 @@ static int int3496_probe(struct platform_device *pdev)
 		ret = PTR_ERR(data->gpio_usb_id);
 		dev_err(dev, "can't request USB ID GPIO: %d\n", ret);
 		return ret;
+	} else if (gpiod_get_direction(data->gpio_usb_id) != GPIOF_DIR_IN) {
+		dev_warn(dev, FW_BUG "USB ID GPIO not in input mode, fixing\n");
+		gpiod_direction_input(data->gpio_usb_id);
 	}
 
 	data->usb_id_irq = gpiod_to_irq(data->gpio_usb_id);
Signature · 1 line
2.9.3
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · Hans de Goede

With the new more strict ACPI gpio code the dsdt's IoRestriction flags are honored on gpiod_get, but in some dsdt's it is wrong, so explicitly call gpiod_direction_input on the id gpio if necessary.

This fixes the following errors when the int3496 code is used together with the new more strict ACPI gpio code:

One nit below.

Quoted 10 lines
[ 2382.484415] gpio gpiochip1: (INT33FF:01): gpiochip_lock_as_irq: tried to flag a GPIO set as output for IRQ
[ 2382.484425] gpio gpiochip1: (INT33FF:01): unable to lock HW IRQ 3 for IRQ
[ 2382.484429] genirq: Failed to request resources for INT3496:00 (irq 174) on irqchip chv-gpio
[ 2382.484518] intel-int3496 INT3496:00: can't request IRQ for USB ID GPIO: -22
[ 2382.500359] intel-int3496: probe of INT3496:00 failed with error -22
                ret = PTR_ERR(data->gpio_usb_id);
                dev_err(dev, "can't request USB ID GPIO: %d\n", ret);
                return ret;

+ } else if (gpiod_get_direction(data->gpio_usb_id) != GPIOF_DIR_IN) {

It's obvious useless use of else. It doesn't harm, it doesn't bring any value either.

Quoted 2 lines
drivers/extcon/extcon-intel-int3496.c +2 -0
+               dev_warn(dev, FW_BUG "USB ID GPIO not in input mode, fixing\n");
+               gpiod_direction_input(data->gpio_usb_id);
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer Applied
#2 lore raw
In reply to Hans de Goede

Hi,

Quoted 20 lines · Hans de Goede

With the new more strict ACPI gpio code the dsdt's IoRestriction flags are honored on gpiod_get, but in some dsdt's it is wrong, so explicitly call gpiod_direction_input on the id gpio if necessary.

This fixes the following errors when the int3496 code is used together with the new more strict ACPI gpio code:

[ 2382.484415] gpio gpiochip1: (INT33FF:01): gpiochip_lock_as_irq: tried to flag a GPIO set as output for IRQ
[ 2382.484425] gpio gpiochip1: (INT33FF:01): unable to lock HW IRQ 3 for IRQ
[ 2382.484429] genirq: Failed to request resources for INT3496:00 (irq 174) on irqchip chv-gpio
[ 2382.484518] intel-int3496 INT3496:00: can't request IRQ for USB ID GPIO: -22
[ 2382.500359] intel-int3496: probe of INT3496:00 failed with error -22
Cc Andy Shevchenko <[email protected]>

---
Changes in v2:
-Warn about firmware bug when the dsdt's IoRestriction does not allow input Changes in v3:

Review

Quoted 6 lines
(quoted diff) +0 -4
-Use FW_BUG macro
-Group check together with gpiodesc error check
-Keep lines within 80 chars limit
---
 drivers/extcon/extcon-intel-int3496.c | 3 +++
 1 file changed, 3 insertions(+)

Applied it. Thanks.

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics