From: Greg Kroah-Hartman Date: Wed, 17 Mar 2021 16:05:33 +0000 (+0100) Subject: drop gpiolib-read-gpio-line-names-from-a-firmware-node.patch from 5.10 and 5.11 X-Git-Tag: v5.10.24~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72c4e765a8ee62552742b59158fc3ba9c6de1e1b;p=thirdparty%2Fkernel%2Fstable-queue.git drop gpiolib-read-gpio-line-names-from-a-firmware-node.patch from 5.10 and 5.11 --- diff --git a/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch b/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch deleted file mode 100644 index 4b8211065e4..00000000000 --- a/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch +++ /dev/null @@ -1,77 +0,0 @@ -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 -@@ -364,22 +364,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; - -@@ -393,7 +389,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.10/series b/queue-5.10/series index eabd67a4827..ad28103244c 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -78,7 +78,6 @@ s390-cio-return-efault-if-copy_to_user-fails.patch bnxt_en-reliably-allocate-irq-table-on-reset-to-avoid-crash.patch gpiolib-acpi-add-acpi_gpio_quirk_absolute_number-quirk.patch gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch -gpiolib-read-gpio-line-names-from-a-firmware-node.patch gpio-pca953x-set-irq-type-when-handle-intel-galileo-gen-2.patch gpio-fix-gpio-device-list-corruption.patch drm-compat-clear-bounce-structures.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 deleted file mode 100644 index 71ecb98dcf6..00000000000 --- a/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch +++ /dev/null @@ -1,77 +0,0 @@ -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 b62895770c4..bf348674d08 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -13,7 +13,6 @@ ath11k-fix-ap-mode-for-qca6390.patch net-l2tp-reduce-log-level-of-messages-in-receive-path-add-counter-instead.patch gpiolib-acpi-add-acpi_gpio_quirk_absolute_number-quirk.patch gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch -gpiolib-read-gpio-line-names-from-a-firmware-node.patch can-skb-can_skb_set_owner-fix-ref-counting-if-socket-was-closed-before-setting-skb-ownership.patch gpio-pca953x-set-irq-type-when-handle-intel-galileo-gen-2.patch can-flexcan-assert-frz-bit-in-flexcan_chip_freeze.patch