lkml.org 
[lkml]   [2022]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.19 33/64] habanalabs: add terminating NULL to attrs arrays
    Date
    From: Dafna Hirschfeld <dhirschfeld@habana.ai>

    [ Upstream commit 78d503087be190eab36290644ccec050135e7c70 ]

    Arrays of struct attribute are expected to be NULL terminated.
    This is required by API methods such as device_add_groups.
    This fixes a crash when loading the driver for Goya device.

    Signed-off-by: Dafna Hirschfeld <dhirschfeld@habana.ai>
    Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
    Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/misc/habanalabs/common/sysfs.c | 2 ++
    drivers/misc/habanalabs/gaudi/gaudi.c | 1 +
    drivers/misc/habanalabs/goya/goya_hwmgr.c | 2 ++
    3 files changed, 5 insertions(+)

    diff --git a/drivers/misc/habanalabs/common/sysfs.c b/drivers/misc/habanalabs/common/sysfs.c
    index 9ebeb18ab85e..da8181068895 100644
    --- a/drivers/misc/habanalabs/common/sysfs.c
    +++ b/drivers/misc/habanalabs/common/sysfs.c
    @@ -73,6 +73,7 @@ static DEVICE_ATTR_RO(clk_cur_freq_mhz);
    static struct attribute *hl_dev_clk_attrs[] = {
    &dev_attr_clk_max_freq_mhz.attr,
    &dev_attr_clk_cur_freq_mhz.attr,
    + NULL,
    };

    static ssize_t vrm_ver_show(struct device *dev, struct device_attribute *attr, char *buf)
    @@ -93,6 +94,7 @@ static DEVICE_ATTR_RO(vrm_ver);

    static struct attribute *hl_dev_vrm_attrs[] = {
    &dev_attr_vrm_ver.attr,
    + NULL,
    };

    static ssize_t uboot_ver_show(struct device *dev, struct device_attribute *attr,
    diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
    index fba322241096..25d735aee6a3 100644
    --- a/drivers/misc/habanalabs/gaudi/gaudi.c
    +++ b/drivers/misc/habanalabs/gaudi/gaudi.c
    @@ -9187,6 +9187,7 @@ static DEVICE_ATTR_RO(infineon_ver);

    static struct attribute *gaudi_vrm_dev_attrs[] = {
    &dev_attr_infineon_ver.attr,
    + NULL,
    };

    static void gaudi_add_device_attr(struct hl_device *hdev, struct attribute_group *dev_clk_attr_grp,
    diff --git a/drivers/misc/habanalabs/goya/goya_hwmgr.c b/drivers/misc/habanalabs/goya/goya_hwmgr.c
    index 6580fc6a486a..b595721751c1 100644
    --- a/drivers/misc/habanalabs/goya/goya_hwmgr.c
    +++ b/drivers/misc/habanalabs/goya/goya_hwmgr.c
    @@ -359,6 +359,7 @@ static struct attribute *goya_clk_dev_attrs[] = {
    &dev_attr_pm_mng_profile.attr,
    &dev_attr_tpc_clk.attr,
    &dev_attr_tpc_clk_curr.attr,
    + NULL,
    };

    static ssize_t infineon_ver_show(struct device *dev, struct device_attribute *attr, char *buf)
    @@ -375,6 +376,7 @@ static DEVICE_ATTR_RO(infineon_ver);

    static struct attribute *goya_vrm_dev_attrs[] = {
    &dev_attr_infineon_ver.attr,
    + NULL,
    };

    void goya_add_device_attr(struct hl_device *hdev, struct attribute_group *dev_clk_attr_grp,
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-14 17:31    [W:3.173 / U:0.756 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site