From f75551cfff681e440ea420beb2c1f8761c4c0e8e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Apr 2021 09:19:01 +0200 Subject: [PATCH] 5.11-stable patches added patches: gpiolib-read-gpio-line-names-from-a-firmware-node.patch --- ...gpio-line-names-from-a-firmware-node.patch | 77 +++++++++++++++++++ queue-5.11/series | 1 + 2 files changed, 78 insertions(+) create mode 100644 queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch diff --git a/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch b/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch new file mode 100644 index 00000000000..71ecb98dcf6 --- /dev/null +++ b/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch @@ -0,0 +1,77 @@ +From b41ba2ec54a70908067034f139aa23d0dd2985ce Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Fri, 5 Mar 2021 14:02:40 +0200 +Subject: gpiolib: Read "gpio-line-names" from a firmware node + +From: Andy Shevchenko + +commit b41ba2ec54a70908067034f139aa23d0dd2985ce upstream. + +On STM32MP1, the GPIO banks are subnodes of pin-controller@50002000, +see arch/arm/boot/dts/stm32mp151.dtsi. The driver for +pin-controller@50002000 is in drivers/pinctrl/stm32/pinctrl-stm32.c +and iterates over all of its DT subnodes when registering each GPIO +bank gpiochip. Each gpiochip has: + + - gpio_chip.parent = dev, + where dev is the device node of the pin controller + - gpio_chip.of_node = np, + which is the OF node of the GPIO bank + +Therefore, dev_fwnode(chip->parent) != of_fwnode_handle(chip.of_node), +i.e. pin-controller@50002000 != pin-controller@50002000/gpio@5000*000. + +The original code behaved correctly, as it extracted the "gpio-line-names" +from of_fwnode_handle(chip.of_node) = pin-controller@50002000/gpio@5000*000. + +To achieve the same behaviour, read property from the firmware node. + +Fixes: 7cba1a4d5e162 ("gpiolib: generalize devprop_gpiochip_set_names() for device properties") +Reported-by: Marek Vasut +Reported-by: Roman Guskov +Signed-off-by: Andy Shevchenko +Tested-by: Marek Vasut +Reviewed-by: Marek Vasut +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpio/gpiolib.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/gpio/gpiolib.c ++++ b/drivers/gpio/gpiolib.c +@@ -365,22 +365,18 @@ static int gpiochip_set_desc_names(struc + * + * Looks for device property "gpio-line-names" and if it exists assigns + * GPIO line names for the chip. The memory allocated for the assigned +- * names belong to the underlying software node and should not be released ++ * names belong to the underlying firmware node and should not be released + * by the caller. + */ + static int devprop_gpiochip_set_names(struct gpio_chip *chip) + { + struct gpio_device *gdev = chip->gpiodev; +- struct device *dev = chip->parent; ++ struct fwnode_handle *fwnode = dev_fwnode(&gdev->dev); + const char **names; + int ret, i; + int count; + +- /* GPIO chip may not have a parent device whose properties we inspect. */ +- if (!dev) +- return 0; +- +- count = device_property_string_array_count(dev, "gpio-line-names"); ++ count = fwnode_property_string_array_count(fwnode, "gpio-line-names"); + if (count < 0) + return 0; + +@@ -394,7 +390,7 @@ static int devprop_gpiochip_set_names(st + if (!names) + return -ENOMEM; + +- ret = device_property_read_string_array(dev, "gpio-line-names", ++ ret = fwnode_property_read_string_array(fwnode, "gpio-line-names", + names, count); + if (ret < 0) { + dev_warn(&gdev->dev, "failed to read GPIO line names\n"); diff --git a/queue-5.11/series b/queue-5.11/series index 2a1492d2335..2b2f8b7ad96 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -193,3 +193,4 @@ lockdep-address-clang-wformat-warning-printing-for-hd.patch dt-bindings-net-ethernet-controller-fix-typo-in-nvmem.patch net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch x86-traps-correct-exc_general_protection-and-math_error-return-paths.patch +gpiolib-read-gpio-line-names-from-a-firmware-node.patch -- 2.47.3