Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/xe/tile: Abort driver load for sysfs creation failure

Ensure that the status of all tile associated sysfs entries creation is
relayed to xe_tile_init_noalloc, leading to a driver load abort if any
sysfs creation failures occur.

-v2
Avoid unnecessary warn/error messages. (Lucas)

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240412181211.1155732-7-himal.prasad.ghimiray@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

authored by

Himal Prasad Ghimiray and committed by
Lucas De Marchi
e3d0839a 9c3f72a3

+18 -24
+1 -1
drivers/gpu/drm/xe/xe_tile.c
··· 170 170 171 171 xe_wa_apply_tile_workarounds(tile); 172 172 173 - xe_tile_sysfs_init(tile); 173 + err = xe_tile_sysfs_init(tile); 174 174 175 175 return 0; 176 176 }
+7 -9
drivers/gpu/drm/xe/xe_tile_sysfs.c
··· 29 29 kobject_put(tile->sysfs); 30 30 } 31 31 32 - void xe_tile_sysfs_init(struct xe_tile *tile) 32 + int xe_tile_sysfs_init(struct xe_tile *tile) 33 33 { 34 34 struct xe_device *xe = tile_to_xe(tile); 35 35 struct device *dev = xe->drm.dev; ··· 38 38 39 39 kt = kzalloc(sizeof(*kt), GFP_KERNEL); 40 40 if (!kt) 41 - return; 41 + return -ENOMEM; 42 42 43 43 kobject_init(&kt->base, &xe_tile_sysfs_kobj_type); 44 44 kt->tile = tile; ··· 46 46 err = kobject_add(&kt->base, &dev->kobj, "tile%d", tile->id); 47 47 if (err) { 48 48 kobject_put(&kt->base); 49 - drm_warn(&xe->drm, "failed to register TILE sysfs directory, err: %d\n", err); 50 - return; 49 + return err; 51 50 } 52 51 53 52 tile->sysfs = &kt->base; 54 53 55 - xe_vram_freq_sysfs_init(tile); 56 - 57 - err = drmm_add_action_or_reset(&xe->drm, tile_sysfs_fini, tile); 54 + err = xe_vram_freq_sysfs_init(tile); 58 55 if (err) 59 - drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n", 60 - __func__, err); 56 + return err; 57 + 58 + return drmm_add_action_or_reset(&xe->drm, tile_sysfs_fini, tile); 61 59 }
+1 -1
drivers/gpu/drm/xe/xe_tile_sysfs.h
··· 8 8 9 9 #include "xe_tile_sysfs_types.h" 10 10 11 - void xe_tile_sysfs_init(struct xe_tile *tile); 11 + int xe_tile_sysfs_init(struct xe_tile *tile); 12 12 13 13 static inline struct xe_tile * 14 14 kobj_to_tile(struct kobject *kobj)
+8 -12
drivers/gpu/drm/xe/xe_vram_freq.c
··· 100 100 * @tile: Xe Tile object 101 101 * 102 102 * It needs to be initialized after the main tile component is ready 103 + * 104 + * Returns: 0 on success, negative error code on error. 103 105 */ 104 - void xe_vram_freq_sysfs_init(struct xe_tile *tile) 106 + int xe_vram_freq_sysfs_init(struct xe_tile *tile) 105 107 { 106 108 struct xe_device *xe = tile_to_xe(tile); 107 109 struct kobject *kobj; 108 110 int err; 109 111 110 112 if (xe->info.platform != XE_PVC) 111 - return; 113 + return 0; 112 114 113 115 kobj = kobject_create_and_add("memory", tile->sysfs); 114 - if (!kobj) { 115 - drm_warn(&xe->drm, "failed to add memory directory, err: %d\n", -ENOMEM); 116 - return; 117 - } 116 + if (!kobj) 117 + return -ENOMEM; 118 118 119 119 err = sysfs_create_group(kobj, &freq_group_attrs); 120 120 if (err) { 121 121 kobject_put(kobj); 122 - drm_warn(&xe->drm, "failed to register vram freq sysfs, err: %d\n", err); 123 - return; 122 + return err; 124 123 } 125 124 126 - err = drmm_add_action_or_reset(&xe->drm, vram_freq_sysfs_fini, kobj); 127 - if (err) 128 - drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n", 129 - __func__, err); 125 + return drmm_add_action_or_reset(&xe->drm, vram_freq_sysfs_fini, kobj); 130 126 }
+1 -1
drivers/gpu/drm/xe/xe_vram_freq.h
··· 8 8 9 9 struct xe_tile; 10 10 11 - void xe_vram_freq_sysfs_init(struct xe_tile *tile); 11 + int xe_vram_freq_sysfs_init(struct xe_tile *tile); 12 12 13 13 #endif /* _XE_VRAM_FREQ_H_ */