From 99f1646058e5e8183e6daa5f317d075a502bdcfe Mon Sep 17 00:00:00 2001 From: Xinghai Cen Date: Mon, 9 Sep 2024 19:33:58 +0800 Subject: [PATCH 1/2] Revert "gpiolib: acpi: Fix failed in acpi_gpiochip_find() by adding parent node match" driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAQ1MS CVE: NA ------------------------------------------------- This reverts commit fe9e7848a6b896402dd0191e2d14731590020b16. Fixes: fe9e7848a6b8 ("gpiolib: acpi: Fix failed in acpi_gpiochip_find() by adding parent node match") Signed-off-by:lujunhua --- drivers/gpio/gpiolib-acpi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 27eb5f245a14..4ab33d55aec4 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -128,8 +128,7 @@ static bool acpi_gpio_deferred_req_irqs_done; static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) { - return device_match_acpi_handle(&gc->gpiodev->dev, data) || - (gc->parent && device_match_acpi_handle(gc->parent, data)); + return device_match_acpi_handle(&gc->gpiodev->dev, data); } /** -- Gitee From f8b15ad4cc588c0b976676e1e967fb1d944326c6 Mon Sep 17 00:00:00 2001 From: Devyn Liu Date: Mon, 13 May 2024 15:59:01 +0800 Subject: [PATCH 2/2] gpiolib: acpi: Fix failed in acpi_gpiochip_find() by adding parent node match mainline inclusion from mainline-v6.11-rc1 commit adbc49a5a8c6fcf7be154c2e30213bbf472940da category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAQ1MS CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git/commit/drivers/gpio/gpiolib-acpi.c?h=spi-v6.11&id=adbc49a5a8c6fcf7be154c2e30213bbf472940da -------------------------------- Previous patch modified the standard used by acpi_gpiochip_find() to match device nodes. Using the device node set in gc->gpiodev->d- ev instead of gc->parent. However, there is a situation in gpio-dwapb where the GPIO device driver will set gc->fwnode for each port corresponding to a child node under a GPIO device, so gc->gpiodev->dev will be assigned the value of each child node in gpiochip_add_data(). gpio-dwapb.c: 128,31 static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, struct dwapb_port_property *pp, unsigned int offs); port->gc.fwnode = pp->fwnode; 693,39 static int dwapb_gpio_probe; err = dwapb_gpio_add_port(gpio, &pdata->properties[i], i); When other drivers request GPIO pin resources through the GPIO device node provided by ACPI (corresponding to the parent node), the change of the matching object to gc->gpiodev->dev in acpi_gpiochip_find() only allows finding the value of each port (child node), resulting in a failed request. Reapply the condition of using gc->parent for match in acpi_gpio- chip_find() in the code can compatible with the problem of gpio-dwapb, and will not affect the two cases mentioned in the patch: 1. There is no setting for gc->fwnode. 2. The case that depends on using gc->fwnode for match. Fixes: 5062e4c14b75 ("gpiolib: acpi: use the fwnode in acpi_gpiochip_find()") Fixes: 067dbc1ea5ce ("gpiolib: acpi: Don't use GPIO chip fwnode in acpi_gpiochip_find()") Signed-off-by:lujunhua Signed-off-by: Devyn Liu Reviewed-by: Mika Westerberg Tested-by: Benjamin Tissoires Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib-acpi.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 4ab33d55aec4..084c1136b1d3 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -128,7 +128,23 @@ static bool acpi_gpio_deferred_req_irqs_done; static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) { - return device_match_acpi_handle(&gc->gpiodev->dev, data); + /* First check the actual GPIO device */ + if (device_match_acpi_handle(&gc->gpiodev->dev, data)) + return true; + + /* + * When the ACPI device is artificially split to the banks of GPIOs, + * where each of them is represented by a separate GPIO device, + * the firmware node of the physical device may not be shared among + * the banks as they may require different values for the same property, + * e.g., number of GPIOs in a certain bank. In such case the ACPI handle + * of a GPIO device is NULL and can not be used. Hence we have to check + * the parent device to be sure that there is no match before bailing + * out. + */ + if (gc->parent) + return device_match_acpi_handle(gc->parent, data); + return false; } /** -- Gitee