Commit 407ac931 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Create debugfs directory automatically for services 



This allows service drivers to use it as parent directory if they need
to add their own debugfs entries.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarYehezkel Bernat <YehezkelShB@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cc0df9c

drivers/thunderbolt/debugfs.c

+24 −0
Original line number Diff line number Diff line
@@ -690,6 +690,30 @@ void tb_switch_debugfs_remove(struct tb_switch *sw) 
	debugfs_remove_recursive(sw->debugfs_dir);

}



/**

 * tb_service_debugfs_init() - Add debugfs directory for service

 * @svc: Thunderbolt service pointer

 *

 * Adds debugfs directory for service.

 */

void tb_service_debugfs_init(struct tb_service *svc)

{

	svc->debugfs_dir = debugfs_create_dir(dev_name(&svc->dev),

					      tb_debugfs_root);

}



/**

 * tb_service_debugfs_remove() - Remove service debugfs directory

 * @svc: Thunderbolt service pointer

 *

 * Removes the previously created debugfs directory for @svc.

 */

void tb_service_debugfs_remove(struct tb_service *svc)

{

	debugfs_remove_recursive(svc->debugfs_dir);

	svc->debugfs_dir = NULL;

}



void tb_debugfs_init(void)

{

	tb_debugfs_root = debugfs_create_dir("thunderbolt", NULL);

drivers/thunderbolt/tb.h

+4 −0
Original line number Diff line number Diff line
@@ -1027,11 +1027,15 @@ void tb_debugfs_init(void); 
void tb_debugfs_exit(void);

void tb_switch_debugfs_init(struct tb_switch *sw);

void tb_switch_debugfs_remove(struct tb_switch *sw);

void tb_service_debugfs_init(struct tb_service *svc);

void tb_service_debugfs_remove(struct tb_service *svc);

#else

static inline void tb_debugfs_init(void) { }

static inline void tb_debugfs_exit(void) { }

static inline void tb_switch_debugfs_init(struct tb_switch *sw) { }

static inline void tb_switch_debugfs_remove(struct tb_switch *sw) { }

static inline void tb_service_debugfs_init(struct tb_service *svc) { }

static inline void tb_service_debugfs_remove(struct tb_service *svc) { }

#endif



#ifdef CONFIG_USB4_KUNIT_TEST

drivers/thunderbolt/xdomain.c

+3 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ static void tb_service_release(struct device *dev) 
	struct tb_service *svc = container_of(dev, struct tb_service, dev);

	struct tb_xdomain *xd = tb_service_parent(svc);



	tb_service_debugfs_remove(svc);

	ida_simple_remove(&xd->service_ids, svc->id);

	kfree(svc->key);

	kfree(svc);
@@ -892,6 +893,8 @@ static void enumerate_services(struct tb_xdomain *xd) 
		svc->dev.parent = &xd->dev;

		dev_set_name(&svc->dev, "%s.%d", dev_name(&xd->dev), svc->id);



		tb_service_debugfs_init(svc);



		if (device_register(&svc->dev)) {

			put_device(&svc->dev);

			break;

include/linux/thunderbolt.h

+4 −0
Original line number Diff line number Diff line
@@ -350,6 +350,9 @@ void tb_unregister_protocol_handler(struct tb_protocol_handler *handler); 
 * @prtcvers: Protocol version from the properties directory

 * @prtcrevs: Protocol software revision from the properties directory

 * @prtcstns: Protocol settings mask from the properties directory

 * @debugfs_dir: Pointer to the service debugfs directory. Always created

 *		 when debugfs is enabled. Can be used by service drivers to

 *		 add their own entries under the service.

 *

 * Each domain exposes set of services it supports as collection of

 * properties. For each service there will be one corresponding
@@ -363,6 +366,7 @@ struct tb_service { 
	u32 prtcvers;

	u32 prtcrevs;

	u32 prtcstns;

	struct dentry *debugfs_dir;

};



static inline struct tb_service *tb_service_get(struct tb_service *svc)