lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 088/150] mei: make sysfs modalias format similar as uevent modalias
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pratyush Anand <panand@redhat.com>

    commit 6f9193ec044a8f72d8b6ae94a5c4ab6e8b0f00ca upstream.

    modprobe is not able to resolve sysfs modalias for mei devices.

    # cat
    /sys/class/watchdog/watchdog0/device/watchdog/watchdog0/device/modalias
    mei::05b79a6f-4628-4d7f-899d-a91514cb32ab:
    # modprobe --set-version 4.9.6-200.fc25.x86_64 -R
    mei::05b79a6f-4628-4d7f-899d-a91514cb32ab:
    modprobe: FATAL: Module mei::05b79a6f-4628-4d7f-899d-a91514cb32ab: not
    found in directory /lib/modules/4.9.6-200.fc25.x86_64
    # cat /lib/modules/4.9.6-200.fc25.x86_64/modules.alias | grep
    05b79a6f-4628-4d7f-899d-a91514cb32ab
    alias mei:*:05b79a6f-4628-4d7f-899d-a91514cb32ab:*:* mei_wdt

    commit b26864cad1c9 ("mei: bus: add client protocol
    version to the device alias"), however sysfs modalias
    is still in formmat mei:S:uuid:*.

    This patch equates format of uevent and sysfs modalias so that modprobe
    is able to resolve the aliases.

    Fixes: commit b26864cad1c9 ("mei: bus: add client protocol version to the device alias")
    Signed-off-by: Pratyush Anand <panand@redhat.com>
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/misc/mei/bus.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/misc/mei/bus.c
    +++ b/drivers/misc/mei/bus.c
    @@ -763,8 +763,10 @@ static ssize_t modalias_show(struct devi
    {
    struct mei_cl_device *cldev = to_mei_cl_device(dev);
    const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
    + u8 version = mei_me_cl_ver(cldev->me_cl);

    - return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", cldev->name, uuid);
    + return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:%02X:",
    + cldev->name, uuid, version);
    }
    static DEVICE_ATTR_RO(modalias);


    \
     
     \ /
      Last update: 2017-06-12 20:55    [W:2.643 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site