Commit f838d624 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Revert "Make HID attributes visible" 



Patch "Make HID attributes visible" is needed for older kernel versions
(e.g. 6.12) where ufs_get_device_desc() is called from ufshcd_probe_hba().
In these older kernel versions ufshcd_get_device_desc() may be called
after the sysfs attributes have been added. In the upstream kernel however
ufshcd_get_device_desc() is called before ufs_sysfs_add_nodes(). See also
the ufshcd_device_params_init() call from ufshcd_init(). Hence, calling
sysfs_update_group() is not necessary.

See also commit 69f5eb78 ("scsi: ufs: core: Move the
ufshcd_device_init(hba, true) call") in kernel v6.13.

This patch fixes the following kernel warning:

sysfs: cannot create duplicate filename '/devices/platform/3c2d0000.ufs/hid'
Workqueue: async async_run_entry_fn
Call trace:
 dump_backtrace+0xfc/0x17c
 show_stack+0x18/0x28
 dump_stack_lvl+0x40/0x104
 dump_stack+0x18/0x3c
 sysfs_warn_dup+0x6c/0xc8
 internal_create_group+0x1c8/0x504
 sysfs_create_groups+0x38/0x9c
 ufs_sysfs_add_nodes+0x20/0x58
 ufshcd_init+0x1114/0x134c
 ufshcd_pltfrm_init+0x728/0x7d8
 ufs_google_probe+0x30/0x84
 platform_probe+0xa0/0xe0
 really_probe+0x114/0x454
 __driver_probe_device+0xa4/0x160
 driver_probe_device+0x44/0x23c
 __device_attach_driver+0x15c/0x1f4
 bus_for_each_drv+0x10c/0x168
 __device_attach_async_helper+0x80/0xf8
 async_run_entry_fn+0x4c/0x17c
 process_one_work+0x26c/0x65c
 worker_thread+0x33c/0x498
 kthread+0x110/0x134
 ret_from_fork+0x10/0x20
ufshcd 3c2d0000.ufs: ufs_sysfs_add_nodes: sysfs groups creation failed (err = -17)

Cc: Daniel Lee <chullee@google.com>
Cc: Peter Wang <peter.wang@mediatek.com>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Fixes: bb7663de ("scsi: ufs: sysfs: Make HID attributes visible")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>

Fixes: bb7663de ("scsi: ufs: sysfs: Make HID attributes visible")
Acked-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://patch.msgid.link/20251028222433.1108299-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c0e37ac6

drivers/ufs/core/ufs-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1949,7 +1949,7 @@ static umode_t ufs_sysfs_hid_is_visible(struct kobject *kobj, 
	return	hba->dev_info.hid_sup ? attr->mode : 0;

}



const struct attribute_group ufs_sysfs_hid_group = {

static const struct attribute_group ufs_sysfs_hid_group = {

	.name = "hid",

	.attrs = ufs_sysfs_hid,

	.is_visible = ufs_sysfs_hid_is_visible,

drivers/ufs/core/ufs-sysfs.h

+0 −1
Original line number Diff line number Diff line
@@ -14,6 +14,5 @@ void ufs_sysfs_remove_nodes(struct device *dev); 


extern const struct attribute_group ufs_sysfs_unit_descriptor_group;

extern const struct attribute_group ufs_sysfs_lun_attributes_group;

extern const struct attribute_group ufs_sysfs_hid_group;



#endif

drivers/ufs/core/ufshcd.c

+0 −2
Original line number Diff line number Diff line
@@ -8499,8 +8499,6 @@ static int ufs_get_device_desc(struct ufs_hba *hba) 
				DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP) &

				UFS_DEV_HID_SUPPORT;



	sysfs_update_group(&hba->dev->kobj, &ufs_sysfs_hid_group);



	model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];



	err = ufshcd_read_string_desc(hba, model_index,