mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									9c3f72a342
								
							
						
					
					
						commit
						e3d0839aa5
					
				
					 5 changed files with 18 additions and 24 deletions
				
			
		| 
						 | 
				
			
			@ -170,7 +170,7 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
 | 
			
		|||
 | 
			
		||||
	xe_wa_apply_tile_workarounds(tile);
 | 
			
		||||
 | 
			
		||||
	xe_tile_sysfs_init(tile);
 | 
			
		||||
	err = xe_tile_sysfs_init(tile);
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,7 @@ static void tile_sysfs_fini(struct drm_device *drm, void *arg)
 | 
			
		|||
	kobject_put(tile->sysfs);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void xe_tile_sysfs_init(struct xe_tile *tile)
 | 
			
		||||
int xe_tile_sysfs_init(struct xe_tile *tile)
 | 
			
		||||
{
 | 
			
		||||
	struct xe_device *xe = tile_to_xe(tile);
 | 
			
		||||
	struct device *dev = xe->drm.dev;
 | 
			
		||||
| 
						 | 
				
			
			@ -38,7 +38,7 @@ void xe_tile_sysfs_init(struct xe_tile *tile)
 | 
			
		|||
 | 
			
		||||
	kt = kzalloc(sizeof(*kt), GFP_KERNEL);
 | 
			
		||||
	if (!kt)
 | 
			
		||||
		return;
 | 
			
		||||
		return -ENOMEM;
 | 
			
		||||
 | 
			
		||||
	kobject_init(&kt->base, &xe_tile_sysfs_kobj_type);
 | 
			
		||||
	kt->tile = tile;
 | 
			
		||||
| 
						 | 
				
			
			@ -46,16 +46,14 @@ void xe_tile_sysfs_init(struct xe_tile *tile)
 | 
			
		|||
	err = kobject_add(&kt->base, &dev->kobj, "tile%d", tile->id);
 | 
			
		||||
	if (err) {
 | 
			
		||||
		kobject_put(&kt->base);
 | 
			
		||||
		drm_warn(&xe->drm, "failed to register TILE sysfs directory, err: %d\n", err);
 | 
			
		||||
		return;
 | 
			
		||||
		return err;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	tile->sysfs = &kt->base;
 | 
			
		||||
 | 
			
		||||
	xe_vram_freq_sysfs_init(tile);
 | 
			
		||||
 | 
			
		||||
	err = drmm_add_action_or_reset(&xe->drm, tile_sysfs_fini, tile);
 | 
			
		||||
	err = xe_vram_freq_sysfs_init(tile);
 | 
			
		||||
	if (err)
 | 
			
		||||
		drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n",
 | 
			
		||||
			 __func__, err);
 | 
			
		||||
		return err;
 | 
			
		||||
 | 
			
		||||
	return drmm_add_action_or_reset(&xe->drm, tile_sysfs_fini, tile);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@
 | 
			
		|||
 | 
			
		||||
#include "xe_tile_sysfs_types.h"
 | 
			
		||||
 | 
			
		||||
void xe_tile_sysfs_init(struct xe_tile *tile);
 | 
			
		||||
int xe_tile_sysfs_init(struct xe_tile *tile);
 | 
			
		||||
 | 
			
		||||
static inline struct xe_tile *
 | 
			
		||||
kobj_to_tile(struct kobject *kobj)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -100,31 +100,27 @@ static void vram_freq_sysfs_fini(struct drm_device *drm, void *arg)
 | 
			
		|||
 * @tile: Xe Tile object
 | 
			
		||||
 *
 | 
			
		||||
 * It needs to be initialized after the main tile component is ready
 | 
			
		||||
 *
 | 
			
		||||
 * Returns: 0 on success, negative error code on error.
 | 
			
		||||
 */
 | 
			
		||||
void xe_vram_freq_sysfs_init(struct xe_tile *tile)
 | 
			
		||||
int xe_vram_freq_sysfs_init(struct xe_tile *tile)
 | 
			
		||||
{
 | 
			
		||||
	struct xe_device *xe = tile_to_xe(tile);
 | 
			
		||||
	struct kobject *kobj;
 | 
			
		||||
	int err;
 | 
			
		||||
 | 
			
		||||
	if (xe->info.platform != XE_PVC)
 | 
			
		||||
		return;
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	kobj = kobject_create_and_add("memory", tile->sysfs);
 | 
			
		||||
	if (!kobj) {
 | 
			
		||||
		drm_warn(&xe->drm, "failed to add memory directory, err: %d\n", -ENOMEM);
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
	if (!kobj)
 | 
			
		||||
		return -ENOMEM;
 | 
			
		||||
 | 
			
		||||
	err = sysfs_create_group(kobj, &freq_group_attrs);
 | 
			
		||||
	if (err) {
 | 
			
		||||
		kobject_put(kobj);
 | 
			
		||||
		drm_warn(&xe->drm, "failed to register vram freq sysfs, err: %d\n", err);
 | 
			
		||||
		return;
 | 
			
		||||
		return err;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	err = drmm_add_action_or_reset(&xe->drm, vram_freq_sysfs_fini, kobj);
 | 
			
		||||
	if (err)
 | 
			
		||||
		drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n",
 | 
			
		||||
			 __func__, err);
 | 
			
		||||
	return drmm_add_action_or_reset(&xe->drm, vram_freq_sysfs_fini, kobj);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,6 @@
 | 
			
		|||
 | 
			
		||||
struct xe_tile;
 | 
			
		||||
 | 
			
		||||
void xe_vram_freq_sysfs_init(struct xe_tile *tile);
 | 
			
		||||
int xe_vram_freq_sysfs_init(struct xe_tile *tile);
 | 
			
		||||
 | 
			
		||||
#endif /* _XE_VRAM_FREQ_H_ */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue