intel-gpio for v6.1-1

* Add a quirk for Asus UM325UAZ to make GPIO interrupts working
 
 The following is an automated git shortlog grouped by driver:
 
 gpiolib:
  -  acpi: Add a quirk for Asus UM325UAZ
  -  acpi: Add support to ignore programming an interrupt
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEqaflIX74DDDzMJJtb7wzTHR8rCgFAmMpvw8ACgkQb7wzTHR8
 rCjgdRAArvfEkU34xwuD+Ost0Jb7qu33LIXk/FHMoTDFviICA3RA9S+WEVIZzbuZ
 zbZyK1JlobgYBMs8R3hfFRu/9ZEvSOe91pvrToMOe+u9FrSFf90+ItYrNQfJs4nU
 sqb/FYqUUKtled4ASqVPNiXPv/qVf3y9zFDFDfjtfZHHkMUycMs8K47/9xt0KJWL
 hb9/clwKxz+OGHW/Zsmhpuu8LKEUXpD0pZk9S9B/AyuTUWT/tzEbBllY2nbtohlK
 eWEno0Ztgw++bMY9R/DmIi7DHpYFHZV1onO8GpEsRaoheUAjG3KVr3gePvnDvqPz
 gIZvSZkzqqXiYZS510/PzcHbEBoO1mQ3BzvrALXGAiH8tBfioaab61C5hpxnmhmM
 zR0QGzcDRgsjxXVtdugEC+MW+oqqKBMkTTFFhkbbDj938j90zLra+648f+eXTbkv
 gfBxjsgF6mjpeAkJo6WumHrXYnEn9riths8S7bGOxs5INTS1j1MMTsH6eDswe2dy
 6mT6/Qd/O7CLFwoWQTlpFVTcHQkcKJ86xqnu3mG4bqpsvClxXO1MSEQ9fg6ESDDl
 qSYHzJYVc7/nBpiNLy+oO3cKFlr7LkXLs5glHeUI/6l2fjwhxMnFQDLp5O7wAG2F
 Cof/uozgFFehqOzzQv3UZzEQ4A9BWI4dVUwXRR4snrpcjSafZiM=
 =4yCI
 -----END PGP SIGNATURE-----

Merge tag 'intel-gpio-v6.1-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next

intel-gpio for v6.1-1

* Add a quirk for Asus UM325UAZ to make GPIO interrupts working
This commit is contained in:
Bartosz Golaszewski 2022-09-20 16:00:41 +02:00
commit 361c1ca384

View File

@ -32,9 +32,16 @@ MODULE_PARM_DESC(ignore_wake,
"controller@pin combos on which to ignore the ACPI wake flag "
"ignore_wake=controller@pin[,controller@pin[,...]]");
static char *ignore_interrupt;
module_param(ignore_interrupt, charp, 0444);
MODULE_PARM_DESC(ignore_interrupt,
"controller@pin combos on which to ignore interrupt "
"ignore_interrupt=controller@pin[,controller@pin[,...]]");
struct acpi_gpiolib_dmi_quirk {
bool no_edge_events_on_boot;
char *ignore_wake;
char *ignore_interrupt;
};
/**
@ -317,14 +324,15 @@ static struct gpio_desc *acpi_request_own_gpiod(struct gpio_chip *chip,
return desc;
}
static bool acpi_gpio_in_ignore_list(const char *controller_in, unsigned int pin_in)
static bool acpi_gpio_in_ignore_list(const char *ignore_list, const char *controller_in,
unsigned int pin_in)
{
const char *controller, *pin_str;
unsigned int pin;
char *endp;
int len;
controller = ignore_wake;
controller = ignore_list;
while (controller) {
pin_str = strchr(controller, '@');
if (!pin_str)
@ -348,7 +356,7 @@ static bool acpi_gpio_in_ignore_list(const char *controller_in, unsigned int pin
return false;
err:
pr_err_once("Error: Invalid value for gpiolib_acpi.ignore_wake: %s\n", ignore_wake);
pr_err_once("Error: Invalid value for gpiolib_acpi.ignore_...: %s\n", ignore_list);
return false;
}
@ -360,7 +368,7 @@ static bool acpi_gpio_irq_is_wake(struct device *parent,
if (agpio->wake_capable != ACPI_WAKE_CAPABLE)
return false;
if (acpi_gpio_in_ignore_list(dev_name(parent), pin)) {
if (acpi_gpio_in_ignore_list(ignore_wake, dev_name(parent), pin)) {
dev_info(parent, "Ignoring wakeup on pin %u\n", pin);
return false;
}
@ -427,6 +435,11 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
goto fail_unlock_irq;
}
if (acpi_gpio_in_ignore_list(ignore_interrupt, dev_name(chip->parent), pin)) {
dev_info(chip->parent, "Ignoring interrupt on pin %u\n", pin);
return AE_OK;
}
event = kzalloc(sizeof(*event), GFP_KERNEL);
if (!event)
goto fail_unlock_irq;
@ -1563,6 +1576,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
.ignore_wake = "INT33FF:01@0",
},
},
{
/*
* Interrupt storm caused from edge triggered floating pin
* Found in BIOS UX325UAZ.300
* https://bugzilla.kernel.org/show_bug.cgi?id=216208
*/
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UAZ_UM325UAZ"),
},
.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
.ignore_interrupt = "AMDI0030:00@18",
},
},
{} /* Terminating entry */
};
@ -1585,6 +1612,9 @@ static int __init acpi_gpio_setup_params(void)
if (ignore_wake == NULL && quirk && quirk->ignore_wake)
ignore_wake = quirk->ignore_wake;
if (ignore_interrupt == NULL && quirk && quirk->ignore_interrupt)
ignore_interrupt = quirk->ignore_interrupt;
return 0;
}