qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

led: trig: netdev: Fix requesting offload device 

JIRA: https://issues.redhat.com/browse/RHEL-32110

commit 7df1f14c04cbb1950e79c19793420f87227c3e80
Author: Andrew Lunn <andrew@lunn.ch>
Date:   Tue Aug 8 23:04:33 2023 +0200

    led: trig: netdev: Fix requesting offload device

    When the netdev trigger is activates, it tries to determine what
    device the LED blinks for, and what the current blink mode is.

    The documentation for hw_control_get() says:

             * Return 0 on success, a negative error number on failing parsing the
             * initial mode. Error from this function is NOT FATAL as the device
             * may be in a not supported initial state by the attached LED trigger.
             */

    For the Marvell PHY and the Armada 370-rd board, the initial LED blink
    mode is not supported by the trigger, so it returns an error. This
    resulted in not getting the device the LED is blinking for. As a
    result, the device is unknown and offloaded is never performed.

    Change to condition to always get the device if offloading is
    supported, and reduce the scope of testing for an error from
    hw_control_get() to skip setting trigger internal state if there is an
    error.

    Reviewed-by: Simon Horman <simon.horman@corigine.com>
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Tested-by: Daniel Golle <daniel@makrotopia.org>
    Link: https://lore.kernel.org/r/20230808210436.838995-2-andrew@lunn.ch
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
This commit is contained in:
Michal Schmidt 2024-04-23 12:18:31 +02:00
parent 583815261c
commit 3388618ebd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/leds/trigger/ledtrig-netdev.c
View File

@ -564,15 +564,17 @@ static int netdev_trig_activate(struct led_classdev *led_cdev)
/* Check if hw control is active by default on the LED.
* Init already enabled mode in hw control.
*/
if (supports_hw_control(led_cdev) &&
!led_cdev->hw_control_get(led_cdev, &mode)) {
if (supports_hw_control(led_cdev)) {
dev = led_cdev->hw_control_get_device(led_cdev);
if (dev) {
const char *name = dev_name(dev);
set_device_name(trigger_data, name, strlen(name));
trigger_data->hw_control = true;
trigger_data->mode = mode;
rc = led_cdev->hw_control_get(led_cdev, &mode);
if (!rc)
trigger_data->mode = mode;
}
}